Skip to content
This repository was archived by the owner on Apr 7, 2026. It is now read-only.

Commit 449f608

Browse files
rahul2393rahul2393
authored
Merge branch 'main' into renovate/com.google.cloud-libraries-bom-26.x
2 parents 43da6ac + d09a900 commit 449f608

77 files changed

Lines changed: 918 additions & 15661 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/sync-repo-settings.yaml‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,10 @@ branchProtectionRules:
1414
- units (8)
1515
- units (11)
1616
- 'Kokoro - Test: Integration'
17-
- 'Kokoro - Test: Integration with Multiplexed Sessions'
1817
- cla/google
1918
- checkstyle
2019
- compile (8)
2120
- compile (11)
22-
- units-with-multiplexed-session (8)
23-
- units-with-multiplexed-session (11)
2421
- unmanaged_dependency_check
2522
- library_generation
2623
- pattern: 3.3.x
@@ -154,7 +151,6 @@ branchProtectionRules:
154151
- units (8)
155152
- units (11)
156153
- 'Kokoro - Test: Integration'
157-
- 'Kokoro - Test: Integration with Multiplexed Sessions'
158154
- cla/google
159155
- checkstyle
160156
- compile (8)
@@ -173,7 +169,6 @@ branchProtectionRules:
173169
- units (8)
174170
- units (11)
175171
- 'Kokoro - Test: Integration'
176-
- 'Kokoro - Test: Integration with Multiplexed Sessions'
177172
- cla/google
178173
- checkstyle
179174
- compile (8)
@@ -194,7 +189,6 @@ branchProtectionRules:
194189
- units (8)
195190
- units (11)
196191
- 'Kokoro - Test: Integration'
197-
- 'Kokoro - Test: Integration with Multiplexed Sessions'
198192
- cla/google
199193
- checkstyle
200194
- compile (8)
@@ -215,7 +209,6 @@ branchProtectionRules:
215209
- units (8)
216210
- units (11)
217211
- 'Kokoro - Test: Integration'
218-
- 'Kokoro - Test: Integration with Multiplexed Sessions'
219212
- cla/google
220213
- checkstyle
221214
- compile (8)

‎.github/workflows/ci.yaml‎

Lines changed: 0 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -36,41 +36,6 @@ jobs:
3636
- run: .kokoro/build.sh
3737
env:
3838
JOB_TYPE: test
39-
units-with-multiplexed-session:
40-
runs-on: ubuntu-latest
41-
strategy:
42-
fail-fast: false
43-
matrix:
44-
java: [ 11, 17, 21 ]
45-
steps:
46-
- uses: actions/checkout@v4
47-
- uses: actions/setup-java@v3
48-
with:
49-
distribution: temurin
50-
java-version: ${{matrix.java}}
51-
- run: java -version
52-
- run: .kokoro/build.sh
53-
env:
54-
JOB_TYPE: test
55-
GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS_PARTITIONED_OPS: true
56-
GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS_FOR_RW: true
57-
units-with-regular-session:
58-
runs-on: ubuntu-latest
59-
strategy:
60-
fail-fast: false
61-
matrix:
62-
java: [ 11, 17, 21 ]
63-
steps:
64-
- uses: actions/checkout@v4
65-
- uses: actions/setup-java@v3
66-
with:
67-
distribution: temurin
68-
java-version: ${{matrix.java}}
69-
- run: java -version
70-
- run: .kokoro/build.sh
71-
env:
72-
JOB_TYPE: test
73-
GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS: false
7439
units-java8:
7540
# Building using Java 17 and run the tests with Java 8 runtime
7641
name: "units (8)"
@@ -90,48 +55,6 @@ jobs:
9055
- run: .kokoro/build.sh
9156
env:
9257
JOB_TYPE: test
93-
units-with-multiplexed-session8:
94-
# Building using Java 17 and run the tests with Java 8 runtime
95-
name: "units-with-multiplexed-session (8)"
96-
runs-on: ubuntu-latest
97-
steps:
98-
- uses: actions/checkout@v4
99-
- uses: actions/setup-java@v3
100-
with:
101-
java-version: 8
102-
distribution: temurin
103-
- run: echo "SUREFIRE_JVM_OPT=-Djvm=${JAVA_HOME}/bin/java" >> $GITHUB_ENV
104-
shell: bash
105-
- uses: actions/setup-java@v3
106-
with:
107-
java-version: 17
108-
distribution: temurin
109-
- run: .kokoro/build.sh
110-
env:
111-
JOB_TYPE: test
112-
GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS: true
113-
GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS_PARTITIONED_OPS: true
114-
GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS_FOR_RW: true
115-
units-with-regular-session8:
116-
# Building using Java 17 and run the tests with Java 8 runtime
117-
name: "units-with-regular-session (8)"
118-
runs-on: ubuntu-latest
119-
steps:
120-
- uses: actions/checkout@v4
121-
- uses: actions/setup-java@v3
122-
with:
123-
java-version: 8
124-
distribution: temurin
125-
- run: echo "SUREFIRE_JVM_OPT=-Djvm=${JAVA_HOME}/bin/java" >> $GITHUB_ENV
126-
shell: bash
127-
- uses: actions/setup-java@v3
128-
with:
129-
java-version: 17
130-
distribution: temurin
131-
- run: .kokoro/build.sh
132-
env:
133-
JOB_TYPE: test
134-
GOOGLE_CLOUD_SPANNER_MULTIPLEXED_SESSIONS: false
13558
windows:
13659
runs-on: windows-latest
13760
steps:

‎.github/workflows/hermetic_library_generation.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
with:
3838
fetch-depth: 0
3939
token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }}
40-
- uses: googleapis/sdk-platform-java/.github/scripts@v2.65.1
40+
- uses: googleapis/sdk-platform-java/.github/scripts@v2.66.0
4141
if: env.SHOULD_RUN == 'true'
4242
with:
4343
base_ref: ${{ github.base_ref }}

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

Lines changed: 0 additions & 42 deletions
This file was deleted.

‎.github/workflows/unmanaged_dependency_check.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@ jobs:
1717
# repository
1818
.kokoro/build.sh
1919
- name: Unmanaged dependency check
20-
uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.55.1
20+
uses: googleapis/sdk-platform-java/java-shared-dependencies/unmanaged-dependency-check@google-cloud-shared-dependencies/v3.56.0
2121
with:
2222
bom-path: google-cloud-spanner-bom/pom.xml

‎.kokoro/build.sh‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -104,21 +104,6 @@ integration)
104104
verify
105105
RETURN_CODE=$?
106106
;;
107-
integration-regular-sessions)
108-
mvn -B ${INTEGRATION_TEST_ARGS} \
109-
-ntp \
110-
-Penable-integration-tests \
111-
-Djava.net.preferIPv4Stack=true \
112-
-DtrimStackTrace=false \
113-
-Dclirr.skip=true \
114-
-Denforcer.skip=true \
115-
-Dmaven.main.skip=true \
116-
-Dspanner.gce.config.project_id=gcloud-devel \
117-
-Dspanner.testenv.instance=projects/gcloud-devel/instances/java-client-integration-tests-regular-sessions \
118-
-fae \
119-
verify
120-
RETURN_CODE=$?
121-
;;
122107
integration-directpath-enabled)
123108
mvn -B ${INTEGRATION_TEST_ARGS} \
124109
-ntp \

‎.kokoro/presubmit/integration-regular-sessions-enabled.cfg‎

Lines changed: 0 additions & 48 deletions
This file was deleted.

‎benchmarks/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>com.google.cloud</groupId>
2626
<artifactId>google-cloud-spanner-parent</artifactId>
27-
<version>6.107.0</version><!-- {x-version-update:google-cloud-spanner:current} -->
27+
<version>6.107.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-spanner:current} -->
2828
</parent>
2929

3030
<properties>

‎google-cloud-spanner-bom/pom.xml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>com.google.cloud</groupId>
55
<artifactId>google-cloud-spanner-bom</artifactId>
6-
<version>6.107.0</version><!-- {x-version-update:google-cloud-spanner:current} -->
6+
<version>6.107.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-spanner:current} -->
77
<packaging>pom</packaging>
88
<parent>
99
<groupId>com.google.cloud</groupId>
1010
<artifactId>sdk-platform-java-config</artifactId>
11-
<version>3.55.1</version>
11+
<version>3.56.0</version>
1212
</parent>
1313

1414
<name>Google Cloud Spanner BOM</name>
@@ -53,43 +53,43 @@
5353
<dependency>
5454
<groupId>com.google.cloud</groupId>
5555
<artifactId>google-cloud-spanner</artifactId>
56-
<version>6.107.0</version><!-- {x-version-update:google-cloud-spanner:current} -->
56+
<version>6.107.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-spanner:current} -->
5757
</dependency>
5858
<dependency>
5959
<groupId>com.google.cloud</groupId>
6060
<artifactId>google-cloud-spanner</artifactId>
6161
<type>test-jar</type>
62-
<version>6.107.0</version><!-- {x-version-update:google-cloud-spanner:current} -->
62+
<version>6.107.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-spanner:current} -->
6363
</dependency>
6464
<dependency>
6565
<groupId>com.google.api.grpc</groupId>
6666
<artifactId>grpc-google-cloud-spanner-v1</artifactId>
67-
<version>6.107.0</version><!-- {x-version-update:grpc-google-cloud-spanner-v1:current} -->
67+
<version>6.107.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-spanner-v1:current} -->
6868
</dependency>
6969
<dependency>
7070
<groupId>com.google.api.grpc</groupId>
7171
<artifactId>grpc-google-cloud-spanner-admin-instance-v1</artifactId>
72-
<version>6.107.0</version><!-- {x-version-update:grpc-google-cloud-spanner-admin-instance-v1:current} -->
72+
<version>6.107.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-spanner-admin-instance-v1:current} -->
7373
</dependency>
7474
<dependency>
7575
<groupId>com.google.api.grpc</groupId>
7676
<artifactId>grpc-google-cloud-spanner-admin-database-v1</artifactId>
77-
<version>6.107.0</version><!-- {x-version-update:grpc-google-cloud-spanner-admin-database-v1:current} -->
77+
<version>6.107.1-SNAPSHOT</version><!-- {x-version-update:grpc-google-cloud-spanner-admin-database-v1:current} -->
7878
</dependency>
7979
<dependency>
8080
<groupId>com.google.api.grpc</groupId>
8181
<artifactId>proto-google-cloud-spanner-admin-instance-v1</artifactId>
82-
<version>6.107.0</version><!-- {x-version-update:proto-google-cloud-spanner-admin-instance-v1:current} -->
82+
<version>6.107.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-spanner-admin-instance-v1:current} -->
8383
</dependency>
8484
<dependency>
8585
<groupId>com.google.api.grpc</groupId>
8686
<artifactId>proto-google-cloud-spanner-v1</artifactId>
87-
<version>6.107.0</version><!-- {x-version-update:proto-google-cloud-spanner-v1:current} -->
87+
<version>6.107.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-spanner-v1:current} -->
8888
</dependency>
8989
<dependency>
9090
<groupId>com.google.api.grpc</groupId>
9191
<artifactId>proto-google-cloud-spanner-admin-database-v1</artifactId>
92-
<version>6.107.0</version><!-- {x-version-update:proto-google-cloud-spanner-admin-database-v1:current} -->
92+
<version>6.107.1-SNAPSHOT</version><!-- {x-version-update:proto-google-cloud-spanner-admin-database-v1:current} -->
9393
</dependency>
9494
</dependencies>
9595
</dependencyManagement>

‎google-cloud-spanner-executor/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
<modelVersion>4.0.0</modelVersion>
66
<groupId>com.google.cloud</groupId>
77
<artifactId>google-cloud-spanner-executor</artifactId>
8-
<version>6.107.0</version><!-- {x-version-update:google-cloud-spanner-executor:current} -->
8+
<version>6.107.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-spanner-executor:current} -->
99
<packaging>jar</packaging>
1010
<name>Google Cloud Spanner Executor</name>
1111

1212
<parent>
1313
<groupId>com.google.cloud</groupId>
1414
<artifactId>google-cloud-spanner-parent</artifactId>
15-
<version>6.107.0</version><!-- {x-version-update:google-cloud-spanner:current} -->
15+
<version>6.107.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-spanner:current} -->
1616
</parent>
1717

1818
<properties>

0 commit comments

Comments
 (0)