Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated driver dependency versions #2614

Merged
merged 2 commits into from
Mar 3, 2025
Merged

Updated driver dependency versions #2614

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f63cdfe
update
lilgreenbird Feb 26, 2025
087b830
remove explicit dependency to msal
lilgreenbird Feb 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 21 additions & 21 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
140 changes: 47 additions & 93 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) -->
<excludedGroups>
xSQLv12,xSQLv15,NTLM,MSI,reqExternalSetup,clientCertAuth,fedAuth,kerberos,requireSecret</excludedGroups>
<excludedGroups>xSQLv12,xSQLv15,NTLM,MSI,reqExternalSetup,clientCertAuth,fedAuth,kerberos</excludedGroups>
<!-- Use -preview for preview release, leave empty for official release. -->
<releaseExt>-preview</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.2</azure-identity.version>
<msal.version>1.15.1</msal.version>
<azure-security-keyvault-keys.version>4.9.2</azure-security-keyvault-keys.version>
<azure-identity.version>1.15.3</azure-identity.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>
<bcprov-jdk18on.version>1.78</bcprov-jdk18on.version>
<bcpkix-jdk18on.version>1.78</bcpkix-jdk18on.version>
<com.google.code.gson.version>2.11.0</com.google.code.gson.version>
<bcprov-jdk18on.version>1.79</bcprov-jdk18on.version>
<bcpkix-jdk18on.version>1.79</bcpkix-jdk18on.version>
<!-- JUnit Test Dependencies -->
<junit.platform.version>[1.3.2, 1.9.0]</junit.platform.version>
<junit.jupiter.version>5.8.2</junit.jupiter.version>
<junit.platform.version>[1.3.2, 1.11.4]</junit.platform.version>
<junit.jupiter.version>5.11.4</junit.jupiter.version>
<hikaricp.version>3.4.2</hikaricp.version>
<dbcp2.version>2.7.0</dbcp2.version>
<slf4j.nop.version>1.7.30</slf4j.nop.version>
<gemini.mock.version>2.1.0.RELEASE</gemini.mock.version>
<dbcp2.version>2.13.0</dbcp2.version>
<slf4j.nop.version>1.7.36</slf4j.nop.version>
<gemini.mock.version>3.0.0.M01</gemini.mock.version>
<h2.version>2.2.220</h2.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>${project.build.sourceEncoding}</project.reporting.outputEncoding>
Expand All @@ -95,12 +92,6 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.microsoft.azure</groupId>
<artifactId>msal4j</artifactId>
<version>${msal.version}</version>
<optional>true</optional>
</dependency>
<!-- dependencies for ANTLR -->
<dependency>
<groupId>org.antlr</groupId>
Expand Down Expand Up @@ -230,8 +221,7 @@
<repositories>
<repository>
<id>central</id>
<url>
https://sqlclientdrivers.pkgs.visualstudio.com/public/_packaging/mssql-jdbc/maven/v1</url>
<url>https://sqlclientdrivers.pkgs.visualstudio.com/public/_packaging/mssql-jdbc/maven/v1</url>
<releases>
<enabled>true</enabled>
</releases>
Expand All @@ -243,8 +233,7 @@
<pluginRepositories>
<pluginRepository>
<id>central</id>
<url>
https://sqlclientdrivers.pkgs.visualstudio.com/public/_packaging/mssql-jdbc/maven/v1</url>
<url>https://sqlclientdrivers.pkgs.visualstudio.com/public/_packaging/mssql-jdbc/maven/v1</url>
<releases>
<enabled>true</enabled>
</releases>
Expand All @@ -257,29 +246,22 @@
<profile>
<id>jre8</id>
<build>
<finalName>
${project.artifactId}-${project.version}.jre8${releaseExt}</finalName>
<finalName>${project.artifactId}-${project.version}.jre8${releaseExt}</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.0</version>
<configuration>
<excludes>
<exclude>
**/com/microsoft/sqlserver/jdbc/ISQLServerConnection43.java</exclude>
<exclude>
**/com/microsoft/sqlserver/jdbc/SQLServerConnection43.java</exclude>
<exclude>
**/com/microsoft/sqlserver/jdbc/SQLServerJdbc43.java</exclude>
<exclude>**/com/microsoft/sqlserver/jdbc/ISQLServerConnection43.java</exclude>
<exclude>**/com/microsoft/sqlserver/jdbc/SQLServerConnection43.java</exclude>
<exclude>**/com/microsoft/sqlserver/jdbc/SQLServerJdbc43.java</exclude>
</excludes>
<testExcludes>
<exclude>
**/com/microsoft/sqlserver/jdbc/connection/ConnectionWrapper43Test.java</exclude>
<exclude>
**/com/microsoft/sqlserver/jdbc/connection/RequestBoundaryMethodsTest.java</exclude>
<exclude>
**/com/microsoft/sqlserver/jdbc/JDBC43Test.java</exclude>
<exclude>**/com/microsoft/sqlserver/jdbc/connection/ConnectionWrapper43Test.java</exclude>
<exclude>**/com/microsoft/sqlserver/jdbc/connection/RequestBoundaryMethodsTest.java</exclude>
<exclude>**/com/microsoft/sqlserver/jdbc/JDBC43Test.java</exclude>
</testExcludes>
<source>1.8</source>
<target>1.8</target>
Expand All @@ -298,8 +280,7 @@
<version>3.1.1</version>
<configuration>
<archive>
<manifestFile>
${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
</archive>
</configuration>
</plugin>
Expand All @@ -308,8 +289,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M1</version>
<configuration>
<!-- Exclude [xJDBC42] For tests not compatible with
JDBC 4.2 Specifications -->
<!-- Exclude [xJDBC42] For tests not compatible with JDBC 4.2 Specifications -->
<excludedGroups>${excludedGroups}, xJDBC42</excludedGroups>
</configuration>
</plugin>
Expand All @@ -319,17 +299,15 @@
<profile>
<id>jre11</id>
<build>
<finalName>
${project.artifactId}-${project.version}.jre11${releaseExt}</finalName>
<finalName>${project.artifactId}-${project.version}.jre11${releaseExt}</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.0</version>
<configuration>
<excludes>
<exclude>
**/com/microsoft/sqlserver/jdbc/SQLServerJdbc42.java</exclude>
<exclude>**/com/microsoft/sqlserver/jdbc/SQLServerJdbc42.java</exclude>
</excludes>
<source>11</source>
<target>11</target>
Expand All @@ -341,11 +319,9 @@
<version>3.1.1</version>
<configuration>
<archive>
<manifestFile>
${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
<manifestEntries>
<Automatic-Module-Name>
com.microsoft.sqlserver.jdbc</Automatic-Module-Name>
<Automatic-Module-Name>com.microsoft.sqlserver.jdbc</Automatic-Module-Name>
</manifestEntries>
</archive>
</configuration>
Expand All @@ -356,17 +332,15 @@
<profile>
<id>jre17</id>
<build>
<finalName>
${project.artifactId}-${project.version}.jre17${releaseExt}</finalName>
<finalName>${project.artifactId}-${project.version}.jre17${releaseExt}</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.0</version>
<configuration>
<excludes>
<exclude>
**/com/microsoft/sqlserver/jdbc/SQLServerJdbc42.java</exclude>
<exclude>**/com/microsoft/sqlserver/jdbc/SQLServerJdbc42.java</exclude>
</excludes>
<source>17</source>
<target>17</target>
Expand All @@ -378,11 +352,9 @@
<version>3.1.1</version>
<configuration>
<archive>
<manifestFile>
${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
<manifestEntries>
<Automatic-Module-Name>
com.microsoft.sqlserver.jdbc</Automatic-Module-Name>
<Automatic-Module-Name>com.microsoft.sqlserver.jdbc</Automatic-Module-Name>
</manifestEntries>
</archive>
</configuration>
Expand All @@ -393,17 +365,15 @@
<profile>
<id>jre21</id>
<build>
<finalName>
${project.artifactId}-${project.version}.jre21${releaseExt}</finalName>
<finalName>${project.artifactId}-${project.version}.jre21${releaseExt}</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.0</version>
<configuration>
<excludes>
<exclude>
**/com/microsoft/sqlserver/jdbc/SQLServerJdbc42.java</exclude>
<exclude>**/com/microsoft/sqlserver/jdbc/SQLServerJdbc42.java</exclude>
</excludes>
<source>21</source>
<target>21</target>
Expand All @@ -415,11 +385,9 @@
<version>3.1.1</version>
<configuration>
<archive>
<manifestFile>
${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
<manifestEntries>
<Automatic-Module-Name>
com.microsoft.sqlserver.jdbc</Automatic-Module-Name>
<Automatic-Module-Name>com.microsoft.sqlserver.jdbc</Automatic-Module-Name>
</manifestEntries>
</archive>
</configuration>
Expand All @@ -433,17 +401,15 @@
<activeByDefault>true</activeByDefault>
</activation>
<build>
<finalName>
${project.artifactId}-${project.version}.jre23${releaseExt}</finalName>
<finalName>${project.artifactId}-${project.version}.jre23${releaseExt}</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.0</version>
<configuration>
<excludes>
<exclude>
**/com/microsoft/sqlserver/jdbc/SQLServerJdbc42.java</exclude>
<exclude>**/com/microsoft/sqlserver/jdbc/SQLServerJdbc42.java</exclude>
</excludes>
<source>23</source>
<target>23</target>
Expand All @@ -455,11 +421,9 @@
<version>3.1.1</version>
<configuration>
<archive>
<manifestFile>
${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
<manifestEntries>
<Automatic-Module-Name>
com.microsoft.sqlserver.jdbc</Automatic-Module-Name>
<Automatic-Module-Name>com.microsoft.sqlserver.jdbc</Automatic-Module-Name>
</manifestEntries>
</archive>
</configuration>
Expand Down Expand Up @@ -506,16 +470,12 @@
<configuration>
<rules>
<bannedPlugins>
<!-- will only display a warning but does
not fail the build. -->
<!-- will only display a warning but does not fail the build. -->
<level>WARN</level>
<excludes>
<exclude>
org.apache.maven.plugins:maven-verifier-plugin</exclude>
<exclude>org.apache.maven.plugins:maven-verifier-plugin</exclude>
</excludes>
<message>
Please consider using the
maven-invoker-plugin
<message>Please consider using the maven-invoker-plugin
(http://maven.apache.org/plugins/maven-invoker-plugin/)!</message>
</bannedPlugins>
<requireMavenVersion>
Expand Down Expand Up @@ -568,13 +528,8 @@
com.microsoft.sqlserver.jdbc.dataclassification,
microsoft.sql
</_exportcontents>
<Import-Package>
!microsoft.sql,
com.ibm.security.auth.module;resolution:=optional,
com.sun.security.auth.module;resolution:=optional,
jdk.net;resolution:=optional,*</Import-Package>
<Bundle-Activator>
com.microsoft.sqlserver.jdbc.osgi.Activator</Bundle-Activator>
<Import-Package>!microsoft.sql,jdk.net;resolution:=optional,*</Import-Package>
<Bundle-Activator>com.microsoft.sqlserver.jdbc.osgi.Activator</Bundle-Activator>
</instructions>
</configuration>
<executions>
Expand Down Expand Up @@ -611,8 +566,7 @@
<inherited>true</inherited>
<configuration>
<outputFile>outdated-dependencies.txt</outputFile>
<rulesUri>
file:///${session.executionRootDirectory}/maven-version-rules.xml</rulesUri>
<rulesUri>file:///${session.executionRootDirectory}/maven-version-rules.xml</rulesUri>
</configuration>
</plugin>
<plugin>
Expand Down
Loading