From aef7c5d5a56301cf6e24ec9e2160048b2a0bf509 Mon Sep 17 00:00:00 2001 From: Jeff Wasty Date: Tue, 16 Jul 2024 12:00:10 -0700 Subject: [PATCH] version update (#2476) --- CHANGELOG.md | 3 ++ README.md | 20 ++++++------ build.gradle | 32 +++++++++---------- mssql-jdbc_auth_LICENSE | 2 +- pom.xml | 7 ++-- .../sqlserver/jdbc/SQLJdbcVersion.java | 6 ++-- src/samples/adaptive/pom.xml | 6 ++-- src/samples/alwaysencrypted/pom.xml | 6 ++-- .../pom.xml | 6 ++-- src/samples/connections/pom.xml | 6 ++-- src/samples/constrained/pom.xml | 6 ++-- src/samples/dataclassification/pom.xml | 6 ++-- src/samples/datatypes/pom.xml | 6 ++-- src/samples/resultsets/pom.xml | 6 ++-- src/samples/sparse/pom.xml | 6 ++-- 15 files changed, 62 insertions(+), 62 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4e7837589..e676970b6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,9 @@ 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) diff --git a/README.md b/README.md index 6756d0e63..c99d951ae 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.sqlserver mssql-jdbc - 12.6.0.jre11 + 12.8.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.sqlserver mssql-jdbc - 12.6.0.jre11 + 12.8.0.jre11 ``` @@ -129,14 +129,14 @@ Projects that require either of the two features need to explicitly declare the com.microsoft.sqlserver mssql-jdbc - 12.6.0.jre11 + 12.8.0.jre11 compile com.azure azure-identity - 1.3.3 + 1.12.2 ``` @@ -147,20 +147,20 @@ Projects that require either of the two features need to explicitly declare the com.microsoft.sqlserver mssql-jdbc - 12.6.0.jre11 + 12.8.0.jre11 compile com.azure azure-identity - 1.3.3 + 1.12.2 com.azure azure-security-keyvault-keys - 4.2.8 + 4.7.3 ``` @@ -174,13 +174,13 @@ When setting 'useFmtOnly' property to 'true' for establishing a connection or cr com.microsoft.sqlserver mssql-jdbc - 12.6.0.jre11 + 12.8.0.jre11 org.antlr antlr4-runtime - 4.9.2 + 4.9.3 ``` @@ -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. diff --git a/build.gradle b/build.gradle index 46119e381..8886d0d52 100644 --- a/build.gradle +++ b/build.gradle @@ -11,8 +11,8 @@ apply plugin: 'java' -version = '12.7.1' -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' } diff --git a/mssql-jdbc_auth_LICENSE b/mssql-jdbc_auth_LICENSE index 7b1555e09..fad60a5d5 100644 --- a/mssql-jdbc_auth_LICENSE +++ b/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. diff --git a/pom.xml b/pom.xml index 3245b7068..0e2c02ece 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 com.microsoft.sqlserver mssql-jdbc - 12.7.1 + 12.8.0 jar Microsoft 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.0 4.7.3 @@ -347,9 +347,6 @@ jre21 - - true - ${project.artifactId}-${project.version}.jre21${releaseExt} diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLJdbcVersion.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLJdbcVersion.java index 8a975e539..e246c1844 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/SQLJdbcVersion.java +++ b/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")); diff --git a/src/samples/adaptive/pom.xml b/src/samples/adaptive/pom.xml index f1ce6c7d4..db9cb224e 100644 --- a/src/samples/adaptive/pom.xml +++ b/src/samples/adaptive/pom.xml @@ -15,7 +15,7 @@ com.microsoft.sqlserver mssql-jdbc - 12.6.0.jre11 + 12.8.0.jre11 @@ -74,8 +74,8 @@ org.apache.maven.plugins maven-compiler-plugin - 18 - 18 + 22 + 22 diff --git a/src/samples/alwaysencrypted/pom.xml b/src/samples/alwaysencrypted/pom.xml index b26a55e0c..57dacc776 100644 --- a/src/samples/alwaysencrypted/pom.xml +++ b/src/samples/alwaysencrypted/pom.xml @@ -15,7 +15,7 @@ com.microsoft.sqlserver mssql-jdbc - 12.6.0.jre11 + 12.8.0.jre11 @@ -42,8 +42,8 @@ org.apache.maven.plugins maven-compiler-plugin - 18 - 18 + 22 + 22 diff --git a/src/samples/azureactivedirectoryauthentication/pom.xml b/src/samples/azureactivedirectoryauthentication/pom.xml index d704cd96f..2553013a5 100644 --- a/src/samples/azureactivedirectoryauthentication/pom.xml +++ b/src/samples/azureactivedirectoryauthentication/pom.xml @@ -14,7 +14,7 @@ com.microsoft.sqlserver mssql-jdbc - 12.6.0.jre11 + 12.8.0.jre11 @@ -57,8 +57,8 @@ org.apache.maven.plugins maven-compiler-plugin - 18 - 18 + 22 + 22 diff --git a/src/samples/connections/pom.xml b/src/samples/connections/pom.xml index 7bc8fd947..434b6e64e 100644 --- a/src/samples/connections/pom.xml +++ b/src/samples/connections/pom.xml @@ -14,7 +14,7 @@ com.microsoft.sqlserver mssql-jdbc - 12.6.0.jre11 + 12.8.0.jre11 @@ -57,8 +57,8 @@ org.apache.maven.plugins maven-compiler-plugin - 18 - 18 + 22 + 22 diff --git a/src/samples/constrained/pom.xml b/src/samples/constrained/pom.xml index 9518b2c53..bfb368f24 100644 --- a/src/samples/constrained/pom.xml +++ b/src/samples/constrained/pom.xml @@ -16,7 +16,7 @@ com.microsoft.sqlserver mssql-jdbc - 12.6.0.jre11 + 12.8.0.jre11 @@ -44,8 +44,8 @@ maven-compiler-plugin 3.8.0 - 18 - 18 + 22 + 22 diff --git a/src/samples/dataclassification/pom.xml b/src/samples/dataclassification/pom.xml index f4f9f7ce4..5497763df 100644 --- a/src/samples/dataclassification/pom.xml +++ b/src/samples/dataclassification/pom.xml @@ -16,7 +16,7 @@ com.microsoft.sqlserver mssql-jdbc - 12.6.0.jre11 + 12.8.0.jre11 @@ -44,8 +44,8 @@ maven-compiler-plugin 3.8.0 - 18 - 18 + 22 + 22 diff --git a/src/samples/datatypes/pom.xml b/src/samples/datatypes/pom.xml index 264dbb745..80df733e7 100644 --- a/src/samples/datatypes/pom.xml +++ b/src/samples/datatypes/pom.xml @@ -15,7 +15,7 @@ com.microsoft.sqlserver mssql-jdbc - 12.6.0.jre11 + 12.8.0.jre11 @@ -74,8 +74,8 @@ org.apache.maven.plugins maven-compiler-plugin - 18 - 18 + 22 + 22 diff --git a/src/samples/resultsets/pom.xml b/src/samples/resultsets/pom.xml index 979b36010..590647080 100644 --- a/src/samples/resultsets/pom.xml +++ b/src/samples/resultsets/pom.xml @@ -14,7 +14,7 @@ com.microsoft.sqlserver mssql-jdbc - 12.6.0.jre11 + 12.8.0.jre11 @@ -73,8 +73,8 @@ org.apache.maven.plugins maven-compiler-plugin - 18 - 18 + 22 + 22 diff --git a/src/samples/sparse/pom.xml b/src/samples/sparse/pom.xml index 9df693086..9313d22c2 100644 --- a/src/samples/sparse/pom.xml +++ b/src/samples/sparse/pom.xml @@ -14,7 +14,7 @@ com.microsoft.sqlserver mssql-jdbc - 12.6.0.jre11 + 12.8.0.jre11 @@ -41,8 +41,8 @@ org.apache.maven.plugins maven-compiler-plugin - 18 - 18 + 22 + 22