diff options
| author | Jenkins CI <ci@sonarsource.com> | 2015-12-14 22:20:07 +0100 |
|---|---|---|
| committer | Jenkins CI <ci@sonarsource.com> | 2015-12-14 22:20:07 +0100 |
| commit | f63a3ab73d37acef942df261f13ebec7573b4e11 (patch) | |
| tree | e859e40d91ba1bbe79a37a4f93b9553c3638415c /server/sonar-search | |
| parent | a4ed263e412aa7fc37d7e5dac4c231acafb1d1d6 (diff) | |
| parent | 6a13e5f6ed2da5101d33b84849594814351c379a (diff) | |
| download | sonarqube-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 'server/sonar-search')
| -rw-r--r-- | server/sonar-search/src/main/java/org/sonar/search/SearchServer.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/server/sonar-search/src/main/java/org/sonar/search/SearchServer.java b/server/sonar-search/src/main/java/org/sonar/search/SearchServer.java index 13dde539c10..77db6b77a1d 100644 --- a/server/sonar-search/src/main/java/org/sonar/search/SearchServer.java +++ b/server/sonar-search/src/main/java/org/sonar/search/SearchServer.java @@ -34,7 +34,9 @@ public class SearchServer implements Monitored { public SearchServer(Props props) { this.settings = new SearchSettings(props); - new MinimumViableSystem().check(); + new MinimumViableSystem() + .checkJavaVersion() + .checkWritableTempDir(); } @Override |