diff --git a/build.gradle b/build.gradle index 3e5d87a9e..648b18895 100644 --- a/build.gradle +++ b/build.gradle @@ -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.7.3', - 'com.azure:azure-identity:1.12.2', - 'org.antlr:antlr4-runtime:4.9.3', - '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', + compileOnly 'com.azure:azure-security-keyvault-keys:4.9.2', + 'com.azure:azure-identity:1.15.3', + 'org.antlr:antlr4-runtime:4.9.1', + 'com.google.code.gson:gson:2.11.0', + 'org.bouncycastle:bcprov-jdk18on:1.79', + 'org.bouncycastle:bcpkix-jdk18on:1.79' + testImplementation 'org.junit.platform:junit-platform-console:1.11.4', + 'org.junit.platform:junit-platform-commons:1.11.4', + 'org.junit.platform:junit-platform-engine:1.11.4', + 'org.junit.platform:junit-platform-launcher:1.11.4', + 'org.junit.platform:junit-platform-runner:1.11.4', 'org.junit.platform:junit-platform-surefire-provider:1.3.2', - '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', + 'org.junit.jupiter:junit-jupiter-api:5.11.4', + 'org.junit.jupiter:junit-jupiter-engine:5.11.4', + 'org.junit.jupiter:junit-jupiter-params:5.11.4', 'com.zaxxer:HikariCP:3.4.2', - 'org.apache.commons:commons-dbcp2:2.7.0', - 'org.slf4j:slf4j-nop:1.7.30', + 'org.apache.commons:commons-dbcp2:2.13.0', + 'org.slf4j:slf4j-nop:1.7.36', 'org.antlr:antlr4-runtime:4.9.3', - 'org.eclipse.gemini.blueprint:gemini-blueprint-mock:2.1.0.RELEASE', - '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', + 'org.eclipse.gemini.blueprint:gemini-blueprint-mock:3.0.0.M01', + 'com.google.code.gson:gson:2.11.0', + 'org.bouncycastle:bcprov-jdk18on:1.79', + 'com.azure:azure-security-keyvault-keys:4.9.2', + 'com.azure:azure-identity:1.15.3', 'com.h2database:h2:2.2.220' } diff --git a/pom.xml b/pom.xml index 284c17582..e055b0449 100644 --- a/pom.xml +++ b/pom.xml @@ -42,35 +42,32 @@ xAzureSQLDB - - - - For tests not compatible with Azure SQL Database - - xAzureSQLDW - - - - For tests not compatible with Azure Data Warehouse - xAzureSQLMI - - - - For tests not compatible with Azure SQL Managed Instance - NTLM - - - For tests using NTLM Authentication mode (excluded by default) - kerberos - - - - For tests using Kerberos authentication (excluded by default) + NTLM - - - - - - - For tests using NTLM Authentication mode (excluded by default) + kerberos - - - - - For tests using Kerberos authentication (excluded by default) reqExternalSetup - For tests requiring external setup (excluded by default) clientCertAuth - - For tests requiring client certificate authentication - setup (excluded by default) - - - - - - - - - - - - - - - - - - - - - - - - requireSecret - For tests requiring setting up secrets manually + setup (excluded by default) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Default testing enabled with SQL Server 2019 (SQLv15) --> - - xSQLv12,xSQLv15,NTLM,MSI,reqExternalSetup,clientCertAuth,fedAuth,kerberos,requireSecret + xSQLv12,xSQLv15,NTLM,MSI,reqExternalSetup,clientCertAuth,fedAuth,kerberos -preview 6.0.0 - 4.7.3 - 1.12.2 - 1.15.1 + 4.9.2 + 1.15.3 1.1.0 4.9.3 - 2.10.1 - 1.78 - 1.78 + 2.11.0 + 1.79 + 1.79 - [1.3.2, 1.9.0] - 5.8.2 + [1.3.2, 1.11.4] + 5.11.4 3.4.2 - 2.7.0 - 1.7.30 - 2.1.0.RELEASE + 2.13.0 + 1.7.36 + 3.0.0.M01 2.2.220 UTF-8 ${project.build.sourceEncoding} @@ -95,12 +92,6 @@ - - com.microsoft.azure - msal4j - ${msal.version} - true - org.antlr @@ -230,8 +221,7 @@ central - - https://sqlclientdrivers.pkgs.visualstudio.com/public/_packaging/mssql-jdbc/maven/v1 + https://sqlclientdrivers.pkgs.visualstudio.com/public/_packaging/mssql-jdbc/maven/v1 true @@ -243,8 +233,7 @@ central - - https://sqlclientdrivers.pkgs.visualstudio.com/public/_packaging/mssql-jdbc/maven/v1 + https://sqlclientdrivers.pkgs.visualstudio.com/public/_packaging/mssql-jdbc/maven/v1 true @@ -257,8 +246,7 @@ jre8 - - ${project.artifactId}-${project.version}.jre8${releaseExt} + ${project.artifactId}-${project.version}.jre8${releaseExt} org.apache.maven.plugins @@ -266,20 +254,14 @@ 3.8.0 - - **/com/microsoft/sqlserver/jdbc/ISQLServerConnection43.java - - **/com/microsoft/sqlserver/jdbc/SQLServerConnection43.java - - **/com/microsoft/sqlserver/jdbc/SQLServerJdbc43.java + **/com/microsoft/sqlserver/jdbc/ISQLServerConnection43.java + **/com/microsoft/sqlserver/jdbc/SQLServerConnection43.java + **/com/microsoft/sqlserver/jdbc/SQLServerJdbc43.java - - **/com/microsoft/sqlserver/jdbc/connection/ConnectionWrapper43Test.java - - **/com/microsoft/sqlserver/jdbc/connection/RequestBoundaryMethodsTest.java - - **/com/microsoft/sqlserver/jdbc/JDBC43Test.java + **/com/microsoft/sqlserver/jdbc/connection/ConnectionWrapper43Test.java + **/com/microsoft/sqlserver/jdbc/connection/RequestBoundaryMethodsTest.java + **/com/microsoft/sqlserver/jdbc/JDBC43Test.java 1.8 1.8 @@ -298,8 +280,7 @@ 3.1.1 - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF + ${project.build.outputDirectory}/META-INF/MANIFEST.MF @@ -308,8 +289,7 @@ maven-surefire-plugin 3.0.0-M1 - + ${excludedGroups}, xJDBC42 @@ -319,8 +299,7 @@ jre11 - - ${project.artifactId}-${project.version}.jre11${releaseExt} + ${project.artifactId}-${project.version}.jre11${releaseExt} org.apache.maven.plugins @@ -328,8 +307,7 @@ 3.8.0 - - **/com/microsoft/sqlserver/jdbc/SQLServerJdbc42.java + **/com/microsoft/sqlserver/jdbc/SQLServerJdbc42.java 11 11 @@ -341,11 +319,9 @@ 3.1.1 - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF + ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - com.microsoft.sqlserver.jdbc + com.microsoft.sqlserver.jdbc @@ -356,8 +332,7 @@ jre17 - - ${project.artifactId}-${project.version}.jre17${releaseExt} + ${project.artifactId}-${project.version}.jre17${releaseExt} org.apache.maven.plugins @@ -365,8 +340,7 @@ 3.8.0 - - **/com/microsoft/sqlserver/jdbc/SQLServerJdbc42.java + **/com/microsoft/sqlserver/jdbc/SQLServerJdbc42.java 17 17 @@ -378,11 +352,9 @@ 3.1.1 - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF + ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - com.microsoft.sqlserver.jdbc + com.microsoft.sqlserver.jdbc @@ -393,8 +365,7 @@ jre21 - - ${project.artifactId}-${project.version}.jre21${releaseExt} + ${project.artifactId}-${project.version}.jre21${releaseExt} org.apache.maven.plugins @@ -402,8 +373,7 @@ 3.8.0 - - **/com/microsoft/sqlserver/jdbc/SQLServerJdbc42.java + **/com/microsoft/sqlserver/jdbc/SQLServerJdbc42.java 21 21 @@ -415,11 +385,9 @@ 3.1.1 - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF + ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - com.microsoft.sqlserver.jdbc + com.microsoft.sqlserver.jdbc @@ -433,8 +401,7 @@ true - - ${project.artifactId}-${project.version}.jre23${releaseExt} + ${project.artifactId}-${project.version}.jre23${releaseExt} org.apache.maven.plugins @@ -442,8 +409,7 @@ 3.8.0 - - **/com/microsoft/sqlserver/jdbc/SQLServerJdbc42.java + **/com/microsoft/sqlserver/jdbc/SQLServerJdbc42.java 23 23 @@ -455,11 +421,9 @@ 3.1.1 - - ${project.build.outputDirectory}/META-INF/MANIFEST.MF + ${project.build.outputDirectory}/META-INF/MANIFEST.MF - - com.microsoft.sqlserver.jdbc + com.microsoft.sqlserver.jdbc @@ -506,16 +470,12 @@ - + WARN - - org.apache.maven.plugins:maven-verifier-plugin + org.apache.maven.plugins:maven-verifier-plugin - - Please consider using the - maven-invoker-plugin + Please consider using the maven-invoker-plugin (http://maven.apache.org/plugins/maven-invoker-plugin/)! @@ -568,13 +528,8 @@ com.microsoft.sqlserver.jdbc.dataclassification, microsoft.sql - - !microsoft.sql, - com.ibm.security.auth.module;resolution:=optional, - com.sun.security.auth.module;resolution:=optional, - jdk.net;resolution:=optional,* - - com.microsoft.sqlserver.jdbc.osgi.Activator + !microsoft.sql,jdk.net;resolution:=optional,* + com.microsoft.sqlserver.jdbc.osgi.Activator @@ -611,8 +566,7 @@ true outdated-dependencies.txt - - file:///${session.executionRootDirectory}/maven-version-rules.xml + file:///${session.executionRootDirectory}/maven-version-rules.xml