From f1c0a09b09699a3f981e59df9caf02057dc89466 Mon Sep 17 00:00:00 2001 From: Diego Alonso Marquez Palacios Date: Tue, 4 Mar 2025 11:21:34 -0500 Subject: [PATCH 1/5] chore: centralize graal 23 downstream updates --- .../com.google.api/gax/native-image.properties | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 gax-java/gax/src/test/resources/META-INF/native-image/com.google.api/gax/native-image.properties diff --git a/gax-java/gax/src/test/resources/META-INF/native-image/com.google.api/gax/native-image.properties b/gax-java/gax/src/test/resources/META-INF/native-image/com.google.api/gax/native-image.properties new file mode 100644 index 0000000000..906b800c3e --- /dev/null +++ b/gax-java/gax/src/test/resources/META-INF/native-image/com.google.api/gax/native-image.properties @@ -0,0 +1,8 @@ +Args=--initialize-at-build-time=java.lang.annotation.Annotation,\ + org.junit.experimental.categories.Category,\ + org.junit.experimental.categories.CategoryValidator,\ + org.junit.Ignore,\ + org.junit.runner.RunWith,\ + org.junit.runners.model.FrameworkField,\ + org.junit.validator.AnnotationValidator,\ + org.junit.vintage.engine.discovery.FilterableIgnoringRunnerDecorator \ No newline at end of file From d0af847bd6815ca7f42677b980884b887321c499 Mon Sep 17 00:00:00 2001 From: Diego Alonso Marquez Palacios Date: Mon, 10 Mar 2025 12:08:13 -0400 Subject: [PATCH 2/5] add native downstream checks --- .github/workflows/downstream.yaml | 6 +++++- .kokoro/presubmit/downstream-compatibility.sh | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/downstream.yaml b/.github/workflows/downstream.yaml index c6b3f64856..f0cea14d64 100644 --- a/.github/workflows/downstream.yaml +++ b/.github/workflows/downstream.yaml @@ -17,6 +17,10 @@ jobs: strategy: fail-fast: false matrix: + job_type: + - test + - graalvm + - graalvm17 repo: - google-cloud-java - java-bigtable @@ -46,7 +50,7 @@ jobs: - name: Test helper scripts run: ./.kokoro/presubmit/common_test.sh - name: Perform downstream compatibility testing - run: REPOS_UNDER_TEST="${{ matrix.repo }}" ./.kokoro/presubmit/downstream-compatibility.sh + run: REPOS_UNDER_TEST="${{ matrix.repo }}" JOB_TYPE="${{ matrix.job_type }}" ./.kokoro/presubmit/downstream-compatibility.sh downstream-compatibility-spring-generator: runs-on: ubuntu-22.04 strategy: diff --git a/.kokoro/presubmit/downstream-compatibility.sh b/.kokoro/presubmit/downstream-compatibility.sh index 2e0b8c7c12..772f11e619 100755 --- a/.kokoro/presubmit/downstream-compatibility.sh +++ b/.kokoro/presubmit/downstream-compatibility.sh @@ -40,7 +40,7 @@ for repo in ${REPOS_UNDER_TEST//,/ }; do # Split on comma git clone "https://github.com/googleapis/$repo.git" --depth=1 --branch "v$last_release" update_all_poms_dependency "$repo" google-cloud-shared-dependencies "$SHARED_DEPS_VERSION" pushd "$repo" - JOB_TYPE="test" ./.kokoro/build.sh + ./.kokoro/build.sh popd done popd From de19c92727988d8485ff2e0effc62615f54f341f Mon Sep 17 00:00:00 2001 From: Diego Alonso Marquez Palacios Date: Mon, 10 Mar 2025 13:32:04 -0400 Subject: [PATCH 3/5] Revert "add native downstream checks" This reverts commit d0af847bd6815ca7f42677b980884b887321c499. --- .github/workflows/downstream.yaml | 6 +----- .kokoro/presubmit/downstream-compatibility.sh | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/downstream.yaml b/.github/workflows/downstream.yaml index f0cea14d64..c6b3f64856 100644 --- a/.github/workflows/downstream.yaml +++ b/.github/workflows/downstream.yaml @@ -17,10 +17,6 @@ jobs: strategy: fail-fast: false matrix: - job_type: - - test - - graalvm - - graalvm17 repo: - google-cloud-java - java-bigtable @@ -50,7 +46,7 @@ jobs: - name: Test helper scripts run: ./.kokoro/presubmit/common_test.sh - name: Perform downstream compatibility testing - run: REPOS_UNDER_TEST="${{ matrix.repo }}" JOB_TYPE="${{ matrix.job_type }}" ./.kokoro/presubmit/downstream-compatibility.sh + run: REPOS_UNDER_TEST="${{ matrix.repo }}" ./.kokoro/presubmit/downstream-compatibility.sh downstream-compatibility-spring-generator: runs-on: ubuntu-22.04 strategy: diff --git a/.kokoro/presubmit/downstream-compatibility.sh b/.kokoro/presubmit/downstream-compatibility.sh index 772f11e619..2e0b8c7c12 100755 --- a/.kokoro/presubmit/downstream-compatibility.sh +++ b/.kokoro/presubmit/downstream-compatibility.sh @@ -40,7 +40,7 @@ for repo in ${REPOS_UNDER_TEST//,/ }; do # Split on comma git clone "https://github.com/googleapis/$repo.git" --depth=1 --branch "v$last_release" update_all_poms_dependency "$repo" google-cloud-shared-dependencies "$SHARED_DEPS_VERSION" pushd "$repo" - ./.kokoro/build.sh + JOB_TYPE="test" ./.kokoro/build.sh popd done popd From 069aeabeda55e5cf7b682a7f47b748a1083b352d Mon Sep 17 00:00:00 2001 From: diegomarquezp Date: Mon, 10 Mar 2025 18:21:18 +0000 Subject: [PATCH 4/5] add guava classes --- .../native-image/com.google.api/gax/native-image.properties | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gax-java/gax/src/main/resources/META-INF/native-image/com.google.api/gax/native-image.properties b/gax-java/gax/src/main/resources/META-INF/native-image/com.google.api/gax/native-image.properties index 53c30ddde9..49e8323211 100644 --- a/gax-java/gax/src/main/resources/META-INF/native-image/com.google.api/gax/native-image.properties +++ b/gax-java/gax/src/main/resources/META-INF/native-image/com.google.api/gax/native-image.properties @@ -4,6 +4,9 @@ Args = --enable-url-protocols=https,http \ com.google.api.gax.core.GaxProperties,\ com.google.common.base.Platform,\ com.google.common.base.Platform$JdkPatternCompiler,\ + com.google.common.collect.ImmutableMapEntry,\ + com.google.common.collect.ImmutableMapEntry$NonTerminalImmutableMapEntry,\ + com.google.common.collect.SingletonImmutableBiMap,\ com.google.protobuf.RuntimeVersion,\ com.google.protobuf.RuntimeVersion$RuntimeDomain \ --features=com.google.api.gax.nativeimage.OpenCensusFeature,\ From 261cb7e7ec1816168154d96fd2c64740fe596189 Mon Sep 17 00:00:00 2001 From: diegomarquezp Date: Tue, 18 Mar 2025 18:42:30 +0000 Subject: [PATCH 5/5] chore: include local test config --- gax-java/gax/pom.xml | 1 + .../native-image/com.google.api/gax/native-image.properties | 1 + .../native-image/com.google.api/gax/native-image.properties | 3 ++- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/gax-java/gax/pom.xml b/gax-java/gax/pom.xml index 596759352e..99ff93724f 100644 --- a/gax-java/gax/pom.xml +++ b/gax-java/gax/pom.xml @@ -99,6 +99,7 @@ com/google/api/gax/rpc/testing/** com/google/api/gax/rpc/mtls/** com/google/api/gax/util/** + **/native-image.properties diff --git a/gax-java/gax/src/main/resources/META-INF/native-image/com.google.api/gax/native-image.properties b/gax-java/gax/src/main/resources/META-INF/native-image/com.google.api/gax/native-image.properties index 49e8323211..5d11a38791 100644 --- a/gax-java/gax/src/main/resources/META-INF/native-image/com.google.api/gax/native-image.properties +++ b/gax-java/gax/src/main/resources/META-INF/native-image/com.google.api/gax/native-image.properties @@ -5,6 +5,7 @@ Args = --enable-url-protocols=https,http \ com.google.common.base.Platform,\ com.google.common.base.Platform$JdkPatternCompiler,\ com.google.common.collect.ImmutableMapEntry,\ + com.google.common.collect.RegularImmutableList,\ com.google.common.collect.ImmutableMapEntry$NonTerminalImmutableMapEntry,\ com.google.common.collect.SingletonImmutableBiMap,\ com.google.protobuf.RuntimeVersion,\ diff --git a/gax-java/gax/src/test/resources/META-INF/native-image/com.google.api/gax/native-image.properties b/gax-java/gax/src/test/resources/META-INF/native-image/com.google.api/gax/native-image.properties index 906b800c3e..0c966978c2 100644 --- a/gax-java/gax/src/test/resources/META-INF/native-image/com.google.api/gax/native-image.properties +++ b/gax-java/gax/src/test/resources/META-INF/native-image/com.google.api/gax/native-image.properties @@ -5,4 +5,5 @@ Args=--initialize-at-build-time=java.lang.annotation.Annotation,\ org.junit.runner.RunWith,\ org.junit.runners.model.FrameworkField,\ org.junit.validator.AnnotationValidator,\ - org.junit.vintage.engine.discovery.FilterableIgnoringRunnerDecorator \ No newline at end of file + org.junit.vintage.engine.discovery.FilterableIgnoringRunnerDecorator,\ + org.junit.vintage.engine.discovery.IgnoringRunnerDecorator \ No newline at end of file