From c235d35fa3148b24617359e2285a0bc6748076cb Mon Sep 17 00:00:00 2001 From: lilgreenbird Date: Wed, 26 Jul 2023 14:46:21 -0700 Subject: [PATCH] Update for 12.4.0 (#2164) --- CHANGELOG.md | 6 ++++++ README.md | 20 +++++++++---------- build.gradle | 4 ++-- pom.xml | 4 ++-- .../sqlserver/jdbc/SQLJdbcVersion.java | 2 +- src/samples/adaptive/pom.xml | 2 +- src/samples/alwaysencrypted/pom.xml | 2 +- .../pom.xml | 2 +- src/samples/connections/pom.xml | 2 +- src/samples/constrained/pom.xml | 2 +- src/samples/dataclassification/pom.xml | 2 +- src/samples/datatypes/pom.xml | 2 +- src/samples/resultsets/pom.xml | 2 +- src/samples/sparse/pom.xml | 2 +- 14 files changed, 30 insertions(+), 24 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4b3b3eef1..b0bc8192f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,12 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/) +## [12.4.0] Stable Release +### Fixed issues +- Revert #2051 (Big decimal precision) / #2116 (Fix for bigDecimal values between 0 and 1 having too high of a precision) [#2176](https://github.com/microsoft/mssql-jdbc/pull/2176) +- Fixed server certificate validation for encrypt=strict [#2174](https://github.com/microsoft/mssql-jdbc/pull/2174) +- Fixed issues identified by SonarQube [#2145](https://github.com/microsoft/mssql-jdbc/pull/2145) + ## [12.3.1] Preview Release ### Added - Added a case to throw XAER_RMFAIL on connection reset for XA transactions [2118](https://github.com/microsoft/mssql-jdbc/pull/2118) diff --git a/README.md b/README.md index 2096a1b72..e542079cb 100644 --- a/README.md +++ b/README.md @@ -82,7 +82,7 @@ We're now on the Maven Central Repository. Add the following to your POM file to com.microsoft.sqlserver mssql-jdbc - 12.2.0.jre11 + 12.4.0.jre11 ``` The driver can be downloaded from [Microsoft](https://aka.ms/downloadmssqljdbc). @@ -93,7 +93,7 @@ To get the latest version of the driver, add the following to your POM file: com.microsoft.sqlserver mssql-jdbc - 12.2.0.jre11 + 12.4.0.jre11 ``` @@ -128,7 +128,7 @@ Projects that require either of the two features need to explicitly declare the com.microsoft.sqlserver mssql-jdbc - 12.2.0.jre11 + 12.4.0.jre11 compile @@ -146,7 +146,7 @@ Projects that require either of the two features need to explicitly declare the com.microsoft.sqlserver mssql-jdbc - 12.2.0.jre11 + 12.4.0.jre11 compile @@ -173,7 +173,7 @@ When setting 'useFmtOnly' property to 'true' for establishing a connection or cr com.microsoft.sqlserver mssql-jdbc - 12.2.0.jre11 + 12.4.0.jre11 @@ -213,7 +213,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. 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, 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. 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, and so on. ## Contributors Special thanks to everyone who has contributed to the project. @@ -229,13 +229,13 @@ Here are our Top 15 contributors from the community: - simon04 (Simon Legner) - gstojsic - cosmofrit -- harawata- shayaantx -- (Iwao AVE!) -- nsidhaye (Nikhil Sidhaye) +- mmimica (Milan Mimica) +- harawata (Iwao AVE!) - rPraml (Roland Praml) +- laeubi (Christoph Laubrich) - worldtiki (Daniel Albuquerque) - shayaantx -- mfriesen (Mike Friesen) +- mnhubspot ## License diff --git a/build.gradle b/build.gradle index 0d7365a96..21d23291f 100644 --- a/build.gradle +++ b/build.gradle @@ -11,7 +11,7 @@ apply plugin: 'java' -version = '12.4.0-SNAPSHOT' +version = '12.4.0' def jreVersion = "" def testOutputDir = file("build/classes/java/test") def archivesBaseName = 'mssql-jdbc' @@ -85,7 +85,7 @@ if(hasProperty('buildProfile') && buildProfile == "jre8") { } } -jar.archiveFileName = "${archivesBaseName}-${version}.${jreVersion}-preview.jar" +jar.archiveFileName = "${archivesBaseName}-${version}.${jreVersion}.jar" jar { manifest { attributes 'Title': "Microsoft JDBC Driver ${archiveVersion} for SQL Server", diff --git a/pom.xml b/pom.xml index d150673e4..c595cb36b 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 com.microsoft.sqlserver mssql-jdbc - 12.4.0-SNAPSHOT + 12.4.0 jar Microsoft JDBC Driver for SQL Server @@ -50,7 +50,7 @@ Default testing enabled with SQL Server 2019 (SQLv15) --> xSQLv12,xSQLv15,NTLM,MSI,reqExternalSetup,clientCertAuth,fedAuth - -preview + 6.0.0 4.6.1 diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/SQLJdbcVersion.java b/src/main/java/com/microsoft/sqlserver/jdbc/SQLJdbcVersion.java index 57bbfb6fe..0bce9f982 100644 --- a/src/main/java/com/microsoft/sqlserver/jdbc/SQLJdbcVersion.java +++ b/src/main/java/com/microsoft/sqlserver/jdbc/SQLJdbcVersion.java @@ -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 0b9fd8da1..96e2be9a0 100644 --- a/src/samples/adaptive/pom.xml +++ b/src/samples/adaptive/pom.xml @@ -15,7 +15,7 @@ com.microsoft.sqlserver mssql-jdbc - 12.2.0.jre11 + 12.4.0.jre11 diff --git a/src/samples/alwaysencrypted/pom.xml b/src/samples/alwaysencrypted/pom.xml index 95bce7ab4..294d4b419 100644 --- a/src/samples/alwaysencrypted/pom.xml +++ b/src/samples/alwaysencrypted/pom.xml @@ -15,7 +15,7 @@ com.microsoft.sqlserver mssql-jdbc - 12.2.0.jre11 + 12.4.0.jre11 diff --git a/src/samples/azureactivedirectoryauthentication/pom.xml b/src/samples/azureactivedirectoryauthentication/pom.xml index 02c4c23c7..518da61a7 100644 --- a/src/samples/azureactivedirectoryauthentication/pom.xml +++ b/src/samples/azureactivedirectoryauthentication/pom.xml @@ -14,7 +14,7 @@ com.microsoft.sqlserver mssql-jdbc - 12.2.0.jre11 + 12.4.0.jre11 diff --git a/src/samples/connections/pom.xml b/src/samples/connections/pom.xml index e2f2128c8..209697c3c 100644 --- a/src/samples/connections/pom.xml +++ b/src/samples/connections/pom.xml @@ -14,7 +14,7 @@ com.microsoft.sqlserver mssql-jdbc - 12.2.0.jre11 + 12.4.0.jre11 diff --git a/src/samples/constrained/pom.xml b/src/samples/constrained/pom.xml index 131e686c9..c2cc82ae6 100644 --- a/src/samples/constrained/pom.xml +++ b/src/samples/constrained/pom.xml @@ -16,7 +16,7 @@ com.microsoft.sqlserver mssql-jdbc - 12.2.0.jre11 + 12.4.0.jre11 diff --git a/src/samples/dataclassification/pom.xml b/src/samples/dataclassification/pom.xml index e3c71dc8a..74ba22bb0 100644 --- a/src/samples/dataclassification/pom.xml +++ b/src/samples/dataclassification/pom.xml @@ -16,7 +16,7 @@ com.microsoft.sqlserver mssql-jdbc - 12.2.0.jre11 + 12.4.0.jre11 diff --git a/src/samples/datatypes/pom.xml b/src/samples/datatypes/pom.xml index d16a5bc74..148d73819 100644 --- a/src/samples/datatypes/pom.xml +++ b/src/samples/datatypes/pom.xml @@ -15,7 +15,7 @@ com.microsoft.sqlserver mssql-jdbc - 12.2.0.jre11 + 12.4.0.jre11 diff --git a/src/samples/resultsets/pom.xml b/src/samples/resultsets/pom.xml index 09c1f42dd..d466f5e75 100644 --- a/src/samples/resultsets/pom.xml +++ b/src/samples/resultsets/pom.xml @@ -14,7 +14,7 @@ com.microsoft.sqlserver mssql-jdbc - 12.2.0.jre11 + 12.4.0.jre11 diff --git a/src/samples/sparse/pom.xml b/src/samples/sparse/pom.xml index c5a7f7aec..e6e3dd4de 100644 --- a/src/samples/sparse/pom.xml +++ b/src/samples/sparse/pom.xml @@ -14,7 +14,7 @@ com.microsoft.sqlserver mssql-jdbc - 12.2.0.jre11 + 12.4.0.jre11