chore: manual fixes for java-spanner-jdbc

suztomo · suztomo · commit cfa412890e6e · 2026-03-24T22:59:58.000Z
diff --git a/.github/workflows/java-spanner-jdbc-ci.yaml b/.github/workflows/java-spanner-jdbc-ci.yaml
@@ -129,6 +129,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
     - uses: actions/setup-java@v4
       with:
         distribution: temurin
@@ -137,3 +139,5 @@ jobs:
     - run: .kokoro/build.sh
       env:
         JOB_TYPE: lint
+        HEAD_SHA: ${{ github.event.pull_request.head.sha }}
+        BASE_SHA: ${{ github.event.pull_request.base.sha }}
diff --git a/.github/workflows/java-spanner-jdbc-integration-tests-against-emulator.yaml b/.github/workflows/java-spanner-jdbc-integration-tests-against-emulator.yaml
@@ -19,7 +19,7 @@ jobs:
         filters: |
           library:
             - 'java-spanner-jdbc/**'
-  units:
+  tests-against-emulator:
     needs: filter
     if: ${{ needs.filter.outputs.library == 'true' }}
     runs-on: ubuntu-latest
@@ -36,11 +36,14 @@ jobs:
     - uses: actions/setup-java@v5
       with:
         distribution: temurin
-        java-version: 8
+        java-version: 17
     - run: java -version
-    - run: .kokoro/build.sh
-    - run: mvn -B -Dspanner.testenv.instance="" -Penable-integration-tests -DtrimStackTrace=false -Dclirr.skip=true -Denforcer.skip=true -fae verify
+    - name: Install dependencies for the integration test
+      run: .kokoro/build.sh
       env:
         JOB_TYPE: test
+    - run: mvn -B -Dspanner.testenv.instance="" -Penable-integration-tests -DtrimStackTrace=false -Dclirr.skip=true -Denforcer.skip=true -fae verify
+      working-directory: java-spanner-jdbc
+      env:
         SPANNER_EMULATOR_HOST: localhost:9010
         GOOGLE_CLOUD_PROJECT: emulator-test-project
diff --git a/.github/workflows/java-spanner-jdbc-quickperf.yaml b/.github/workflows/java-spanner-jdbc-quickperf.yaml
@@ -43,4 +43,4 @@ jobs:
           java-version: 17
       - name: Run tests
         run: mvn test
-        working-directory: samples/quickperf
+        working-directory: java-spanner-jdbc/samples/quickperf
diff --git a/.github/workflows/java-spanner-jdbc-sample-tests.yml b/.github/workflows/java-spanner-jdbc-sample-tests.yml
@@ -43,4 +43,4 @@ jobs:
           java-version: 8
       - name: Run sample tests
         run: mvn --quiet --batch-mode test
-        working-directory: samples/snippets
+        working-directory: java-spanner-jdbc/samples/snippets
diff --git a/.github/workflows/java-spanner-jdbc-spring-data-jdbc-sample.yaml b/.github/workflows/java-spanner-jdbc-spring-data-jdbc-sample.yaml
@@ -43,7 +43,7 @@ jobs:
           java-version: 17
       - name: Run tests on GoogleSQL
         run: mvn test
-        working-directory: samples/spring-data-jdbc/googlesql
+        working-directory: java-spanner-jdbc/samples/spring-data-jdbc/googlesql
       - name: Run tests on PostgreSQL
         run: mvn test
-        working-directory: samples/spring-data-jdbc/postgresql
+        working-directory: java-spanner-jdbc/samples/spring-data-jdbc/postgresql
diff --git a/.github/workflows/java-spanner-jdbc-spring-data-mybatis-sample.yaml b/.github/workflows/java-spanner-jdbc-spring-data-mybatis-sample.yaml
@@ -43,7 +43,7 @@ jobs:
           java-version: 17
       - name: Run GoogleSQL sample tests
         run: mvn test
-        working-directory: samples/spring-data-mybatis/googlesql
+        working-directory: java-spanner-jdbc/samples/spring-data-mybatis/googlesql
       - name: Run PostgreSQL sample tests
         run: mvn test
-        working-directory: samples/spring-data-mybatis/postgresql
+        working-directory: java-spanner-jdbc/samples/spring-data-mybatis/postgresql
diff --git a/.kokoro/presubmit/spanner-jdbc-graalvm-native-presubmit.cfg b/.kokoro/presubmit/spanner-jdbc-graalvm-native-presubmit.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.57.0"
+  value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.57.0" # {x-version-update:google-cloud-shared-dependencies:current}
 }
 
 env_vars: {
@@ -36,3 +36,8 @@ env_vars: {
   key: "BUILD_SUBDIR"
   value: "java-spanner-jdbc"
 }
+
+env_vars: {
+  key: "INTEGRATION_TEST_ARGS"
+  value: "-Dtest=com.google.cloud.spanner.jdbc.it.**"
+}
diff --git a/.kokoro/presubmit/spanner-jdbc-integration.cfg b/.kokoro/presubmit/spanner-jdbc-integration.cfg
@@ -3,7 +3,7 @@
 # Configure the docker image for kokoro-trampoline.
 env_vars: {
   key: "TRAMPOLINE_IMAGE"
-  value: "gcr.io/cloud-devrel-kokoro-resources/java8"
+  value: "gcr.io/cloud-devrel-kokoro-resources/java11"
 }
 
 env_vars: {
diff --git a/java-spanner-jdbc/pom.xml b/java-spanner-jdbc/pom.xml
@@ -59,13 +59,6 @@
 
   <dependencyManagement>
     <dependencies>
-      <dependency>
-        <groupId>com.google.cloud</groupId>
-        <artifactId>google-cloud-spanner-bom</artifactId>
-        <version>6.111.1</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
       <dependency>
         <groupId>io.opencensus</groupId>
         <artifactId>opencensus-api</artifactId>
@@ -103,6 +96,7 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-spanner</artifactId>
+      <version>6.112.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-spanner:current} -->
     </dependency>
     <dependency>
       <groupId>io.grpc</groupId>
@@ -143,6 +137,7 @@
     <dependency>
       <groupId>com.google.api.grpc</groupId>
       <artifactId>proto-google-cloud-spanner-v1</artifactId>
+      <version>6.112.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-spanner-v1:current} -->
     </dependency>
     <dependency>
       <groupId>io.opentelemetry</groupId>
@@ -152,6 +147,7 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-spanner</artifactId>
+      <version>6.112.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-spanner:current} -->
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
@@ -207,13 +203,13 @@
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-trace</artifactId>
-      <version>2.87.0</version><!-- {x-version-update:google-cloud-trace:current} -->
+      <version>2.89.0-SNAPSHOT</version><!-- {x-version-update:google-cloud-trace:current} -->
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>com.google.api.grpc</groupId>
       <artifactId>proto-google-cloud-trace-v1</artifactId>
-      <version>2.87.0</version><!-- {x-version-update:proto-google-cloud-trace-v1:current} -->
+      <version>2.89.0-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-trace-v1:current} -->
       <scope>test</scope>
     </dependency>
 
@@ -345,10 +341,12 @@
             </goals>
             <configuration>
               <mainClass>com.google.cloud.spanner.jdbc.ConnectionPropertiesFileGenerator</mainClass>
+              <arguments>
+                <argument>${project.basedir}/documentation/connection_properties.md</argument>
+              </arguments>
               <classpathScope>test</classpathScope>
               <skip>false</skip>
-            </configuration>
-          </execution>
+            </configuration>          </execution>
         </executions>
       </plugin>
     </plugins>
diff --git a/java-spanner-jdbc/src/test/java/com/google/cloud/spanner/jdbc/ConnectionPropertiesFileGenerator.java b/java-spanner-jdbc/src/test/java/com/google/cloud/spanner/jdbc/ConnectionPropertiesFileGenerator.java
@@ -28,6 +28,7 @@
 public class ConnectionPropertiesFileGenerator {
 
   public static void main(String[] args) throws IOException {
+    String filename = args.length > 0 ? args[0] : "documentation/connection_properties.md";
     StringBuilder builder =
         new StringBuilder("# Supported Connection Properties\n\n")
             .append(
@@ -57,8 +58,7 @@ public static void main(String[] args) throws IOException {
           .append(connectionProperty.getContext())
           .append(" |\n");
     }
-    try (BufferedWriter writer =
-        new BufferedWriter(new FileWriter("documentation/connection_properties.md"))) {
+    try (BufferedWriter writer = new BufferedWriter(new FileWriter(filename))) {
       writer.write(builder.toString());
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`# Configure the docker image for kokoro-trampoline.`
`4`	`4`	`env_vars: {`
`5`	`5`	`key: "TRAMPOLINE_IMAGE"`
`6`		`- value: "gcr.io/cloud-devrel-kokoro-resources/java8"`
	`6`	`+ value: "gcr.io/cloud-devrel-kokoro-resources/java11"`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`env_vars: {`
Original file line number	Diff line number	Diff line change
`@@ -28,6 +28,7 @@`
`28`	`28`	`public class ConnectionPropertiesFileGenerator {`
`29`	`29`
`30`	`30`	`public static void main(String[] args) throws IOException {`
	`31`	`+ String filename = args.length > 0 ? args[0] : "documentation/connection_properties.md";`
`31`	`32`	`StringBuilder builder =`
`32`	`33`	`new StringBuilder("# Supported Connection Properties\n\n")`
`33`	`34`	`.append(`
`@@ -57,8 +58,7 @@ public static void main(String[] args) throws IOException {`
`57`	`58`	`.append(connectionProperty.getContext())`
`58`	`59`	`.append(" \|\n");`
`59`	`60`	`}`
`60`		`- try (BufferedWriter writer =`
`61`		`- new BufferedWriter(new FileWriter("documentation/connection_properties.md"))) {`
	`61`	`+ try (BufferedWriter writer = new BufferedWriter(new FileWriter(filename))) {`
`62`	`62`	`writer.write(builder.toString());`
`63`	`63`	`}`
`64`	`64`	`}`