From f4daddb30447165f73e2b5d8bcb8436c684cf5fb Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 25 Feb 2025 09:42:20 -0500 Subject: [PATCH 1/3] chore(main): release 1.14.5-SNAPSHOT (#993) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- .cloudbuild/cloudbuild-test-a.yaml | 2 +- .cloudbuild/cloudbuild-test-b.yaml | 2 +- .cloudbuild/cloudbuild.yaml | 2 +- java-shared-config/pom.xml | 4 ++-- native-image-shared-config/pom.xml | 2 +- versions.txt | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.cloudbuild/cloudbuild-test-a.yaml b/.cloudbuild/cloudbuild-test-a.yaml index 5b3aff4a..81d9ea81 100644 --- a/.cloudbuild/cloudbuild-test-a.yaml +++ b/.cloudbuild/cloudbuild-test-a.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.14.4' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.14.5-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build diff --git a/.cloudbuild/cloudbuild-test-b.yaml b/.cloudbuild/cloudbuild-test-b.yaml index 8f7c97b1..981d1795 100644 --- a/.cloudbuild/cloudbuild-test-b.yaml +++ b/.cloudbuild/cloudbuild-test-b.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.14.4' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.14.5-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM B build diff --git a/.cloudbuild/cloudbuild.yaml b/.cloudbuild/cloudbuild.yaml index 71e2a13c..110ca861 100644 --- a/.cloudbuild/cloudbuild.yaml +++ b/.cloudbuild/cloudbuild.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.14.4' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.14.5-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build - name: gcr.io/cloud-builders/docker diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 4fa627b3..4b032bcd 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.14.4 + 1.14.5-SNAPSHOT Google Cloud Shared Config https://github.com/googleapis/java-shared-config @@ -16,7 +16,7 @@ com.google.cloud native-image-shared-config - 1.14.4 + 1.14.5-SNAPSHOT ../native-image-shared-config diff --git a/native-image-shared-config/pom.xml b/native-image-shared-config/pom.xml index 03d41405..6b812791 100644 --- a/native-image-shared-config/pom.xml +++ b/native-image-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud native-image-shared-config pom - 1.14.4 + 1.14.5-SNAPSHOT Native Image Shared Config https://github.com/googleapis/java-shared-config diff --git a/versions.txt b/versions.txt index f7c62aa2..190188ce 100644 --- a/versions.txt +++ b/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.14.4:1.14.4 +google-cloud-shared-config:1.14.4:1.14.5-SNAPSHOT From 6838220bee2c8041f860274dc985aa99f01be51a Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Tue, 4 Mar 2025 16:03:38 -0500 Subject: [PATCH 2/3] feat: google-java-format version as a property (#997) Once we declare this version as a property, then the hermetic build script can use the property value to determine the version of the google-java-format to download when it builds the container image. ``` $ JAVA_FORMAT_VERSION=$(mvn -pl java-shared-config help:evaluate -Dexpression='google-java-format.version' -q -DforceStdout) $ echo $JAVA_FORMAT_VERSION 1.7 ``` This uses https://maven.apache.org/plugins/maven-help-plugin/evaluate-mojo.html --- java-shared-config/pom.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 4b032bcd..287be32e 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -28,6 +28,7 @@ true 1.11.0 /java/docs/reference/ + 1.7 @@ -179,7 +180,7 @@ com.google.googlejavaformat google-java-format - 1.7 + ${google-java-format.version} From a315cf154ffb2dfd77ff7ce9892f8bb8a40ec7cc Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 11 Mar 2025 14:42:00 -0400 Subject: [PATCH 3/3] chore(main): release 1.15.0 (#999) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- .cloudbuild/cloudbuild-test-a.yaml | 2 +- .cloudbuild/cloudbuild-test-b.yaml | 2 +- .cloudbuild/cloudbuild.yaml | 2 +- CHANGELOG.md | 7 +++++++ java-shared-config/pom.xml | 4 ++-- native-image-shared-config/pom.xml | 2 +- versions.txt | 2 +- 7 files changed, 14 insertions(+), 7 deletions(-) diff --git a/.cloudbuild/cloudbuild-test-a.yaml b/.cloudbuild/cloudbuild-test-a.yaml index 81d9ea81..c700ad59 100644 --- a/.cloudbuild/cloudbuild-test-a.yaml +++ b/.cloudbuild/cloudbuild-test-a.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.14.5-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.15.0' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build diff --git a/.cloudbuild/cloudbuild-test-b.yaml b/.cloudbuild/cloudbuild-test-b.yaml index 981d1795..04b3f2c9 100644 --- a/.cloudbuild/cloudbuild-test-b.yaml +++ b/.cloudbuild/cloudbuild-test-b.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.14.5-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.15.0' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM B build diff --git a/.cloudbuild/cloudbuild.yaml b/.cloudbuild/cloudbuild.yaml index 110ca861..21876be0 100644 --- a/.cloudbuild/cloudbuild.yaml +++ b/.cloudbuild/cloudbuild.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.14.5-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.15.0' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build - name: gcr.io/cloud-builders/docker diff --git a/CHANGELOG.md b/CHANGELOG.md index 18fdbf9b..b2aa1d2f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [1.15.0](https://github.com/googleapis/java-shared-config/compare/v1.14.4...v1.15.0) (2025-03-04) + + +### Features + +* Google-java-format version as a property ([#997](https://github.com/googleapis/java-shared-config/issues/997)) ([6838220](https://github.com/googleapis/java-shared-config/commit/6838220bee2c8041f860274dc985aa99f01be51a)) + ## [1.14.4](https://github.com/googleapis/java-shared-config/compare/v1.14.3...v1.14.4) (2025-02-24) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 287be32e..fa4cd376 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud google-cloud-shared-config pom - 1.14.5-SNAPSHOT + 1.15.0 Google Cloud Shared Config https://github.com/googleapis/java-shared-config @@ -16,7 +16,7 @@ com.google.cloud native-image-shared-config - 1.14.5-SNAPSHOT + 1.15.0 ../native-image-shared-config diff --git a/native-image-shared-config/pom.xml b/native-image-shared-config/pom.xml index 6b812791..5d6015e7 100644 --- a/native-image-shared-config/pom.xml +++ b/native-image-shared-config/pom.xml @@ -6,7 +6,7 @@ com.google.cloud native-image-shared-config pom - 1.14.5-SNAPSHOT + 1.15.0 Native Image Shared Config https://github.com/googleapis/java-shared-config diff --git a/versions.txt b/versions.txt index 190188ce..dad75b0e 100644 --- a/versions.txt +++ b/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.14.4:1.14.5-SNAPSHOT +google-cloud-shared-config:1.15.0:1.15.0