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

4 files changed, 2 insertions, 4 deletions

diff --git a/sonar-application/src/main/assembly/conf/sonar.properties b/sonar-application/src/main/assembly/conf/sonar.properties
index e816df50295..fc40e150757 100644
--- a/sonar-application/src/main/assembly/conf/sonar.properties
+++ b/sonar-application/src/main/assembly/conf/sonar.properties
@@ -88,7 +88,7 @@
 #    The HotSpot Server VM is recommended. The property -server should be added if server mode
 #    is not enabled by default on your environment: http://docs.oracle.com/javase/7/docs/technotes/guides/vm/server-class.html
 #
-#sonar.web.javaOpts=-Xmx512m -Xms128m  -XX:MaxPermSize=160m -XX:+HeapDumpOnOutOfMemoryError -Djava.net.preferIPv4Stack=true
+#sonar.web.javaOpts=-Xmx512m -Xms128m -XX:+HeapDumpOnOutOfMemoryError -Djava.net.preferIPv4Stack=true
 
 # Same as previous property, but allows to not repeat all other settings like -Xmx
 #sonar.web.javaAdditionalOpts=
@@ -134,7 +134,7 @@
 #    The HotSpot Server VM is recommended. The property -server should be added if server mode
 #    is not enabled by default on your environment: http://docs.oracle.com/javase/7/docs/technotes/guides/vm/server-class.html
 #
-#sonar.ce.javaOpts=-Xmx512m -Xms128m -XX:MaxPermSize=160m -XX:+HeapDumpOnOutOfMemoryError -Djava.net.preferIPv4Stack=true
+#sonar.ce.javaOpts=-Xmx512m -Xms128m -XX:+HeapDumpOnOutOfMemoryError -Djava.net.preferIPv4Stack=true
 
 # Same as previous property, but allows to not repeat all other settings like -Xmx
 #sonar.ce.javaAdditionalOpts=
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
--- a/sonar-application/src/main/assembly/lib/jdbc/mssql/sqljdbc41.jar
+++ /dev/null
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
--- /dev/null
+++ b/sonar-application/src/main/assembly/lib/jdbc/mssql/sqljdbc42.jar
diff --git a/sonar-application/src/main/java/org/sonar/application/App.java b/sonar-application/src/main/java/org/sonar/application/App.java
index de5db3c03e4..8c8d73529a8 100644
--- a/sonar-application/src/main/java/org/sonar/application/App.java
+++ b/sonar-application/src/main/java/org/sonar/application/App.java
@@ -26,7 +26,6 @@ import java.util.List;
 import java.util.Properties;
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.lang.StringUtils;
-import org.sonar.process.MinimumViableSystem;
 import org.sonar.process.ProcessId;
 import org.sonar.process.ProcessProperties;
 import org.sonar.process.Props;
@@ -128,7 +127,6 @@ public class App implements Stoppable {
   }
 
   public static void main(String[] args) throws Exception {
-    new MinimumViableSystem().checkJavaVersion();
     CommandLineParser cli = new CommandLineParser();
     Properties rawProperties = cli.parseArguments(args);
     Props props = new PropsBuilder(rawProperties, new JdbcSettings()).build();