SONAR-6552 Replace jTDS by Microsoft JDBC driver 4.1

2 files changed, 10 insertions, 6 deletions

diff --git a/sonar-db/src/main/java/org/sonar/db/dialect/MsSql.java b/sonar-db/src/main/java/org/sonar/db/dialect/MsSql.java
index d55139113c2..27443bf49a1 100644
--- a/sonar-db/src/main/java/org/sonar/db/dialect/MsSql.java
+++ b/sonar-db/src/main/java/org/sonar/db/dialect/MsSql.java
@@ -26,13 +26,12 @@ public class MsSql extends AbstractDialect {
   public static final String ID = "mssql";
 
   public MsSql() {
-    super(ID, "sqlserver", "net.sourceforge.jtds.jdbc.Driver", "1", "0", "SELECT 1");
+    super(ID, "sqlserver", "com.microsoft.sqlserver.jdbc.SQLServerDriver", "1", "0", "SELECT 1");
   }
 
   @Override
   public boolean matchesJdbcURL(String jdbcConnectionURL) {
-    return StringUtils.startsWithIgnoreCase(jdbcConnectionURL, "jdbc:microsoft:sqlserver:")
-      || StringUtils.startsWithIgnoreCase(jdbcConnectionURL, "jdbc:jtds:sqlserver:");
+    return StringUtils.startsWithIgnoreCase(jdbcConnectionURL, "jdbc:sqlserver:");
   }
 
   @Override
diff --git a/sonar-db/src/test/java/org/sonar/db/dialect/MsSqlTest.java b/sonar-db/src/test/java/org/sonar/db/dialect/MsSqlTest.java
index 3b1ebb14989..f1159fc153c 100644
--- a/sonar-db/src/test/java/org/sonar/db/dialect/MsSqlTest.java
+++ b/sonar-db/src/test/java/org/sonar/db/dialect/MsSqlTest.java
@@ -29,8 +29,7 @@ public class MsSqlTest {
 
   @Test
   public void matchesJdbcURL() {
-    assertThat(msSql.matchesJdbcURL("jdbc:jtds:sqlserver://localhost;databaseName=SONAR;SelectMethod=Cursor")).isTrue();
-    assertThat(msSql.matchesJdbcURL("jdbc:microsoft:sqlserver://localhost:1433;databasename=sonar")).isTrue();
+    assertThat(msSql.matchesJdbcURL("jdbc:sqlserver://localhost:1433;databasename=sonar")).isTrue();
 
     assertThat(msSql.matchesJdbcURL("jdbc:hsql:foo")).isFalse();
     assertThat(msSql.matchesJdbcURL("jdbc:mysql:foo")).isFalse();
@@ -46,11 +45,17 @@ public class MsSqlTest {
   public void should_configure() {
     assertThat(msSql.getId()).isEqualTo("mssql");
     assertThat(msSql.getActiveRecordDialectCode()).isEqualTo("sqlserver");
-    assertThat(msSql.getDefaultDriverClassName()).isEqualTo("net.sourceforge.jtds.jdbc.Driver");
+    assertThat(msSql.getDefaultDriverClassName()).isEqualTo("com.microsoft.sqlserver.jdbc.SQLServerDriver");
     assertThat(msSql.getValidationQuery()).isEqualTo("SELECT 1");
   }
 
   @Test
+  public void do_not_support_jtds_since_5_2() throws Exception {
+    assertThat(msSql.matchesJdbcURL("jdbc:jtds:sqlserver://localhost;databaseName=SONAR;SelectMethod=Cursor")).isFalse();
+
+  }
+
+  @Test
   public void msSql_does_supportMigration() {
     assertThat(msSql.supportsMigration()).isTrue();
   }