From: Simon Brandhof <simon.brandhof@sonarsource.com>
Date: Thu, 26 May 2016 14:19:42 +0000 (+0200)
Subject: SONAR-7652 fix connection to SQL Azure
X-Git-Tag: 5.6-RC2~6
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=7a4e71586a11644181f593aed3b23692ba887cdc;p=sonarqube.git

SONAR-7652 fix connection to SQL Azure

Support of SSL connection is fixed by upgrading
to Microsoft driver 4.2.
---

diff --git a/it/it-tests/pom.xml b/it/it-tests/pom.xml
index 7cbe88e4539..8ff922a7902 100644
--- a/it/it-tests/pom.xml
+++ b/it/it-tests/pom.xml
@@ -191,10 +191,10 @@
         </dependency>
         <dependency>
           <groupId>com.microsoft.sqljdbc</groupId>
-          <artifactId>sqljdbc41</artifactId>
-          <version>4.1</version>
+          <artifactId>sqljdbc</artifactId>
+          <version>4.2</version>
           <scope>system</scope>
-          <systemPath>${project.basedir}/../../sonar-application/src/main/assembly/lib/jdbc/mssql/sqljdbc41.jar
+          <systemPath>${project.basedir}/../../sonar-application/src/main/assembly/lib/jdbc/mssql/sqljdbc42.jar
           </systemPath>
         </dependency>
       </dependencies>
diff --git a/sonar-application/src/main/assembly/lib/jdbc/mssql/sqljdbc41.jar b/sonar-application/src/main/assembly/lib/jdbc/mssql/sqljdbc41.jar
deleted file mode 100644
index 5cb586c83cd..00000000000
Binary files a/sonar-application/src/main/assembly/lib/jdbc/mssql/sqljdbc41.jar and /dev/null differ
diff --git a/sonar-application/src/main/assembly/lib/jdbc/mssql/sqljdbc42.jar b/sonar-application/src/main/assembly/lib/jdbc/mssql/sqljdbc42.jar
new file mode 100644
index 00000000000..2cfdf26d175
Binary files /dev/null and b/sonar-application/src/main/assembly/lib/jdbc/mssql/sqljdbc42.jar differ
diff --git a/sonar-db/pom.xml b/sonar-db/pom.xml
index 8f689b02cd7..096d13a9d44 100644
--- a/sonar-db/pom.xml
+++ b/sonar-db/pom.xml
@@ -215,10 +215,10 @@
         </dependency>
         <dependency>
           <groupId>com.microsoft.sqljdbc</groupId>
-          <artifactId>sqljdbc41</artifactId>
-          <version>4.1</version>
+          <artifactId>sqljdbc</artifactId>
+          <version>4.2</version>
           <scope>system</scope>
-          <systemPath>${project.basedir}/../sonar-application/src/main/assembly/lib/jdbc/mssql/sqljdbc41.jar
+          <systemPath>${project.basedir}/../sonar-application/src/main/assembly/lib/jdbc/mssql/sqljdbc42.jar
           </systemPath>
         </dependency>
       </dependencies>
diff --git a/tests/upgrade/pom.xml b/tests/upgrade/pom.xml
index 847ca805db7..142a01662b8 100644
--- a/tests/upgrade/pom.xml
+++ b/tests/upgrade/pom.xml
@@ -91,10 +91,10 @@
         </dependency>
         <dependency>
           <groupId>com.microsoft.sqljdbc</groupId>
-          <artifactId>sqljdbc41</artifactId>
-          <version>4.1</version>
+          <artifactId>sqljdbc</artifactId>
+          <version>4.2</version>
           <scope>system</scope>
-          <systemPath>${project.basedir}/../../sonar-application/src/main/assembly/lib/jdbc/mssql/sqljdbc41.jar
+          <systemPath>${project.basedir}/../../sonar-application/src/main/assembly/lib/jdbc/mssql/sqljdbc42.jar
           </systemPath>
         </dependency>
       </dependencies>