Merge branch 'dev' into pbf-shard-generator-add-bounds

.github/workflows/ci.yml

@@ -24,7 +24,7 @@ jobs:
     - name: Set up JDK 11
       uses: actions/[email protected]
       with:
-        java-version: 11.0.2
+        java-version: 11.0.13
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
     - name: Grant execute permission for Github Actions Workflows

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2015-2021, Apple Inc. All rights reserved.
+Copyright (c) 2015-2022, Apple Inc. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, 
 are permitted provided that the following conditions are met:  

build.gradle

@@ -1,14 +1,14 @@
 plugins {
-	id 'java'
-	id 'maven'
-	id 'maven-publish'
-	id 'idea'
-	id 'signing'
-	id 'checkstyle'
-	id 'jacoco'
-	id "com.diffplug.gradle.spotless" version "3.27.0"
-	id 'org.sonarqube' version '2.8'
-	// id "io.codearte.nexus-staging" version "0.12.0"
+    id 'java'
+    id 'maven'
+    id 'maven-publish'
+    id 'idea'
+    id 'signing'
+    id 'checkstyle'
+    id 'jacoco'
+    id "com.diffplug.gradle.spotless" version "3.27.0"
+    id 'org.sonarqube' version '2.8'
+    // id "io.codearte.nexus-staging" version "0.12.0"
 }
 
 apply from: 'dependencies.gradle'
@@ -23,9 +23,20 @@ targetCompatibility=11
 
 repositories
 {
+    maven {
+        url "https://repo.maven.apache.org/maven2/"
+        artifactUrls "https://repo.maven.apache.org/maven2/"
+        // javax.media:jai_core:1.1.3 has the pom in central, but the jar in osgeo
+        artifactUrls "https://repo.osgeo.org/repository/release/"
+    }
     // For geotools
-    maven { url "http://repo.osgeo.org/repository/release/" }
-    mavenCentral()
+    maven {
+       url "https://repo.osgeo.org/repository/release/"
+       content {
+         // osgeo removed the jar and added a -norce version
+         excludeVersion("log4j", "log4j", "1.2.17")
+       }
+     }
     // For Spark CDH
     maven { url "https://repository.cloudera.com/content/repositories/releases/" }
     // For jetty (through spark)

dependencies.gradle

@@ -1,7 +1,7 @@
 project.ext.versions = [
     checkstyle: '8.18',
     jacoco: '0.8.3',
-    atlas: '6.6.1',
+    atlas: '7.0.2',
     spark: '3.0.1',
     snappy: '1.1.1.6',
     atlas_checkstyle: '5.6.9',

gradle.properties

@@ -1,5 +1,5 @@
 group=org.openstreetmap.atlas
-version=5.3.9-SNAPSHOT
+version=5.4.0-SNAPSHOT
 
 maven2_url=https://oss.sonatype.org/service/local/staging/deploy/maven2/
 snapshot_url=https://oss.sonatype.org/content/repositories/snapshots/

src/integrationTest/java/org/openstreetmap/atlas/mutator/AtlasMutatorIntegrationTest.java

@@ -248,7 +248,7 @@ public void mutate()
          * ADDs. In the case of brand new relation ADDs, we are now leaving the "mutator:" tags on
          * the relation itself instead of moving them to the metadata.
          */
-        Assert.assertTrue(outputLz9x261y195.metaData().getTags().isEmpty());
+        // Assert.assertTrue(outputLz9x261y195.metaData().getTags().isEmpty());
         outputLz9x261y195.relations().forEach(
                 relation -> Assert.assertTrue(relation.getTags().entrySet().stream().anyMatch(
                         entry -> entry.getKey().startsWith(AtlasMutator.MUTATOR_META_DATA_KEY

src/main/java/org/openstreetmap/atlas/mutator/AtlasMutatorHelper.java

@@ -603,7 +603,7 @@ public AtlasMetaData metaData()
                             return new AtlasMetaData(metaData.getSize(), false,
                                     metaData.getCodeVersion().orElse(null),
                                     metaData.getDataVersion().orElse(null), country,
-                                    metaData.getShardName().orElse(null), metaData.getTags());
+                                    countryShard.getShard().getName(), metaData.getTags());
                         }
                     };
                     source.preemptiveLoad();