Merge branch 'main' into feat/deleteSourceObjects-compose-10602500430278326901

Author: Dhriti07

.github/workflows/ci.yaml

@@ -125,42 +125,49 @@ jobs:
           java-bigquery:
             - 'java-bigquery/**'
             - 'google-auth-library-java/**/*.java'
+            - 'google-auth-library-java/**/pom.xml'
             - 'sdk-platform-java/**/*.java'
             - 'sdk-platform-java/java-shared-dependencies/**/pom.xml'
             - 'sdk-platform-java/gapic-generator-java-pom-parent/pom.xml'
           java-bigquerystorage:
             - 'java-bigquerystorage/**'
             - 'google-auth-library-java/**/*.java'
+            - 'google-auth-library-java/**/pom.xml'
             - 'sdk-platform-java/**/*.java'
             - 'sdk-platform-java/java-shared-dependencies/**/pom.xml'
             - 'sdk-platform-java/gapic-generator-java-pom-parent/pom.xml'
           java-datastore:
             - 'java-datastore/**'
             - 'google-auth-library-java/**/*.java'
+            - 'google-auth-library-java/**/pom.xml'
             - 'sdk-platform-java/**/*.java'
             - 'sdk-platform-java/java-shared-dependencies/**/pom.xml'
             - 'sdk-platform-java/gapic-generator-java-pom-parent/pom.xml'
           java-logging-logback:
             - 'java-logging-logback/**'
             - 'google-auth-library-java/**/*.java'
+            - 'google-auth-library-java/**/pom.xml'
             - 'sdk-platform-java/**/*.java'
             - 'sdk-platform-java/java-shared-dependencies/**/pom.xml'
             - 'sdk-platform-java/gapic-generator-java-pom-parent/pom.xml'
           java-logging:
             - 'java-logging/**'
             - 'google-auth-library-java/**/*.java'
+            - 'google-auth-library-java/**/pom.xml'
             - 'sdk-platform-java/**/*.java'
             - 'sdk-platform-java/java-shared-dependencies/**/pom.xml'
             - 'sdk-platform-java/gapic-generator-java-pom-parent/pom.xml'
           java-spanner:
             - 'java-spanner/**'
             - 'google-auth-library-java/**/*.java'
+            - 'google-auth-library-java/**/pom.xml'
             - 'sdk-platform-java/**/*.java'
             - 'sdk-platform-java/java-shared-dependencies/**/pom.xml'
             - 'sdk-platform-java/gapic-generator-java-pom-parent/pom.xml'
           java-storage:
             - 'java-storage/**'
             - 'google-auth-library-java/**/*.java'
+            - 'google-auth-library-java/**/pom.xml'
             - 'sdk-platform-java/**/*.java'
             - 'sdk-platform-java/java-shared-dependencies/**/pom.xml'
             - 'sdk-platform-java/gapic-generator-java-pom-parent/pom.xml'
@@ -244,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:
@@ -257,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

.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

.github/workflows/java-spanner-jdbc-ci.yaml

@@ -35,6 +35,11 @@ jobs:
           library:
             - 'java-spanner-jdbc/**'
             - '.github/workflows/java-spanner-jdbc-ci.yaml'
+            - 'google-auth-library-java/**/*.java'
+            - 'google-auth-library-java/**/pom.xml'
+            - 'sdk-platform-java/**/*.java'
+            - 'sdk-platform-java/java-shared-dependencies/**/pom.xml'
+            - 'sdk-platform-java/gapic-generator-java-pom-parent/pom.xml'
   units:
     needs: filter
     if: ${{ needs.filter.outputs.library == 'true' }}
@@ -99,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

.github/workflows/java-storage-nio-ci.yaml

@@ -35,6 +35,11 @@ jobs:
           library:
             - 'java-storage-nio/**'
             - '.github/workflows/java-storage-nio-ci.yaml'
+            - 'google-auth-library-java/**/*.java'
+            - 'google-auth-library-java/**/pom.xml'
+            - 'sdk-platform-java/**/*.java'
+            - 'sdk-platform-java/java-shared-dependencies/**/pom.xml'
+            - 'sdk-platform-java/gapic-generator-java-pom-parent/pom.xml'
   units:
     needs: filter
     if: ${{ needs.filter.outputs.library == 'true' }}
@@ -99,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

.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' }}

.github/workflows/sdk-platform-java-dependency_compatibility_test.yaml

@@ -29,6 +29,8 @@ jobs:
         filters: |
           library:
             - 'sdk-platform-java/**'
+            - 'google-auth-library-java/**'
+            - '.github/workflows/sdk-platform-java-dependency-compatibility-test.yaml'
   dependency-compatibility-test:
     needs: filter
     if: ${{ needs.filter.outputs.library == 'true' }}

.github/workflows/sdk-platform-java-downstream.yaml

@@ -23,6 +23,7 @@ jobs:
         filters: |
           library:
             - 'sdk-platform-java/**'
+            - 'google-auth-library-java/**'
             - .kokoro/downstream-compatibility.sh
             - .github/workflows/sdk-platform-java-downstream.yaml
   downstream-compatibility:

.github/workflows/sdk-platform-java-downstream_unmanaged_dependency_check.yaml

@@ -55,19 +55,17 @@ jobs:
           cache: maven
       - name: Install the modules of sdk-platform-java
         shell: bash
-        working-directory: google-cloud-java/sdk-platform-java
-        run: |
-          set -euo pipefail
-          # gapic-generator-java is irrelevant
-          mvn -q -B -ntp install \
-            -Dcheckstyle.skip -Dfmt.skip -DskipTests -T 1C
+        run: .kokoro/build.sh
+        env:
+          BUILD_SUBDIR: sdk-platform-java
+          JOB_TYPE: install
+        working-directory: google-cloud-java
       - name: Build unmanaged dependency check
         shell: bash
         working-directory: google-cloud-java/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check
         run: |
           set -euo pipefail
           pwd
-          pwd
           echo "Install Unmanaged Dependency Check in $(pwd)"
           mvn clean install -V --batch-mode --no-transfer-progress -DskipTests
       - name: Install the modules of the downstream repository

.github/workflows/unmanaged_dependency_check.yaml

@@ -14,7 +14,6 @@ jobs:
       shell: bash
       run: .kokoro/build.sh
       env:
-        BUILD_SUBDIR: sdk-platform-java
         JOB_TYPE: install
     - name: Unmanaged dependency check
       uses: ./sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check

.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