From 269bde80a73e7cb2672cc755d609b1223d86f916 Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Thu, 23 Apr 2026 20:35:35 +0000 Subject: [PATCH 01/17] ci: bring the dependencies check back This change adds the dependencies check back to the ci.yaml, google-auth-library-java-ci.yaml, and sdk-platform-java-ci.yaml. This removes unnecessary java version matrix logic in existing dependencies check. Java 17 just works fine. Fixes https://github.com/googleapis/google-cloud-java/issues/12895 --- .github/workflows/ci.yaml | 20 +++++++++++++++---- .../google-auth-library-java-ci.yaml | 13 +++++++++++- .github/workflows/java-spanner-jdbc-ci.yaml | 6 +----- .github/workflows/java-storage-nio-ci.yaml | 6 +----- .github/workflows/sdk-platform-java-ci.yaml | 14 +++++++++++++ 5 files changed, 44 insertions(+), 15 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index b2824ec81719..08784a7158ed 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -251,9 +251,6 @@ jobs: matrix: package: ${{ fromJSON(needs.changes.outputs.packages) }} steps: - - name: Get current week within the year - id: date - run: echo "::set-output name=week_of_year::$(date +'%W' --utc)" - uses: actions/checkout@v4 - uses: actions/setup-java@v4 with: @@ -264,8 +261,23 @@ jobs: BUILD_SUBDIR: ${{matrix.package}} JOB_TYPE: clirr JOB_NAME: clirr-${{matrix.package}} + split-dependencies: + runs-on: ubuntu-latest + needs: changes + strategy: + matrix: + package: ${{ fromJSON(needs.changes.outputs.packages) }} + steps: + - uses: actions/checkout@v4 + - uses: actions/setup-java@v4 + with: + distribution: temurin + java-version: 17 + - run: .kokoro/dependencies.sh + env: + BUILD_SUBDIR: ${{matrix.package}} required: - needs: [ changes, split-units, split-clirr ] + needs: [ changes, split-units, split-clirr, split-dependencies ] name: conditional-required-check if: ${{ always() }} # Always run even if any "needs" jobs fail runs-on: ubuntu-22.04 diff --git a/.github/workflows/google-auth-library-java-ci.yaml b/.github/workflows/google-auth-library-java-ci.yaml index 7abb290ab4d6..21373cd62925 100644 --- a/.github/workflows/google-auth-library-java-ci.yaml +++ b/.github/workflows/google-auth-library-java-ci.yaml @@ -70,9 +70,20 @@ jobs: env: JOB_TYPE: clirr BUILD_SUBDIR: google-auth-library-java + dependencies: + needs: filter + if: ${{ needs.filter.outputs.library == 'true' }} + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: actions/setup-java@v4 + with: + distribution: temurin + java-version: 17 + - run: .kokoro/dependencies.sh required: - needs: [ units-logging, clirr ] + needs: [ units-logging, clirr, dependencies ] name: conditional-required-check if: ${{ always() }} # Always run even if any "needs" jobs fail runs-on: ubuntu-22.04 diff --git a/.github/workflows/java-spanner-jdbc-ci.yaml b/.github/workflows/java-spanner-jdbc-ci.yaml index e5216ed808c4..5d114841a7d2 100644 --- a/.github/workflows/java-spanner-jdbc-ci.yaml +++ b/.github/workflows/java-spanner-jdbc-ci.yaml @@ -104,16 +104,12 @@ jobs: needs: filter if: ${{ needs.filter.outputs.library == 'true' }} runs-on: ubuntu-latest - strategy: - matrix: - java: [17] steps: - uses: actions/checkout@v4 - uses: actions/setup-java@v4 with: distribution: temurin - java-version: ${{matrix.java}} - - run: java -version + java-version: 17 - run: .kokoro/dependencies.sh javadoc: needs: filter diff --git a/.github/workflows/java-storage-nio-ci.yaml b/.github/workflows/java-storage-nio-ci.yaml index 8cb8b2afecc6..e53a05764dcb 100644 --- a/.github/workflows/java-storage-nio-ci.yaml +++ b/.github/workflows/java-storage-nio-ci.yaml @@ -104,16 +104,12 @@ jobs: needs: filter if: ${{ needs.filter.outputs.library == 'true' }} runs-on: ubuntu-latest - strategy: - matrix: - java: [17] steps: - uses: actions/checkout@v4 - uses: actions/setup-java@v4 with: distribution: temurin - java-version: ${{matrix.java}} - - run: java -version + java-version: 17 - run: .kokoro/dependencies.sh javadoc: needs: filter diff --git a/.github/workflows/sdk-platform-java-ci.yaml b/.github/workflows/sdk-platform-java-ci.yaml index bb1c8d0a9aa6..28e2f4ed79d5 100644 --- a/.github/workflows/sdk-platform-java-ci.yaml +++ b/.github/workflows/sdk-platform-java-ci.yaml @@ -69,6 +69,20 @@ jobs: JOB_TYPE: clirr BUILD_SUBDIR: sdk-platform-java + dependencies: + needs: filter + if: ${{ needs.filter.outputs.library == 'true' }} + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: actions/setup-java@v4 + with: + distribution: temurin + java-version: 17 + - run: .kokoro/dependencies.sh + env: + BUILD_SUBDIR: sdk-platform-java + sdk-platform-java-8: needs: filter if: ${{ needs.filter.outputs.library == 'true' }} From 566a89e250e2c1e10f7da5eaa6d6613f7b5ea9fa Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Thu, 23 Apr 2026 22:43:56 +0000 Subject: [PATCH 02/17] Fixing dependency issue in cab-token-generator --- google-auth-library-java/cab-token-generator/pom.xml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/google-auth-library-java/cab-token-generator/pom.xml b/google-auth-library-java/cab-token-generator/pom.xml index f14748eeb066..3bb70a2f118e 100644 --- a/google-auth-library-java/cab-token-generator/pom.xml +++ b/google-auth-library-java/cab-token-generator/pom.xml @@ -22,6 +22,10 @@ + + com.google.guava + guava + com.google.auth google-auth-library-oauth2-http @@ -38,10 +42,6 @@ com.google.errorprone error_prone_annotations - - com.google.guava - guava - com.google.protobuf protobuf-java @@ -50,10 +50,6 @@ dev.cel cel - - com.google.code.findbugs - jsr305 - com.google.crypto.tink tink From 11bdd1a9030aa57fe63b1278f3336ddedbd91052 Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Thu, 23 Apr 2026 23:55:17 +0000 Subject: [PATCH 03/17] stop introducing com.google.code.findbugs:annotations in dependency tree --- google-auth-library-java/cab-token-generator/pom.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/google-auth-library-java/cab-token-generator/pom.xml b/google-auth-library-java/cab-token-generator/pom.xml index 3bb70a2f118e..4169bfab6e6f 100644 --- a/google-auth-library-java/cab-token-generator/pom.xml +++ b/google-auth-library-java/cab-token-generator/pom.xml @@ -49,6 +49,12 @@ dev.cel cel + + + com.google.code.findbugs + annotations + + com.google.crypto.tink From 006366bfc98f9ea4c951bcb35e25d76674b23bf4 Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Fri, 24 Apr 2026 01:29:29 +0000 Subject: [PATCH 04/17] removed unnecessary dependencies --- sdk-platform-java/api-common-java/pom.xml | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/sdk-platform-java/api-common-java/pom.xml b/sdk-platform-java/api-common-java/pom.xml index 881eac206666..2e5022dc055d 100644 --- a/sdk-platform-java/api-common-java/pom.xml +++ b/sdk-platform-java/api-common-java/pom.xml @@ -60,18 +60,11 @@ javax.annotation-api ${javax.annotation-api.version} - - com.google.errorprone - error_prone_annotations - ${errorprone.version} - compile - - - org.junit.jupiter - junit-jupiter-engine - ${junit.version} + junit + junit + 4.13.2 test @@ -81,8 +74,8 @@ test - org.junit.vintage - junit-vintage-engine + org.junit.jupiter + junit-jupiter-api ${junit.version} test @@ -92,11 +85,6 @@ 1.4.4 test - - com.google.j2objc - j2objc-annotations - ${j2objc-annotations.version} - From dbcfb74985a25ff9ebef3eb32628b3d1b6034fd8 Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Fri, 24 Apr 2026 01:57:22 +0000 Subject: [PATCH 05/17] not using error_prone_annotations from protobuf-java-util --- sdk-platform-java/gax-java/gax/pom.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sdk-platform-java/gax-java/gax/pom.xml b/sdk-platform-java/gax-java/gax/pom.xml index 4719780fa26e..c1780f814d83 100644 --- a/sdk-platform-java/gax-java/gax/pom.xml +++ b/sdk-platform-java/gax-java/gax/pom.xml @@ -41,6 +41,13 @@ com.google.protobuf protobuf-java-util + + + + com.google.errorprone + error_prone_annotations + + org.threeten From 2e8ecb640d363c7a047c994dafa1c47d1ebda345 Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Fri, 24 Apr 2026 02:11:18 +0000 Subject: [PATCH 06/17] Bring back error_prone_annotations --- sdk-platform-java/api-common-java/pom.xml | 16 ++++++++++++++++ sdk-platform-java/gax-java/gax/pom.xml | 7 ------- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/sdk-platform-java/api-common-java/pom.xml b/sdk-platform-java/api-common-java/pom.xml index 2e5022dc055d..3deaca944f3a 100644 --- a/sdk-platform-java/api-common-java/pom.xml +++ b/sdk-platform-java/api-common-java/pom.xml @@ -60,6 +60,12 @@ javax.annotation-api ${javax.annotation-api.version} + + com.google.errorprone + error_prone_annotations + ${errorprone.version} + compile + junit @@ -117,6 +123,16 @@ + + org.apache.maven.plugins + maven-dependency-plugin + + + com.google.errorprone:error_prone_annotations + + + + diff --git a/sdk-platform-java/gax-java/gax/pom.xml b/sdk-platform-java/gax-java/gax/pom.xml index c1780f814d83..4719780fa26e 100644 --- a/sdk-platform-java/gax-java/gax/pom.xml +++ b/sdk-platform-java/gax-java/gax/pom.xml @@ -41,13 +41,6 @@ com.google.protobuf protobuf-java-util - - - - com.google.errorprone - error_prone_annotations - - org.threeten From 897a939e70d14e2420c52936ef5405e249c48ce5 Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Fri, 24 Apr 2026 02:17:36 +0000 Subject: [PATCH 07/17] Accept javax.annotation:javax.annotation-api unused declared dep --- sdk-platform-java/api-common-java/pom.xml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sdk-platform-java/api-common-java/pom.xml b/sdk-platform-java/api-common-java/pom.xml index 3deaca944f3a..1815d3d9b681 100644 --- a/sdk-platform-java/api-common-java/pom.xml +++ b/sdk-platform-java/api-common-java/pom.xml @@ -127,9 +127,11 @@ org.apache.maven.plugins maven-dependency-plugin - - com.google.errorprone:error_prone_annotations - + + + com.google.errorprone:error_prone_annotations + javax.annotation:javax.annotation-api + From dd9738d0935e47b9a3be92aa2e79892331930dca Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Fri, 24 Apr 2026 02:38:13 +0000 Subject: [PATCH 08/17] declared dependencies --- .kokoro/dependencies.sh | 5 +-- sdk-platform-java/gax-java/gax/pom.xml | 56 ++++++++++++++++++++++++++ 2 files changed, 58 insertions(+), 3 deletions(-) diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh index 008b72d8134b..552492c5cf22 100755 --- a/.kokoro/dependencies.sh +++ b/.kokoro/dependencies.sh @@ -58,9 +58,8 @@ then fi # this should run maven enforcer -retry_with_backoff 3 10 \ - mvn install -B -V -ntp \ - -Pquick-build -DskipTests=true -Dmaven.javadoc.skip=true -Denforcer.skip=false +mvn install -B -V -ntp \ + -Pquick-build -DskipTests=true -Dmaven.javadoc.skip=true -Denforcer.skip=false mvn -B dependency:analyze -Pquick-build -DfailOnWarning=true -Dmdep.analyze.skip=false diff --git a/sdk-platform-java/gax-java/gax/pom.xml b/sdk-platform-java/gax-java/gax/pom.xml index 4719780fa26e..19fd0254f028 100644 --- a/sdk-platform-java/gax-java/gax/pom.xml +++ b/sdk-platform-java/gax-java/gax/pom.xml @@ -95,6 +95,53 @@ slf4j-api true + + io.opentelemetry + opentelemetry-sdk-metrics + test + + + io.opentelemetry + opentelemetry-sdk-common + test + + + org.junit.jupiter + junit-jupiter-api + ${junit.version} + test + + + io.grpc + grpc-api + runtime + + + com.google.code.gson + gson + + + com.google.http-client + google-http-client-gson + + + com.google.http-client + google-http-client + + + com.google.auto.value + auto-value-annotations + + + io.opentelemetry + opentelemetry-sdk + test + + + com.google.errorprone + error_prone_annotations + ${errorprone.version} + @@ -132,6 +179,15 @@ + + org.apache.maven.plugins + maven-dependency-plugin + + + org.junit.jupiter:junit-jupiter-engine + + + org.apache.maven.plugins From 1bde06fda46c31d40abb6c7dfbb92fd46dbd7481 Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Fri, 24 Apr 2026 02:48:40 +0000 Subject: [PATCH 09/17] gax-grpc --- sdk-platform-java/gax-java/gax-grpc/pom.xml | 30 ++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/sdk-platform-java/gax-java/gax-grpc/pom.xml b/sdk-platform-java/gax-java/gax-grpc/pom.xml index af5e752d774e..ae9e603dfa56 100644 --- a/sdk-platform-java/gax-java/gax-grpc/pom.xml +++ b/sdk-platform-java/gax-java/gax-grpc/pom.xml @@ -117,6 +117,20 @@ test testlib + + org.junit.jupiter + junit-jupiter-api + ${junit.version} + test + + + com.google.http-client + google-http-client + + + com.google.protobuf + protobuf-java + @@ -148,6 +162,20 @@ + + org.apache.maven.plugins + maven-dependency-plugin + + + io.grpc:grpc-netty-shaded + io.grpc:grpc-googleapis + org.slf4j:slf4j-api + io.grpc:grpc-s2a + org.junit.jupiter:junit-jupiter-engine + org.junit.jupiter:junit-jupiter-params + + + @@ -166,4 +194,4 @@ - \ No newline at end of file + From 05a720ac553c85310c1d46861a0d01b42d770aa5 Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Fri, 24 Apr 2026 03:00:28 +0000 Subject: [PATCH 10/17] gax-httpjson --- .../gax-java/gax-httpjson/pom.xml | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/sdk-platform-java/gax-java/gax-httpjson/pom.xml b/sdk-platform-java/gax-java/gax-httpjson/pom.xml index e660228e6e89..6c6ca4b34707 100644 --- a/sdk-platform-java/gax-java/gax-httpjson/pom.xml +++ b/sdk-platform-java/gax-java/gax-httpjson/pom.xml @@ -93,6 +93,18 @@ test testlib + + + org.junit.jupiter + junit-jupiter-api + ${junit.version} + test + + + com.google.errorprone + error_prone_annotations + ${errorprone.version} + @@ -115,6 +127,17 @@ + + org.apache.maven.plugins + maven-dependency-plugin + + + org.slf4j:slf4j-api + org.junit.jupiter:junit-jupiter-engine + org.junit.jupiter:junit-jupiter-params + + + From 5751c464b65f0dd9331fe2685eb61a10693eac80 Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Fri, 24 Apr 2026 03:16:07 +0000 Subject: [PATCH 11/17] gapic-generator-java --- .../gapic-generator-java/pom.xml | 52 +++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/sdk-platform-java/gapic-generator-java/pom.xml b/sdk-platform-java/gapic-generator-java/pom.xml index da49819c86bb..3a634edcc1bf 100644 --- a/sdk-platform-java/gapic-generator-java/pom.xml +++ b/sdk-platform-java/gapic-generator-java/pom.xml @@ -373,6 +373,16 @@ + + org.apache.maven.plugins + maven-dependency-plugin + + + com.google.errorprone:error_prone_annotations + org.junit.jupiter:junit-jupiter-engine + + + @@ -487,5 +497,47 @@ ${junit.version} test + + + com.google.code.findbugs + jsr305 + 3.0.2 + + + com.google.api + api-common + 2.62.0 + + + org.junit.jupiter + junit-jupiter-api + ${junit.version} + test + + + io.grpc + grpc-api + ${grpc.version} + + + com.google.code.gson + gson + ${gson.version} + + + com.google.http-client + google-http-client + ${google.http-client.version} + + + com.google.api.grpc + proto-google-common-protos + 2.70.0 + + + com.google.protobuf + protobuf-java + ${protobuf.version} + From 899126a22505ebbd7dc4db3413e980ba6ac72fea Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Fri, 24 Apr 2026 03:28:38 +0000 Subject: [PATCH 12/17] java-core --- .../gapic-generator-java/pom.xml | 1 - .../gax-java/gax-httpjson/pom.xml | 1 - .../java-core/google-cloud-core/pom.xml | 28 +++++++++++++++++++ 3 files changed, 28 insertions(+), 2 deletions(-) diff --git a/sdk-platform-java/gapic-generator-java/pom.xml b/sdk-platform-java/gapic-generator-java/pom.xml index 3a634edcc1bf..8295ff3a2b0c 100644 --- a/sdk-platform-java/gapic-generator-java/pom.xml +++ b/sdk-platform-java/gapic-generator-java/pom.xml @@ -497,7 +497,6 @@ ${junit.version} test - com.google.code.findbugs jsr305 diff --git a/sdk-platform-java/gax-java/gax-httpjson/pom.xml b/sdk-platform-java/gax-java/gax-httpjson/pom.xml index 6c6ca4b34707..cccd2f2c9b53 100644 --- a/sdk-platform-java/gax-java/gax-httpjson/pom.xml +++ b/sdk-platform-java/gax-java/gax-httpjson/pom.xml @@ -93,7 +93,6 @@ test testlib - org.junit.jupiter junit-jupiter-api diff --git a/sdk-platform-java/java-core/google-cloud-core/pom.xml b/sdk-platform-java/java-core/google-cloud-core/pom.xml index 39fafdbda39a..ee8f89d9f632 100644 --- a/sdk-platform-java/java-core/google-cloud-core/pom.xml +++ b/sdk-platform-java/java-core/google-cloud-core/pom.xml @@ -109,5 +109,33 @@ guava-testlib test + + org.junit.jupiter + junit-jupiter-api + ${junit.version} + test + + + junit + junit + 4.13.2 + test + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + com.google.errorprone:error_prone_annotations + org.junit.platform:junit-platform-launcher + org.junit.jupiter:junit-jupiter-engine + org.junit.vintage:junit-vintage-engine + + + + + From e816784dcf5b5bd8a6696d82a94fc5dfca18759f Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Fri, 24 Apr 2026 03:49:13 +0000 Subject: [PATCH 13/17] java-core and java-showcase --- .../proto-gapic-showcase-v1beta1/pom.xml | 13 +++++++++++ .../java-core/google-cloud-core-grpc/pom.xml | 22 +++++++++++++++++++ .../java-core/google-cloud-core-http/pom.xml | 22 +++++++++++++++++++ 3 files changed, 57 insertions(+) diff --git a/java-showcase/proto-gapic-showcase-v1beta1/pom.xml b/java-showcase/proto-gapic-showcase-v1beta1/pom.xml index 4d948c3a16a2..8fa4fe9d2afa 100644 --- a/java-showcase/proto-gapic-showcase-v1beta1/pom.xml +++ b/java-showcase/proto-gapic-showcase-v1beta1/pom.xml @@ -55,4 +55,17 @@ + + + + org.apache.maven.plugins + maven-dependency-plugin + + + com.google.api.grpc:proto-google-iam-v1 + + + + + diff --git a/sdk-platform-java/java-core/google-cloud-core-grpc/pom.xml b/sdk-platform-java/java-core/google-cloud-core-grpc/pom.xml index bc54af021709..9b9782148927 100644 --- a/sdk-platform-java/java-core/google-cloud-core-grpc/pom.xml +++ b/sdk-platform-java/java-core/google-cloud-core-grpc/pom.xml @@ -75,5 +75,27 @@ easymock test + + org.junit.jupiter + junit-jupiter-api + ${junit.version} + test + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + com.google.errorprone:error_prone_annotations + org.junit.platform:junit-platform-launcher + org.junit.jupiter:junit-jupiter-engine + org.junit.vintage:junit-vintage-engine + + + + + diff --git a/sdk-platform-java/java-core/google-cloud-core-http/pom.xml b/sdk-platform-java/java-core/google-cloud-core-http/pom.xml index 44af1ec7949e..5dbcbd31ca94 100644 --- a/sdk-platform-java/java-core/google-cloud-core-http/pom.xml +++ b/sdk-platform-java/java-core/google-cloud-core-http/pom.xml @@ -101,5 +101,27 @@ truth test + + org.junit.jupiter + junit-jupiter-api + ${junit.version} + test + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + com.google.errorprone:error_prone_annotations + org.junit.platform:junit-platform-launcher + org.junit.jupiter:junit-jupiter-engine + org.junit.vintage:junit-vintage-engine + + + + + From c2705abc98097b9f504d48b846ca4ac95db7cc3f Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Fri, 24 Apr 2026 04:17:30 +0000 Subject: [PATCH 14/17] format --- sdk-platform-java/api-common-java/pom.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sdk-platform-java/api-common-java/pom.xml b/sdk-platform-java/api-common-java/pom.xml index 1815d3d9b681..14dcd1e35728 100644 --- a/sdk-platform-java/api-common-java/pom.xml +++ b/sdk-platform-java/api-common-java/pom.xml @@ -133,8 +133,7 @@ javax.annotation:javax.annotation-api - - + From 32ac550b797f314cd8d654e6fb0741dcde7f1f76 Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Fri, 24 Apr 2026 16:25:15 +0000 Subject: [PATCH 15/17] skip showcase dependency check --- java-showcase/pom.xml | 1 + java-showcase/proto-gapic-showcase-v1beta1/pom.xml | 13 ------------- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/java-showcase/pom.xml b/java-showcase/pom.xml index 508f3ee9fdfd..daec9128481a 100644 --- a/java-showcase/pom.xml +++ b/java-showcase/pom.xml @@ -24,6 +24,7 @@ true true true + true diff --git a/java-showcase/proto-gapic-showcase-v1beta1/pom.xml b/java-showcase/proto-gapic-showcase-v1beta1/pom.xml index 8fa4fe9d2afa..4d948c3a16a2 100644 --- a/java-showcase/proto-gapic-showcase-v1beta1/pom.xml +++ b/java-showcase/proto-gapic-showcase-v1beta1/pom.xml @@ -55,17 +55,4 @@ - - - - org.apache.maven.plugins - maven-dependency-plugin - - - com.google.api.grpc:proto-google-iam-v1 - - - - - From 9c31a980ff8e6abf2777ac1a63ca0dfc263524c7 Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Fri, 24 Apr 2026 16:36:05 +0000 Subject: [PATCH 16/17] IgnoreNonCompile to reduce the test dependency exclusions --- google-cloud-jar-parent/pom.xml | 1 + java-bigquery/google-cloud-bigquery-jdbc/pom.xml | 1 + .../gapic-generator-java-pom-parent/pom.xml | 1 + sdk-platform-java/gapic-generator-java/pom.xml | 5 ++--- sdk-platform-java/gax-java/gax-grpc/pom.xml | 2 -- sdk-platform-java/gax-java/gax-httpjson/pom.xml | 2 -- sdk-platform-java/gax-java/gax/pom.xml | 9 --------- .../java-core/google-cloud-core-grpc/pom.xml | 3 --- .../java-core/google-cloud-core-http/pom.xml | 3 --- sdk-platform-java/java-core/google-cloud-core/pom.xml | 3 --- 10 files changed, 5 insertions(+), 25 deletions(-) diff --git a/google-cloud-jar-parent/pom.xml b/google-cloud-jar-parent/pom.xml index 7ea2f4738280..ef05a8f8c9f1 100644 --- a/google-cloud-jar-parent/pom.xml +++ b/google-cloud-jar-parent/pom.xml @@ -20,6 +20,7 @@ false + true diff --git a/java-bigquery/google-cloud-bigquery-jdbc/pom.xml b/java-bigquery/google-cloud-bigquery-jdbc/pom.xml index 9c8172aec2fb..7a2c6fa132d3 100644 --- a/java-bigquery/google-cloud-bigquery-jdbc/pom.xml +++ b/java-bigquery/google-cloud-bigquery-jdbc/pom.xml @@ -161,6 +161,7 @@ com.google.cloud google-cloud-bigquery-parent 2.65.0 + ../ diff --git a/sdk-platform-java/gapic-generator-java-pom-parent/pom.xml b/sdk-platform-java/gapic-generator-java-pom-parent/pom.xml index a94c10f85c15..bc94e6e4ea61 100644 --- a/sdk-platform-java/gapic-generator-java-pom-parent/pom.xml +++ b/sdk-platform-java/gapic-generator-java-pom-parent/pom.xml @@ -40,6 +40,7 @@ 2.0.16 true + true diff --git a/sdk-platform-java/gapic-generator-java/pom.xml b/sdk-platform-java/gapic-generator-java/pom.xml index 8295ff3a2b0c..9dc08db15a4f 100644 --- a/sdk-platform-java/gapic-generator-java/pom.xml +++ b/sdk-platform-java/gapic-generator-java/pom.xml @@ -379,7 +379,6 @@ com.google.errorprone:error_prone_annotations - org.junit.jupiter:junit-jupiter-engine @@ -505,7 +504,7 @@ com.google.api api-common - 2.62.0 + 2.62.0 org.junit.jupiter @@ -531,7 +530,7 @@ com.google.api.grpc proto-google-common-protos - 2.70.0 + 2.70.0 com.google.protobuf diff --git a/sdk-platform-java/gax-java/gax-grpc/pom.xml b/sdk-platform-java/gax-java/gax-grpc/pom.xml index ae9e603dfa56..0c14cf21db60 100644 --- a/sdk-platform-java/gax-java/gax-grpc/pom.xml +++ b/sdk-platform-java/gax-java/gax-grpc/pom.xml @@ -171,8 +171,6 @@ io.grpc:grpc-googleapis org.slf4j:slf4j-api io.grpc:grpc-s2a - org.junit.jupiter:junit-jupiter-engine - org.junit.jupiter:junit-jupiter-params diff --git a/sdk-platform-java/gax-java/gax-httpjson/pom.xml b/sdk-platform-java/gax-java/gax-httpjson/pom.xml index cccd2f2c9b53..9ebd19c64515 100644 --- a/sdk-platform-java/gax-java/gax-httpjson/pom.xml +++ b/sdk-platform-java/gax-java/gax-httpjson/pom.xml @@ -132,8 +132,6 @@ org.slf4j:slf4j-api - org.junit.jupiter:junit-jupiter-engine - org.junit.jupiter:junit-jupiter-params diff --git a/sdk-platform-java/gax-java/gax/pom.xml b/sdk-platform-java/gax-java/gax/pom.xml index 19fd0254f028..8bbb9c5c52d0 100644 --- a/sdk-platform-java/gax-java/gax/pom.xml +++ b/sdk-platform-java/gax-java/gax/pom.xml @@ -179,15 +179,6 @@ - - org.apache.maven.plugins - maven-dependency-plugin - - - org.junit.jupiter:junit-jupiter-engine - - - org.apache.maven.plugins diff --git a/sdk-platform-java/java-core/google-cloud-core-grpc/pom.xml b/sdk-platform-java/java-core/google-cloud-core-grpc/pom.xml index 9b9782148927..144c049cc08b 100644 --- a/sdk-platform-java/java-core/google-cloud-core-grpc/pom.xml +++ b/sdk-platform-java/java-core/google-cloud-core-grpc/pom.xml @@ -90,9 +90,6 @@ com.google.errorprone:error_prone_annotations - org.junit.platform:junit-platform-launcher - org.junit.jupiter:junit-jupiter-engine - org.junit.vintage:junit-vintage-engine diff --git a/sdk-platform-java/java-core/google-cloud-core-http/pom.xml b/sdk-platform-java/java-core/google-cloud-core-http/pom.xml index 5dbcbd31ca94..98c1e33de846 100644 --- a/sdk-platform-java/java-core/google-cloud-core-http/pom.xml +++ b/sdk-platform-java/java-core/google-cloud-core-http/pom.xml @@ -116,9 +116,6 @@ com.google.errorprone:error_prone_annotations - org.junit.platform:junit-platform-launcher - org.junit.jupiter:junit-jupiter-engine - org.junit.vintage:junit-vintage-engine diff --git a/sdk-platform-java/java-core/google-cloud-core/pom.xml b/sdk-platform-java/java-core/google-cloud-core/pom.xml index ee8f89d9f632..6cd3177c6922 100644 --- a/sdk-platform-java/java-core/google-cloud-core/pom.xml +++ b/sdk-platform-java/java-core/google-cloud-core/pom.xml @@ -130,9 +130,6 @@ com.google.errorprone:error_prone_annotations - org.junit.platform:junit-platform-launcher - org.junit.jupiter:junit-jupiter-engine - org.junit.vintage:junit-vintage-engine From 659ee7136af393abda6cf7b986255cccf1070fb0 Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Fri, 24 Apr 2026 20:45:02 +0000 Subject: [PATCH 17/17] declare junit dependency in google-cloud-bigquery-jdbc --- java-bigquery/google-cloud-bigquery-jdbc/pom.xml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/java-bigquery/google-cloud-bigquery-jdbc/pom.xml b/java-bigquery/google-cloud-bigquery-jdbc/pom.xml index 7a2c6fa132d3..4ce42dd0ea6c 100644 --- a/java-bigquery/google-cloud-bigquery-jdbc/pom.xml +++ b/java-bigquery/google-cloud-bigquery-jdbc/pom.xml @@ -30,8 +30,7 @@ UTF-8 UTF-8 github - google-cloud-bigquery-jdbc - + google-cloud-bigquery-jdbc @@ -161,7 +160,6 @@ com.google.cloud google-cloud-bigquery-parent 2.65.0 - ../ @@ -279,6 +277,11 @@ + + junit + junit + test + com.google.truth truth @@ -373,4 +376,4 @@ - \ No newline at end of file +