From de6258fe229bdb16eb68b422111c8fb880e85a54 Mon Sep 17 00:00:00 2001 From: chingor13 Date: Thu, 16 Apr 2026 18:30:24 +0000 Subject: [PATCH 1/6] ci: trigger sdk-platform-java tests --- sdk-platform-java/GEMINI.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk-platform-java/GEMINI.md b/sdk-platform-java/GEMINI.md index aed84e060b35..df090820aaa3 100644 --- a/sdk-platform-java/GEMINI.md +++ b/sdk-platform-java/GEMINI.md @@ -154,4 +154,4 @@ Showcase integration tests are run against a local server that implements the Sh - **Issues:** All significant changes should start with a GitHub issue. - **Pull Requests:** All code changes must be submitted via a pull request and require review. Before creating a PR, always pull latest from main, merge main to local branch and resolve any conflicts. - **Testing:** All new logic should be accompanied by tests. -- For more details, see `CONTRIBUTING.md`. \ No newline at end of file +- For more details, see `CONTRIBUTING.md`. From 333a5c1794c30006ee9da89f132bb006f2b4e7c8 Mon Sep 17 00:00:00 2001 From: chingor13 Date: Thu, 16 Apr 2026 19:08:18 +0000 Subject: [PATCH 2/6] test: remove auth library version from compatibility test --- sdk-platform-java/dependencies.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/sdk-platform-java/dependencies.txt b/sdk-platform-java/dependencies.txt index be11b4a2d350..afdb572539e8 100644 --- a/sdk-platform-java/dependencies.txt +++ b/sdk-platform-java/dependencies.txt @@ -10,7 +10,6 @@ # These dependencies are declared: https://github.com/googleapis/sdk-platform-java/blob/main/gapic-generator-java-pom-parent/pom.xml javax.annotation:javax.annotation-api,javax.annotation-api=1.3.2 io.grpc:grpc-bom,grpc=1.80.0 -com.google.auth:google-auth-library-bom,google.auth=1.46.0 com.google.http-client:google-http-client,google.http-client=2.1.0 com.google.code.gson:gson,gson=2.13.2 com.google.guava:guava,guava=33.5.0-jre From 38187a955170e50ac165b2363b8a9be1ba96cdf7 Mon Sep 17 00:00:00 2001 From: chingor13 Date: Thu, 16 Apr 2026 21:45:35 +0000 Subject: [PATCH 3/6] ci: fix sonar module installation --- .github/workflows/sdk-platform-java-sonar.yaml | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/.github/workflows/sdk-platform-java-sonar.yaml b/.github/workflows/sdk-platform-java-sonar.yaml index 24133d69110d..fb4ef9217358 100644 --- a/.github/workflows/sdk-platform-java-sonar.yaml +++ b/.github/workflows/sdk-platform-java-sonar.yaml @@ -46,13 +46,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: | From c3dc97dc5e06c062f3bea77c33ef216b337e45af Mon Sep 17 00:00:00 2001 From: chingor13 Date: Thu, 16 Apr 2026 21:56:27 +0000 Subject: [PATCH 4/6] only run sonar for sdk-platform-java --- .github/workflows/sdk-platform-java-sonar.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/sdk-platform-java-sonar.yaml b/.github/workflows/sdk-platform-java-sonar.yaml index fb4ef9217358..985a391881f5 100644 --- a/.github/workflows/sdk-platform-java-sonar.yaml +++ b/.github/workflows/sdk-platform-java-sonar.yaml @@ -84,6 +84,7 @@ jobs: -Dsonar.projectKey=googleapis_gapic-generator-java \ -Dsonar.organization=googleapis \ -Dsonar.host.url=https://sonarcloud.io + working-directory: sdk-platform-java - name: Build and analyze Showcase Integration Tests Coverage env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any @@ -98,3 +99,4 @@ jobs: -Dsonar.organization=googleapis \ -Dsonar.host.url=https://sonarcloud.io \ -Dsonar.projectName=java_showcase_integration_tests + working-directory: sdk-platform-java From a4a7521cb744e63d3bacd7eba9d70d749a299b5a Mon Sep 17 00:00:00 2001 From: chingor13 Date: Fri, 17 Apr 2026 19:25:41 +0000 Subject: [PATCH 5/6] test: disable getNOPLogger test --- .../test/java/com/google/api/gax/logging/Slf4jUtilsTest.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sdk-platform-java/gax-java/gax/src/test/java/com/google/api/gax/logging/Slf4jUtilsTest.java b/sdk-platform-java/gax-java/gax/src/test/java/com/google/api/gax/logging/Slf4jUtilsTest.java index b40ca1bc2c9c..b2b0f21dc791 100644 --- a/sdk-platform-java/gax-java/gax/src/test/java/com/google/api/gax/logging/Slf4jUtilsTest.java +++ b/sdk-platform-java/gax-java/gax/src/test/java/com/google/api/gax/logging/Slf4jUtilsTest.java @@ -46,6 +46,7 @@ import com.google.protobuf.Option; import java.util.HashMap; import java.util.Map; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.mockito.Mockito; import org.slf4j.Logger; @@ -56,6 +57,7 @@ class Slf4jUtilsTest { // This test should only run GOOGLE_SDK_JAVA_LOGGING != true @Test + @Disabled("See https://github.com/googleapis/google-cloud-java/issues/12828") void testGetLogger_loggingDisabled_shouldGetNOPLogger() { Logger logger = Slf4jUtils.getLogger(Slf4jUtilsTest.class); assertEquals(NOPLogger.class, logger.getClass()); From 9906b7c9df4f78490c4836dca5da6b877bbb93d1 Mon Sep 17 00:00:00 2001 From: chingor13 Date: Fri, 17 Apr 2026 19:44:55 +0000 Subject: [PATCH 6/6] stop using Google mirror for tests --- settings.xml | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/settings.xml b/settings.xml index 8b592f625d58..3af27a94af88 100644 --- a/settings.xml +++ b/settings.xml @@ -18,15 +18,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 https://maven.apache.org/xsd/settings-1.0.0.xsd"> - - - - google-maven-central - GCS Maven Central mirror - https://maven-central.storage-download.googleapis.com/maven2/ - central - - +