diff --git a/.cloudbuild/cloudbuild-test-a.yaml b/.cloudbuild/cloudbuild-test-a.yaml index 272418ad..57681050 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.8-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.8.1' # {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 bfaf4f2c..94d7819a 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.8-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.8.1' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM B build diff --git a/.cloudbuild/cloudbuild.yaml b/.cloudbuild/cloudbuild.yaml index fe5a5cfa..ae302805 100644 --- a/.cloudbuild/cloudbuild.yaml +++ b/.cloudbuild/cloudbuild.yaml @@ -14,11 +14,14 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.7.8-SNAPSHOT' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.8.1' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build - name: gcr.io/cloud-builders/docker - args: ["build", "-t", "gcr.io/cloud-devrel-public-resources/graalvm_a:${_JAVA_SHARED_CONFIG_VERSION}", "--file", "graalvm-a.Dockerfile", "."] + args: ["build", + "-t", "gcr.io/cloud-devrel-public-resources/graalvm_a:${_JAVA_SHARED_CONFIG_VERSION}", + "-t", "gcr.io/cloud-devrel-public-resources/graalvm_a:infrastructure-public-image-$SHORT_SHA", + "--file", "graalvm-a.Dockerfile", "."] dir: .cloudbuild id: graalvm-a-build waitFor: ["-"] @@ -29,7 +32,9 @@ steps: # GraalVM B build - name: gcr.io/cloud-builders/docker - args: [ "build", "-t", "gcr.io/cloud-devrel-public-resources/graalvm_b:${_JAVA_SHARED_CONFIG_VERSION}", "--file", "graalvm-b.Dockerfile", "." ] + args: [ "build", "-t", "gcr.io/cloud-devrel-public-resources/graalvm_b:${_JAVA_SHARED_CONFIG_VERSION}", + "-t", "gcr.io/cloud-devrel-public-resources/graalvm_b:infrastructure-public-image-$SHORT_SHA", + "--file", "graalvm-b.Dockerfile", "." ] dir: .cloudbuild id: graalvm-b-build waitFor: [ "-" ] @@ -42,3 +47,5 @@ steps: images: - gcr.io/cloud-devrel-public-resources/graalvm_a:${_JAVA_SHARED_CONFIG_VERSION} - gcr.io/cloud-devrel-public-resources/graalvm_b:${_JAVA_SHARED_CONFIG_VERSION} + - gcr.io/cloud-devrel-public-resources/graalvm_a:infrastructure-public-image-$SHORT_SHA + - gcr.io/cloud-devrel-public-resources/graalvm_b:infrastructure-public-image-$SHORT_SHA diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index 291f8e29..359fe71c 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -13,5 +13,5 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest - digest: sha256:dc11e2119c854b57b7f7ed9962391decf002454700020a52b5d0d46c40b80a7e -# created: 2024-04-15T22:37:28.944513098Z + digest: sha256:72f0d373307d128b2cb720c5cb4d90b31f0e86529dd138c632710ae0c69efae3 +# created: 2024-06-05T18:32:21.724930324Z diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index 494a0510..6d24843d 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -49,6 +49,8 @@ branchProtectionRules: - "build (11, java-bigtable, javadoc)" - "javadoc-with-doclet (java-bigtable)" - "cla/google" + - "graalvm-presubmit-shared-config-a (cloud-devrel-kokoro-resources)" + - "graalvm-presubmit-shared-config-b (cloud-devrel-kokoro-resources)" - pattern: java7 # Can admins overwrite branch protection. # Defaults to `true` diff --git a/.github/trusted-contribution.yml b/.github/trusted-contribution.yml index a0ba1f7d..88d3ac9b 100644 --- a/.github/trusted-contribution.yml +++ b/.github/trusted-contribution.yml @@ -1,3 +1,9 @@ trustedContributors: - renovate-bot - gcf-owl-bot[bot] + +annotations: +- type: comment + text: "/gcbrun" +- type: label + text: "kokoro:force-run" diff --git a/.github/workflows/approve-readme.yaml b/.github/workflows/approve-readme.yaml index f5fc7d51..59f00b8e 100644 --- a/.github/workflows/approve-readme.yaml +++ b/.github/workflows/approve-readme.yaml @@ -21,7 +21,7 @@ jobs: runs-on: ubuntu-latest if: github.repository_owner == 'googleapis' && github.head_ref == 'autosynth-readme' steps: - - uses: actions/github-script@v6 + - uses: actions/github-script@v7 with: github-token: ${{secrets.YOSHI_APPROVER_TOKEN}} script: | diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index ae66b197..b91fa381 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -27,8 +27,8 @@ jobs: matrix: java: [11, 17, 21] steps: - - uses: actions/checkout@v3 - - uses: actions/setup-java@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-java@v4 with: distribution: temurin java-version: ${{matrix.java}} @@ -41,8 +41,8 @@ jobs: name: "units (8)" runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: actions/setup-java@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-java@v4 with: java-version: 8 distribution: temurin @@ -51,7 +51,7 @@ jobs: # https://maven.apache.org/surefire/maven-surefire-plugin/test-mojo.html#jvm run: echo "SUREFIRE_JVM_OPT=-Djvm=${JAVA_HOME}/bin/java" >> $GITHUB_ENV shell: bash - - uses: actions/setup-java@v3 + - uses: actions/setup-java@v4 with: java-version: 17 distribution: temurin @@ -63,8 +63,8 @@ jobs: steps: - name: Support longpaths run: git config --system core.longpaths true - - uses: actions/checkout@v3 - - uses: actions/setup-java@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-java@v4 with: distribution: temurin java-version: 8 @@ -78,8 +78,8 @@ jobs: matrix: java: [17] steps: - - uses: actions/checkout@v3 - - uses: actions/setup-java@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-java@v4 with: distribution: temurin java-version: ${{matrix.java}} @@ -88,8 +88,8 @@ jobs: javadoc: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: actions/setup-java@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-java@v4 with: distribution: temurin java-version: 17 @@ -100,8 +100,8 @@ jobs: lint: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: actions/setup-java@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-java@v4 with: distribution: temurin java-version: 11 @@ -112,8 +112,8 @@ jobs: clirr: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 - - uses: actions/setup-java@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-java@v4 with: distribution: temurin java-version: 8 diff --git a/.github/workflows/downstream-dependencies.yaml b/.github/workflows/downstream-dependencies.yaml index 631e7c3c..5c9c372a 100644 --- a/.github/workflows/downstream-dependencies.yaml +++ b/.github/workflows/downstream-dependencies.yaml @@ -18,7 +18,7 @@ jobs: - java-storage - java-pubsub steps: - - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 + - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4 - uses: actions/setup-java@v4 with: distribution: zulu @@ -31,7 +31,7 @@ jobs: flatten-plugin-check: runs-on: ubuntu-latest steps: - - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 + - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4 - uses: actions/setup-java@v4 with: distribution: zulu diff --git a/.github/workflows/downstream-maven-plugins.yaml b/.github/workflows/downstream-maven-plugins.yaml index 3668d5cd..ac9a5afa 100644 --- a/.github/workflows/downstream-maven-plugins.yaml +++ b/.github/workflows/downstream-maven-plugins.yaml @@ -25,7 +25,7 @@ jobs: - javadoc # maven-javadoc-plugin - javadoc-with-doclet # test javadoc generation with doclet steps: - - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 + - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4 - uses: actions/setup-java@v4 with: distribution: zulu @@ -54,7 +54,7 @@ jobs: - java-datastore - java-bigquerystorage steps: - - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 + - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4 - uses: actions/setup-java@v4 with: distribution: temurin diff --git a/.github/workflows/renovate_config_check.yaml b/.github/workflows/renovate_config_check.yaml index 87d8eb2b..7c5ec786 100644 --- a/.github/workflows/renovate_config_check.yaml +++ b/.github/workflows/renovate_config_check.yaml @@ -14,7 +14,7 @@ jobs: uses: actions/checkout@v4 - name: Set up Node.js - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: '20' diff --git a/CHANGELOG.md b/CHANGELOG.md index 04a6d886..122a352c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,31 @@ # Changelog +## [1.8.1](https://github.com/googleapis/java-shared-config/compare/v1.8.0...v1.8.1) (2024-06-24) + + +### Dependencies + +* Update actions/checkout digest to 692973e ([#814](https://github.com/googleapis/java-shared-config/issues/814)) ([ebece6b](https://github.com/googleapis/java-shared-config/commit/ebece6b7df6208527450c12368fcc0c6ce07ac67)) + +## [1.8.0](https://github.com/googleapis/java-shared-config/compare/v1.7.7...v1.8.0) (2024-05-29) + + +### Features + +* [java] allow passing libraries_bom_version from env ([#1967](https://github.com/googleapis/java-shared-config/issues/1967)) ([#825](https://github.com/googleapis/java-shared-config/issues/825)) ([07c7cec](https://github.com/googleapis/java-shared-config/commit/07c7cece6ddc793e01b108e96416750fd00c09da)) +* Add `libraries_bom_version` in metadata ([#1956](https://github.com/googleapis/java-shared-config/issues/1956)) ([#805](https://github.com/googleapis/java-shared-config/issues/805)) ([a30f02d](https://github.com/googleapis/java-shared-config/commit/a30f02d78d39ee8a2a2be0fd8401a647871d10ca)) +* Use maven properties to manage dependency versions for native profile ([#824](https://github.com/googleapis/java-shared-config/issues/824)) ([465bb39](https://github.com/googleapis/java-shared-config/commit/465bb399aef9aa8383f11c23f10a97df49c1d057)) + + +### Dependencies + +* Update actions/setup-node action to v4 ([#811](https://github.com/googleapis/java-shared-config/issues/811)) ([fdb1044](https://github.com/googleapis/java-shared-config/commit/fdb1044693c2175782f02a670b550e96f1c15d0b)) +* Update actions/setup-node action to v4 ([#818](https://github.com/googleapis/java-shared-config/issues/818)) ([6222364](https://github.com/googleapis/java-shared-config/commit/6222364b4795661f282593b135d415827700d635)) +* Update actions/setup-node action to v4 ([#819](https://github.com/googleapis/java-shared-config/issues/819)) ([ffb2a7a](https://github.com/googleapis/java-shared-config/commit/ffb2a7a3ff131a8d5af869098fdd69d0cdd87c4d)) +* Update dependency com.puppycrawl.tools:checkstyle to v10.16.0 ([#816](https://github.com/googleapis/java-shared-config/issues/816)) ([efc5585](https://github.com/googleapis/java-shared-config/commit/efc5585ec817e327e0381412c2b2436e3ef0510d)) +* Update dependency com.puppycrawl.tools:checkstyle to v10.17.0 ([#831](https://github.com/googleapis/java-shared-config/issues/831)) ([b0c9e75](https://github.com/googleapis/java-shared-config/commit/b0c9e75e778950401df28adb10998a676d6a24ff)) +* Update dependency org.graalvm.buildtools:native-maven-plugin to v0.10.2 ([#826](https://github.com/googleapis/java-shared-config/issues/826)) ([881e72f](https://github.com/googleapis/java-shared-config/commit/881e72f7e5dc1304929b89e9ec9d1ba9d4d0bead)) + ## [1.7.7](https://github.com/googleapis/java-shared-config/compare/v1.7.6...v1.7.7) (2024-04-17) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index 7f2feb27..8a1b22f5 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.8-SNAPSHOT + 1.8.1 Google Cloud Shared Config https://github.com/googleapis/java-shared-config @@ -16,7 +16,7 @@ com.google.cloud native-image-shared-config - 1.7.8-SNAPSHOT + 1.8.1 ../native-image-shared-config @@ -49,7 +49,7 @@ org.apache.maven.plugins maven-enforcer-plugin - 3.4.1 + 3.5.0 org.codehaus.mojo @@ -61,7 +61,7 @@ org.codehaus.mojo exec-maven-plugin - 3.2.0 + 3.3.0 + 1.8.1 Native Image Shared Config https://github.com/googleapis/java-shared-config @@ -58,8 +58,11 @@ - 3.2.5 24.0.1 + 3.3.0 + 0.10.2 + 5.10.2 + 1.3.0 @@ -78,7 +81,7 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.13 + 1.7.0 true ossrh @@ -138,7 +141,7 @@ org.apache.maven.plugins maven-gpg-plugin - 3.2.3 + 3.2.4 sign-artifacts @@ -166,12 +169,12 @@ org.opentest4j opentest4j - 1.3.0 + ${opentest4j.version} org.junit.vintage junit-vintage-engine - 5.10.2 + ${junit-vintage-engine.version} test @@ -185,7 +188,7 @@ org.junit.vintage junit-vintage-engine - 5.10.2 + ${junit-vintage-engine.version} @@ -201,7 +204,7 @@ org.graalvm.buildtools native-maven-plugin - 0.10.1 + ${native-maven-plugin.version} true diff --git a/pom.xml b/pom.xml index 524af717..58462df3 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ org.apache.maven.plugins maven-deploy-plugin - 3.1.1 + 3.1.2 true @@ -56,7 +56,7 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.13 + 1.7.0 true sonatype-nexus-staging diff --git a/versions.txt b/versions.txt index 2ceb1a83..59b0becf 100644 --- a/versions.txt +++ b/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.7.7:1.7.8-SNAPSHOT +google-cloud-shared-config:1.8.1:1.8.1