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' }}
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/google-auth-library-java/cab-token-generator/pom.xml b/google-auth-library-java/cab-token-generator/pom.xml
index f14748eeb066..4169bfab6e6f 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
@@ -49,10 +49,12 @@
dev.cel
cel
-
-
- com.google.code.findbugs
- jsr305
+
+
+ com.google.code.findbugs
+ annotations
+
+
com.google.crypto.tink
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..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
@@ -278,6 +277,11 @@
+
+ junit
+ junit
+ test
+
com.google.truth
truth
@@ -372,4 +376,4 @@
-
\ No newline at end of file
+
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/sdk-platform-java/api-common-java/pom.xml b/sdk-platform-java/api-common-java/pom.xml
index 881eac206666..14dcd1e35728 100644
--- a/sdk-platform-java/api-common-java/pom.xml
+++ b/sdk-platform-java/api-common-java/pom.xml
@@ -66,12 +66,11 @@
${errorprone.version}
compile
-
- org.junit.jupiter
- junit-jupiter-engine
- ${junit.version}
+ junit
+ junit
+ 4.13.2
test
@@ -81,8 +80,8 @@
test
- org.junit.vintage
- junit-vintage-engine
+ org.junit.jupiter
+ junit-jupiter-api
${junit.version}
test
@@ -92,11 +91,6 @@
1.4.4
test
-
- com.google.j2objc
- j2objc-annotations
- ${j2objc-annotations.version}
-
@@ -129,6 +123,17 @@
+
+ org.apache.maven.plugins
+ maven-dependency-plugin
+
+
+
+ com.google.errorprone:error_prone_annotations
+ javax.annotation:javax.annotation-api
+
+
+
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 da49819c86bb..9dc08db15a4f 100644
--- a/sdk-platform-java/gapic-generator-java/pom.xml
+++ b/sdk-platform-java/gapic-generator-java/pom.xml
@@ -373,6 +373,15 @@
+
+ org.apache.maven.plugins
+ maven-dependency-plugin
+
+
+ com.google.errorprone:error_prone_annotations
+
+
+
@@ -487,5 +496,46 @@
${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}
+
diff --git a/sdk-platform-java/gax-java/gax-grpc/pom.xml b/sdk-platform-java/gax-java/gax-grpc/pom.xml
index af5e752d774e..0c14cf21db60 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,18 @@
+
+ org.apache.maven.plugins
+ maven-dependency-plugin
+
+
+ io.grpc:grpc-netty-shaded
+ io.grpc:grpc-googleapis
+ org.slf4j:slf4j-api
+ io.grpc:grpc-s2a
+
+
+
@@ -166,4 +192,4 @@
-
\ No newline at end of file
+
diff --git a/sdk-platform-java/gax-java/gax-httpjson/pom.xml b/sdk-platform-java/gax-java/gax-httpjson/pom.xml
index e660228e6e89..9ebd19c64515 100644
--- a/sdk-platform-java/gax-java/gax-httpjson/pom.xml
+++ b/sdk-platform-java/gax-java/gax-httpjson/pom.xml
@@ -93,6 +93,17 @@
test
testlib
+
+ org.junit.jupiter
+ junit-jupiter-api
+ ${junit.version}
+ test
+
+
+ com.google.errorprone
+ error_prone_annotations
+ ${errorprone.version}
+
@@ -115,6 +126,15 @@
+
+ org.apache.maven.plugins
+ maven-dependency-plugin
+
+
+ org.slf4j:slf4j-api
+
+
+
diff --git a/sdk-platform-java/gax-java/gax/pom.xml b/sdk-platform-java/gax-java/gax/pom.xml
index 4719780fa26e..8bbb9c5c52d0 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}
+
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..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
@@ -75,5 +75,24 @@
easymock
test
+
+ org.junit.jupiter
+ junit-jupiter-api
+ ${junit.version}
+ test
+
+
+
+
+ org.apache.maven.plugins
+ maven-dependency-plugin
+
+
+ com.google.errorprone:error_prone_annotations
+
+
+
+
+
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..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
@@ -101,5 +101,24 @@
truth
test
+
+ org.junit.jupiter
+ junit-jupiter-api
+ ${junit.version}
+ test
+
+
+
+
+ org.apache.maven.plugins
+ maven-dependency-plugin
+
+
+ com.google.errorprone:error_prone_annotations
+
+
+
+
+
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..6cd3177c6922 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,30 @@
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
+
+
+
+
+