Merge branch 'main' into feat/channelpool-resizing

Author: lqiu96

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

@@ -180,7 +180,13 @@ jobs:
         with:
           java-version: 17
           distribution: temurin
-      - name: Compile with Java 17 and run tests with Java 8
+      - name: Install all modules using Java 17
+        shell: bash
+        run: .kokoro/build.sh
+        env:
+          BUILD_SUBDIR: sdk-platform-java
+          JOB_TYPE: install
+      - name: Run tests with Java 8
         shell: bash
         run: |
           set -x
@@ -192,7 +198,7 @@ jobs:
               -Djvm="${JAVA8_HOME}/bin/java"
         working-directory: sdk-platform-java
       # The `envVarTest` profile runs tests that require an environment variable
-      - name: Compile with Java 17 and run tests with Java 8 (Env Var Tests)
+      - name: Run tests with Java 8 (Env Var Tests)
         shell: bash
         run: |
           set -x

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

@@ -20,6 +20,7 @@ jobs:
         filters: |
           library:
             - 'sdk-platform-java/**'
+            - '.github/workflows/sdk-platform-java-sonar.yaml'
   build:
     needs: filter
     if: needs.filter.outputs.library == 'true' && (github.event.pull_request.head.repo.full_name == github.repository || github.event_name != 'pull_request')
@@ -46,13 +47,18 @@ jobs:
           path: ~/.m2
           key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
           restore-keys: ${{ runner.os }}-m2
-      - name: Install modules to local maven
-        run: |
-          mvn install -T 1C -DskipTests -ntp -B
-          cd java-showcase
-          mvn install -T 1C -DskipTests -ntp -B
+      - name: Install sdk-platform-modules
+        shell: bash
+        run: .kokoro/build.sh
+        env:
+          BUILD_SUBDIR: sdk-platform-java
+          JOB_TYPE: install
+      - name: Install java-showcase
+        shell: bash
+        run: mvn install -T 1C -DskipTests -ntp -B
+        working-directory: sdk-platform-java/java-showcase
       - name: Parse showcase version
-        working-directory: java-showcase/gapic-showcase
+        working-directory: sdk-platform-java/java-showcase/gapic-showcase
         run: echo "SHOWCASE_VERSION=$(mvn help:evaluate -Dexpression=gapic-showcase.version -q -DforceStdout)" >> "$GITHUB_ENV"
       - name: Install showcase server
         run: |
@@ -68,28 +74,29 @@ jobs:
       # step for a few tests (env var tests) may be overkill and should be better covered
       # when we can upgrade to JUnit 5 (https://github.com/googleapis/sdk-platform-java/issues/1611#issuecomment-1970079325)
       - name: Build and analyze for full test coverage
+        working-directory: sdk-platform-java
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
-          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN_FOR_GENERATOR }}
         run: |
           mvn -B verify -Pquick-build \
               -DenableFullTestCoverage \
               -Penable-integration-tests \
               org.sonarsource.scanner.maven:sonar-maven-plugin:sonar \
-              -Dsonar.projectKey=googleapis_gapic-generator-java \
+              -Dsonar.projectKey=googleapis_google-cloud-java_generator \
               -Dsonar.organization=googleapis \
               -Dsonar.host.url=https://sonarcloud.io
       - name: Build and analyze Showcase Integration Tests Coverage
+        working-directory: sdk-platform-java
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}  # Needed to get PR information, if any
-          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN_FOR_SHOWCASE }}
         run: |
           mvn -B clean verify -Pquick-build \
               -DskipUnitTests \
               -Penable-integration-tests \
               -DenableShowcaseTestCoverage \
               org.sonarsource.scanner.maven:sonar-maven-plugin:sonar \
-              -Dsonar.projectKey=googleapis_gapic-generator-java_integration_tests \
+              -Dsonar.projectKey=googleapis_google-cloud-java_showcase \
               -Dsonar.organization=googleapis \
-              -Dsonar.host.url=https://sonarcloud.io \
-              -Dsonar.projectName=java_showcase_integration_tests
+              -Dsonar.host.url=https://sonarcloud.io

.kokoro/common.sh

@@ -408,6 +408,7 @@ function install_modules() {
     always_install_deps_list=(
       'google-auth-library-java/appengine'
       'google-auth-library-java/bom'
+      'google-auth-library-java/cab-token-generator'
       'google-auth-library-java/credentials'
       'google-auth-library-java/oauth2_http'
       'sdk-platform-java/java-shared-dependencies'

sdk-platform-java/hermetic_build/library_generation/tests/resources/test_monorepo_postprocessing/java-dns/pom.xml

@@ -4,6 +4,6 @@
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud-dns</artifactId>
   <packaging>jar</packaging>
-  <version>2.33.0-SNAPSHOT</version><!-- {x-version-update:google-cloud-dns:current} -->
+  <version>2.33.0-SNAPSHOT</version><!-- {x-version-update:google-cloud-dns-golden:current} -->
   <name>Google Cloud DNS Parent</name>
 </project>

sdk-platform-java/hermetic_build/library_generation/tests/resources/test_monorepo_postprocessing/java-service-control/google-cloud-service-control-bom/pom.xml

@@ -3,6 +3,6 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud-service-control-bom</artifactId>
-  <version>1.35.0-SNAPSHOT</version><!-- {x-version-update:google-cloud-service-control:current} -->
+  <version>1.35.0-SNAPSHOT</version><!-- {x-version-update:google-cloud-service-control-golden:current} -->
   <packaging>pom</packaging>
 </project>

sdk-platform-java/hermetic_build/library_generation/tests/resources/test_monorepo_postprocessing/java-tasks/google-cloud-tasks-bom/pom.xml

@@ -3,6 +3,6 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.cloud</groupId>
   <artifactId>google-cloud-tasks-bom</artifactId>
-  <version>2.35.0-SNAPSHOT</version><!-- {x-version-update:google-cloud-tasks:current} -->
+  <version>2.35.0-SNAPSHOT</version><!-- {x-version-update:google-cloud-tasks-golden:current} -->
   <packaging>pom</packaging>
 </project>