diff --git a/.cloudbuild/cloudbuild-test-a.yaml b/.cloudbuild/cloudbuild-test-a.yaml index c700ad59..4cc8daf1 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.15.0' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.15.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 04b3f2c9..ba5a6bfa 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.15.0' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.15.1' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM B build diff --git a/.cloudbuild/cloudbuild.yaml b/.cloudbuild/cloudbuild.yaml index 21876be0..2d597637 100644 --- a/.cloudbuild/cloudbuild.yaml +++ b/.cloudbuild/cloudbuild.yaml @@ -14,7 +14,7 @@ timeout: 7200s # 2 hours substitutions: - _JAVA_SHARED_CONFIG_VERSION: '1.15.0' # {x-version-update:google-cloud-shared-config:current} + _JAVA_SHARED_CONFIG_VERSION: '1.15.1' # {x-version-update:google-cloud-shared-config:current} steps: # GraalVM A build - name: gcr.io/cloud-builders/docker diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index b8c744b4..68bd68e3 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -40,13 +40,13 @@ branchProtectionRules: - "dependencies (11, java-pubsub)" - "flatten-plugin-check" - "build (8, java-bigquery, test)" - - "build (8, java-bigquery, lint)" - "build (8, java-bigquery, clirr)" - "build (8, java-bigtable, javadoc)" - "build (11, java-bigquery, test)" - - "build (11, java-bigquery, lint)" - "build (11, java-bigquery, clirr)" - "build (11, java-bigtable, javadoc)" + - "lint (17, java-bigquery, lint)" + - "lint (21, java-bigquery, lint)" - "javadoc-with-doclet (java-bigtable)" - "cla/google" - "graalvm-presubmit-shared-config-a (java-graalvm-ci-prod)" diff --git a/.github/workflows/downstream-maven-plugins.yaml b/.github/workflows/downstream-maven-plugins.yaml index 850f42ef..8eef928a 100644 --- a/.github/workflows/downstream-maven-plugins.yaml +++ b/.github/workflows/downstream-maven-plugins.yaml @@ -20,7 +20,6 @@ jobs: - java-bigtable job-type: - test # maven-surefire-plugin - - lint # fmt-maven-plugin and google-java-format - clirr # clirr-maven-plugin - javadoc # maven-javadoc-plugin - javadoc-with-doclet # test javadoc generation with doclet @@ -34,6 +33,27 @@ jobs: - run: sudo apt-get update -y - run: sudo apt-get install libxml2-utils - run: .kokoro/client-library-check.sh ${{matrix.repo}} ${{matrix.job-type}} + lint: + runs-on: ubuntu-latest + strategy: + fail-fast: false + matrix: + java: [17, 21] + repo: + - java-bigquery + - java-bigtable + job-type: + - lint # fmt-maven-plugin and google-java-format + steps: + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 + - uses: actions/setup-java@v4 + with: + distribution: zulu + java-version: ${{matrix.java}} + - run: java -version + - run: sudo apt-get update -y + - run: sudo apt-get install libxml2-utils + - run: .kokoro/client-library-check.sh ${{matrix.repo}} ${{matrix.job-type}} javadoc-with-doclet: runs-on: ubuntu-latest strategy: diff --git a/.kokoro/client-library-check.sh b/.kokoro/client-library-check.sh index e68e8043..425cdb45 100755 --- a/.kokoro/client-library-check.sh +++ b/.kokoro/client-library-check.sh @@ -155,6 +155,10 @@ flatten-plugin) popd ;; *) + # Here we replace the com.coveo fmt plugin with the spotify version. + # This `sed` won't be needed once downstream repositories update + # `.kokoro/build.sh` to use the `com.spotify.fmt` group ID. + sed -i 's/com.coveo:fmt-maven-plugin/com.spotify.fmt:fmt-maven-plugin/' .kokoro/build.sh # This reads the JOB_TYPE environmental variable .kokoro/build.sh RETURN_CODE=$? diff --git a/.kokoro/presubmit/downstream-build.sh b/.kokoro/presubmit/downstream-build.sh index 3ca932fc..45a7b571 100755 --- a/.kokoro/presubmit/downstream-build.sh +++ b/.kokoro/presubmit/downstream-build.sh @@ -42,14 +42,14 @@ cp settings.xml "${HOME}/.m2" git clone "https://github.com/googleapis/sdk-platform-java" --depth=1 # Update the shared-config version in showcase -pushd sdk-platform-java/showcase +pushd sdk-platform-java/java-showcase modify_shared_config popd pushd sdk-platform-java mvn -B -ntp install --projects '!gapic-generator-java' -Dcheckstyle.skip -Dfmt.skip -DskipTests popd -pushd sdk-platform-java/showcase/gapic-showcase +pushd sdk-platform-java/java-showcase/gapic-showcase SHOWCASE_VERSION=$(mvn help:evaluate -Dexpression=gapic-showcase.version -q -DforceStdout) popd @@ -62,8 +62,8 @@ tar -xf showcase-* popd # Run showcase tests with `native` profile -pushd sdk-platform-java/showcase -mvn test -Pnative,-showcase -Denforcer.skip=true -ntp -B +pushd sdk-platform-java/java-showcase +mvn test -Pnative,showcase -Denforcer.skip=true -ntp -B popd -exit $RETURN_CODE \ No newline at end of file +exit $RETURN_CODE diff --git a/CHANGELOG.md b/CHANGELOG.md index b2aa1d2f..bbd3730e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [1.15.1](https://github.com/googleapis/java-shared-config/compare/v1.15.0...v1.15.1) (2025-03-26) + + +### Dependencies + +* Update google-java-format to the latest ([aa78b13](https://github.com/googleapis/java-shared-config/commit/aa78b13e765259d70c20e8a50bde92b3ab33a8a1)) + ## [1.15.0](https://github.com/googleapis/java-shared-config/compare/v1.14.4...v1.15.0) (2025-03-04) diff --git a/java-shared-config/pom.xml b/java-shared-config/pom.xml index fa4cd376..96c8e318 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.15.0 + 1.15.1 Google Cloud Shared Config https://github.com/googleapis/java-shared-config @@ -16,7 +16,7 @@ com.google.cloud native-image-shared-config - 1.15.0 + 1.15.1 ../native-image-shared-config @@ -28,7 +28,7 @@ true 1.11.0 /java/docs/reference/ - 1.7 + 1.25.2 @@ -169,9 +169,9 @@ 2.8 - com.coveo + com.spotify.fmt fmt-maven-plugin - 2.9 + 2.25 true diff --git a/native-image-shared-config/pom.xml b/native-image-shared-config/pom.xml index 5d6015e7..c671eff3 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.15.0 + 1.15.1 Native Image Shared Config https://github.com/googleapis/java-shared-config diff --git a/versions.txt b/versions.txt index dad75b0e..a1410227 100644 --- a/versions.txt +++ b/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-cloud-shared-config:1.15.0:1.15.0 +google-cloud-shared-config:1.15.1:1.15.1