aboutsummaryrefslogtreecommitdiffstats
path: root/sonar-application
diff options
context:
space:
mode:
authorJenkins CI <ci@sonarsource.com>2015-12-14 22:20:07 +0100
committerJenkins CI <ci@sonarsource.com>2015-12-14 22:20:07 +0100
commitf63a3ab73d37acef942df261f13ebec7573b4e11 (patch)
treee859e40d91ba1bbe79a37a4f93b9553c3638415c /sonar-application
parenta4ed263e412aa7fc37d7e5dac4c231acafb1d1d6 (diff)
parent6a13e5f6ed2da5101d33b84849594814351c379a (diff)
downloadsonarqube-f63a3ab73d37acef942df261f13ebec7573b4e11.tar.gz
sonarqube-f63a3ab73d37acef942df261f13ebec7573b4e11.zip
Automatic merge from branch-5.3
* origin/branch-5.3: SONAR-7141 Fail fast if server started with Java 1.6 SONAR-7140 Do not check java.io.tmpdir in bootstrap process SONAR-6905 Batch should dump analysis-related URL into a properties file
Diffstat (limited to 'sonar-application')
-rw-r--r--sonar-application/src/main/java/org/sonar/application/App.java2
1 files changed, 1 insertions, 1 deletions
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 9547d505895..8c6afac739a 100644
--- a/sonar-application/src/main/java/org/sonar/application/App.java
+++ b/sonar-application/src/main/java/org/sonar/application/App.java
@@ -109,7 +109,7 @@ public class App implements Stoppable {
}
public static void main(String[] args) throws Exception {
- new MinimumViableSystem().check();
+ new MinimumViableSystem().checkJavaVersion();
CommandLineParser cli = new CommandLineParser();
Properties rawProperties = cli.parseArguments(args);
Props props = new PropsBuilder(rawProperties, new JdbcSettings()).build();