You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2013/12/03 16:28:17 UTC
git commit: Make it possible to configure the heap size used by Maven’s forked Java VMs.
Updated Branches:
refs/heads/master 96a3a6d85 -> da6eb8524
Make it possible to configure the heap size used by Maven’s forked Java VMs.
“porting” these changes over from the old repo, see also:
https://github.com/apigee/usergrid-stack/pull/262
https://github.com/apigee/usergrid-stack/pull/264
https://github.com/apigee/usergrid-stack/pull/265
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/da6eb852
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/da6eb852
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/da6eb852
Branch: refs/heads/master
Commit: da6eb8524c2c1840c390ca14708715b3d258027e
Parents: 96a3a6d
Author: Dave Johnson <dm...@apigee.com>
Authored: Tue Dec 3 10:28:14 2013 -0500
Committer: Dave Johnson <dm...@apigee.com>
Committed: Tue Dec 3 10:28:14 2013 -0500
----------------------------------------------------------------------
stack/core/pom.xml | 12 ++++--------
stack/mongo-emulator/pom.xml | 4 ++--
stack/pom.xml | 17 ++++++++++++-----
stack/rest/pom.xml | 18 +++++++-----------
stack/services/pom.xml | 14 ++++++--------
stack/test-utils/pom.xml | 2 +-
stack/tools/pom.xml | 2 +-
stack/websocket/pom.xml | 2 +-
8 files changed, 34 insertions(+), 37 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/da6eb852/stack/core/pom.xml
----------------------------------------------------------------------
diff --git a/stack/core/pom.xml b/stack/core/pom.xml
index f8fa832..d5e5a94 100644
--- a/stack/core/pom.xml
+++ b/stack/core/pom.xml
@@ -12,10 +12,6 @@
<!-- Up to 30x parallelism can be used -->
<core.it.forkCount>2</core.it.forkCount>
<core.it.suite.concurrency>5</core.it.suite.concurrency>
-
- <!-- This seems to be a safe figure -->
- <core.it.heapmax>1024m</core.it.heapmax>
- <core.it.heapmin>1024m</core.it.heapmin>
</properties>
<artifactId>usergrid-core</artifactId>
@@ -55,7 +51,7 @@
<forkCount>${core.it.forkCount}</forkCount>
<reuseForks>false</reuseForks>
- <argLine>-Xmx${core.it.heapmax} -Xms${core.it.heapmin} -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8
+ <argLine>-Xmx${ug.heapmax} -Xms${ug.heapmin} -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8
</argLine>
<includes>
@@ -139,7 +135,7 @@
<forkCount>${core.it.forkCount}</forkCount>
<reuseForks>false</reuseForks>
- <argLine>-Xmx${core.it.heapmax} -Xms${core.it.heapmin} -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8
+ <argLine>-Xmx${ug.heapmax} -Xms${ug.heapmin} -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8
</argLine>
<includes>
@@ -241,7 +237,7 @@
<target.directory>${project.build.directory}</target.directory>
</systemPropertyVariables>
<forkMode>once</forkMode>
- <argLine>-Xmx3G -Xms2G -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8</argLine>
+ <argLine>-Xmx${ug.heapmax} -Xms${ug.heapmin} -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8</argLine>
<includes>
<include>**/*ConcurrentCoreITSuite.java</include>
@@ -548,4 +544,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-</project>
+</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/da6eb852/stack/mongo-emulator/pom.xml
----------------------------------------------------------------------
diff --git a/stack/mongo-emulator/pom.xml b/stack/mongo-emulator/pom.xml
index 05f385c..2a4ca6c 100644
--- a/stack/mongo-emulator/pom.xml
+++ b/stack/mongo-emulator/pom.xml
@@ -53,7 +53,7 @@
<storage-config>${basedir}/src/test/conf</storage-config>
</systemPropertyVariables>
<forkMode>always</forkMode>
- <argLine>-Xmx2G -Xms2G</argLine>
+ <argLine>-Xmx${ug.heapmax} -Xms${ug.heapmin}</argLine>
</configuration>
</plugin>
</plugins>
@@ -165,4 +165,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-</project>
+</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/da6eb852/stack/pom.xml
----------------------------------------------------------------------
diff --git a/stack/pom.xml b/stack/pom.xml
index e3823e9..f97677f 100644
--- a/stack/pom.xml
+++ b/stack/pom.xml
@@ -65,11 +65,20 @@
<!-- =================================================================== -->
<!-- Properties: General Settings -->
<!-- =================================================================== -->
+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <!-- you can override these via MAVEN_OPTS -->
+ <ug.heapmax>1024m</ug.heapmax>
+ <ug.heapmin>1024m</ug.heapmin>
+
+ <usergrid-custom-spring-properties>classpath:/usergrid-custom.properties</usergrid-custom-spring-properties>
+ <usergrid-custom-spring-test-properties>classpath:/usergrid-custom-test.properties</usergrid-custom-spring-test-properties>
+
<!-- =================================================================== -->
<!-- Properties: Dependency Settings -->
<!-- =================================================================== -->
+
<amber-version>0.22-incubating</amber-version>
<cassandra-version>1.2.10</cassandra-version>
<hector-om-version>3.0-03</hector-om-version>
@@ -87,11 +96,9 @@
<slf4j-version>1.6.1</slf4j-version>
<snakeyaml-version>1.8</snakeyaml-version>
<tomcat-version>6.0.33</tomcat-version>
- <usergrid-custom-spring-properties>classpath:/usergrid-custom.properties</usergrid-custom-spring-properties>
- <usergrid-custom-spring-test-properties>classpath:/usergrid-custom-test.properties
- </usergrid-custom-spring-test-properties>
<antlr.version>3.4</antlr.version>
<tika.version>1.4</tika.version>
+
</properties>
<licenses>
@@ -1548,7 +1555,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<version>2.15</version>
<configuration>
- <argLine>-Xmx1024m</argLine>
+ <argLine>-Xmx${ug.heapmax} -Xms${ug.heapmin}</argLine>
</configuration>
</plugin>
@@ -1772,4 +1779,4 @@
<url>https://usergrid-maven.s3.amazonaws.com/dependencies</url>
</repository>
</repositories>
-</project>
+</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/da6eb852/stack/rest/pom.xml
----------------------------------------------------------------------
diff --git a/stack/rest/pom.xml b/stack/rest/pom.xml
index 576cd45..6b13d4c 100644
--- a/stack/rest/pom.xml
+++ b/stack/rest/pom.xml
@@ -16,10 +16,6 @@
<properties>
<!-- If you got the resources, max parallelism = 6 forks -->
<rest.it.forkCount>3</rest.it.forkCount>
-
- <!-- Tests can run even on 128m, but let's play it safe -->
- <rest.it.heapmax>256m</rest.it.heapmax>
- <rest.it.heapmin>256m</rest.it.heapmin>
</properties>
<profiles>
@@ -43,7 +39,7 @@
</systemPropertyVariables>
<forkMode>once</forkMode>
<!-- TODO: make this into a small configuration but based on settings.xml -->
- <argLine>-Xmx1G -Xms256m -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8</argLine>
+ <argLine>-Xmx${ug.heapmax} -Xms${ug.heapmin} -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8</argLine>
<includes>
<include>**/RestTestSuite.java</include>
@@ -82,7 +78,7 @@
<forkCount>${rest.it.forkCount}</forkCount>
<reuseForks>false</reuseForks>
<perCoreThreadCount>false</perCoreThreadCount>
- <argLine>-Xmx${rest.it.heapmax} -Xms${rest.it.heapmin} -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8
+ <argLine>-Xmx${ug.heapmax} -Xms${ug.heapmin} -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8
</argLine>
<includes>
@@ -140,7 +136,7 @@
<forkCount>${rest.it.forkCount}</forkCount>
<reuseForks>false</reuseForks>
<perCoreThreadCount>false</perCoreThreadCount>
- <argLine>-Xmx${rest.it.heapmax} -Xms${rest.it.heapmin} -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8
+ <argLine>-Xmx${ug.heapmax} -Xms${ug.heapmin} -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8
</argLine>
<includes>
@@ -178,7 +174,7 @@
<target.directory>${project.build.directory}</target.directory>
</systemPropertyVariables>
<forkMode>once</forkMode>
- <argLine>-Xmx2G -Xms2G -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8</argLine>
+ <argLine>-Xmx${ug.heapmax} -Xms${ug.heapmin} -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8</argLine>
<includes>
<include>**/ConcurrentRestTestSuite.java</include>
@@ -215,7 +211,7 @@
<target.directory>${project.build.directory}</target.directory>
</systemPropertyVariables>
<forkMode>once</forkMode>
- <argLine>-Xmx2G -Xms2G -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8</argLine>
+ <argLine>-Xmx${ug.heapmax} -Xms${ug.heapmin} -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8</argLine>
<includes>
<include>**/ConcurrentRestITSuite.java</include>
@@ -264,7 +260,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <argLine>-Xmx2G -Xms2G -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8</argLine>
+ <argLine>-Xmx${ug.heapmax} -Xms${ug.heapmin} -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8</argLine>
</configuration>
</plugin>
@@ -564,4 +560,4 @@
<classifier>tests</classifier>
</dependency>
</dependencies>
-</project>
+</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/da6eb852/stack/services/pom.xml
----------------------------------------------------------------------
diff --git a/stack/services/pom.xml b/stack/services/pom.xml
index ec907d6..692e839 100644
--- a/stack/services/pom.xml
+++ b/stack/services/pom.xml
@@ -11,8 +11,6 @@
<!-- Override these properties in your settings.xml in an active profile -->
<properties>
<services.it.forkCount>2</services.it.forkCount>
- <services.it.heapmax>384m</services.it.heapmax>
- <services.it.heapmin>384m</services.it.heapmin>
</properties>
<artifactId>usergrid-services</artifactId>
@@ -51,7 +49,7 @@
</systemPropertyVariables>
<forkMode>once</forkMode>
<!-- TODO: make this into a small configuration but based on settings.xml -->
- <argLine>-Xmx1G -Xms256m -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8</argLine>
+ <argLine>-Xmx${ug.heapmax} -Xms${ug.heapmin} -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8</argLine>
<includes>
<include>**/ServiceTestSuite.java</include>
@@ -90,7 +88,7 @@
<forkCount>${services.it.forkCount}</forkCount>
<reuseForks>false</reuseForks>
- <argLine>-Xmx${services.it.heapmax} -Xms${services.it.heapmin} -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8</argLine>
+ <argLine>-Xmx${ug.heapmax} -Xms${ug.heapmin} -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8</argLine>
<argLine>
-javaagent:${settings.localRepository}/org/powermock/powermock-module-javaagent/1.5.1/powermock-module-javaagent-1.5.1.jar
</argLine>
@@ -146,7 +144,7 @@
<target.directory>${project.build.directory}</target.directory>
</systemPropertyVariables>
<forkMode>once</forkMode>
- <argLine>-Xmx2G -Xms2G -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8</argLine>
+ <argLine>-Xmx${ug.heapmax} -Xms${ug.heapmin} -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8</argLine>
<argLine>
-javaagent:${settings.localRepository}/org/powermock/powermock-module-javaagent/1.5.1/powermock-module-javaagent-1.5.1.jar
</argLine>
@@ -187,7 +185,7 @@
<target.directory>${project.build.directory}</target.directory>
</systemPropertyVariables>
<forkMode>once</forkMode>
- <argLine>-Xmx2G -Xms2G -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8</argLine>
+ <argLine>-Xmx${ug.heapmax} -Xms${ug.heapmin} -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8</argLine>
<argLine>
-javaagent:${settings.localRepository}/org/powermock/powermock-module-javaagent/1.5.1/powermock-module-javaagent-1.5.1.jar
</argLine>
@@ -252,7 +250,7 @@
<forkCount>${services.it.forkCount}</forkCount>
<reuseForks>false</reuseForks>
- <argLine>-Xmx1G -Xms512m -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8</argLine>
+ <argLine>-Xmx${ug.heapmax} -Xms${ug.heapmin} -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8</argLine>
<argLine>
-javaagent:${settings.localRepository}/org/powermock/powermock-module-javaagent/1.5.1/powermock-module-javaagent-1.5.1.jar
</argLine>
@@ -533,4 +531,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-</project>
+</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/da6eb852/stack/test-utils/pom.xml
----------------------------------------------------------------------
diff --git a/stack/test-utils/pom.xml b/stack/test-utils/pom.xml
index 4248069..6331b18 100644
--- a/stack/test-utils/pom.xml
+++ b/stack/test-utils/pom.xml
@@ -35,7 +35,7 @@
<storage-config>${basedir}/src/test/conf</storage-config>
<target-directory>${project.build.directory}</target-directory>
</systemPropertyVariables>
- <argLine>-Xmx2G -Xms2G -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8</argLine>
+ <argLine>-Xmx${ug.heapmax} -Xms${ug.heapmin} -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8</argLine>
<includes>
<include>**/CassandraResourceITSuite.java</include>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/da6eb852/stack/tools/pom.xml
----------------------------------------------------------------------
diff --git a/stack/tools/pom.xml b/stack/tools/pom.xml
index 128e96c..636d36f 100644
--- a/stack/tools/pom.xml
+++ b/stack/tools/pom.xml
@@ -52,7 +52,7 @@
<storage-config>${basedir}/src/test/conf</storage-config>
</systemPropertyVariables>
<forkMode>always</forkMode>
- <argLine>-Xmx2G -Xms2G -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8</argLine>
+ <argLine>-Xmx${ug.heapmax} -Xms${ug.heapmin} -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8</argLine>
</configuration>
</plugin>
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/da6eb852/stack/websocket/pom.xml
----------------------------------------------------------------------
diff --git a/stack/websocket/pom.xml b/stack/websocket/pom.xml
index 8d1a4cf..80f80dd 100644
--- a/stack/websocket/pom.xml
+++ b/stack/websocket/pom.xml
@@ -53,7 +53,7 @@
<storage-config>${basedir}/src/test/conf</storage-config>
</systemPropertyVariables>
<forkMode>always</forkMode>
- <argLine>-Xmx2G -Xms2G -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8</argLine>
+ <argLine>-Xmx${ug.heapmax} -Xms${ug.heapmin} -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8</argLine>
</configuration>
</plugin>
</plugins>