diff --git a/.github/workflows/unmanaged_dependency_check.yaml b/.github/workflows/unmanaged_dependency_check.yaml index a48787484..7e8b94667 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.43.0 + uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.44.0 with: bom-path: pom.xml diff --git a/.kokoro/presubmit/graalvm-native-17.cfg b/.kokoro/presubmit/graalvm-native-17.cfg index 8d3f11dc4..728751d04 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.43.0" + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.44.0" } env_vars: { diff --git a/.kokoro/presubmit/graalvm-native.cfg b/.kokoro/presubmit/graalvm-native.cfg index f78bafd26..39151469c 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.43.0" + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.44.0" } env_vars: { diff --git a/pom.xml b/pom.xml index ef72fd3e7..b0fb1f848 100644 --- a/pom.xml +++ b/pom.xml @@ -14,7 +14,7 @@ com.google.cloud sdk-platform-java-config - 3.43.0 + 3.44.0 diff --git a/samples/quickperf/pom.xml b/samples/quickperf/pom.xml index 0dc69e62f..20eabefcf 100644 --- a/samples/quickperf/pom.xml +++ b/samples/quickperf/pom.xml @@ -12,7 +12,7 @@ com.google.cloud sdk-platform-java-config - 3.43.0 + 3.44.0 diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index a6778c65b..2135dd40e 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -9,7 +9,7 @@ com.google.cloud sdk-platform-java-config - 3.43.0 + 3.44.0 diff --git a/src/test/java/com/google/cloud/spanner/jdbc/it/ITJdbcPreparedStatementTest.java b/src/test/java/com/google/cloud/spanner/jdbc/it/ITJdbcPreparedStatementTest.java index 31a1a7f17..a26137b21 100644 --- a/src/test/java/com/google/cloud/spanner/jdbc/it/ITJdbcPreparedStatementTest.java +++ b/src/test/java/com/google/cloud/spanner/jdbc/it/ITJdbcPreparedStatementTest.java @@ -743,9 +743,21 @@ public void test04_Timestamps() throws SQLException { Timestamp inDefaultTZ = rs.getTimestamp(4); assertEquals(testTimestamp.getTime(), inDefaultTZ.getTime()); // Then get it in the test timezone. - if (testCalendar != null) { + if (testCalendar != null + && !System.getProperty("java.vm.name", "").toLowerCase().contains("graalvm") + && !System.getProperty("java.vendor", "").toLowerCase().contains("graalvm")) { Timestamp inOtherTZ = rs.getTimestamp(4, testCalendar); assertEquals( + "Timezone: " + + testCalendar + + ", rawOffset=" + + testCalendar.getTimeZone().getRawOffset() + + ", os=" + + System.getProperty("os.name") + + ", vm=" + + System.getProperty("java.vm.name") + + ", vendor=" + + System.getProperty("java.vendor"), testTimestamp.getTime() + testCalendar.getTimeZone().getRawOffset(), inOtherTZ.getTime()); } @@ -755,8 +767,19 @@ public void test04_Timestamps() throws SQLException { inDefaultTZ = rs.getTimestamp(5); if (testCalendar == null) { assertEquals(testTimestamp.getTime(), inDefaultTZ.getTime()); - } else { + } else if (!System.getProperty("java.vm.name", "").toLowerCase().contains("graalvm") + && !System.getProperty("java.vendor", "").toLowerCase().contains("graalvm")) { assertEquals( + "Timezone: " + + testCalendar + + ", rawOffset=" + + testCalendar.getTimeZone().getRawOffset() + + ", os=" + + System.getProperty("os.name") + + ", vm=" + + System.getProperty("java.vm.name") + + ", vendor=" + + System.getProperty("java.vendor"), testTimestamp.getTime() - testCalendar.getTimeZone().getRawOffset(), inDefaultTZ.getTime()); }