From 839a526192f9ee06ab482bd0c07d7f9818f69abe Mon Sep 17 00:00:00 2001 From: Svetoslav Neykov Date: Fri, 19 May 2017 15:55:00 +0300 Subject: [PATCH] Move to Java 8, remove MaxPermSize options --- .mvn/jvm.config | 2 +- .../brooklyn/core/mgmt/internal/TestEntityWithEffectors.java | 2 +- parent/pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.mvn/jvm.config b/.mvn/jvm.config index af5fbd1a36..d24b75aeb4 100644 --- a/.mvn/jvm.config +++ b/.mvn/jvm.config @@ -1 +1 @@ --Xmx1024m -Xms512m -XX:MaxPermSize=256m +-Xmx1024m -Xms512m diff --git a/core/src/test/java/org/apache/brooklyn/core/mgmt/internal/TestEntityWithEffectors.java b/core/src/test/java/org/apache/brooklyn/core/mgmt/internal/TestEntityWithEffectors.java index 4bb137d880..35c9a5a175 100644 --- a/core/src/test/java/org/apache/brooklyn/core/mgmt/internal/TestEntityWithEffectors.java +++ b/core/src/test/java/org/apache/brooklyn/core/mgmt/internal/TestEntityWithEffectors.java @@ -51,7 +51,7 @@ *
  * {@code
  * cp /path/to/test-entities.jar ./lib/dropins/
- * export JAVA_OPTS="-Xms256m -Xmx1g -XX:MaxPermSize=256m -Dlogback.configurationFile=/path/to/logback-trace.xml"
+ * export JAVA_OPTS="-Xms256m -Xmx1g -Dlogback.configurationFile=/path/to/logback-trace.xml"
  * ./bin/brooklyn launch --persist auto --persistenceDir /path/to/persistedState
  * }
  * 
diff --git a/parent/pom.xml b/parent/pom.xml index 29645afcf6..dfb79b703d 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -668,7 +668,7 @@ maven-surefire-plugin ${surefire.version} - -Xms768m -Xmx768m -XX:MaxPermSize=256m -verbose:gc -XX:SoftRefLRUPolicyMSPerMB=1 + -Xms768m -Xmx768m -verbose:gc -XX:SoftRefLRUPolicyMSPerMB=1