Adjusting and uniforming memory settings - also attempting to make Travis CI 
more constant


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/4aea7769
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/4aea7769
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/4aea7769

Branch: refs/heads/SYNCOPE-156
Commit: 4aea77695f0bf889a4fc8d095e8060898554b744
Parents: 509d30e
Author: Francesco Chicchiriccò <ilgro...@apache.org>
Authored: Mon Oct 26 13:38:15 2015 +0100
Committer: Francesco Chicchiriccò <ilgro...@apache.org>
Committed: Mon Oct 26 13:38:15 2015 +0100

----------------------------------------------------------------------
 .travis.yml                   | 2 +-
 fit/console-reference/pom.xml | 6 +++---
 fit/core-reference/pom.xml    | 8 ++++----
 pom.xml                       | 1 +
 4 files changed, 9 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/4aea7769/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 044d84d..c6894ea 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,7 +24,7 @@ install: mvn --show-version --quiet -P all,skipTests
 #invoker.streamLogs: we cannot access to log files through Travis web ui, so 
display everything in the console
 script:
   - sudo rm /etc/mavenrc
-  - export MAVEN_OPTS="-Xmx2469m -XX:MaxPermSize=512m -XX:+TieredCompilation 
-XX:TieredStopAtLevel=1"
+  - export MAVEN_OPTS="-Xmx2048m -Xms1024m -XX:MaxPermSize=512m 
-XX:+TieredCompilation -XX:TieredStopAtLevel=1"
   - mvn --show-version --quiet clean install -Dinvoker.streamLogs=true
 notifications:
   email:

http://git-wip-us.apache.org/repos/asf/syncope/blob/4aea7769/fit/console-reference/pom.xml
----------------------------------------------------------------------
diff --git a/fit/console-reference/pom.xml b/fit/console-reference/pom.xml
index 3c89990..e6b2a2b 100644
--- a/fit/console-reference/pom.xml
+++ b/fit/console-reference/pom.xml
@@ -229,7 +229,7 @@ ORYX.Editor.createByUrl = function(modelUrl){"/>
               
<cargo.tomcat.ajp.port>${cargo.tomcat.ajp.port}</cargo.tomcat.ajp.port>
               <cargo.rmi.port>${cargo.rmi.port}</cargo.rmi.port>
 
-              <cargo.jvmargs>-XX:+CMSClassUnloadingEnabled 
-XX:+UseConcMarkSweepGC -XX:MaxPermSize=512m</cargo.jvmargs>
+              <cargo.jvmargs>-XX:+CMSClassUnloadingEnabled 
-XX:+UseConcMarkSweepGC -XX:MaxPermSize=512m -Xmx1024m -Xms512m</cargo.jvmargs>
             </properties>
             <configfiles>
               <configfile>
@@ -319,7 +319,7 @@ ORYX.Editor.createByUrl = function(modelUrl){"/>
               <configuration>
                 <properties>
                   <cargo.jvmargs>-Xdebug 
-Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n
-                    -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC 
-XX:MaxPermSize=512m</cargo.jvmargs>
+                    -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC 
-XX:MaxPermSize=512m -Xmx1024m -Xms512m</cargo.jvmargs>
                 </properties>
               </configuration>
             </configuration>
@@ -561,7 +561,7 @@ ORYX.Editor.createByUrl = function(modelUrl){"/>
                 <properties>
                   <cargo.jvmargs>-Xdebug 
-Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n
                     -noverify -javaagent:${env.REBEL_HOME}/jrebel.jar 
-Drebel.spring_plugin=true
-                    -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC 
-XX:MaxPermSize=512m</cargo.jvmargs>
+                    -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC 
-XX:MaxPermSize=512m -Xmx1024m -Xms512m</cargo.jvmargs>
                 </properties>
               </configuration>
             </configuration>

http://git-wip-us.apache.org/repos/asf/syncope/blob/4aea7769/fit/core-reference/pom.xml
----------------------------------------------------------------------
diff --git a/fit/core-reference/pom.xml b/fit/core-reference/pom.xml
index 724f592..4a3df61 100644
--- a/fit/core-reference/pom.xml
+++ b/fit/core-reference/pom.xml
@@ -237,7 +237,7 @@ under the License.
               
<cargo.tomcat.ajp.port>${cargo.tomcat.ajp.port}</cargo.tomcat.ajp.port>
               <cargo.rmi.port>${cargo.rmi.port}</cargo.rmi.port>
 
-              <cargo.jvmargs>-XX:+CMSClassUnloadingEnabled 
-XX:+UseConcMarkSweepGC -XX:MaxPermSize=512m</cargo.jvmargs>
+              <cargo.jvmargs>-XX:+CMSClassUnloadingEnabled 
-XX:+UseConcMarkSweepGC -XX:MaxPermSize=512m -Xmx1024m -Xms512m</cargo.jvmargs>
             </properties>
             <configfiles>
               <configfile>
@@ -671,7 +671,7 @@ under the License.
               </container>
               <configuration>
                 <properties>
-                  <cargo.jvmargs>-Xms1024m -Xmx2048m -XX:PermSize=512m 
-XX:MaxPermSize=1024m -XX:+UseConcMarkSweepGC -XX:+CMSPermGenSweepingEnabled 
-XX:+CMSClassUnloadingEnabled</cargo.jvmargs>
+                  <cargo.jvmargs>-XX:+CMSClassUnloadingEnabled 
-XX:+UseConcMarkSweepGC -XX:PermSize=512m -XX:MaxPermSize=1024m -Xmx2048m 
-Xms1024m</cargo.jvmargs>
                 </properties>
               </configuration>
             </configuration>            
@@ -710,7 +710,7 @@ under the License.
               <configuration>
                 <properties>
                   <cargo.jvmargs>-Xdebug -Djaxb.debug=true 
-Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n
-                    -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC 
-XX:MaxPermSize=512m</cargo.jvmargs>
+                    -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC 
-XX:MaxPermSize=512m -Xmx1024m -Xms512m</cargo.jvmargs>
                 </properties>
               </configuration>
             </configuration>
@@ -846,7 +846,7 @@ under the License.
                 <properties>
                   <cargo.jvmargs>-Xdebug -Djaxb.debug=true 
-Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n
                     -noverify -javaagent:${env.REBEL_HOME}/jrebel.jar 
-Drebel.spring_plugin=true         
-                    -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC 
-XX:MaxPermSize=512m</cargo.jvmargs>
+                    -XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC 
-XX:MaxPermSize=512m -Xmx1024m -Xms512m</cargo.jvmargs>
                 </properties>
               </configuration>
             </configuration>

http://git-wip-us.apache.org/repos/asf/syncope/blob/4aea7769/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 1d767b2..9875081 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1251,6 +1251,7 @@ under the License.
             <redirectTestOutputToFile>true</redirectTestOutputToFile>
             <encoding>utf-8</encoding>
             <runOrder>alphabetical</runOrder>
+            <argLine>-Xms512m -Xmx1024m -XX:PermSize=256m -XX:MaxPermSize=512m 
-Xss256k</argLine>
           </configuration>
           <executions>
             <execution>

Reply via email to