From e9066b1c1f45dc275458cc5563c09be77a5fddc0 Mon Sep 17 00:00:00 2001 From: matthieun Date: Wed, 12 Jan 2022 12:49:33 -0800 Subject: [PATCH 1/7] Update date range --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index 03edb778..c6db3010 100644 --- a/LICENSE +++ b/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: From 70a71ffbb292b16b161c360182e819e7e0bf5cba Mon Sep 17 00:00:00 2001 From: matthieun Date: Thu, 13 Jan 2022 11:22:00 -0800 Subject: [PATCH 2/7] Put maven central first (#198) * Put maven central first * why not * why not * why not * why not * why not * why not * why not * why not * why not * why not * add exclude * oops --- .github/workflows/ci.yml | 2 +- build.gradle | 35 +++++++++++++++++++++++------------ 2 files changed, 24 insertions(+), 13 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 49edc5d1..c7ba282d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -24,7 +24,7 @@ jobs: - name: Set up JDK 11 uses: actions/setup-java@v1.4.3 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 diff --git a/build.gradle b/build.gradle index c57b936c..58b28a6a 100644 --- a/build.gradle +++ b/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) From 0d4f135b8ccb8e3c7de2d886d5a3d394f9f07b44 Mon Sep 17 00:00:00 2001 From: Samuel Gass Date: Wed, 16 Mar 2022 14:46:50 -0700 Subject: [PATCH 3/7] Override Atlas metadata to guarantee shard name is correct (#200) --- .../org/openstreetmap/atlas/mutator/AtlasMutatorHelper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/openstreetmap/atlas/mutator/AtlasMutatorHelper.java b/src/main/java/org/openstreetmap/atlas/mutator/AtlasMutatorHelper.java index 5db85412..19e54afb 100644 --- a/src/main/java/org/openstreetmap/atlas/mutator/AtlasMutatorHelper.java +++ b/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(); From 4ed0423426c4474a5d4dc159d32212c85eeac974 Mon Sep 17 00:00:00 2001 From: Samuel Gass Date: Thu, 17 Mar 2022 08:30:38 -0700 Subject: [PATCH 4/7] Update atlas version --- dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.gradle b/dependencies.gradle index 4aad4e17..a56b08cc 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,7 +1,7 @@ project.ext.versions = [ checkstyle: '8.18', jacoco: '0.8.3', - atlas: '6.6.1', + atlas: '6.6.3', spark: '3.0.1', snappy: '1.1.1.6', atlas_checkstyle: '5.6.9', From 856ce9785c0cdb2fee31d8caed479340da4750b2 Mon Sep 17 00:00:00 2001 From: Samuel Gass Date: Thu, 31 Mar 2022 10:51:27 -0700 Subject: [PATCH 5/7] Bump atlas version --- dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.gradle b/dependencies.gradle index a56b08cc..9fae07b2 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,7 +1,7 @@ project.ext.versions = [ checkstyle: '8.18', jacoco: '0.8.3', - atlas: '6.6.3', + atlas: '7.0.2', spark: '3.0.1', snappy: '1.1.1.6', atlas_checkstyle: '5.6.9', From 6cb8a2f388a583bd2aa37870265a5b826335203d Mon Sep 17 00:00:00 2001 From: Samuel Gass Date: Thu, 31 Mar 2022 11:44:53 -0700 Subject: [PATCH 6/7] Update IT (#202) * update IT * spotless --- .../atlas/mutator/AtlasMutatorIntegrationTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/integrationTest/java/org/openstreetmap/atlas/mutator/AtlasMutatorIntegrationTest.java b/src/integrationTest/java/org/openstreetmap/atlas/mutator/AtlasMutatorIntegrationTest.java index 7ec8c18f..e7eb19cd 100644 --- a/src/integrationTest/java/org/openstreetmap/atlas/mutator/AtlasMutatorIntegrationTest.java +++ b/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 From 525c9ac749819fef0e030d21c559e178c3e53120 Mon Sep 17 00:00:00 2001 From: Samuel Gass Date: Thu, 31 Mar 2022 13:16:45 -0700 Subject: [PATCH 7/7] Bump version before release --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index d84283f1..c1117830 100644 --- a/gradle.properties +++ b/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/