Skip to content

Commit

Permalink
Maven | Update all Maven plugins and dependencies to latest versions (…
Browse files Browse the repository at this point in the history 
…microsoft#1037)
  • Loading branch information
@cheenamalhotra
cheenamalhotra authored Apr 19, 2019
1 parent 9f78a13 commit 3242324
Show file tree
Hide file tree
Showing 2 changed files with 54 additions and 68 deletions.
45 changes: 0 additions & 45 deletions .travis.yml
View file

This file was deleted.

77 changes: 54 additions & 23 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,11 @@
<packaging>jar</packaging>

<name>Microsoft JDBC Driver for SQL Server</name>

<description>
Microsoft JDBC Driver for SQL Server.
</description>

<url>https://github.com/Microsoft/mssql-jdbc</url>

<licenses>
Expand Down Expand Up @@ -48,19 +50,24 @@
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Default testing enabled with SQL Server 2019 (SQLv14) -->
<excludeGroups>xSQLv15</excludeGroups>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

<!-- Driver Dependencies -->
<azure.keyvault.version>1.2.0</azure.keyvault.version>
<azure.adal4j.version>1.6.3</azure.adal4j.version>
<azure.keyvault.version>1.2.1</azure.keyvault.version>
<azure.adal4j.version>1.6.4</azure.adal4j.version>
<rest.client.version>1.6.5</rest.client.version>
<osgi.version>4.3.1</osgi.version>
<osgi.core.version>6.0.0</osgi.core.version>
<osgi.comp.version>5.0.0</osgi.comp.version>
<!-- JUnit Test Dependencies -->
<junit.platform.version>[1.3.2,1.4.0]</junit.platform.version>
<junit.jupiter.version>5.4.0</junit.jupiter.version>
<junit.platform.version>[1.3.2, 1.4.2]</junit.platform.version>
<junit.jupiter.version>5.4.2</junit.jupiter.version>
<hikaricp.version>3.3.1</hikaricp.version>
<dbcp2.version>2.6.0</dbcp2.version>
<slf4j.nop.version>1.7.26</slf4j.nop.version>
<gemini.mock.version>2.1.0.RELEASE</gemini.mock.version>

<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>${project.build.sourceEncoding}</project.reporting.outputEncoding>
<enforcer.skip>false</enforcer.skip>
</properties>

<dependencies>
Expand All @@ -70,12 +77,6 @@
<version>${azure.keyvault.version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-keyvault-webkey</artifactId>
<version>${azure.keyvault.version}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.microsoft.azure</groupId>
<artifactId>adal4j</artifactId>
Expand All @@ -93,13 +94,13 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
<version>${osgi.version}</version>
<version>${osgi.core.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
<version>${osgi.version}</version>
<version>${osgi.comp.version}</version>
<scope>provided</scope>
</dependency>

Expand Down Expand Up @@ -206,7 +207,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.0.2</version>
<version>3.1.1</version>
<configuration>
<archive>
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
Expand All @@ -216,7 +217,7 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.2</version>
<version>0.8.3</version>
<executions>
<execution>
<id>pre-test</id>
Expand All @@ -236,7 +237,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.22.0</version>
<version>3.0.0-M1</version>
<configuration>
<argLine>
${argLine} --illegal-access=permit
Expand Down Expand Up @@ -274,7 +275,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.0.2</version>
<version>3.1.1</version>
<configuration>
<archive>
<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
Expand All @@ -287,7 +288,7 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.2</version>
<version>0.8.3</version>
<executions>
<execution>
<id>pre-test</id>
Expand All @@ -307,7 +308,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.22.0</version>
<version>3.0.0-M1</version>
<configuration>
<argLine>
${argLine} --illegal-access=permit
Expand Down Expand Up @@ -370,7 +371,7 @@
(http://maven.apache.org/plugins/maven-invoker-plugin/)!</message>
</bannedPlugins>
<requireMavenVersion>
<version>3.0.5</version>
<version>3.5.0</version>
</requireMavenVersion>
<requireJavaVersion>
<version>11</version>
Expand All @@ -397,7 +398,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>3.5.0</version>
<version>4.2.0</version>
<extensions>true</extensions>
<configuration>
<instructions>
Expand Down Expand Up @@ -451,7 +452,7 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.2</version>
<version>0.8.3</version>
<configuration>
<fileSets>
<fileSet>
Expand All @@ -465,6 +466,36 @@
<destFile>${project.build.directory}/jacoco.exec</destFile>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<version>3.1.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>2.8.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
<version>2.5.2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>3.1.0</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>3.7.1</version>
</plugin>
<plugin>
<groupId>org.apache.maven</groupId>
<artifactId>maven-archiver</artifactId>
<version>3.4.0</version>
</plugin>
</plugins>
</build>
</project>

0 comments on commit 3242324

Please sign in to comment.