From c37cded626c55aa6b242c48035dd8dc7cbc7dd31 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 11 Feb 2025 01:44:20 +0000 Subject: [PATCH 01/21] deps: update dependency com.google.cloud:sdk-platform-java-config to v3.43.0 --- .github/workflows/unmanaged_dependency_check.yaml | 2 +- .kokoro/presubmit/graalvm-native-17.cfg | 2 +- .kokoro/presubmit/graalvm-native.cfg | 2 +- pom.xml | 2 +- samples/quickperf/pom.xml | 2 +- samples/snippets/pom.xml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/unmanaged_dependency_check.yaml b/.github/workflows/unmanaged_dependency_check.yaml index 6d507150e..a48787484 100644 --- a/.github/workflows/unmanaged_dependency_check.yaml +++ b/.github/workflows/unmanaged_dependency_check.yaml @@ -14,6 +14,6 @@ jobs: shell: bash run: .kokoro/build.sh - name: Unmanaged dependency check - uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.42.0 + uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.43.0 with: bom-path: pom.xml diff --git a/.kokoro/presubmit/graalvm-native-17.cfg b/.kokoro/presubmit/graalvm-native-17.cfg index b78c82df5..8d3f11dc4 100644 --- a/.kokoro/presubmit/graalvm-native-17.cfg +++ b/.kokoro/presubmit/graalvm-native-17.cfg @@ -3,7 +3,7 @@ # Configure the docker image for kokoro-trampoline. env_vars: { key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.42.0" + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.43.0" } env_vars: { diff --git a/.kokoro/presubmit/graalvm-native.cfg b/.kokoro/presubmit/graalvm-native.cfg index f08c4be3e..f78bafd26 100644 --- a/.kokoro/presubmit/graalvm-native.cfg +++ b/.kokoro/presubmit/graalvm-native.cfg @@ -3,7 +3,7 @@ # Configure the docker image for kokoro-trampoline. env_vars: { key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.42.0" + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.43.0" } env_vars: { diff --git a/pom.xml b/pom.xml index 407823276..993d58cdc 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ com.google.cloud sdk-platform-java-config - 3.42.0 + 3.43.0 diff --git a/samples/quickperf/pom.xml b/samples/quickperf/pom.xml index f0670c6e6..e9dbe6c06 100644 --- a/samples/quickperf/pom.xml +++ b/samples/quickperf/pom.xml @@ -12,7 +12,7 @@ com.google.cloud sdk-platform-java-config - 3.42.0 + 3.43.0 diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index 697da8e6c..09cd1009a 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -9,7 +9,7 @@ com.google.cloud sdk-platform-java-config - 3.42.0 + 3.43.0 From d3f0047a808b15d4ac1b61138a1c6f40aeac3f71 Mon Sep 17 00:00:00 2001 From: diegomarquezp Date: Wed, 12 Feb 2025 16:27:19 +0000 Subject: [PATCH 02/21] initialize Dialect$2 as part of strict-image-heap enforcement --- .../google-cloud-spanner-jdbc/native-image.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties b/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties index b5754aca4..4e8c49158 100644 --- a/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties +++ b/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties @@ -2,5 +2,6 @@ Args = --initialize-at-build-time==com.google.cloud.spanner.IntegrationTestEnv,\ com.google.cloud.spanner.jdbc.it.JdbcIntegrationTestEnv,\ com.google.common.collect.RegularImmutableMap,\ com.google.cloud.spanner.Dialect,\ + com.google.cloud.spanner.Dialect$2,\ com.google.spanner.admin.database.v1.DatabaseDialect,\ org.junit.runners.MethodSorters \ No newline at end of file From bde775152716a0d0b8c4e7498127bc23b9df9574 Mon Sep 17 00:00:00 2001 From: diegomarquezp Date: Wed, 12 Feb 2025 16:51:14 +0000 Subject: [PATCH 03/21] Revert "initialize Dialect$2 as part of strict-image-heap enforcement" This reverts commit d3f0047a808b15d4ac1b61138a1c6f40aeac3f71. --- .../google-cloud-spanner-jdbc/native-image.properties | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties b/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties index 4e8c49158..b5754aca4 100644 --- a/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties +++ b/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties @@ -2,6 +2,5 @@ Args = --initialize-at-build-time==com.google.cloud.spanner.IntegrationTestEnv,\ com.google.cloud.spanner.jdbc.it.JdbcIntegrationTestEnv,\ com.google.common.collect.RegularImmutableMap,\ com.google.cloud.spanner.Dialect,\ - com.google.cloud.spanner.Dialect$2,\ com.google.spanner.admin.database.v1.DatabaseDialect,\ org.junit.runners.MethodSorters \ No newline at end of file From 95140c64dbc98b56973d4fc1566208c1bad0414c Mon Sep 17 00:00:00 2001 From: diegomarquezp Date: Wed, 12 Feb 2025 18:15:15 +0000 Subject: [PATCH 04/21] Reapply "initialize Dialect$2 as part of strict-image-heap enforcement" This reverts commit bde775152716a0d0b8c4e7498127bc23b9df9574. --- .../google-cloud-spanner-jdbc/native-image.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties b/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties index b5754aca4..4e8c49158 100644 --- a/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties +++ b/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties @@ -2,5 +2,6 @@ Args = --initialize-at-build-time==com.google.cloud.spanner.IntegrationTestEnv,\ com.google.cloud.spanner.jdbc.it.JdbcIntegrationTestEnv,\ com.google.common.collect.RegularImmutableMap,\ com.google.cloud.spanner.Dialect,\ + com.google.cloud.spanner.Dialect$2,\ com.google.spanner.admin.database.v1.DatabaseDialect,\ org.junit.runners.MethodSorters \ No newline at end of file From 1b95468c2e1aaab8799077dba7e8aeee6b3c1e5e Mon Sep 17 00:00:00 2001 From: diegomarquezp Date: Wed, 12 Feb 2025 18:16:02 +0000 Subject: [PATCH 05/21] initialize Dialect$1 at build time --- .../google-cloud-spanner-jdbc/native-image.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties b/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties index 4e8c49158..7f301caaa 100644 --- a/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties +++ b/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties @@ -3,5 +3,6 @@ Args = --initialize-at-build-time==com.google.cloud.spanner.IntegrationTestEnv,\ com.google.common.collect.RegularImmutableMap,\ com.google.cloud.spanner.Dialect,\ com.google.cloud.spanner.Dialect$2,\ + com.google.cloud.spanner.Dialect$1,\ com.google.spanner.admin.database.v1.DatabaseDialect,\ org.junit.runners.MethodSorters \ No newline at end of file From 260cafdcb8c47a84558b2f097c3f034b6c93b8f4 Mon Sep 17 00:00:00 2001 From: diegomarquezp Date: Wed, 12 Feb 2025 19:00:43 +0000 Subject: [PATCH 06/21] initialize immutable map entry at build time --- .../google-cloud-spanner-jdbc/native-image.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties b/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties index 7f301caaa..a93ad0e5a 100644 --- a/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties +++ b/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties @@ -1,6 +1,7 @@ Args = --initialize-at-build-time==com.google.cloud.spanner.IntegrationTestEnv,\ com.google.cloud.spanner.jdbc.it.JdbcIntegrationTestEnv,\ com.google.common.collect.RegularImmutableMap,\ + com.google.common.collect.ImmutableMapEntry,\ com.google.cloud.spanner.Dialect,\ com.google.cloud.spanner.Dialect$2,\ com.google.cloud.spanner.Dialect$1,\ From d469da9b945d758703041b0073a7d0553cb59e86 Mon Sep 17 00:00:00 2001 From: diegomarquezp Date: Wed, 12 Feb 2025 19:29:54 +0000 Subject: [PATCH 07/21] initialize subclass of immutable map entry --- .../google-cloud-spanner-jdbc/native-image.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties b/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties index a93ad0e5a..9aeaf4c24 100644 --- a/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties +++ b/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties @@ -2,6 +2,7 @@ Args = --initialize-at-build-time==com.google.cloud.spanner.IntegrationTestEnv,\ com.google.cloud.spanner.jdbc.it.JdbcIntegrationTestEnv,\ com.google.common.collect.RegularImmutableMap,\ com.google.common.collect.ImmutableMapEntry,\ + com.google.common.collect.ImmutableMapEntry$NonTerminalImmutableMapEntry,\ com.google.cloud.spanner.Dialect,\ com.google.cloud.spanner.Dialect$2,\ com.google.cloud.spanner.Dialect$1,\ From 1be30bd4b41c9406a43dd95abe903edd558ab5a4 Mon Sep 17 00:00:00 2001 From: diegomarquezp Date: Wed, 12 Feb 2025 19:42:26 +0000 Subject: [PATCH 08/21] initialize database dialect $1 --- .../google-cloud-spanner-jdbc/native-image.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties b/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties index 9aeaf4c24..69bf70d04 100644 --- a/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties +++ b/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties @@ -7,4 +7,5 @@ Args = --initialize-at-build-time==com.google.cloud.spanner.IntegrationTestEnv,\ com.google.cloud.spanner.Dialect$2,\ com.google.cloud.spanner.Dialect$1,\ com.google.spanner.admin.database.v1.DatabaseDialect,\ + com.google.spanner.admin.database.v1.DatabaseDialect$1,\ org.junit.runners.MethodSorters \ No newline at end of file From 95a0d5cbc38f1f99960f0d146bf65b33d7f24475 Mon Sep 17 00:00:00 2001 From: diegomarquezp Date: Wed, 12 Feb 2025 20:16:21 +0000 Subject: [PATCH 09/21] add test class initialization --- .../google-cloud-spanner-jdbc/native-image.properties | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 src/test/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties diff --git a/src/test/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties b/src/test/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties new file mode 100644 index 000000000..25c1af034 --- /dev/null +++ b/src/test/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties @@ -0,0 +1,2 @@ +Args=--initialize-at-build-time=org.junit.runner.RunWith\ + --initialize-at-build-time=java.lang.annotation.Annotation From 143266eb0d73f8f50104455539ac9ba660ada282 Mon Sep 17 00:00:00 2001 From: diegomarquezp Date: Wed, 12 Feb 2025 20:51:28 +0000 Subject: [PATCH 10/21] add test class initialization ii --- .../google-cloud-spanner-jdbc/native-image.properties | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/test/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties b/src/test/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties index 25c1af034..3ddb94945 100644 --- a/src/test/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties +++ b/src/test/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties @@ -1,2 +1,3 @@ Args=--initialize-at-build-time=org.junit.runner.RunWith\ - --initialize-at-build-time=java.lang.annotation.Annotation + --initialize-at-build-time=java.lang.annotation.Annotation\ + --initialize-at-build-time=org.junit.runners.Parameterized From ac987c1b947f41fc03c559b0863024188919d200 Mon Sep 17 00:00:00 2001 From: diegomarquezp Date: Wed, 12 Feb 2025 22:08:09 +0000 Subject: [PATCH 11/21] move parameterized initialization to production config --- .../google-cloud-spanner-jdbc/native-image.properties | 3 ++- .../google-cloud-spanner-jdbc/native-image.properties | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties b/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties index 69bf70d04..2c6b56c9b 100644 --- a/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties +++ b/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties @@ -8,4 +8,5 @@ Args = --initialize-at-build-time==com.google.cloud.spanner.IntegrationTestEnv,\ com.google.cloud.spanner.Dialect$1,\ com.google.spanner.admin.database.v1.DatabaseDialect,\ com.google.spanner.admin.database.v1.DatabaseDialect$1,\ - org.junit.runners.MethodSorters \ No newline at end of file + org.junit.runners.MethodSorters,\ + org.junit.runners.Parameterized \ No newline at end of file diff --git a/src/test/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties b/src/test/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties index 3ddb94945..f482849d3 100644 --- a/src/test/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties +++ b/src/test/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties @@ -1,3 +1,2 @@ Args=--initialize-at-build-time=org.junit.runner.RunWith\ --initialize-at-build-time=java.lang.annotation.Annotation\ - --initialize-at-build-time=org.junit.runners.Parameterized From d78fe2f5ff06c0675054deaf95fb9b709fae796f Mon Sep 17 00:00:00 2001 From: diegomarquezp Date: Wed, 12 Feb 2025 22:10:22 +0000 Subject: [PATCH 12/21] move junit config to test config --- .../google-cloud-spanner-jdbc/native-image.properties | 4 +--- .../google-cloud-spanner-jdbc/native-image.properties | 3 +++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties b/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties index 2c6b56c9b..36dc4bae3 100644 --- a/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties +++ b/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties @@ -7,6 +7,4 @@ Args = --initialize-at-build-time==com.google.cloud.spanner.IntegrationTestEnv,\ com.google.cloud.spanner.Dialect$2,\ com.google.cloud.spanner.Dialect$1,\ com.google.spanner.admin.database.v1.DatabaseDialect,\ - com.google.spanner.admin.database.v1.DatabaseDialect$1,\ - org.junit.runners.MethodSorters,\ - org.junit.runners.Parameterized \ No newline at end of file + com.google.spanner.admin.database.v1.DatabaseDialect$1,\ \ No newline at end of file diff --git a/src/test/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties b/src/test/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties index f482849d3..cd1fdd7e0 100644 --- a/src/test/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties +++ b/src/test/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties @@ -1,2 +1,5 @@ Args=--initialize-at-build-time=org.junit.runner.RunWith\ --initialize-at-build-time=java.lang.annotation.Annotation\ + --initialize-at-build-time=java.lang.annotation.Annotation\ + --initialize-at-build-time=org.junit.runners.MethodSorters\ + --initialize-at-build-time=org.junit.runners.Parameterized\ From 1e865ba3e00a219a85742a23f54819901a9812b4 Mon Sep 17 00:00:00 2001 From: diegomarquezp Date: Thu, 13 Feb 2025 03:10:39 +0000 Subject: [PATCH 13/21] Revert "move junit config to test config" This reverts commit d78fe2f5ff06c0675054deaf95fb9b709fae796f. --- .../google-cloud-spanner-jdbc/native-image.properties | 4 +++- .../google-cloud-spanner-jdbc/native-image.properties | 3 --- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties b/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties index 36dc4bae3..2c6b56c9b 100644 --- a/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties +++ b/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties @@ -7,4 +7,6 @@ Args = --initialize-at-build-time==com.google.cloud.spanner.IntegrationTestEnv,\ com.google.cloud.spanner.Dialect$2,\ com.google.cloud.spanner.Dialect$1,\ com.google.spanner.admin.database.v1.DatabaseDialect,\ - com.google.spanner.admin.database.v1.DatabaseDialect$1,\ \ No newline at end of file + com.google.spanner.admin.database.v1.DatabaseDialect$1,\ + org.junit.runners.MethodSorters,\ + org.junit.runners.Parameterized \ No newline at end of file diff --git a/src/test/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties b/src/test/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties index cd1fdd7e0..f482849d3 100644 --- a/src/test/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties +++ b/src/test/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties @@ -1,5 +1,2 @@ Args=--initialize-at-build-time=org.junit.runner.RunWith\ --initialize-at-build-time=java.lang.annotation.Annotation\ - --initialize-at-build-time=java.lang.annotation.Annotation\ - --initialize-at-build-time=org.junit.runners.MethodSorters\ - --initialize-at-build-time=org.junit.runners.Parameterized\ From 44a29f1162cc1df774857e1d08b09c792e8f0df8 Mon Sep 17 00:00:00 2001 From: diegomarquezp Date: Thu, 13 Feb 2025 05:59:42 +0000 Subject: [PATCH 14/21] include runwith in initialized junit classes --- .../google-cloud-spanner-jdbc/native-image.properties | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties b/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties index 2c6b56c9b..562d7353a 100644 --- a/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties +++ b/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties @@ -9,4 +9,5 @@ Args = --initialize-at-build-time==com.google.cloud.spanner.IntegrationTestEnv,\ com.google.spanner.admin.database.v1.DatabaseDialect,\ com.google.spanner.admin.database.v1.DatabaseDialect$1,\ org.junit.runners.MethodSorters,\ - org.junit.runners.Parameterized \ No newline at end of file + org.junit.runners.Parameterized,\ + org.junit.runner.RunWith,\ \ No newline at end of file From 5dd52b6fbbcbbdfb64f3f1a6e095ef35a1d1023d Mon Sep 17 00:00:00 2001 From: diegomarquezp Date: Thu, 13 Feb 2025 06:19:22 +0000 Subject: [PATCH 15/21] add junit method order to image heap --- .../google-cloud-spanner-jdbc/native-image.properties | 4 +++- .../google-cloud-spanner-jdbc/native-image.properties | 2 -- 2 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 src/test/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties diff --git a/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties b/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties index 562d7353a..afaa8e5b2 100644 --- a/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties +++ b/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties @@ -10,4 +10,6 @@ Args = --initialize-at-build-time==com.google.cloud.spanner.IntegrationTestEnv,\ com.google.spanner.admin.database.v1.DatabaseDialect$1,\ org.junit.runners.MethodSorters,\ org.junit.runners.Parameterized,\ - org.junit.runner.RunWith,\ \ No newline at end of file + org.junit.runner.RunWith,\ + org.junit.FixMethodOrder,\ + java.lang.annotation.Annotation \ No newline at end of file diff --git a/src/test/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties b/src/test/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties deleted file mode 100644 index f482849d3..000000000 --- a/src/test/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties +++ /dev/null @@ -1,2 +0,0 @@ -Args=--initialize-at-build-time=org.junit.runner.RunWith\ - --initialize-at-build-time=java.lang.annotation.Annotation\ From 1b7f38e96001d307706e0653d815eb416c72548c Mon Sep 17 00:00:00 2001 From: Diego Marquez Date: Thu, 13 Feb 2025 13:25:20 -0500 Subject: [PATCH 16/21] add junit's category to image heap --- .../google-cloud-spanner-jdbc/native-image.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties b/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties index afaa8e5b2..c132e1743 100644 --- a/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties +++ b/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties @@ -12,4 +12,5 @@ Args = --initialize-at-build-time==com.google.cloud.spanner.IntegrationTestEnv,\ org.junit.runners.Parameterized,\ org.junit.runner.RunWith,\ org.junit.FixMethodOrder,\ + org.junit.experimental.categories.Category,\ java.lang.annotation.Annotation \ No newline at end of file From 619e39662e04221819e8b75dace7315d5f3b146e Mon Sep 17 00:00:00 2001 From: Diego Marquez Date: Thu, 13 Feb 2025 15:22:58 -0500 Subject: [PATCH 17/21] remove java.lang.annotation from image heap --- .../google-cloud-spanner-jdbc/native-image.properties | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties b/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties index c132e1743..e614a6f0c 100644 --- a/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties +++ b/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties @@ -12,5 +12,4 @@ Args = --initialize-at-build-time==com.google.cloud.spanner.IntegrationTestEnv,\ org.junit.runners.Parameterized,\ org.junit.runner.RunWith,\ org.junit.FixMethodOrder,\ - org.junit.experimental.categories.Category,\ - java.lang.annotation.Annotation \ No newline at end of file + org.junit.experimental.categories.Category,\ \ No newline at end of file From 3c0627c5c8939b88775b48939a821185135fa27c Mon Sep 17 00:00:00 2001 From: Diego Marquez Date: Sun, 16 Feb 2025 19:22:13 -0500 Subject: [PATCH 18/21] initialize parameterized junit class at build time --- .../google-cloud-spanner-jdbc/native-image.properties | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties b/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties index e614a6f0c..c56290380 100644 --- a/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties +++ b/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties @@ -12,4 +12,5 @@ Args = --initialize-at-build-time==com.google.cloud.spanner.IntegrationTestEnv,\ org.junit.runners.Parameterized,\ org.junit.runner.RunWith,\ org.junit.FixMethodOrder,\ - org.junit.experimental.categories.Category,\ \ No newline at end of file + org.junit.experimental.categories.Category,\ + org.junit.runners.parameterized.BlockJUnit4ClassRunnerWithParameters,\ \ No newline at end of file From 503d2a7a737d9d61bbba127986c66435881d86de Mon Sep 17 00:00:00 2001 From: Diego Marquez Date: Sun, 16 Feb 2025 19:44:37 -0500 Subject: [PATCH 19/21] initialize framework in image-heap --- .../google-cloud-spanner-jdbc/native-image.properties | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties b/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties index c56290380..e67c5147f 100644 --- a/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties +++ b/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties @@ -13,4 +13,5 @@ Args = --initialize-at-build-time==com.google.cloud.spanner.IntegrationTestEnv,\ org.junit.runner.RunWith,\ org.junit.FixMethodOrder,\ org.junit.experimental.categories.Category,\ - org.junit.runners.parameterized.BlockJUnit4ClassRunnerWithParameters,\ \ No newline at end of file + org.junit.runners.parameterized.BlockJUnit4ClassRunnerWithParameters,\ + org.junit.runners.model.FrameworkField,\ \ No newline at end of file From cb7c184da966015b24f47cbceefa85f33711326b Mon Sep 17 00:00:00 2001 From: Diego Marquez Date: Sun, 16 Feb 2025 19:57:06 -0500 Subject: [PATCH 20/21] initialize it test parameter at build time explicitly --- .../google-cloud-spanner-jdbc/native-image.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties b/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties index e67c5147f..78920ac26 100644 --- a/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties +++ b/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties @@ -1,5 +1,6 @@ Args = --initialize-at-build-time==com.google.cloud.spanner.IntegrationTestEnv,\ com.google.cloud.spanner.jdbc.it.JdbcIntegrationTestEnv,\ + com.google.cloud.spanner.jdbc.it.DialectTestParameter,\ com.google.common.collect.RegularImmutableMap,\ com.google.common.collect.ImmutableMapEntry,\ com.google.common.collect.ImmutableMapEntry$NonTerminalImmutableMapEntry,\ From 15a59cc23f3bf762b24f74b89873efd3b59079a7 Mon Sep 17 00:00:00 2001 From: Diego Marquez Date: Mon, 17 Feb 2025 00:31:45 -0500 Subject: [PATCH 21/21] explicitly initialize singleton immutablebimap --- .../google-cloud-spanner-jdbc/native-image.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties b/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties index 78920ac26..f9e42bad8 100644 --- a/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties +++ b/src/main/resources/META-INF/native-image/com.google.cloud/google-cloud-spanner-jdbc/native-image.properties @@ -4,6 +4,7 @@ Args = --initialize-at-build-time==com.google.cloud.spanner.IntegrationTestEnv,\ com.google.common.collect.RegularImmutableMap,\ com.google.common.collect.ImmutableMapEntry,\ com.google.common.collect.ImmutableMapEntry$NonTerminalImmutableMapEntry,\ + com.google.common.collect.SingletonImmutableBiMap,\ com.google.cloud.spanner.Dialect,\ com.google.cloud.spanner.Dialect$2,\ com.google.cloud.spanner.Dialect$1,\