chore(spanner): apply manual changes

Author: chingor13

.github/workflows/java-spanner-integration-tests-against-emulator.yaml

@@ -4,8 +4,6 @@ on:
     - main
   pull_request:
 name: java-spanner integration-tests-against-emulator
-env:
-  BUILD_SUBDIR: java-spanner
 jobs:
   filter:
     runs-on: ubuntu-latest
@@ -33,26 +31,15 @@ jobs:
 
     steps:
     - uses: actions/checkout@v6
-    - uses: stCarolas/setup-maven@v5
-      with:
-        maven-version: 3.8.1
-    # Build with JDK 11 and run tests with JDK 8
-    - uses: actions/setup-java@v5
-      with:
-        java-version: 11
-        distribution: temurin
-    - name: Compiling main library
-      run: .kokoro/build.sh
     - uses: actions/setup-java@v5
       with:
-        java-version: 8
         distribution: temurin
+        java-version: 11
     - name: Running tests
-      run: |
-        mvn -V -B -Dspanner.testenv.instance="" -Penable-integration-tests \
-            -DtrimStackTrace=false -Dclirr.skip=true -Denforcer.skip=true \
-            -Dmaven.main.skip=true -fae verify
+      run: .kokoro/build.sh
       env:
         JOB_TYPE: test
+        BUILD_SUBDIR: java-spanner
         SPANNER_EMULATOR_HOST: localhost:9010
         GOOGLE_CLOUD_PROJECT: emulator-test-project
+        SUREFIRE_JVM_OPT: '-Penable-integration-tests -DskipUnitTests=true -Dspanner.testenv.instance="" -Dmaven.main.skip=true'

.kokoro/build.sh

@@ -245,10 +245,12 @@ case ${JOB_TYPE} in
                 if [ -f "${dir}/pom.xml" ] && [ "${dir}" != "." ]; then
                     # Filter out directories not participating in the default formatting reactor:
                     # - samples are handwritten by developers
+                    # - benchmarks are handwritten by developers
                     # - proto-*/grpc-* are generated code and should use the compiler format
                     # - *-bom/parents are POM-only and contain no Java source
                     if [[ "${dir}" != *"samples"* ]] && \
                        [[ "${dir}" != *"java-showcase"* ]] && \
+                       [[ "$(basename "${dir}")" != *"benchmark"* ]] && \
                        [[ "$(basename "${dir}")" != "proto-google-"* ]] && \
                        [[ "$(basename "${dir}")" != "grpc-google-"* ]] && \
                        [[ "$(basename "${dir}")" != *"-bom" ]] && \

.kokoro/presubmit/spanner-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: {

gapic-libraries-bom/pom.xml

@@ -1242,6 +1242,13 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+      <dependency>
+        <groupId>com.google.cloud</groupId>
+        <artifactId>google-cloud-spanner-bom</artifactId>
+        <version>6.111.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-spanner:current} -->
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-spanneradapter-bom</artifactId>

generation_config.yaml

@@ -2486,7 +2486,7 @@ libraries:
   requires_billing: true
   codeowner_team: '@googleapis/spanner-team'
   library_type: GAPIC_COMBO
-  excluded_poms: google-cloud-spanner-bom
+  excluded_poms: google-cloud-spanner-bom,google-cloud-spanner
   recommended_package: com.google.cloud.spanner
   GAPICs:
   - proto_path: google/spanner/admin/database/v1

java-spanner/.github/scripts/update_generation_config.sh

@@ -8,7 +8,7 @@
   "transport": "grpc",
   "language": "java",
   "repo": "googleapis/google-cloud-java",
-  "repo_short": "google-cloud-java",
+  "repo_short": "java-spanner",
   "distribution_name": "com.google.cloud:google-cloud-spanner",
   "api_id": "spanner.googleapis.com",
   "library_type": "GAPIC_COMBO",
@@ -18,4 +18,4 @@
   "issue_tracker": "https://issuetracker.google.com/issues?q=componentid:190851%2B%20status:open",
   "recommended_package": "com.google.cloud.spanner",
   "min_java_version": 8
-}
+}