From 6a13e5f6ed2da5101d33b84849594814351c379a Mon Sep 17 00:00:00 2001 From: Simon Brandhof Date: Mon, 14 Dec 2015 14:25:14 +0100 Subject: [PATCH] SONAR-7141 Fail fast if server started with Java 1.6 --- .../main/java/org/sonar/process/MinimumViableSystem.java | 4 ++-- .../java/org/sonar/process/MinimumViableSystemTest.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) 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 9a166fdaed7..4b182468fb3 100644 --- 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 a3b3f582ee7..291862930be 100644 --- 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."); } } -- 2.39.5