Merge branch 'microsoft:main' into feature/1582_JavaTypeUUID

CHANGELOG.md

@@ -3,6 +3,31 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 
+## [12.8.0] Stable Release
+- No changes since previous release
+
+## [12.7.1] Preview Release
+### Added
+- Added JDK 22 support [#2414](https://github.com/microsoft/mssql-jdbc/pull/2414)
+- Added credential caching for Managed Identity Credential and Default Azure Credential [#2415](https://github.com/microsoft/mssql-jdbc/pull/2415)
+- Added Caching SQLServerBulkCopy object for batch insert [#2435](https://github.com/microsoft/mssql-jdbc/pull/2435)
+- Added connection level bulk copy metadata caching [#2464](https://github.com/microsoft/mssql-jdbc/pull/2464)
+- Added logging to token caching [#2468](https://github.com/microsoft/mssql-jdbc/pull/2468)
+
+### Changed
+- Bump org.bouncycastle:bcprov-jdk18on from 1.77 to 1.78 [#2403](https://github.com/microsoft/mssql-jdbc/pull/2403)
+- Enum SQLServerSortOrder is now public [#2405](https://github.com/microsoft/mssql-jdbc/pull/2405)
+- Bump com.azure:azure-identity from 1.12.1 to 1.12.2 [#2447](https://github.com/microsoft/mssql-jdbc/pull/2447)
+- Bump com.microsoft.azure:msal4j from 1.15.0 to 1.15.1 [#2448](https://github.com/microsoft/mssql-jdbc/pull/2448)
+
+### Fixed issues
+- Execute stored procedures directly for RPC calls [#2410](https://github.com/microsoft/mssql-jdbc/pull/2410)
+- Fix SqlAuthenticationToken constructor accepting unix epoch [#2425](https://github.com/microsoft/mssql-jdbc/pull/2425)
+- TokenCredential class shouldn't be required [#2441](https://github.com/microsoft/mssql-jdbc/pull/2441)
+- Fixed timestamp string conversion error for CallableStatements [#2449](https://github.com/microsoft/mssql-jdbc/pull/2449)
+- Fixed CallableStatements default value regression [#2452](https://github.com/microsoft/mssql-jdbc/pull/2452)
+- Fixed parentheses parsing for stored procedure names and function names [#2467](https://github.com/microsoft/mssql-jdbc/pull/2467)
+
 ## [12.7.0] Preview Release
 ### Added
 - Server Message Handler and SQLException Chaining [#2251](https://github.com/microsoft/mssql-jdbc/pull/2251)

README.md

@@ -83,7 +83,7 @@ We're now on the Maven Central Repository. Add the following to your POM file to
 <dependency>
 	<groupId>com.microsoft.sqlserver</groupId>
 	<artifactId>mssql-jdbc</artifactId>
-	<version>12.6.0.jre11</version>
+	<version>12.8.0.jre11</version>
 </dependency>
 ```
 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:
 <dependency>
 	<groupId>com.microsoft.sqlserver</groupId>
 	<artifactId>mssql-jdbc</artifactId>
-	<version>12.6.0.jre11</version>
+	<version>12.8.0.jre11</version>
 </dependency>
 ```
 
@@ -129,14 +129,14 @@ Projects that require either of the two features need to explicitly declare the
 <dependency>
 	<groupId>com.microsoft.sqlserver</groupId>
 	<artifactId>mssql-jdbc</artifactId>
-	<version>12.6.0.jre11</version>
+	<version>12.8.0.jre11</version>
 	<scope>compile</scope>
 </dependency>
 
 <dependency>
 	<groupId>com.azure</groupId>
 	<artifactId>azure-identity</artifactId>
-	<version>1.3.3</version>
+	<version>1.12.2</version>
 </dependency>
 
 ```
@@ -147,20 +147,20 @@ Projects that require either of the two features need to explicitly declare the
 <dependency>
 	<groupId>com.microsoft.sqlserver</groupId>
 	<artifactId>mssql-jdbc</artifactId>
-	<version>12.6.0.jre11</version>
+	<version>12.8.0.jre11</version>
 	<scope>compile</scope>
 </dependency>
 
 <dependency>
 	<groupId>com.azure</groupId>
 	<artifactId>azure-identity</artifactId>
-	<version>1.3.3</version>
+	<version>1.12.2</version>
 </dependency>
 
 <dependency>
 	<groupId>com.azure</groupId>
 	<artifactId>azure-security-keyvault-keys</artifactId>
-	<version>4.2.8</version>
+	<version>4.7.3</version>
 </dependency>
 ```
 
@@ -174,13 +174,13 @@ When setting 'useFmtOnly' property to 'true' for establishing a connection or cr
 <dependency>
 	<groupId>com.microsoft.sqlserver</groupId>
 	<artifactId>mssql-jdbc</artifactId>
-	<version>12.6.0.jre11</version>
+	<version>12.8.0.jre11</version>
 </dependency>
 
 <dependency>
 	<groupId>org.antlr</groupId>
 	<artifactId>antlr4-runtime</artifactId>
-	<version>4.9.2</version>
+	<version>4.9.3</version>
 </dependency>
 ```
 
@@ -214,7 +214,7 @@ Preview releases happen approximately monthly between stable releases. This give
 You can see what is going into a future release by monitoring [Milestones](https://github.com/Microsoft/mssql-jdbc/milestones) in the repository.
 
 ### Version conventions
-Starting with 6.0, stable versions have an even minor version. For example, 6.0, 6.2, 6.4, 7.0, 7.2, 7.4, 8.2, 8.4, 9.2, 9.4, 10.2, 11.2, 12.2, 12.4, 12.6. Preview versions have an odd minor version. For example, 6.1, 6.3, 6.5, 7.1, 7.3, 8.1, 9.1, 10.1, 11.1, 12.1, 12.3, 12.5, and so on.
+Starting with 6.0, stable versions have an even minor version. For example, 6.0, 6.2, 6.4, 7.0, 7.2, 7.4, 8.2, 8.4, 9.2, 9.4, 10.2, 11.2, 12.2, 12.4, 12.6, 12.8. Preview versions have an odd minor version. For example, 6.1, 6.3, 6.5, 7.1, 7.3, 8.1, 9.1, 10.1, 11.1, 12.1, 12.3, 12.5, 12.7, and so on.
 
 ## Contributors 
 Special thanks to everyone who has contributed to the project. 

build.gradle

@@ -11,8 +11,8 @@
 
 apply plugin: 'java'
 
-version = '12.7.1-SNAPSHOT'
-def releaseExt = '-preview'
+version = '12.8.0'
+def releaseExt = ''
 def jreVersion = ""
 def testOutputDir = file("build/classes/java/test")
 def archivesBaseName = 'mssql-jdbc'
@@ -46,7 +46,7 @@ if (!hasProperty('buildProfile') || (hasProperty('buildProfile') && buildProfile
 	targetCompatibility = 22
 }
 
-if (!hasProperty('buildProfile') || (hasProperty('buildProfile') && buildProfile == "jre21")) {
+if (hasProperty('buildProfile') && buildProfile == "jre21") {
 
 	jreVersion = "jre21"
 	excludedFile = 'com/microsoft/sqlserver/jdbc/SQLServerJdbc42.java'
@@ -143,29 +143,29 @@ repositories {
 dependencies {
     implementation 'org.osgi:org.osgi.core:6.0.0',
 			'org.osgi:org.osgi.service.jdbc:1.1.0'
-	compileOnly 'com.azure:azure-security-keyvault-keys:4.5.2',
-			'com.azure:azure-identity:1.7.0',
+	compileOnly 'com.azure:azure-security-keyvault-keys:4.7.3',
+			'com.azure:azure-identity:1.12.2',
 			'org.antlr:antlr4-runtime:4.9.3',
-			'com.google.code.gson:gson:2.9.0',
-			'org.bouncycastle:bcprov-jdk15on:1.70',
-			'org.bouncycastle:bcpkix-jdk15on:1.70'
+			'com.google.code.gson:gson:2.10.1',
+			'org.bouncycastle:bcprov-jdk18on:1.78',
+			'org.bouncycastle:bcpkix-jdk18on:1.78'
     testImplementation 'org.junit.platform:junit-platform-console:1.5.2',
 			'org.junit.platform:junit-platform-commons:1.5.2',
 			'org.junit.platform:junit-platform-engine:1.5.2',
 			'org.junit.platform:junit-platform-launcher:1.5.2',
 			'org.junit.platform:junit-platform-runner:1.5.2',
 			'org.junit.platform:junit-platform-surefire-provider:1.3.2',
-			'org.junit.jupiter:junit-jupiter-api:5.6.0',
-			'org.junit.jupiter:junit-jupiter-engine:5.6.0',
-			'org.junit.jupiter:junit-jupiter-params:5.6.0',
+			'org.junit.jupiter:junit-jupiter-api:5.8.2',
+			'org.junit.jupiter:junit-jupiter-engine:5.8.2',
+			'org.junit.jupiter:junit-jupiter-params:5.8.2',
 			'com.zaxxer:HikariCP:3.4.2',
 			'org.apache.commons:commons-dbcp2:2.7.0',
 			'org.slf4j:slf4j-nop:1.7.30',
 			'org.antlr:antlr4-runtime:4.9.3',
 			'org.eclipse.gemini.blueprint:gemini-blueprint-mock:2.1.0.RELEASE',
-			'com.google.code.gson:gson:2.9.0',
-			'org.bouncycastle:bcprov-jdk15on:1.70',
-			'com.azure:azure-security-keyvault-keys:4.5.2',
-			'com.azure:azure-identity:1.7.0',
-			'com.h2database:h2:2.1.210'
+			'com.google.code.gson:gson:2.10.1',
+			'org.bouncycastle:bcprov-jdk18on:1.78',
+			'com.azure:azure-security-keyvault-keys:4.7.3',
+			'com.azure:azure-identity:1.12.2',
+			'com.h2database:h2:2.2.220'
 }

mssql-jdbc_auth_LICENSE

@@ -1,5 +1,5 @@
 MICROSOFT SOFTWARE LICENSE TERMS
-MICROSOFT JDBC DRIVER 12.7.1 FOR SQL SERVER
+MICROSOFT JDBC DRIVER 12.8.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.
 

pom.xml

@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.microsoft.sqlserver</groupId>
 	<artifactId>mssql-jdbc</artifactId>
-	<version>12.7.1-SNAPSHOT</version>
+	<version>12.8.0</version>
 	<packaging>jar</packaging>
 	<name>Microsoft JDBC Driver for SQL Server</name>
 	<description>
@@ -51,12 +51,12 @@
 			Default testing enabled with SQL Server 2019 (SQLv15) -->
 		<excludedGroups>xSQLv12,xSQLv15,NTLM,MSI,reqExternalSetup,clientCertAuth,fedAuth,kerberos</excludedGroups>
 		<!-- Use -preview for preview release, leave empty for official release. -->
-		<releaseExt>-preview</releaseExt>
+		<releaseExt></releaseExt>
 		<!-- Driver Dependencies -->
 		<org.osgi.core.version>6.0.0</org.osgi.core.version>
 		<azure-security-keyvault-keys.version>4.7.3</azure-security-keyvault-keys.version>
-		<azure-identity.version>1.12.1</azure-identity.version>
-		<msal.version>1.15.0</msal.version>
+		<azure-identity.version>1.12.2</azure-identity.version>
+		<msal.version>1.15.1</msal.version>
 		<osgi.jdbc.version>1.1.0</osgi.jdbc.version>
 		<antlr-runtime.version>4.9.3</antlr-runtime.version>
 		<com.google.code.gson.version>2.10.1</com.google.code.gson.version>
@@ -347,9 +347,6 @@
 		</profile>
 		<profile>
 			<id>jre21</id>
-			<activation>
-				<activeByDefault>true</activeByDefault>
-			</activation>
 			<build>
 				<finalName>${project.artifactId}-${project.version}.jre21${releaseExt}</finalName>
 				<plugins>

src/main/java/com/microsoft/sqlserver/jdbc/ISQLServerConnection.java

@@ -532,4 +532,19 @@ CallableStatement prepareCall(String sql, int nType, int nConcur, int nHold,
      * @return flag for using Bulk Copy API for batch insert operations.
      */
     boolean getUseBulkCopyForBatchInsert();
+
+    /**
+     * Returns value of 'cacheBulkCopyMetadata' from Connection String.
+     *
+     * @param cacheBulkCopyMetadata
+     *        indicates whether the driver should use connection level caching of metadata for bulk copy
+     */
+    void setcacheBulkCopyMetadata(boolean cacheBulkCopyMetadata);
+
+    /**
+     * Sets the value for 'cacheBulkCopyMetadata' property
+     *
+     * @return cacheBulkCopyMetadata boolean value
+     */
+    boolean getcacheBulkCopyMetadata();
 }

src/main/java/com/microsoft/sqlserver/jdbc/ISQLServerDataSource.java

@@ -1350,4 +1350,19 @@ public interface ISQLServerDataSource extends javax.sql.CommonDataSource {
      * @return calcBigDecimalPrecision boolean value
      */
     boolean getCalcBigDecimalPrecision();
+
+    /**
+     * Returns value of 'cacheBulkCopyMetadata' from Connection String.
+     *
+     * @param cacheBulkCopyMetadata
+     *        indicates whether the driver should use connection level caching of metadata for bulk copy
+     */
+    void setcacheBulkCopyMetadata(boolean cacheBulkCopyMetadata);
+
+    /**
+     * Sets the value for 'cacheBulkCopyMetadata' property
+     *
+     * @return cacheBulkCopyMetadata boolean value
+     */
+    boolean getcacheBulkCopyMetadata();
 }

src/main/java/com/microsoft/sqlserver/jdbc/SQLJdbcVersion.java

@@ -7,15 +7,15 @@
 
 final class SQLJdbcVersion {
     static final int MAJOR = 12;
-    static final int MINOR = 7;
-    static final int PATCH = 1;
+    static final int MINOR = 8;
+    static final int PATCH = 0;
     static final int BUILD = 0;
     /*
      * Used to load mssql-jdbc_auth DLL.
      * 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"));