diff --git a/CHANGELOG.md b/CHANGELOG.md
index d24bd2194..8e6e9982b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,22 @@
# Changelog
+## [1.25.0](https://github.com/GoogleCloudPlatform/cloud-sql-jdbc-socket-factory/compare/v1.24.2...v1.25.0) (2025-04-28)
+
+
+### Features
+
+* Update TLS validation to use both SAN and CN fields. ([#2150](https://github.com/GoogleCloudPlatform/cloud-sql-jdbc-socket-factory/issues/2150)) ([e7d9cef](https://github.com/GoogleCloudPlatform/cloud-sql-jdbc-socket-factory/commit/e7d9cefa0bee8f14dcaf34294889c89cd638dadc))
+
+
+### Bug Fixes
+
+* Roll back dependency update that broke R2DBC + MariaDB IAM E2E Test ([#2154](https://github.com/GoogleCloudPlatform/cloud-sql-jdbc-socket-factory/issues/2154)) ([2ac2d04](https://github.com/GoogleCloudPlatform/cloud-sql-jdbc-socket-factory/commit/2ac2d049cde8d141642ec5e38947c052dd286976))
+
+
+### Dependencies
+
+* Update Non-major dependencies ([#2145](https://github.com/GoogleCloudPlatform/cloud-sql-jdbc-socket-factory/issues/2145)) ([119e644](https://github.com/GoogleCloudPlatform/cloud-sql-jdbc-socket-factory/commit/119e644785766d32f09d8d4ffca5bec5d72027ff))
+
## [1.24.2](https://github.com/GoogleCloudPlatform/cloud-sql-jdbc-socket-factory/compare/v1.24.1...v1.24.2) (2025-04-15)
diff --git a/core/pom.xml b/core/pom.xml
index 3edc89f22..4278e4193 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -23,10 +23,10 @@
com.google.cloud.sql
jdbc-socket-factory-parent
- 1.24.3-SNAPSHOT
+ 1.25.0
jdbc-socket-factory-core
- 1.24.3-SNAPSHOT
+ 1.25.0
jar
Cloud SQL Core Socket Factory (Core Library, don't depend on this directly)
diff --git a/docs/jdbc.md b/docs/jdbc.md
index 31b9df273..a1dba7dd8 100644
--- a/docs/jdbc.md
+++ b/docs/jdbc.md
@@ -16,14 +16,14 @@ Maven
com.google.cloud.sql
mysql-socket-factory-connector-j-8
- 1.24.2
+ 1.25.0
```
Gradle
```gradle
-compile 'com.google.cloud.sql:mysql-socket-factory-connector-j-8:1.24.2'
+compile 'com.google.cloud.sql:mysql-socket-factory-connector-j-8:1.25.0'
```
@@ -37,14 +37,14 @@ Maven
com.google.cloud.sql
mariadb-socket-factory
- 1.24.2
+ 1.25.0
```
Gradle
```gradle
-compile 'com.google.cloud.sql:mariadb-socket-factory:1.24.2'
+compile 'com.google.cloud.sql:mariadb-socket-factory:1.25.0'
```
**Note:** Also include the JDBC Driver for
@@ -60,14 +60,14 @@ Maven
com.google.cloud.sql
postgres-socket-factory
- 1.24.2
+ 1.25.0
```
Gradle
```gradle
-compile 'com.google.cloud.sql:postgres-socket-factory:1.24.2'
+compile 'com.google.cloud.sql:postgres-socket-factory:1.25.0'
```
**Note:** Also include the JDBC Driver for
@@ -83,14 +83,14 @@ Maven
com.google.cloud.sql
cloud-sql-connector-jdbc-sqlserver
- 1.24.2
+ 1.25.0
```
Gradle
```gradle
-compile 'com.google.cloud.sql:cloud-sql-connector-jdbc-sqlserver:1.24.2'
+compile 'com.google.cloud.sql:cloud-sql-connector-jdbc-sqlserver:1.25.0'
```
**Note:** Also include the JDBC Driver for SQL
diff --git a/docs/r2dbc.md b/docs/r2dbc.md
index c2169f8e4..de187c368 100644
--- a/docs/r2dbc.md
+++ b/docs/r2dbc.md
@@ -18,14 +18,14 @@ Maven
com.google.cloud.sql
cloud-sql-connector-r2dbc-mysql
- 1.24.2
+ 1.25.0
```
Gradle
```gradle
-compile 'com.google.cloud.sql:cloud-sql-connector-r2dbc-mysql:1.24.2'
+compile 'com.google.cloud.sql:cloud-sql-connector-r2dbc-mysql:1.25.0'
```
**Note:** Also include the R2DBC Driver for
@@ -40,14 +40,14 @@ Maven
com.google.cloud
cloud-sql-connector-r2dbc-mariadb
- 1.24.2
+ 1.25.0
```
Gradle
```gradle
-compile 'com.google.cloud:cloud-sql-connector-r2dbc-mariadb:1.24.2'
+compile 'com.google.cloud:cloud-sql-connector-r2dbc-mariadb:1.25.0'
```
**Note:** Also include the R2DBC Driver for
@@ -63,14 +63,14 @@ Maven
com.google.cloud.sql
cloud-sql-connector-r2dbc-postgres
- 1.24.2
+ 1.25.0
```
Gradle
```gradle
-compile 'com.google.cloud.sql:cloud-sql-connector-r2dbc-postgres:1.24.2'
+compile 'com.google.cloud.sql:cloud-sql-connector-r2dbc-postgres:1.25.0'
```
**Note:** Also include the R2DBC Driver for
@@ -86,14 +86,14 @@ Maven
com.google.cloud.sql
cloud-sql-connector-r2dbc-sqlserver
- 1.24.2
+ 1.25.0
```
Gradle
```gradle
-compile 'com.google.cloud.sql:cloud-sql-connector-r2dbc-sqlserver:1.24.2'
+compile 'com.google.cloud.sql:cloud-sql-connector-r2dbc-sqlserver:1.25.0'
```
**Note:** Also include the R2DBC Driver for SQL
diff --git a/jdbc/mariadb/pom.xml b/jdbc/mariadb/pom.xml
index 1bfabf5b9..4c0460d14 100644
--- a/jdbc/mariadb/pom.xml
+++ b/jdbc/mariadb/pom.xml
@@ -22,11 +22,11 @@
com.google.cloud.sql
jdbc-socket-factory-parent
- 1.24.3-SNAPSHOT
+ 1.25.0
../../pom.xml
mariadb-socket-factory
- 1.24.3-SNAPSHOT
+ 1.25.0
jar
Cloud SQL MariaDB Socket Factory
diff --git a/jdbc/mysql-j-8/pom.xml b/jdbc/mysql-j-8/pom.xml
index 50681d83b..f7edc6fde 100644
--- a/jdbc/mysql-j-8/pom.xml
+++ b/jdbc/mysql-j-8/pom.xml
@@ -23,12 +23,12 @@
com.google.cloud.sql
jdbc-socket-factory-parent
- 1.24.3-SNAPSHOT
+ 1.25.0
../../pom.xml
mysql-socket-factory-connector-j-8
- 1.24.3-SNAPSHOT
+ 1.25.0
jar
Cloud SQL MySQL Socket Factory (for Connector/J 8.x)
diff --git a/jdbc/postgres/pom.xml b/jdbc/postgres/pom.xml
index 6766ff5dc..973076180 100644
--- a/jdbc/postgres/pom.xml
+++ b/jdbc/postgres/pom.xml
@@ -22,11 +22,11 @@
com.google.cloud.sql
jdbc-socket-factory-parent
- 1.24.3-SNAPSHOT
+ 1.25.0
../../pom.xml
postgres-socket-factory
- 1.24.3-SNAPSHOT
+ 1.25.0
jar
Cloud SQL Postgres Socket Factory
diff --git a/jdbc/sqlserver/pom.xml b/jdbc/sqlserver/pom.xml
index 8cec8ae47..effe0bf6d 100644
--- a/jdbc/sqlserver/pom.xml
+++ b/jdbc/sqlserver/pom.xml
@@ -22,11 +22,11 @@
com.google.cloud.sql
jdbc-socket-factory-parent
- 1.24.3-SNAPSHOT
+ 1.25.0
../../pom.xml
cloud-sql-connector-jdbc-sqlserver
- 1.24.3-SNAPSHOT
+ 1.25.0
jar
Cloud SQL JDBC Connector for SQL Server
diff --git a/pom.xml b/pom.xml
index fb460d53f..8458cc9e2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
com.google.cloud.sql
jdbc-socket-factory-parent
pom
- 1.24.3-SNAPSHOT
+ 1.25.0
com.google.cloud
diff --git a/r2dbc/core/pom.xml b/r2dbc/core/pom.xml
index f88ab9ee3..a769aabda 100644
--- a/r2dbc/core/pom.xml
+++ b/r2dbc/core/pom.xml
@@ -21,11 +21,11 @@
com.google.cloud.sql
jdbc-socket-factory-parent
- 1.24.3-SNAPSHOT
+ 1.25.0
../../pom.xml
cloud-sql-connector-r2dbc-core
- 1.24.3-SNAPSHOT
+ 1.25.0
jar
Cloud SQL R2DBC Connection Factory (R2DBC Core Library, don't depend on this directly)
diff --git a/r2dbc/mariadb/pom.xml b/r2dbc/mariadb/pom.xml
index 86c200147..10faf2808 100644
--- a/r2dbc/mariadb/pom.xml
+++ b/r2dbc/mariadb/pom.xml
@@ -22,12 +22,12 @@
com.google.cloud.sql
jdbc-socket-factory-parent
- 1.24.3-SNAPSHOT
+ 1.25.0
../../pom.xml
com.google.cloud
cloud-sql-connector-r2dbc-mariadb
- 1.24.3-SNAPSHOT
+ 1.25.0
jar
Google Cloud SQL R2DBC Connector for MariaDB
diff --git a/r2dbc/mysql/pom.xml b/r2dbc/mysql/pom.xml
index 17aacdc1d..4275db2dc 100644
--- a/r2dbc/mysql/pom.xml
+++ b/r2dbc/mysql/pom.xml
@@ -22,11 +22,11 @@
com.google.cloud.sql
jdbc-socket-factory-parent
- 1.24.3-SNAPSHOT
+ 1.25.0
../../pom.xml
cloud-sql-connector-r2dbc-mysql
- 1.24.3-SNAPSHOT
+ 1.25.0
jar
Cloud SQL R2DBC Connection Factory for MySQL
diff --git a/r2dbc/postgres/pom.xml b/r2dbc/postgres/pom.xml
index d559b33b1..f32b4e7b7 100644
--- a/r2dbc/postgres/pom.xml
+++ b/r2dbc/postgres/pom.xml
@@ -22,11 +22,11 @@
com.google.cloud.sql
jdbc-socket-factory-parent
- 1.24.3-SNAPSHOT
+ 1.25.0
../../pom.xml
cloud-sql-connector-r2dbc-postgres
- 1.24.3-SNAPSHOT
+ 1.25.0
jar
Cloud SQL R2DBC Connection Factory for Postgres
diff --git a/r2dbc/sqlserver/pom.xml b/r2dbc/sqlserver/pom.xml
index 12470c64a..3747094d6 100644
--- a/r2dbc/sqlserver/pom.xml
+++ b/r2dbc/sqlserver/pom.xml
@@ -22,11 +22,11 @@
com.google.cloud.sql
jdbc-socket-factory-parent
- 1.24.3-SNAPSHOT
+ 1.25.0
../../pom.xml
cloud-sql-connector-r2dbc-sqlserver
- 1.24.3-SNAPSHOT
+ 1.25.0
jar
Cloud SQL R2DBC Connection Factory for SQL Server
diff --git a/versions.txt b/versions.txt
index 0f4950a9d..fab548071 100644
--- a/versions.txt
+++ b/versions.txt
@@ -1,15 +1,15 @@
# Format:
# module:released-version:current-version
-jdbc-socket-factory-parent:1.24.2:1.24.3-SNAPSHOT
-jdbc-socket-factory-core:1.24.2:1.24.3-SNAPSHOT
-mariadb-socket-factory:1.24.2:1.24.3-SNAPSHOT
-mysql-socket-factory:1.24.2:1.24.3-SNAPSHOT
-mysql-socket-factory-connector-j-8:1.24.2:1.24.3-SNAPSHOT
-postgres-socket-factory:1.24.2:1.24.3-SNAPSHOT
-cloud-sql-connector-jdbc-sqlserver:1.24.2:1.24.3-SNAPSHOT
-cloud-sql-connector-r2dbc-core:1.24.2:1.24.3-SNAPSHOT
-cloud-sql-connector-r2dbc-mariadb:1.24.2:1.24.3-SNAPSHOT
-cloud-sql-connector-r2dbc-mysql:1.24.2:1.24.3-SNAPSHOT
-cloud-sql-connector-r2dbc-postgres:1.24.2:1.24.3-SNAPSHOT
-cloud-sql-connector-r2dbc-sqlserver:1.24.2:1.24.3-SNAPSHOT
+jdbc-socket-factory-parent:1.25.0:1.25.0
+jdbc-socket-factory-core:1.25.0:1.25.0
+mariadb-socket-factory:1.25.0:1.25.0
+mysql-socket-factory:1.25.0:1.25.0
+mysql-socket-factory-connector-j-8:1.25.0:1.25.0
+postgres-socket-factory:1.25.0:1.25.0
+cloud-sql-connector-jdbc-sqlserver:1.25.0:1.25.0
+cloud-sql-connector-r2dbc-core:1.25.0:1.25.0
+cloud-sql-connector-r2dbc-mariadb:1.25.0:1.25.0
+cloud-sql-connector-r2dbc-mysql:1.25.0:1.25.0
+cloud-sql-connector-r2dbc-postgres:1.25.0:1.25.0
+cloud-sql-connector-r2dbc-sqlserver:1.25.0:1.25.0