SONAR-7141 Fail fast if server started with Java 1.6

diff --git a/server/sonar-process/src/main/java/org/sonar/process/MinimumViableSystem.java b/server/sonar-process/src/main/java/org/sonar/process/MinimumViableSystem.java
index 9a166fdaed73c22bd036a24beba088b70043f928..4b182468fb3ab3cee4087f46a8d7cf98afce7468 100644 (file)
--- a/server/sonar-process/src/main/java/org/sonar/process/MinimumViableSystem.java
+++ b/server/sonar-process/src/main/java/org/sonar/process/MinimumViableSystem.java
@@ -68,9 +68,9 @@ public class MinimumViableSystem {
 
   // Visible for testing
   void checkJavaVersion(String javaVersion) {
-    if (!javaVersion.startsWith("1.6") && !javaVersion.startsWith("1.7") && !javaVersion.startsWith("1.8")) {
+    if (!javaVersion.startsWith("1.7") && !javaVersion.startsWith("1.8")) {
       // still better than "java.lang.UnsupportedClassVersionError: Unsupported major.minor version 49.0
-      throw new MessageException(format("Supported versions of Java are 1.6, 1.7 and 1.8. Got %s.", javaVersion));
+      throw new MessageException(format("Supported versions of Java are 1.7 and 1.8. Got %s.", javaVersion));
     }
   }
 

diff --git a/server/sonar-process/src/test/java/org/sonar/process/MinimumViableSystemTest.java b/server/sonar-process/src/test/java/org/sonar/process/MinimumViableSystemTest.java
index a3b3f582ee79bc0acc8f64bd78f7d963bd9918cf..291862930be6a09dd60e55e5c3e5bb824f254f35 100644 (file)
--- a/server/sonar-process/src/test/java/org/sonar/process/MinimumViableSystemTest.java
+++ b/server/sonar-process/src/test/java/org/sonar/process/MinimumViableSystemTest.java
@@ -40,13 +40,13 @@ public class MinimumViableSystemTest {
   public void checkJavaVersion() {
     // yes, sources are compiled with a supported Java version!
     underTest.checkJavaVersion();
-    underTest.checkJavaVersion("1.6");
+    underTest.checkJavaVersion("1.7");
 
     try {
-      underTest.checkJavaVersion("1.9");
+      underTest.checkJavaVersion("1.6");
       fail();
     } catch (MessageException e) {
-      assertThat(e).hasMessage("Supported versions of Java are 1.6, 1.7 and 1.8. Got 1.9.");
+      assertThat(e).hasMessage("Supported versions of Java are 1.7 and 1.8. Got 1.6.");
     }
   }