diff --git a/CHANGELOG.md b/CHANGELOG.md
index 552526457..a7889732a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,29 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/)
+## [12.10.0] Stable Release
+### Fixed issues
+- Fixed getGeneratedKeys functionality for execute API [#2554](https://github.com/microsoft/mssql-jdbc/pull/2554)
+- Added provision to set SQLServerBulkCopy options in PreparedStatement [#2555](https://github.com/microsoft/mssql-jdbc/pull/2555)
+- Fixed ISQLServerConnection java doc reference [#2560](https://github.com/microsoft/mssql-jdbc/pull/2560)
+- Capture Client Guest OS and architecture in JDBC [#2561](https://github.com/microsoft/mssql-jdbc/pull/2561)
+- Introduced timeouts for MSAL calls [#2562](https://github.com/microsoft/mssql-jdbc/pull/2562)
+- Fixed OffsetDateTime conversion for pre-Gregorian dates [#2568](https://github.com/microsoft/mssql-jdbc/pull/2568)
+- Fix for driver cutting out the question mark from columns labels (aliases) [#2569](https://github.com/microsoft/mssql-jdbc/pull/2569)
+- Handled failure in getApplicationName() [#2571](https://github.com/microsoft/mssql-jdbc/pull/2571)
+- Fixed issue with SQLServerBulkCopy from CSV with setEscapeColumnDelimerts set to true [#2575](https://github.com/microsoft/mssql-jdbc/pull/2575)
+- Apply new naming scheme to interfaceLibName [#2577](https://github.com/microsoft/mssql-jdbc/pull/2577)
+- Fixed issue for finding `mssql-jdbc.properties` location in test environments [#2579](https://github.com/microsoft/mssql-jdbc/pull/2579)
+- Fixed issue for IBM Semeru Runtime Certified Edition for z/OS and Kerberos [#2581](https://github.com/microsoft/mssql-jdbc/pull/2581)
+- Changed the scope of BULK_COPY_OPERATION_CACHE to connection [#2594](https://github.com/microsoft/mssql-jdbc/pull/2594)
+- Added "requireSecret" exclude tag for tests which require adding a secret to app registration [#2596](https://github.com/microsoft/mssql-jdbc/pull/2596)
+- Set appropriate value to requestedEncryptionLevel for encrypt=STRICT [#2597](https://github.com/microsoft/mssql-jdbc/pull/2597)
+- Add test for ManagedIdentityWithEncryptStrict [#2599](https://github.com/microsoft/mssql-jdbc/pull/2599)
+- Check for null when getting DTV values (JDBC spec compliance - getBinaryStream /getAsciiStream will return null when the value is null) [#2600](https://github.com/microsoft/mssql-jdbc/pull/2600)
+- Added com.ibm.security.auth.module and com.sun.security.auth.module as option import [#2609](https://github.com/microsoft/mssql-jdbc/pull/2609)
+- Updated driver dependency versions [#2614](https://github.com/microsoft/mssql-jdbc/pull/2614)
+- Removed scheme from URI before fetching path for CRL path check [#2622](https://github.com/microsoft/mssql-jdbc/pull/2622)
+
## [12.9.0] Preview Release
### Added
- Added configurable retry logic feature, supporting both statement, and connection, retry [#2396](https://github.com/microsoft/mssql-jdbc/pull/2396)[#2519](https://github.com/microsoft/mssql-jdbc/pull/2519)
diff --git a/README.md b/README.md
index 7423adff1..a42de7b4c 100644
--- a/README.md
+++ b/README.md
@@ -83,7 +83,7 @@ We're now on the Maven Central Repository. Add the following to your POM file to
com.microsoft.sqlservermssql-jdbc
- 12.8.1.jre11
+ 12.10.0.jre11
```
The driver can be downloaded from [Microsoft](https://aka.ms/downloadmssqljdbc). For driver version 12.1.0 and greater, please use the jre11 version when using Java 11 or greater, and the jre8 version when using Java 8.
@@ -94,7 +94,7 @@ To get the latest version of the driver, add the following to your POM file:
com.microsoft.sqlservermssql-jdbc
- 12.8.1.jre11
+ 12.10.0.jre11
```
@@ -129,7 +129,7 @@ Projects that require either of the two features need to explicitly declare the
com.microsoft.sqlservermssql-jdbc
- 12.8.1.jre11
+ 12.10.0.jre11compile
@@ -147,7 +147,7 @@ Projects that require either of the two features need to explicitly declare the
com.microsoft.sqlservermssql-jdbc
- 12.8.1.jre11
+ 12.10.0.jre11compile
@@ -174,7 +174,7 @@ When setting 'useFmtOnly' property to 'true' for establishing a connection or cr
com.microsoft.sqlservermssql-jdbc
- 12.8.1.jre11
+ 12.10.0.jre11
diff --git a/build.gradle b/build.gradle
index 648b18895..1d8b6b15a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -11,8 +11,8 @@
apply plugin: 'java'
-version = '12.9.0'
-def releaseExt = '-preview'
+version = '12.10.0'
+def releaseExt = ''
def jreVersion = ""
def testOutputDir = file("build/classes/java/test")
def archivesBaseName = 'mssql-jdbc'
diff --git a/mssql-jdbc_auth_LICENSE b/mssql-jdbc_auth_LICENSE
index b9ebea4ff..642645aeb 100644
--- a/mssql-jdbc_auth_LICENSE
+++ b/mssql-jdbc_auth_LICENSE
@@ -1,5 +1,5 @@
MICROSOFT SOFTWARE LICENSE TERMS
-MICROSOFT JDBC DRIVER 12.9.0 FOR SQL SERVER
+MICROSOFT JDBC DRIVER 12.10.0 FOR SQL SERVER
These license terms are an agreement between you and Microsoft Corporation (or one of its affiliates). They apply to the software named above and any Microsoft services or software updates (except to the extent such services or updates are accompanied by new or additional terms, in which case those different terms apply prospectively and do not alter your or Microsoft’s rights relating to pre-updated software or services). IF YOU COMPLY WITH THESE LICENSE TERMS, YOU HAVE THE RIGHTS BELOW. BY USING THE SOFTWARE, YOU ACCEPT THESE TERMS.
diff --git a/pom.xml b/pom.xml
index e055b0449..7b4db61de 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
4.0.0com.microsoft.sqlservermssql-jdbc
- 12.9.0
+ 12.10.0jarMicrosoft JDBC Driver for SQL Server
@@ -51,7 +51,7 @@
Default testing enabled with SQL Server 2019 (SQLv15) -->
xSQLv12,xSQLv15,NTLM,MSI,reqExternalSetup,clientCertAuth,fedAuth,kerberos
- -preview
+ 6.0.04.9.2
diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLJdbcVersion.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLJdbcVersion.java
index 2f76db4f8..b457eaa57 100644
--- a/src/main/java/com/microsoft/sqlserver/jdbc/SQLJdbcVersion.java
+++ b/src/main/java/com/microsoft/sqlserver/jdbc/SQLJdbcVersion.java
@@ -7,7 +7,7 @@
final class SQLJdbcVersion {
static final int MAJOR = 12;
- static final int MINOR = 9;
+ static final int MINOR = 10;
static final int PATCH = 0;
static final int BUILD = 0;
/*
@@ -15,7 +15,7 @@ final class SQLJdbcVersion {
* 1. Set to "-preview" for preview release.
* 2. Set to "" (empty String) for official release.
*/
- static final String RELEASE_EXT = "-preview";
+ static final String RELEASE_EXT = "";
private SQLJdbcVersion() {
throw new UnsupportedOperationException(SQLServerException.getErrString("R_notSupported"));
diff --git a/src/samples/adaptive/pom.xml b/src/samples/adaptive/pom.xml
index f185669c6..b14b6bae3 100644
--- a/src/samples/adaptive/pom.xml
+++ b/src/samples/adaptive/pom.xml
@@ -15,7 +15,7 @@
com.microsoft.sqlservermssql-jdbc
- 12.8.0.jre11
+ 12.10.0.jre11
@@ -74,8 +74,8 @@
org.apache.maven.pluginsmaven-compiler-plugin
- 22
- 22
+ 23
+ 23
diff --git a/src/samples/alwaysencrypted/pom.xml b/src/samples/alwaysencrypted/pom.xml
index d25b975aa..7341ca97d 100644
--- a/src/samples/alwaysencrypted/pom.xml
+++ b/src/samples/alwaysencrypted/pom.xml
@@ -15,7 +15,7 @@
com.microsoft.sqlservermssql-jdbc
- 12.8.0.jre11
+ 12.10.0.jre11
@@ -42,8 +42,8 @@
org.apache.maven.pluginsmaven-compiler-plugin
- 22
- 22
+ 23
+ 23
diff --git a/src/samples/azureactivedirectoryauthentication/pom.xml b/src/samples/azureactivedirectoryauthentication/pom.xml
index 8c1acabb3..9279ae457 100644
--- a/src/samples/azureactivedirectoryauthentication/pom.xml
+++ b/src/samples/azureactivedirectoryauthentication/pom.xml
@@ -14,7 +14,7 @@
com.microsoft.sqlservermssql-jdbc
- 12.8.0.jre11
+ 12.10.0.jre11
@@ -57,8 +57,8 @@
org.apache.maven.pluginsmaven-compiler-plugin
- 22
- 22
+ 23
+ 23
diff --git a/src/samples/connections/pom.xml b/src/samples/connections/pom.xml
index bbc06a442..d88cc89a8 100644
--- a/src/samples/connections/pom.xml
+++ b/src/samples/connections/pom.xml
@@ -14,7 +14,7 @@
com.microsoft.sqlservermssql-jdbc
- 12.8.0.jre11
+ 12.10.0.jre11
@@ -57,8 +57,8 @@
org.apache.maven.pluginsmaven-compiler-plugin
- 22
- 22
+ 23
+ 23
diff --git a/src/samples/constrained/pom.xml b/src/samples/constrained/pom.xml
index 330ab1830..33a35dc25 100644
--- a/src/samples/constrained/pom.xml
+++ b/src/samples/constrained/pom.xml
@@ -16,7 +16,7 @@
com.microsoft.sqlservermssql-jdbc
- 12.8.0.jre11
+ 12.10.0.jre11
@@ -44,8 +44,8 @@
maven-compiler-plugin3.8.0
- 22
- 22
+ 23
+ 23
diff --git a/src/samples/dataclassification/pom.xml b/src/samples/dataclassification/pom.xml
index c7743021c..3d6c39966 100644
--- a/src/samples/dataclassification/pom.xml
+++ b/src/samples/dataclassification/pom.xml
@@ -16,7 +16,7 @@
com.microsoft.sqlservermssql-jdbc
- 12.8.0.jre11
+ 12.10.0.jre11
@@ -44,8 +44,8 @@
maven-compiler-plugin3.8.0
- 22
- 22
+ 23
+ 23
diff --git a/src/samples/datatypes/pom.xml b/src/samples/datatypes/pom.xml
index 9052880a9..b19cf898e 100644
--- a/src/samples/datatypes/pom.xml
+++ b/src/samples/datatypes/pom.xml
@@ -15,7 +15,7 @@
com.microsoft.sqlservermssql-jdbc
- 12.8.0.jre11
+ 12.10.0.jre11
@@ -74,8 +74,8 @@
org.apache.maven.pluginsmaven-compiler-plugin
- 22
- 22
+ 23
+ 23
diff --git a/src/samples/resultsets/pom.xml b/src/samples/resultsets/pom.xml
index c54636cd4..7597c1f36 100644
--- a/src/samples/resultsets/pom.xml
+++ b/src/samples/resultsets/pom.xml
@@ -14,7 +14,7 @@
com.microsoft.sqlservermssql-jdbc
- 12.8.0.jre11
+ 12.10.0.jre11
@@ -73,8 +73,8 @@
org.apache.maven.pluginsmaven-compiler-plugin
- 22
- 22
+ 23
+ 23
diff --git a/src/samples/sparse/pom.xml b/src/samples/sparse/pom.xml
index 3e7b15c94..db9059f33 100644
--- a/src/samples/sparse/pom.xml
+++ b/src/samples/sparse/pom.xml
@@ -14,7 +14,7 @@
com.microsoft.sqlservermssql-jdbc
- 12.8.0.jre11
+ 12.10.0.jre11
@@ -41,8 +41,8 @@
org.apache.maven.pluginsmaven-compiler-plugin
- 22
- 22
+ 23
+ 23