SONAR-8547 Get MSSQL driver from Maven central

MSSQL driver has been deployed by Microsoft on Maven central.
 This artifact is used now instead of copying it in Git sources.

7 files changed, 28 insertions, 28 deletions

diff --git a/it/it-tests/pom.xml b/it/it-tests/pom.xml
index 48bb8cb4cd4..8b656b5fd13 100644
--- a/it/it-tests/pom.xml
+++ b/it/it-tests/pom.xml
@@ -241,12 +241,8 @@
           <artifactId>ojdbc6</artifactId>
         </dependency>
         <dependency>
-          <groupId>com.microsoft.sqljdbc</groupId>
-          <artifactId>sqljdbc</artifactId>
-          <version>4.2</version>
-          <scope>system</scope>
-          <systemPath>${project.basedir}/../../sonar-application/src/main/assembly/lib/jdbc/mssql/sqljdbc42.jar
-          </systemPath>
+          <groupId>com.microsoft.sqlserver</groupId>
+          <artifactId>mssql-jdbc</artifactId>
         </dependency>
       </dependencies>
     </profile>
diff --git a/pom.xml b/pom.xml
index 8b59ab99dce..2591bb7fe3d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -723,6 +723,11 @@
         <version>1.1.13.2</version>
       </dependency>
       <dependency>
+        <groupId>com.microsoft.sqlserver</groupId>
+        <artifactId>mssql-jdbc</artifactId>
+        <version>6.1.0.jre8</version>
+      </dependency>
+      <dependency>
         <groupId>mysql</groupId>
         <artifactId>mysql-connector-java</artifactId>
         <version>5.1.39</version>
diff --git a/sonar-application/assembly.xml b/sonar-application/assembly.xml
index e4f951c2858..dc2e1dadf0b 100644
--- a/sonar-application/assembly.xml
+++ b/sonar-application/assembly.xml
@@ -109,6 +109,14 @@
     </dependencySet>
     <!-- JDBC drivers -->
     <dependencySet>
+      <outputDirectory>lib/jdbc/mssql/</outputDirectory>
+      <includes>
+        <include>com.microsoft.sqlserver:mssql-jdbc</include>
+      </includes>
+      <unpack>false</unpack>
+      <scope>provided</scope>
+    </dependencySet>
+    <dependencySet>
       <outputDirectory>lib/jdbc/mysql/</outputDirectory>
       <includes>
         <include>mysql:mysql-connector-java</include>
diff --git a/sonar-application/pom.xml b/sonar-application/pom.xml
index d050696f4d7..f808f75cd45 100644
--- a/sonar-application/pom.xml
+++ b/sonar-application/pom.xml
@@ -75,6 +75,11 @@
     </dependency>
 
     <dependency>
+      <groupId>com.microsoft.sqlserver</groupId>
+      <artifactId>mssql-jdbc</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
       <groupId>mysql</groupId>
       <artifactId>mysql-connector-java</artifactId>
       <scope>provided</scope>
diff --git a/sonar-application/src/main/assembly/lib/jdbc/mssql/sqljdbc42.jar b/sonar-application/src/main/assembly/lib/jdbc/mssql/sqljdbc42.jar
deleted file mode 100644
index 2cfdf26d175..00000000000
--- a/sonar-application/src/main/assembly/lib/jdbc/mssql/sqljdbc42.jar
+++ /dev/null
diff --git a/sonar-db/pom.xml b/sonar-db/pom.xml
index 86626942ed5..afdecf49170 100644
--- a/sonar-db/pom.xml
+++ b/sonar-db/pom.xml
@@ -206,6 +206,10 @@
       </activation>
       <dependencies>
         <dependency>
+          <groupId>com.microsoft.sqlserver</groupId>
+          <artifactId>mssql-jdbc</artifactId>
+        </dependency>
+        <dependency>
           <groupId>mysql</groupId>
           <artifactId>mysql-connector-java</artifactId>
         </dependency>
@@ -217,14 +221,6 @@
           <groupId>com.oracle</groupId>
           <artifactId>ojdbc6</artifactId>
         </dependency>
-        <dependency>
-          <groupId>com.microsoft.sqljdbc</groupId>
-          <artifactId>sqljdbc</artifactId>
-          <version>4.2</version>
-          <scope>system</scope>
-          <systemPath>${project.basedir}/../sonar-application/src/main/assembly/lib/jdbc/mssql/sqljdbc42.jar
-          </systemPath>
-        </dependency>
       </dependencies>
     </profile>
   </profiles>
diff --git a/tests/upgrade/pom.xml b/tests/upgrade/pom.xml
index 7c1f0c5ae5e..59086bf5f6d 100644
--- a/tests/upgrade/pom.xml
+++ b/tests/upgrade/pom.xml
@@ -88,6 +88,10 @@
       </activation>
       <dependencies>
         <dependency>
+          <groupId>com.microsoft.sqlserver</groupId>
+          <artifactId>mssql-jdbc</artifactId>
+        </dependency>
+        <dependency>
           <groupId>mysql</groupId>
           <artifactId>mysql-connector-java</artifactId>
         </dependency>
@@ -99,20 +103,6 @@
           <groupId>com.oracle</groupId>
           <artifactId>ojdbc6</artifactId>
         </dependency>
-        <dependency>
-          <!-- used to start previous versions of SQ on MSSQL -->
-          <groupId>net.sourceforge.jtds</groupId>
-          <artifactId>jtds</artifactId>
-          <version>1.3.1</version>
-        </dependency>
-        <dependency>
-          <groupId>com.microsoft.sqljdbc</groupId>
-          <artifactId>sqljdbc</artifactId>
-          <version>4.2</version>
-          <scope>system</scope>
-          <systemPath>${project.basedir}/../../sonar-application/src/main/assembly/lib/jdbc/mssql/sqljdbc42.jar
-          </systemPath>
-        </dependency>
       </dependencies>
     </profile>
   </profiles>