Skip to content

Commit 8a77b15

Browse files
lilgreenbirdlilgreenbird
authored
Update dependency versions (#2614)
1 parent 7e795d4 commit 8a77b15

File tree

2 files changed

+68
-114
lines changed

2 files changed

+68
-114
lines changed

‎build.gradle‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -143,29 +143,29 @@ repositories {
143143
dependencies {
144144
implementation 'org.osgi:org.osgi.core:6.0.0',
145145
'org.osgi:org.osgi.service.jdbc:1.1.0'
146-
compileOnly 'com.azure:azure-security-keyvault-keys:4.7.3',
147-
'com.azure:azure-identity:1.12.2',
148-
'org.antlr:antlr4-runtime:4.9.3',
149-
'com.google.code.gson:gson:2.10.1',
150-
'org.bouncycastle:bcprov-jdk18on:1.78',
151-
'org.bouncycastle:bcpkix-jdk18on:1.78'
152-
testImplementation 'org.junit.platform:junit-platform-console:1.5.2',
153-
'org.junit.platform:junit-platform-commons:1.5.2',
154-
'org.junit.platform:junit-platform-engine:1.5.2',
155-
'org.junit.platform:junit-platform-launcher:1.5.2',
156-
'org.junit.platform:junit-platform-runner:1.5.2',
146+
compileOnly 'com.azure:azure-security-keyvault-keys:4.9.2',
147+
'com.azure:azure-identity:1.15.3',
148+
'org.antlr:antlr4-runtime:4.9.1',
149+
'com.google.code.gson:gson:2.11.0',
150+
'org.bouncycastle:bcprov-jdk18on:1.79',
151+
'org.bouncycastle:bcpkix-jdk18on:1.79'
152+
testImplementation 'org.junit.platform:junit-platform-console:1.11.4',
153+
'org.junit.platform:junit-platform-commons:1.11.4',
154+
'org.junit.platform:junit-platform-engine:1.11.4',
155+
'org.junit.platform:junit-platform-launcher:1.11.4',
156+
'org.junit.platform:junit-platform-runner:1.11.4',
157157
'org.junit.platform:junit-platform-surefire-provider:1.3.2',
158-
'org.junit.jupiter:junit-jupiter-api:5.8.2',
159-
'org.junit.jupiter:junit-jupiter-engine:5.8.2',
160-
'org.junit.jupiter:junit-jupiter-params:5.8.2',
158+
'org.junit.jupiter:junit-jupiter-api:5.11.4',
159+
'org.junit.jupiter:junit-jupiter-engine:5.11.4',
160+
'org.junit.jupiter:junit-jupiter-params:5.11.4',
161161
'com.zaxxer:HikariCP:3.4.2',
162-
'org.apache.commons:commons-dbcp2:2.7.0',
163-
'org.slf4j:slf4j-nop:1.7.30',
162+
'org.apache.commons:commons-dbcp2:2.13.0',
163+
'org.slf4j:slf4j-nop:1.7.36',
164164
'org.antlr:antlr4-runtime:4.9.3',
165-
'org.eclipse.gemini.blueprint:gemini-blueprint-mock:2.1.0.RELEASE',
166-
'com.google.code.gson:gson:2.10.1',
167-
'org.bouncycastle:bcprov-jdk18on:1.78',
168-
'com.azure:azure-security-keyvault-keys:4.7.3',
169-
'com.azure:azure-identity:1.12.2',
165+
'org.eclipse.gemini.blueprint:gemini-blueprint-mock:3.0.0.M01',
166+
'com.google.code.gson:gson:2.11.0',
167+
'org.bouncycastle:bcprov-jdk18on:1.79',
168+
'com.azure:azure-security-keyvault-keys:4.9.2',
169+
'com.azure:azure-identity:1.15.3',
170170
'com.h2database:h2:2.2.220'
171171
}

‎pom.xml‎

Lines changed: 47 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -42,35 +42,32 @@
4242
xAzureSQLDB - - - - For tests not compatible with Azure SQL Database - -
4343
xAzureSQLDW - - - - For tests not compatible with Azure Data Warehouse -
4444
xAzureSQLMI - - - - For tests not compatible with Azure SQL Managed Instance
45-
NTLM - - - For tests using NTLM Authentication mode (excluded by default)
46-
kerberos - - - - For tests using Kerberos authentication (excluded by default)
45+
NTLM - - - - - - - For tests using NTLM Authentication mode (excluded by default)
46+
kerberos - - - - - For tests using Kerberos authentication (excluded by default)
4747
reqExternalSetup - For tests requiring external setup (excluded by default)
4848
clientCertAuth - - For tests requiring client certificate authentication
49-
setup (excluded by default) - - - - - - - - - - - - - - - - - - - - - - -
50-
requireSecret - For tests requiring setting up secrets manually
49+
setup (excluded by default) - - - - - - - - - - - - - - - - - - - - - - -
5150
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
5251
Default testing enabled with SQL Server 2019 (SQLv15) -->
53-
<excludedGroups>
54-
xSQLv12,xSQLv15,NTLM,MSI,reqExternalSetup,clientCertAuth,fedAuth,kerberos,requireSecret</excludedGroups>
52+
<excludedGroups>xSQLv12,xSQLv15,NTLM,MSI,reqExternalSetup,clientCertAuth,fedAuth,kerberos</excludedGroups>
5553
<!-- Use -preview for preview release, leave empty for official release. -->
5654
<releaseExt>-preview</releaseExt>
5755
<!-- Driver Dependencies -->
5856
<org.osgi.core.version>6.0.0</org.osgi.core.version>
59-
<azure-security-keyvault-keys.version>4.7.3</azure-security-keyvault-keys.version>
60-
<azure-identity.version>1.12.2</azure-identity.version>
61-
<msal.version>1.15.1</msal.version>
57+
<azure-security-keyvault-keys.version>4.9.2</azure-security-keyvault-keys.version>
58+
<azure-identity.version>1.15.3</azure-identity.version>
6259
<osgi.jdbc.version>1.1.0</osgi.jdbc.version>
6360
<antlr-runtime.version>4.9.3</antlr-runtime.version>
64-
<com.google.code.gson.version>2.10.1</com.google.code.gson.version>
65-
<bcprov-jdk18on.version>1.78</bcprov-jdk18on.version>
66-
<bcpkix-jdk18on.version>1.78</bcpkix-jdk18on.version>
61+
<com.google.code.gson.version>2.11.0</com.google.code.gson.version>
62+
<bcprov-jdk18on.version>1.79</bcprov-jdk18on.version>
63+
<bcpkix-jdk18on.version>1.79</bcpkix-jdk18on.version>
6764
<!-- JUnit Test Dependencies -->
68-
<junit.platform.version>[1.3.2, 1.9.0]</junit.platform.version>
69-
<junit.jupiter.version>5.8.2</junit.jupiter.version>
65+
<junit.platform.version>[1.3.2, 1.11.4]</junit.platform.version>
66+
<junit.jupiter.version>5.11.4</junit.jupiter.version>
7067
<hikaricp.version>3.4.2</hikaricp.version>
71-
<dbcp2.version>2.7.0</dbcp2.version>
72-
<slf4j.nop.version>1.7.30</slf4j.nop.version>
73-
<gemini.mock.version>2.1.0.RELEASE</gemini.mock.version>
68+
<dbcp2.version>2.13.0</dbcp2.version>
69+
<slf4j.nop.version>1.7.36</slf4j.nop.version>
70+
<gemini.mock.version>3.0.0.M01</gemini.mock.version>
7471
<h2.version>2.2.220</h2.version>
7572
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
7673
<project.reporting.outputEncoding>${project.build.sourceEncoding}</project.reporting.outputEncoding>
@@ -95,12 +92,6 @@
9592
</exclusion>
9693
</exclusions>
9794
</dependency>
98-
<dependency>
99-
<groupId>com.microsoft.azure</groupId>
100-
<artifactId>msal4j</artifactId>
101-
<version>${msal.version}</version>
102-
<optional>true</optional>
103-
</dependency>
10495
<!-- dependencies for ANTLR -->
10596
<dependency>
10697
<groupId>org.antlr</groupId>
@@ -230,8 +221,7 @@
230221
<repositories>
231222
<repository>
232223
<id>central</id>
233-
<url>
234-
https://sqlclientdrivers.pkgs.visualstudio.com/public/_packaging/mssql-jdbc/maven/v1</url>
224+
<url>https://sqlclientdrivers.pkgs.visualstudio.com/public/_packaging/mssql-jdbc/maven/v1</url>
235225
<releases>
236226
<enabled>true</enabled>
237227
</releases>
@@ -243,8 +233,7 @@
243233
<pluginRepositories>
244234
<pluginRepository>
245235
<id>central</id>
246-
<url>
247-
https://sqlclientdrivers.pkgs.visualstudio.com/public/_packaging/mssql-jdbc/maven/v1</url>
236+
<url>https://sqlclientdrivers.pkgs.visualstudio.com/public/_packaging/mssql-jdbc/maven/v1</url>
248237
<releases>
249238
<enabled>true</enabled>
250239
</releases>
@@ -257,29 +246,22 @@
257246
<profile>
258247
<id>jre8</id>
259248
<build>
260-
<finalName>
261-
${project.artifactId}-${project.version}.jre8${releaseExt}</finalName>
249+
<finalName>${project.artifactId}-${project.version}.jre8${releaseExt}</finalName>
262250
<plugins>
263251
<plugin>
264252
<groupId>org.apache.maven.plugins</groupId>
265253
<artifactId>maven-compiler-plugin</artifactId>
266254
<version>3.8.0</version>
267255
<configuration>
268256
<excludes>
269-
<exclude>
270-
**/com/microsoft/sqlserver/jdbc/ISQLServerConnection43.java</exclude>
271-
<exclude>
272-
**/com/microsoft/sqlserver/jdbc/SQLServerConnection43.java</exclude>
273-
<exclude>
274-
**/com/microsoft/sqlserver/jdbc/SQLServerJdbc43.java</exclude>
257+
<exclude>**/com/microsoft/sqlserver/jdbc/ISQLServerConnection43.java</exclude>
258+
<exclude>**/com/microsoft/sqlserver/jdbc/SQLServerConnection43.java</exclude>
259+
<exclude>**/com/microsoft/sqlserver/jdbc/SQLServerJdbc43.java</exclude>
275260
</excludes>
276261
<testExcludes>
277-
<exclude>
278-
**/com/microsoft/sqlserver/jdbc/connection/ConnectionWrapper43Test.java</exclude>
279-
<exclude>
280-
**/com/microsoft/sqlserver/jdbc/connection/RequestBoundaryMethodsTest.java</exclude>
281-
<exclude>
282-
**/com/microsoft/sqlserver/jdbc/JDBC43Test.java</exclude>
262+
<exclude>**/com/microsoft/sqlserver/jdbc/connection/ConnectionWrapper43Test.java</exclude>
263+
<exclude>**/com/microsoft/sqlserver/jdbc/connection/RequestBoundaryMethodsTest.java</exclude>
264+
<exclude>**/com/microsoft/sqlserver/jdbc/JDBC43Test.java</exclude>
283265
</testExcludes>
284266
<source>1.8</source>
285267
<target>1.8</target>
@@ -298,8 +280,7 @@
298280
<version>3.1.1</version>
299281
<configuration>
300282
<archive>
301-
<manifestFile>
302-
${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
283+
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
303284
</archive>
304285
</configuration>
305286
</plugin>
@@ -308,8 +289,7 @@
308289
<artifactId>maven-surefire-plugin</artifactId>
309290
<version>3.0.0-M1</version>
310291
<configuration>
311-
<!-- Exclude [xJDBC42] For tests not compatible with
312-
JDBC 4.2 Specifications -->
292+
<!-- Exclude [xJDBC42] For tests not compatible with JDBC 4.2 Specifications -->
313293
<excludedGroups>${excludedGroups}, xJDBC42</excludedGroups>
314294
</configuration>
315295
</plugin>
@@ -319,17 +299,15 @@
319299
<profile>
320300
<id>jre11</id>
321301
<build>
322-
<finalName>
323-
${project.artifactId}-${project.version}.jre11${releaseExt}</finalName>
302+
<finalName>${project.artifactId}-${project.version}.jre11${releaseExt}</finalName>
324303
<plugins>
325304
<plugin>
326305
<groupId>org.apache.maven.plugins</groupId>
327306
<artifactId>maven-compiler-plugin</artifactId>
328307
<version>3.8.0</version>
329308
<configuration>
330309
<excludes>
331-
<exclude>
332-
**/com/microsoft/sqlserver/jdbc/SQLServerJdbc42.java</exclude>
310+
<exclude>**/com/microsoft/sqlserver/jdbc/SQLServerJdbc42.java</exclude>
333311
</excludes>
334312
<source>11</source>
335313
<target>11</target>
@@ -341,11 +319,9 @@
341319
<version>3.1.1</version>
342320
<configuration>
343321
<archive>
344-
<manifestFile>
345-
${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
322+
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
346323
<manifestEntries>
347-
<Automatic-Module-Name>
348-
com.microsoft.sqlserver.jdbc</Automatic-Module-Name>
324+
<Automatic-Module-Name>com.microsoft.sqlserver.jdbc</Automatic-Module-Name>
349325
</manifestEntries>
350326
</archive>
351327
</configuration>
@@ -356,17 +332,15 @@
356332
<profile>
357333
<id>jre17</id>
358334
<build>
359-
<finalName>
360-
${project.artifactId}-${project.version}.jre17${releaseExt}</finalName>
335+
<finalName>${project.artifactId}-${project.version}.jre17${releaseExt}</finalName>
361336
<plugins>
362337
<plugin>
363338
<groupId>org.apache.maven.plugins</groupId>
364339
<artifactId>maven-compiler-plugin</artifactId>
365340
<version>3.8.0</version>
366341
<configuration>
367342
<excludes>
368-
<exclude>
369-
**/com/microsoft/sqlserver/jdbc/SQLServerJdbc42.java</exclude>
343+
<exclude>**/com/microsoft/sqlserver/jdbc/SQLServerJdbc42.java</exclude>
370344
</excludes>
371345
<source>17</source>
372346
<target>17</target>
@@ -378,11 +352,9 @@
378352
<version>3.1.1</version>
379353
<configuration>
380354
<archive>
381-
<manifestFile>
382-
${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
355+
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
383356
<manifestEntries>
384-
<Automatic-Module-Name>
385-
com.microsoft.sqlserver.jdbc</Automatic-Module-Name>
357+
<Automatic-Module-Name>com.microsoft.sqlserver.jdbc</Automatic-Module-Name>
386358
</manifestEntries>
387359
</archive>
388360
</configuration>
@@ -393,17 +365,15 @@
393365
<profile>
394366
<id>jre21</id>
395367
<build>
396-
<finalName>
397-
${project.artifactId}-${project.version}.jre21${releaseExt}</finalName>
368+
<finalName>${project.artifactId}-${project.version}.jre21${releaseExt}</finalName>
398369
<plugins>
399370
<plugin>
400371
<groupId>org.apache.maven.plugins</groupId>
401372
<artifactId>maven-compiler-plugin</artifactId>
402373
<version>3.8.0</version>
403374
<configuration>
404375
<excludes>
405-
<exclude>
406-
**/com/microsoft/sqlserver/jdbc/SQLServerJdbc42.java</exclude>
376+
<exclude>**/com/microsoft/sqlserver/jdbc/SQLServerJdbc42.java</exclude>
407377
</excludes>
408378
<source>21</source>
409379
<target>21</target>
@@ -415,11 +385,9 @@
415385
<version>3.1.1</version>
416386
<configuration>
417387
<archive>
418-
<manifestFile>
419-
${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
388+
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
420389
<manifestEntries>
421-
<Automatic-Module-Name>
422-
com.microsoft.sqlserver.jdbc</Automatic-Module-Name>
390+
<Automatic-Module-Name>com.microsoft.sqlserver.jdbc</Automatic-Module-Name>
423391
</manifestEntries>
424392
</archive>
425393
</configuration>
@@ -433,17 +401,15 @@
433401
<activeByDefault>true</activeByDefault>
434402
</activation>
435403
<build>
436-
<finalName>
437-
${project.artifactId}-${project.version}.jre23${releaseExt}</finalName>
404+
<finalName>${project.artifactId}-${project.version}.jre23${releaseExt}</finalName>
438405
<plugins>
439406
<plugin>
440407
<groupId>org.apache.maven.plugins</groupId>
441408
<artifactId>maven-compiler-plugin</artifactId>
442409
<version>3.8.0</version>
443410
<configuration>
444411
<excludes>
445-
<exclude>
446-
**/com/microsoft/sqlserver/jdbc/SQLServerJdbc42.java</exclude>
412+
<exclude>**/com/microsoft/sqlserver/jdbc/SQLServerJdbc42.java</exclude>
447413
</excludes>
448414
<source>23</source>
449415
<target>23</target>
@@ -455,11 +421,9 @@
455421
<version>3.1.1</version>
456422
<configuration>
457423
<archive>
458-
<manifestFile>
459-
${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
424+
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
460425
<manifestEntries>
461-
<Automatic-Module-Name>
462-
com.microsoft.sqlserver.jdbc</Automatic-Module-Name>
426+
<Automatic-Module-Name>com.microsoft.sqlserver.jdbc</Automatic-Module-Name>
463427
</manifestEntries>
464428
</archive>
465429
</configuration>
@@ -506,16 +470,12 @@
506470
<configuration>
507471
<rules>
508472
<bannedPlugins>
509-
<!-- will only display a warning but does
510-
not fail the build. -->
473+
<!-- will only display a warning but does not fail the build. -->
511474
<level>WARN</level>
512475
<excludes>
513-
<exclude>
514-
org.apache.maven.plugins:maven-verifier-plugin</exclude>
476+
<exclude>org.apache.maven.plugins:maven-verifier-plugin</exclude>
515477
</excludes>
516-
<message>
517-
Please consider using the
518-
maven-invoker-plugin
478+
<message>Please consider using the maven-invoker-plugin
519479
(http://maven.apache.org/plugins/maven-invoker-plugin/)!</message>
520480
</bannedPlugins>
521481
<requireMavenVersion>
@@ -568,13 +528,8 @@
568528
com.microsoft.sqlserver.jdbc.dataclassification,
569529
microsoft.sql
570530
</_exportcontents>
571-
<Import-Package>
572-
!microsoft.sql,
573-
com.ibm.security.auth.module;resolution:=optional,
574-
com.sun.security.auth.module;resolution:=optional,
575-
jdk.net;resolution:=optional,*</Import-Package>
576-
<Bundle-Activator>
577-
com.microsoft.sqlserver.jdbc.osgi.Activator</Bundle-Activator>
531+
<Import-Package>!microsoft.sql,jdk.net;resolution:=optional,*</Import-Package>
532+
<Bundle-Activator>com.microsoft.sqlserver.jdbc.osgi.Activator</Bundle-Activator>
578533
</instructions>
579534
</configuration>
580535
<executions>
@@ -611,8 +566,7 @@
611566
<inherited>true</inherited>
612567
<configuration>
613568
<outputFile>outdated-dependencies.txt</outputFile>
614-
<rulesUri>
615-
file:///${session.executionRootDirectory}/maven-version-rules.xml</rulesUri>
569+
<rulesUri>file:///${session.executionRootDirectory}/maven-version-rules.xml</rulesUri>
616570
</configuration>
617571
</plugin>
618572
<plugin>

0 commit comments

Comments
 (0)