aboutsummaryrefslogtreecommitdiffstats
path: root/tests/upgrade
diff options
context:
space:
mode:
authorJenkins CI <ci@sonarsource.com>2016-05-27 10:10:42 +0200
committerJenkins CI <ci@sonarsource.com>2016-05-27 10:10:42 +0200
commitb1d1599fdce122e247d8bb85ee0daa672616b4db (patch)
tree13a20f183721d95cd1d8ac51a11f4ed19fe3abda /tests/upgrade
parent396b9c34fc0a5e6110782d2355d169c7f40528a7 (diff)
parent7a4e71586a11644181f593aed3b23692ba887cdc (diff)
downloadsonarqube-b1d1599fdce122e247d8bb85ee0daa672616b4db.tar.gz
sonarqube-b1d1599fdce122e247d8bb85ee0daa672616b4db.zip
Automatic merge from branch-5.6
* origin/branch-5.6: SONAR-7652 fix connection to SQL Azure Upgrade version of java 8 on Travis SONAR-7653 remove useless code SONAR-7653 remove Java option XX:MaxPermSize SONAR-7587 end of support of Java 7
Diffstat (limited to 'tests/upgrade')
-rw-r--r--tests/upgrade/pom.xml6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/upgrade/pom.xml b/tests/upgrade/pom.xml
index 336fb983e27..b9746c94fd1 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>