aboutsummaryrefslogtreecommitdiffstats
path: root/server/sonar-process
diff options
context:
space:
mode:
authorSimon Brandhof <simon.brandhof@sonarsource.com>2016-05-26 15:33:54 +0200
committerSimon Brandhof <simon.brandhof@sonarsource.com>2016-05-26 16:02:28 +0200
commit9ad75916d9932a694fe0b18a039e1ef46bdd815d (patch)
tree73059f2a09ca18c543396ba3ce7037465149203d /server/sonar-process
parent45248a93901bbdac018a172a9f1db956cba876bf (diff)
downloadsonarqube-9ad75916d9932a694fe0b18a039e1ef46bdd815d.tar.gz
sonarqube-9ad75916d9932a694fe0b18a039e1ef46bdd815d.zip
SONAR-7653 remove Java option XX:MaxPermSize
this option is dropped from java 8
Diffstat (limited to 'server/sonar-process')
-rw-r--r--server/sonar-process/src/main/java/org/sonar/process/ProcessProperties.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/server/sonar-process/src/main/java/org/sonar/process/ProcessProperties.java b/server/sonar-process/src/main/java/org/sonar/process/ProcessProperties.java
index 550a7014f0d..57e5c7eb450 100644
--- a/server/sonar-process/src/main/java/org/sonar/process/ProcessProperties.java
+++ b/server/sonar-process/src/main/java/org/sonar/process/ProcessProperties.java
@@ -115,9 +115,9 @@ public class ProcessProperties {
"-XX:+HeapDumpOnOutOfMemoryError");
defaults.put(ProcessProperties.SEARCH_JAVA_ADDITIONAL_OPTS, "");
- defaults.put(ProcessProperties.WEB_JAVA_OPTS, "-Xmx512m -Xms128m -XX:MaxPermSize=160m -XX:+HeapDumpOnOutOfMemoryError -Djava.net.preferIPv4Stack=true");
+ defaults.put(ProcessProperties.WEB_JAVA_OPTS, "-Xmx512m -Xms128m -XX:+HeapDumpOnOutOfMemoryError -Djava.net.preferIPv4Stack=true");
defaults.put(ProcessProperties.WEB_JAVA_ADDITIONAL_OPTS, "");
- defaults.put(ProcessProperties.CE_JAVA_OPTS, "-Xmx512m -Xms128m -XX:MaxPermSize=160m -XX:+HeapDumpOnOutOfMemoryError -Djava.net.preferIPv4Stack=true");
+ defaults.put(ProcessProperties.CE_JAVA_OPTS, "-Xmx512m -Xms128m -XX:+HeapDumpOnOutOfMemoryError -Djava.net.preferIPv4Stack=true");
defaults.put(ProcessProperties.CE_JAVA_ADDITIONAL_OPTS, "");
defaults.put(ProcessProperties.JDBC_MAX_ACTIVE, "60");
defaults.put(ProcessProperties.JDBC_MAX_IDLE, "5");