From 96589efd2d4abbda8623c855c92be092293133ce Mon Sep 17 00:00:00 2001 From: Burke Davison <40617934+burkedavison@users.noreply.github.com> Date: Tue, 16 Apr 2024 12:43:36 -0400 Subject: [PATCH 1/9] fix: graalvm image terraform install (#806) * fix: graalvm image terraform install * fix: use modified hashicorp repo configuration --- .cloudbuild/graalvm-a.Dockerfile | 2 ++ .cloudbuild/graalvm-b.Dockerfile | 2 ++ .cloudbuild/hashicorp.repo | 13 +++++++++++++ 3 files changed, 17 insertions(+) create mode 100644 .cloudbuild/hashicorp.repo diff --git a/.cloudbuild/graalvm-a.Dockerfile b/.cloudbuild/graalvm-a.Dockerfile index d0cfee89..41505aa6 100644 --- a/.cloudbuild/graalvm-a.Dockerfile +++ b/.cloudbuild/graalvm-a.Dockerfile @@ -37,6 +37,8 @@ ENV PATH $PATH:/usr/local/gcloud/google-cloud-sdk/bin RUN yum install -y docker-engine docker-cli # Install terraform +# See also https://www.hashicorp.com/official-packaging-guide +COPY hashicorp.repo /etc/yum.repos.d/hashicorp.repo RUN yum -y install terraform # Install jq diff --git a/.cloudbuild/graalvm-b.Dockerfile b/.cloudbuild/graalvm-b.Dockerfile index 722e066b..743c53b2 100644 --- a/.cloudbuild/graalvm-b.Dockerfile +++ b/.cloudbuild/graalvm-b.Dockerfile @@ -37,6 +37,8 @@ ENV PATH $PATH:/usr/local/gcloud/google-cloud-sdk/bin RUN yum install -y docker-engine docker-cli # Install terraform +# See also https://www.hashicorp.com/official-packaging-guide +COPY hashicorp.repo /etc/yum.repos.d/hashicorp.repo RUN yum -y install terraform # Install jq diff --git a/.cloudbuild/hashicorp.repo b/.cloudbuild/hashicorp.repo new file mode 100644 index 00000000..68ae2f8f --- /dev/null +++ b/.cloudbuild/hashicorp.repo @@ -0,0 +1,13 @@ +[hashicorp] +name=Hashicorp Stable - $basearch +baseurl=https://rpm.releases.hashicorp.com/RHEL/7/$basearch/stable +enabled=1 +gpgcheck=1 +gpgkey=https://rpm.releases.hashicorp.com/gpg + +[hashicorp-test] +name=Hashicorp Test - $basearch +baseurl=https://rpm.releases.hashicorp.com/RHEL/7/$basearch/test +enabled=0 +gpgcheck=1 +gpgkey=https://rpm.releases.hashicorp.com/gpg \ No newline at end of file From 8b625c0c05f90c0df5fa5f2e11da8e8b8067ce85 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 16 Apr 2024 20:48:59 +0200 Subject: [PATCH 2/9] build(deps): update dependency org.apache.maven.plugins:maven-source-plugin to v3.3.1 (#802) --- native-image-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/native-image-shared-config/pom.xml b/native-image-shared-config/pom.xml index e99f2dca..112a6e5f 100644 --- a/native-image-shared-config/pom.xml +++ b/native-image-shared-config/pom.xml @@ -109,7 +109,7 @@ org.apache.maven.plugins maven-source-plugin - 3.3.0 + 3.3.1 attach-sources From 8136d33b21a7492bee3673836db035be14240c44 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 16 Apr 2024 20:49:32 +0200 Subject: [PATCH 3/9] build(deps): update dependency org.apache.maven.plugins:maven-compiler-plugin to v3.13.0 (#794) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 0a65e55c..0fdc7c2f 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -114,7 +114,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.12.1 + 3.13.0 1.8 1.8 From 15870f491eba6132ae60239eda1ebec5b307b4e6 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 16 Apr 2024 20:50:54 +0200 Subject: [PATCH 4/9] build(deps): update dependency org.jacoco:jacoco-maven-plugin to v0.8.12 (#799) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 0fdc7c2f..fc45c987 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -135,7 +135,7 @@ org.jacoco jacoco-maven-plugin - 0.8.11 + 0.8.12 org.apache.maven.plugins From e485b45aff22a0528feabfa9348152c20a146560 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 16 Apr 2024 20:51:03 +0200 Subject: [PATCH 5/9] build(deps): update dependency org.apache.maven.plugins:maven-gpg-plugin to v3.2.3 (#793) --- native-image-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/native-image-shared-config/pom.xml b/native-image-shared-config/pom.xml index 112a6e5f..618d04ec 100644 --- a/native-image-shared-config/pom.xml +++ b/native-image-shared-config/pom.xml @@ -138,7 +138,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.2.0 + 3.2.3 sign-artifacts From 984f434ddbb9ddbf60d80d14dae6a92d8639596a Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 16 Apr 2024 20:51:11 +0200 Subject: [PATCH 6/9] deps: update dependency com.puppycrawl.tools:checkstyle to v10.15.0 (#792) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index fc45c987..88b913bc 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -521,7 +521,7 @@ com.puppycrawl.tools checkstyle - 10.14.1 + 10.15.0 From 567ba397399c67fbbad3558358a7d86f30e8b3e7 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Wed, 17 Apr 2024 18:04:38 +0200 Subject: [PATCH 7/9] build(deps): update dependency org.apache.maven.plugins:maven-jar-plugin to v3.4.0 (#807) --- java-shared-config/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 88b913bc..e34a0882 100644 --- a/java-shared-config/pom.xml +++ b/java-shared-config/pom.xml @@ -94,7 +94,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.3.0 + 3.4.0 true From a0beeedf4478bedfafd58e0dcab1d1dc12c2cb99 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 17 Apr 2024 14:00:23 -0400 Subject: [PATCH 8/9] chore(main): release 1.7.7-SNAPSHOT (#789) 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 cbfdcb2c..d277d21a 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.7.6' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.7.7-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 a2f03ba6..1ea736f5 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.7.6' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.7.7-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM B build diff --git a/.cloudbuild/cloudbuild.yaml b/.cloudbuild/cloudbuild.yaml index 1f9d6e9f..9bfc32c8 100644 --- a/.cloudbuild/cloudbuild.yaml +++ b/.cloudbuild/cloudbuild.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.7.6' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.7.7-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 e34a0882..29700e5a 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.7.6 + 1.7.7-SNAPSHOT Google Cloud Shared Config https://github.com/googleapis/java-shared-config @@ -16,7 +16,7 @@ com.google.cloud native-image-shared-config - 1.7.6 + 1.7.7-SNAPSHOT ../native-image-shared-config diff --git a/native-image-shared-config/pom.xml b/native-image-shared-config/pom.xml index 618d04ec..bea9e0a7 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.7.6 + 1.7.7-SNAPSHOT Native Image Shared Config https://github.com/googleapis/java-shared-config diff --git a/versions.txt b/versions.txt index 13a433c5..c1eaa815 100644 --- a/versions.txt +++ b/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.7.6:1.7.6 +google-cloud-shared-config:1.7.6:1.7.7-SNAPSHOT From e1effa0c53305ee12f2b5f14f900296da3255090 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 17 Apr 2024 14:49:33 -0400 Subject: [PATCH 9/9] chore(main): release 1.7.7 (#808) 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 | 17 +++++++++++++++++ java-shared-config/pom.xml | 4 ++-- native-image-shared-config/pom.xml | 2 +- versions.txt | 2 +- 7 files changed, 24 insertions(+), 7 deletions(-) diff --git a/.cloudbuild/cloudbuild-test-a.yaml b/.cloudbuild/cloudbuild-test-a.yaml index d277d21a..bd91a2ad 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.7.7-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.7.7' # {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 1ea736f5..a18401c7 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.7.7-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.7.7' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM B build diff --git a/.cloudbuild/cloudbuild.yaml b/.cloudbuild/cloudbuild.yaml index 9bfc32c8..cbf34c06 100644 --- a/.cloudbuild/cloudbuild.yaml +++ b/.cloudbuild/cloudbuild.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.7.7-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.7.7' # {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 ea445d7f..04a6d886 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,22 @@ # Changelog +## [1.7.7](https://github.com/googleapis/java-shared-config/compare/v1.7.6...v1.7.7) (2024-04-17) + + +### Bug Fixes + +* Graalvm image terraform install ([#806](https://github.com/googleapis/java-shared-config/issues/806)) ([96589ef](https://github.com/googleapis/java-shared-config/commit/96589efd2d4abbda8623c855c92be092293133ce)) + + +### Dependencies + +* Update dependency com.puppycrawl.tools:checkstyle to v10.15.0 ([#792](https://github.com/googleapis/java-shared-config/issues/792)) ([984f434](https://github.com/googleapis/java-shared-config/commit/984f434ddbb9ddbf60d80d14dae6a92d8639596a)) +* Update dependency org.apache.maven.plugins:maven-compiler-plugin to v3.13.0 ([8136d33](https://github.com/googleapis/java-shared-config/commit/8136d33b21a7492bee3673836db035be14240c44)) +* Update dependency org.apache.maven.plugins:maven-gpg-plugin to v3.2.3 ([e485b45](https://github.com/googleapis/java-shared-config/commit/e485b45aff22a0528feabfa9348152c20a146560)) +* Update dependency org.apache.maven.plugins:maven-jar-plugin to v3.4.0 ([567ba39](https://github.com/googleapis/java-shared-config/commit/567ba397399c67fbbad3558358a7d86f30e8b3e7)) +* Update dependency org.apache.maven.plugins:maven-source-plugin to v3.3.1 ([8b625c0](https://github.com/googleapis/java-shared-config/commit/8b625c0c05f90c0df5fa5f2e11da8e8b8067ce85)) +* Update dependency org.jacoco:jacoco-maven-plugin to v0.8.12 ([15870f4](https://github.com/googleapis/java-shared-config/commit/15870f491eba6132ae60239eda1ebec5b307b4e6)) + ## [1.7.6](https://github.com/googleapis/java-shared-config/compare/v1.7.5...v1.7.6) (2024-03-14) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 29700e5a..0bfc989b 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.7.7-SNAPSHOT + 1.7.7 Google Cloud Shared Config https://github.com/googleapis/java-shared-config @@ -16,7 +16,7 @@ com.google.cloud native-image-shared-config - 1.7.7-SNAPSHOT + 1.7.7 ../native-image-shared-config diff --git a/native-image-shared-config/pom.xml b/native-image-shared-config/pom.xml index bea9e0a7..f424532c 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.7.7-SNAPSHOT + 1.7.7 Native Image Shared Config https://github.com/googleapis/java-shared-config diff --git a/versions.txt b/versions.txt index c1eaa815..f8dc4eb7 100644 --- a/versions.txt +++ b/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.7.6:1.7.7-SNAPSHOT +google-cloud-shared-config:1.7.7:1.7.7