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

9 files changed, 12 insertions, 12 deletions

diff --git a/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/computation/ComputationTest.java b/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/computation/ComputationTest.java
index 86d305c6ab5..b720db5564c 100644
--- a/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/computation/ComputationTest.java
+++ b/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/computation/ComputationTest.java
@@ -48,7 +48,7 @@ public class ComputationTest extends PerfTestCase {
     .addPlugin(FileLocation.byWildcardMavenFilename(new File("../../plugins/sonar-xoo-plugin/target"), "sonar-xoo-plugin-*.jar"))
     .setServerProperty(
       "sonar.web.javaOpts",
-      String.format("-Xms%dm -Xmx%dm -XX:+HeapDumpOnOutOfMemoryError -XX:MaxPermSize=160m -Djava.awt.headless=true", MAX_HEAP_SIZE_IN_MEGA, MAX_HEAP_SIZE_IN_MEGA))
+      String.format("-Xms%dm -Xmx%dm -XX:+HeapDumpOnOutOfMemoryError -Djava.awt.headless=true", MAX_HEAP_SIZE_IN_MEGA, MAX_HEAP_SIZE_IN_MEGA))
     .setServerProperty("sonar.log.level", "DEBUG")
     .restoreProfileAtStartup(FileLocation.ofClasspath("/one-xoo-issue-per-line.xml"))
     .build();
diff --git a/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/scanner/suite/BootstrappingTest.java b/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/scanner/suite/BootstrappingTest.java
index c14bf582c33..14d260f1639 100644
--- a/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/scanner/suite/BootstrappingTest.java
+++ b/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/scanner/suite/BootstrappingTest.java
@@ -75,7 +75,7 @@ public class BootstrappingTest extends PerfTestCase {
         "sonar.sources", "",
         "sonar.showProfiling", "true");
     scanner
-      .setEnvironmentVariable("SONAR_RUNNER_OPTS", "-Xmx512m -server -XX:MaxPermSize=64m")
+      .setEnvironmentVariable("SONAR_RUNNER_OPTS", "-Xmx512m -server")
       .setProjectDir(manyFlatModulesBaseDir);
 
     BuildResult result = orchestrator.executeBuild(scanner);
@@ -117,7 +117,7 @@ public class BootstrappingTest extends PerfTestCase {
         "sonar.projectVersion", "1.0",
         "sonar.sources", "",
         "sonar.showProfiling", "true");
-    scanner.setEnvironmentVariable("SONAR_RUNNER_OPTS", "-Xmx512m -server -XX:MaxPermSize=64m");
+    scanner.setEnvironmentVariable("SONAR_RUNNER_OPTS", "-Xmx512m -server");
     scanner.setProjectDir(manyNestedModulesBaseDir);
 
     BuildResult result = orchestrator.executeBuild(scanner);
diff --git a/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/scanner/suite/FileSystemTest.java b/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/scanner/suite/FileSystemTest.java
index e1ba5264111..d9987051f3d 100644
--- a/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/scanner/suite/FileSystemTest.java
+++ b/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/scanner/suite/FileSystemTest.java
@@ -79,7 +79,7 @@ public class FileSystemTest extends PerfTestCase {
         "sonar.sources", "src",
         "sonar.analysis.mode", "issues",
         "sonar.showProfiling", "true")
-      .setEnvironmentVariable("SONAR_RUNNER_OPTS", "-Xmx" + xmx + "m -server -XX:MaxPermSize=64m")
+      .setEnvironmentVariable("SONAR_RUNNER_OPTS", "-Xmx" + xmx + "m -server")
       .setProjectDir(baseDir);
 
     orchestrator.executeBuild(runner);
diff --git a/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/scanner/suite/HighlightingTest.java b/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/scanner/suite/HighlightingTest.java
index 615cf6a976f..4cac738fdfe 100644
--- a/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/scanner/suite/HighlightingTest.java
+++ b/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/scanner/suite/HighlightingTest.java
@@ -92,7 +92,7 @@ public class HighlightingTest extends PerfTestCase {
         "sonar.projectVersion", "1.0",
         "sonar.sources", "src",
         "sonar.showProfiling", "true");
-    scanner.setEnvironmentVariable("SONAR_RUNNER_OPTS", "-Xmx512m -server -XX:MaxPermSize=64m")
+    scanner.setEnvironmentVariable("SONAR_RUNNER_OPTS", "-Xmx512m -server")
       .setProjectDir(baseDir);
 
     BuildResult result = orchestrator.executeBuild(scanner);
diff --git a/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/scanner/suite/IssuesModeTest.java b/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/scanner/suite/IssuesModeTest.java
index fd930cd5ee2..046e1309f51 100644
--- a/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/scanner/suite/IssuesModeTest.java
+++ b/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/scanner/suite/IssuesModeTest.java
@@ -59,7 +59,7 @@ public class IssuesModeTest extends PerfTestCase {
     orchestrator.getServer().provisionProject("sample", "xoo-sample");
     orchestrator.getServer().associateProjectToQualityProfile("sample", "xoo", "one-xoo-issue-per-line");
     SonarScanner runner = newScanner(
-      "-Xmx512m -server -XX:MaxPermSize=64m",
+      "-Xmx512m -server",
       "sonar.analysis.mode", "issues",
       "sonar.userHome", userHome.getAbsolutePath(),
       "sonar.showProfiling", "true");
diff --git a/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/scanner/suite/MemoryTest.java b/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/scanner/suite/MemoryTest.java
index ce903b56590..c6d6412e18d 100644
--- a/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/scanner/suite/MemoryTest.java
+++ b/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/scanner/suite/MemoryTest.java
@@ -85,7 +85,7 @@ public class MemoryTest extends PerfTestCase {
         "sonar.projectVersion", "1.0",
         "sonar.sources", "",
         "sonar.showProfiling", "true");
-    scanner.setEnvironmentVariable("SONAR_RUNNER_OPTS", "-Xmx512m -server -XX:MaxPermSize=64m")
+    scanner.setEnvironmentVariable("SONAR_RUNNER_OPTS", "-Xmx512m -server")
       .setProjectDir(baseDir);
 
     BuildResult result = orchestrator.executeBuild(scanner);
diff --git a/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/scanner/suite/ScannerPerfTestSuite.java b/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/scanner/suite/ScannerPerfTestSuite.java
index 7365b8f5da9..cc3c6793077 100644
--- a/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/scanner/suite/ScannerPerfTestSuite.java
+++ b/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/scanner/suite/ScannerPerfTestSuite.java
@@ -45,7 +45,7 @@ public class ScannerPerfTestSuite {
     .builderEnv()
     .addPlugin(FileLocation.byWildcardMavenFilename(new File("../../plugins/sonar-xoo-plugin/target"), "sonar-xoo-plugin-*.jar"))
     // should not be so high, but required as long embedded h2 is used -> requires more memory on server
-    .setServerProperty("sonar.web.javaOpts", "-Xmx1G -XX:MaxPermSize=100m -XX:+HeapDumpOnOutOfMemoryError")
+    .setServerProperty("sonar.web.javaOpts", "-Xmx1G -XX:+HeapDumpOnOutOfMemoryError")
     // Needed by DuplicationTest::hugeJavaFile
     .setOrchestratorProperty("javaVersion", "LATEST_RELEASE").addPlugin("java")
     .restoreProfileAtStartup(FileLocation.ofClasspath("/one-xoo-issue-per-line.xml"))
diff --git a/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/server/ServerTest.java b/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/server/ServerTest.java
index ca2520b0247..d0c17e807ff 100644
--- a/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/server/ServerTest.java
+++ b/tests/perf/src/test/java/org/sonarsource/sonarqube/perf/server/ServerTest.java
@@ -40,7 +40,7 @@ public class ServerTest extends PerfTestCase {
   // ES + TOMCAT
   @Test
   public void server_startup_and_shutdown() throws Exception {
-    String defaultWebJavaOptions = "-Xmx768m -XX:MaxPermSize=160m -XX:+HeapDumpOnOutOfMemoryError -Djava.awt.headless=true -Dfile.encoding=UTF-8 -Djruby.management.enabled=false";
+    String defaultWebJavaOptions = "-Xmx768m -XX:+HeapDumpOnOutOfMemoryError -Djava.awt.headless=true -Dfile.encoding=UTF-8 -Djruby.management.enabled=false";
     Orchestrator orchestrator = Orchestrator.builderEnv()
       .setOrchestratorProperty("javaVersion", "LATEST_RELEASE")
       .addPlugin("java")
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>