Merge branch 'main' into diegomarquezp-patch-2

Author: diegomarquezp

.github/CODEOWNERS

@@ -5,4 +5,4 @@
 # https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners#codeowners-syntax
 
 # The @googleapis/spanner-client-libraries-java is the default owner for changes in this repo
-*                       @googleapis/yoshi-java @googleapis/spanner-client-libraries-java
+*                       @googleapis/cloud-sdk-java-team @googleapis/spanner-client-libraries-java

.github/release-please.yml

@@ -2,26 +2,30 @@ releaseType: java-yoshi
 bumpMinorPreMajor: true
 handleGHRelease: true
 branches:
-    - branch: 3.3.x
-    - branch: 4.0.x
-    - branch: 5.2.x
-    - branch: 6.4.4-sp
-      releaseType: java-lts
-    - branch: 6.14.x
-      releaseType: java-backport
-    - branch: 6.23.x
-    - branch: 6.33.x
-    - branch: 6.55.x
-      releaseType: java-backport
-    - branch: 6.67.x
-      releaseType: java-backport
-    - branch: 6.66.x
-      releaseType: java-backport
-    - branch: 6.88.x
-      releaseType: java-backport
-    - branch: 6.96.x
-      releaseType: java-backport
-    - branch: 6.95.x
-      releaseType: java-backport
-    - branch: protobuf-4.x-rc
-      manifest: true
+  - branch: 3.3.x
+  - branch: 4.0.x
+  - branch: 5.2.x
+  - branch: 6.4.4-sp
+    releaseType: java-lts
+  - branch: 6.14.x
+    releaseType: java-backport
+  - branch: 6.23.x
+  - branch: 6.33.x
+  - branch: 6.55.x
+    releaseType: java-backport
+  - branch: 6.67.x
+    releaseType: java-backport
+  - branch: 6.66.x
+    releaseType: java-backport
+  - branch: 6.88.x
+    releaseType: java-backport
+  - branch: 6.96.x
+    releaseType: java-backport
+  - branch: 6.95.x
+    releaseType: java-backport
+  - branch: protobuf-4.x-rc
+    manifest: true
+  - releaseType: java-backport
+    bumpMinorPreMajor: true
+    handleGHRelease: true
+    branch: 6.109.x

.github/scripts/update_generation_config.sh

@@ -18,7 +18,17 @@ function get_latest_released_version() {
     group_id_url_path="$(sed 's|\.|/|g' <<< "${group_id}")"
     url="https://repo1.maven.org/maven2/${group_id_url_path}/${artifact_id}/maven-metadata.xml"
     xml_content=$(curl -s --fail "${url}")
-    latest=$(xmllint --xpath 'metadata/versioning/latest/text()' - <<< "${xml_content}")
+    
+    # 1. Extract all version tags
+    # 2. Strip the XML tags to leave just the version numbers
+    # 3. Filter for strictly numbers.numbers.numbers (e.g., 2.54.0)
+    # 4. Sort by version (V) and take the last one (tail -n 1)
+    latest=$(echo "${xml_content}" \
+      | grep -oE '<version>[0-9]+\.[0-9]+\.[0-9]+</version>' \
+      | sed -E 's/<[^>]+>//g' \
+      | sort -V \
+      | tail -n 1)
+    
     if [[ -z "${latest}" ]]; then
         echo "The latest version of ${group_id}:${artifact_id} is empty."
         echo "The returned json from maven.org is invalid: ${json_content}"

.github/sync-repo-settings.yaml

@@ -14,13 +14,10 @@ branchProtectionRules:
       - units (8)
       - units (11)
       - 'Kokoro - Test: Integration'
-      - 'Kokoro - Test: Integration with Multiplexed Sessions'
       - cla/google
       - checkstyle
       - compile (8)
       - compile (11)
-      - units-with-multiplexed-session (8)
-      - units-with-multiplexed-session (11)
       - unmanaged_dependency_check
       - library_generation
   - pattern: 3.3.x
@@ -154,7 +151,6 @@ branchProtectionRules:
       - units (8)
       - units (11)
       - 'Kokoro - Test: Integration'
-      - 'Kokoro - Test: Integration with Multiplexed Sessions'
       - cla/google
       - checkstyle
       - compile (8)
@@ -173,7 +169,6 @@ branchProtectionRules:
       - units (8)
       - units (11)
       - 'Kokoro - Test: Integration'
-      - 'Kokoro - Test: Integration with Multiplexed Sessions'
       - cla/google
       - checkstyle
       - compile (8)
@@ -194,7 +189,6 @@ branchProtectionRules:
       - units (8)
       - units (11)
       - 'Kokoro - Test: Integration'
-      - 'Kokoro - Test: Integration with Multiplexed Sessions'
       - cla/google
       - checkstyle
       - compile (8)
@@ -215,7 +209,6 @@ branchProtectionRules:
       - units (8)
       - units (11)
       - 'Kokoro - Test: Integration'
-      - 'Kokoro - Test: Integration with Multiplexed Sessions'
       - cla/google
       - checkstyle
       - compile (8)
@@ -224,6 +217,24 @@ branchProtectionRules:
       - units-with-multiplexed-session (11)
       - unmanaged_dependency_check
       - library_generation
+  - pattern: 6.109.x
+    isAdminEnforced: true
+    requiredApprovingReviewCount: 1
+    requiresCodeOwnerReviews: true
+    requiresStrictStatusChecks: false
+    requiredStatusCheckContexts:
+      - dependencies (17)
+      - lint
+      - javadoc
+      - units (8)
+      - units (11)
+      - 'Kokoro - Test: Integration'
+      - cla/google
+      - checkstyle
+      - compile (8)
+      - compile (11)
+      - unmanaged_dependency_check
+      - library_generation
 permissionRules:
   - team: yoshi-admins
     permission: admin

.github/workflows/ci.yaml

@@ -36,41 +36,6 @@ jobs:
     - run: .kokoro/build.sh
       env:
         JOB_TYPE: test
-  units-with-multiplexed-session:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        java: [ 11, 17, 21 ]
-    steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-java@v3
-      with:
-        distribution: temurin
-        java-version: ${{matrix.java}}
-    - run: java -version
-    - run: .kokoro/build.sh
-      env:
-        JOB_TYPE: test
-        GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS_PARTITIONED_OPS: true
-        GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS_FOR_RW: true
-  units-with-regular-session:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        java: [ 11, 17, 21 ]
-    steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-java@v3
-      with:
-        distribution: temurin
-        java-version: ${{matrix.java}}
-    - run: java -version
-    - run: .kokoro/build.sh
-      env:
-        JOB_TYPE: test
-        GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS: false
   units-java8:
     # Building using Java 17 and run the tests with Java 8 runtime
     name: "units (8)"
@@ -90,48 +55,6 @@ jobs:
     - run: .kokoro/build.sh
       env:
         JOB_TYPE: test
-  units-with-multiplexed-session8:
-    # Building using Java 17 and run the tests with Java 8 runtime
-    name: "units-with-multiplexed-session (8)"
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-java@v3
-        with:
-          java-version: 8
-          distribution: temurin
-      - run: echo "SUREFIRE_JVM_OPT=-Djvm=${JAVA_HOME}/bin/java" >> $GITHUB_ENV
-        shell: bash
-      - uses: actions/setup-java@v3
-        with:
-          java-version: 17
-          distribution: temurin
-      - run: .kokoro/build.sh
-        env:
-          JOB_TYPE: test
-          GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS: true
-          GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS_PARTITIONED_OPS: true
-          GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS_FOR_RW: true
-  units-with-regular-session8:
-    # Building using Java 17 and run the tests with Java 8 runtime
-    name: "units-with-regular-session (8)"
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-java@v3
-      with:
-        java-version: 8
-        distribution: temurin
-    - run: echo "SUREFIRE_JVM_OPT=-Djvm=${JAVA_HOME}/bin/java" >> $GITHUB_ENV
-      shell: bash
-    - uses: actions/setup-java@v3
-      with:
-        java-version: 17
-        distribution: temurin
-    - run: .kokoro/build.sh
-      env:
-        JOB_TYPE: test
-        GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS: false
   windows:
     runs-on: windows-latest
     steps:

.github/workflows/hermetic_library_generation.yaml

@@ -37,7 +37,7 @@ jobs:
       with:
         fetch-depth: 0
         token: ${{ secrets.CLOUD_JAVA_BOT_GITHUB_TOKEN }}
-    - uses: googleapis/sdk-platform-java/.github/scripts@v2.65.1
+    - uses: googleapis/sdk-platform-java/.github/scripts@v2.66.1
       if: env.SHOULD_RUN == 'true'
       with:
         base_ref: ${{ github.base_ref }}

.github/workflows/integration-tests-against-emulator-with-regular-session.yaml

@@ -17,6 +17,6 @@ jobs:
           # repository
           .kokoro/build.sh
       - name: Unmanaged dependency check
-        uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.55.1
+        uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.56.1
         with:
           bom-path: google-cloud-spanner-bom/pom.xml

.github/workflows/unmanaged_dependency_check.yaml

@@ -29,7 +29,7 @@ jobs:
     - uses: actions/checkout@v4
       with:
         fetch-depth: 0
-        token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
+        token: ${{ secrets.CLOUD_JAVA_BOT_GITHUB_TOKEN }}
     - name: Install Dependencies
       shell: bash
       run: sudo apt-get update && sudo apt-get install -y libxml2-utils
@@ -43,5 +43,5 @@ jobs:
           --base_branch "${base_branch}" \
           --repo ${{ github.repository }}
       env:
-        GH_TOKEN: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
+        GH_TOKEN: ${{ secrets.CLOUD_JAVA_BOT_GITHUB_TOKEN }}
 

.github/workflows/update_generation_config.yaml

@@ -104,21 +104,6 @@ integration)
       verify
     RETURN_CODE=$?
     ;;
-integration-regular-sessions)
-    mvn -B ${INTEGRATION_TEST_ARGS} \
-      -ntp \
-      -Penable-integration-tests \
-      -Djava.net.preferIPv4Stack=true \
-      -DtrimStackTrace=false \
-      -Dclirr.skip=true \
-      -Denforcer.skip=true \
-      -Dmaven.main.skip=true \
-      -Dspanner.gce.config.project_id=gcloud-devel \
-      -Dspanner.testenv.instance=projects/gcloud-devel/instances/java-client-integration-tests-regular-sessions \
-      -fae \
-      verify
-    RETURN_CODE=$?
-    ;;
 integration-directpath-enabled)
     mvn -B ${INTEGRATION_TEST_ARGS} \
       -ntp \