Skip to content

Commit 49d8693

Browse files
lqiu96lqiu96
committed
Merge branch 'main' into PR #2113 to update
2 parents 613c1c6 + 630e518 commit 49d8693

File tree

12 files changed

+63
-20
lines changed

12 files changed

+63
-20
lines changed

‎CHANGELOG.md‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,30 @@
11
# Changelog
22

3+
## [2.34.1](https://github.com/googleapis/java-spanner-jdbc/compare/v2.34.0...v2.34.1) (2025-12-16)
4+
5+
6+
### Bug Fixes
7+
8+
* Cast double Inf and NaN to float ([#2304](https://github.com/googleapis/java-spanner-jdbc/issues/2304)) ([a947024](https://github.com/googleapis/java-spanner-jdbc/commit/a94702446aee20013157b45bf1d9c3938f0b6982)), closes [#2256](https://github.com/googleapis/java-spanner-jdbc/issues/2256)
9+
10+
11+
### Dependencies
12+
13+
* Update actions/checkout action to v6 ([#2299](https://github.com/googleapis/java-spanner-jdbc/issues/2299)) ([fbc8969](https://github.com/googleapis/java-spanner-jdbc/commit/fbc8969d66f4687ce91268309a862a0cbe0a114c))
14+
* Update dependency com.google.cloud:google-cloud-spanner to v6.104.0 ([#2312](https://github.com/googleapis/java-spanner-jdbc/issues/2312)) ([930797b](https://github.com/googleapis/java-spanner-jdbc/commit/930797b71f30e458dee20679178ff3510fcba919))
15+
* Update dependency com.google.cloud:google-cloud-spanner to v6.105.0 ([#2325](https://github.com/googleapis/java-spanner-jdbc/issues/2325)) ([34a9768](https://github.com/googleapis/java-spanner-jdbc/commit/34a9768b203c967f4191427a815b71e1a503de8f))
16+
* Update dependency com.google.cloud:google-cloud-spanner-bom to v6.104.0 ([#2313](https://github.com/googleapis/java-spanner-jdbc/issues/2313)) ([5250e2d](https://github.com/googleapis/java-spanner-jdbc/commit/5250e2d069179bdeb773e5e0a1f2a5defd411811))
17+
* Update dependency com.google.cloud:google-cloud-spanner-bom to v6.105.0 ([#2326](https://github.com/googleapis/java-spanner-jdbc/issues/2326)) ([8f3e6b7](https://github.com/googleapis/java-spanner-jdbc/commit/8f3e6b72baccc5ae8dd5ce3c55807bc889a7f208))
18+
* Update dependency com.google.cloud:sdk-platform-java-config to v3.54.2 ([#2322](https://github.com/googleapis/java-spanner-jdbc/issues/2322)) ([2faffb4](https://github.com/googleapis/java-spanner-jdbc/commit/2faffb46c71e4b44b42dbc4bfd5d70a3e55eb5f6))
19+
* Update dependency io.opentelemetry:opentelemetry-bom to v1.57.0 ([#2316](https://github.com/googleapis/java-spanner-jdbc/issues/2316)) ([77aab00](https://github.com/googleapis/java-spanner-jdbc/commit/77aab00ec385a7bfe61615b6b250c0b97a9a9f07))
20+
* Update dependency net.bytebuddy:byte-buddy to v1.18.2 ([#2306](https://github.com/googleapis/java-spanner-jdbc/issues/2306)) ([ba7430c](https://github.com/googleapis/java-spanner-jdbc/commit/ba7430cd229214487dfe4db208cb274d4662bf19))
21+
* Update dependency net.bytebuddy:byte-buddy-agent to v1.18.2 ([#2307](https://github.com/googleapis/java-spanner-jdbc/issues/2307)) ([86dc72b](https://github.com/googleapis/java-spanner-jdbc/commit/86dc72b0e1d7199b229474008cb68400458f233e))
22+
* Update dependency org.springframework.boot:spring-boot to v4 ([#2300](https://github.com/googleapis/java-spanner-jdbc/issues/2300)) ([a6dddf2](https://github.com/googleapis/java-spanner-jdbc/commit/a6dddf2aef2e9d35ec2bf26ea1a1586ab65e122a))
23+
* Update dependency org.springframework.boot:spring-boot-starter-data-jdbc to v4 ([#2301](https://github.com/googleapis/java-spanner-jdbc/issues/2301)) ([92efa98](https://github.com/googleapis/java-spanner-jdbc/commit/92efa986a0880524a3d19685df0e08cf7815a69a))
24+
* Update dependency org.springframework.boot:spring-boot-starter-parent to v3.5.8 ([#2298](https://github.com/googleapis/java-spanner-jdbc/issues/2298)) ([5603846](https://github.com/googleapis/java-spanner-jdbc/commit/5603846fc004a0e31cbcf10bc246d477cd80d9dd))
25+
* Update dependency org.testcontainers:testcontainers to v2.0.3 ([#2323](https://github.com/googleapis/java-spanner-jdbc/issues/2323)) ([65302d4](https://github.com/googleapis/java-spanner-jdbc/commit/65302d44315548af3406853121e341523c89521c))
26+
* Update dependency org.testcontainers:testcontainers-bom to v2.0.3 ([#2324](https://github.com/googleapis/java-spanner-jdbc/issues/2324)) ([8e8b3a0](https://github.com/googleapis/java-spanner-jdbc/commit/8e8b3a0b4c613324a07609fa142330322e8eab95))
27+
328
## [2.34.0](https://github.com/googleapis/java-spanner-jdbc/compare/v2.33.3...v2.34.0) (2025-11-18)
429

530

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ If you are using Maven, add this to your pom.xml file:
2020
<dependency>
2121
<groupId>com.google.cloud</groupId>
2222
<artifactId>google-cloud-spanner-jdbc</artifactId>
23-
<version>2.34.0</version>
23+
<version>2.34.1</version>
2424
</dependency>
2525
```
2626
<!--- {x-version-update-end} -->
@@ -30,15 +30,15 @@ If you are using Gradle without BOM, add this to your dependencies
3030

3131
<!--- {x-version-update-start:google-cloud-spanner-jdbc:released} -->
3232
```Groovy
33-
implementation 'com.google.cloud:google-cloud-spanner-jdbc:2.34.0'
33+
implementation 'com.google.cloud:google-cloud-spanner-jdbc:2.34.1'
3434
```
3535
<!--- {x-version-update-end} -->
3636

3737
If you are using SBT, add this to your dependencies
3838

3939
<!--- {x-version-update-start:google-cloud-spanner-jdbc:released} -->
4040
```Scala
41-
libraryDependencies += "com.google.cloud" % "google-cloud-spanner-jdbc" % "2.34.0"
41+
libraryDependencies += "com.google.cloud" % "google-cloud-spanner-jdbc" % "2.34.1"
4242
```
4343
<!--- {x-version-update-end} -->
4444

‎pom.xml‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
55
<modelVersion>4.0.0</modelVersion>
66
<artifactId>google-cloud-spanner-jdbc</artifactId>
7-
<version>2.34.1-SNAPSHOT</version><!-- {x-version-update:google-cloud-spanner-jdbc:current} -->
7+
<version>2.34.2-SNAPSHOT</version><!-- {x-version-update:google-cloud-spanner-jdbc:current} -->
88
<packaging>jar</packaging>
99
<name>Google Cloud Spanner JDBC</name>
1010
<url>https://github.com/googleapis/java-spanner-jdbc</url>
@@ -61,10 +61,15 @@
6161
<dependency>
6262
<groupId>com.google.cloud</groupId>
6363
<artifactId>google-cloud-spanner-bom</artifactId>
64-
<version>6.104.0</version>
64+
<version>6.105.0</version>
6565
<type>pom</type>
6666
<scope>import</scope>
6767
</dependency>
68+
<dependency>
69+
<groupId>com.google.cloud</groupId>
70+
<artifactId>grpc-gcp</artifactId>
71+
<version>1.9.0</version>
72+
</dependency>
6873
<dependency>
6974
<groupId>com.google.cloud</groupId>
7075
<artifactId>google-cloud-shared-dependencies</artifactId>
@@ -166,7 +171,7 @@
166171
<dependency>
167172
<groupId>org.testcontainers</groupId>
168173
<artifactId>testcontainers</artifactId>
169-
<version>2.0.2</version>
174+
<version>2.0.3</version>
170175
<scope>test</scope>
171176
</dependency>
172177
<dependency>

‎samples/quickperf/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
<dependency>
7474
<groupId>org.testcontainers</groupId>
7575
<artifactId>testcontainers</artifactId>
76-
<version>2.0.2</version>
76+
<version>2.0.3</version>
7777
<scope>test</scope>
7878
</dependency>
7979
<dependency>

‎samples/snapshot/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
<dependency>
3030
<groupId>com.google.cloud</groupId>
3131
<artifactId>google-cloud-spanner-jdbc</artifactId>
32-
<version>2.34.1-SNAPSHOT</version>
32+
<version>2.34.2-SNAPSHOT</version>
3333
</dependency>
3434
<!-- {x-version-update-end} -->
3535

‎samples/snippets/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
<dependency>
5555
<groupId>org.testcontainers</groupId>
5656
<artifactId>testcontainers</artifactId>
57-
<version>2.0.2</version>
57+
<version>2.0.3</version>
5858
<scope>test</scope>
5959
</dependency>
6060
<dependency>

‎samples/spring-data-jdbc/googlesql/pom.xml‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,15 @@
3030
<dependency>
3131
<groupId>com.google.cloud</groupId>
3232
<artifactId>google-cloud-spanner-bom</artifactId>
33-
<version>6.104.0</version>
33+
<version>6.105.0</version>
3434
<scope>import</scope>
3535
<type>pom</type>
3636
</dependency>
37+
<dependency>
38+
<groupId>com.google.cloud</groupId>
39+
<artifactId>grpc-gcp</artifactId>
40+
<version>1.9.0</version>
41+
</dependency>
3742
<dependency>
3843
<groupId>com.google.cloud</groupId>
3944
<artifactId>libraries-bom</artifactId>
@@ -90,7 +95,7 @@
9095
<dependency>
9196
<groupId>org.testcontainers</groupId>
9297
<artifactId>testcontainers</artifactId>
93-
<version>2.0.2</version>
98+
<version>2.0.3</version>
9499
</dependency>
95100

96101
<dependency>

‎samples/spring-data-jdbc/postgresql/pom.xml‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,15 @@
3030
<dependency>
3131
<groupId>com.google.cloud</groupId>
3232
<artifactId>google-cloud-spanner-bom</artifactId>
33-
<version>6.104.0</version>
33+
<version>6.105.0</version>
3434
<scope>import</scope>
3535
<type>pom</type>
3636
</dependency>
37+
<dependency>
38+
<groupId>com.google.cloud</groupId>
39+
<artifactId>grpc-gcp</artifactId>
40+
<version>1.9.0</version>
41+
</dependency>
3742
<dependency>
3843
<groupId>com.google.cloud</groupId>
3944
<artifactId>libraries-bom</artifactId>
@@ -132,7 +137,7 @@
132137
<dependency>
133138
<groupId>org.testcontainers</groupId>
134139
<artifactId>testcontainers</artifactId>
135-
<version>2.0.2</version>
140+
<version>2.0.3</version>
136141
<scope>test</scope>
137142
</dependency>
138143
</dependencies>

‎samples/spring-data-jdbc/postgresql/src/main/java/com/google/cloud/spanner/sample/OpenTelemetryConfiguration.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@
3636
import java.io.IOException;
3737
import java.util.concurrent.ThreadLocalRandom;
3838
import org.springframework.beans.factory.annotation.Value;
39-
import org.springframework.boot.autoconfigure.AutoConfiguration;
40-
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
4139
import org.springframework.context.annotation.Bean;
4240
import org.springframework.context.annotation.Configuration;
4341

‎samples/spring-data-mybatis/googlesql/pom.xml‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,15 @@
3535
<dependency>
3636
<groupId>com.google.cloud</groupId>
3737
<artifactId>google-cloud-spanner-bom</artifactId>
38-
<version>6.104.0</version>
38+
<version>6.105.0</version>
3939
<scope>import</scope>
4040
<type>pom</type>
4141
</dependency>
42+
<dependency>
43+
<groupId>com.google.cloud</groupId>
44+
<artifactId>grpc-gcp</artifactId>
45+
<version>1.9.0</version>
46+
</dependency>
4247
<dependency>
4348
<groupId>com.google.cloud</groupId>
4449
<artifactId>libraries-bom</artifactId>
@@ -49,7 +54,7 @@
4954
<dependency>
5055
<groupId>org.testcontainers</groupId>
5156
<artifactId>testcontainers-bom</artifactId>
52-
<version>2.0.2</version>
57+
<version>2.0.3</version>
5358
<scope>import</scope>
5459
<type>pom</type>
5560
</dependency>
@@ -94,7 +99,7 @@
9499
<dependency>
95100
<groupId>com.google.cloud</groupId>
96101
<artifactId>google-cloud-spanner</artifactId>
97-
<version>6.104.0</version>
102+
<version>6.105.0</version>
98103
<type>test-jar</type>
99104
<scope>test</scope>
100105
</dependency>

0 commit comments

Comments
 (0)