GitLab Mirror pushed to branch 2.14 at cms-community / hippo-jackrabbit
Commits: d574fe8d by Julian Reschke at 2017-01-20T15:24:00+00:00 JCR-4104: cleanup how command lines for test executions are constructed (ported to 2.14) git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/branches/2.14@1779635 13f79535-47bb-0310-9956-ffa450edef68 - - - - - 9 changed files: - jackrabbit-core/pom.xml - jackrabbit-jcr-client/pom.xml - jackrabbit-jcr-rmi/pom.xml - jackrabbit-jcr-server/pom.xml - jackrabbit-jcr2dav/pom.xml - jackrabbit-parent/pom.xml - jackrabbit-spi2dav/pom.xml - jackrabbit-spi2jcr/pom.xml - jackrabbit-webdav/pom.xml Changes: ===================================== jackrabbit-core/pom.xml ===================================== --- a/jackrabbit-core/pom.xml +++ b/jackrabbit-core/pom.xml @@ -35,6 +35,7 @@ <properties> <org.apache.jackrabbit.test.integration>false</org.apache.jackrabbit.test.integration> + <test.opts.memory>-Xmx512m</test.opts.memory> </properties> <build> @@ -74,7 +75,7 @@ <includes> <include>**/*TestAll.java</include> </includes> - <argLine>-Xmx512m</argLine> + <argLine>${test.opts}</argLine> <systemProperties> <property> <name>java.awt.headless</name> ===================================== jackrabbit-jcr-client/pom.xml ===================================== --- a/jackrabbit-jcr-client/pom.xml +++ b/jackrabbit-jcr-client/pom.xml @@ -70,7 +70,7 @@ </includes> <workingDirectory>target</workingDirectory> <forkMode>once</forkMode> - <argLine>-Xmx128m -enableassertions</argLine> + <argLine>${test.opts}</argLine> </configuration> </plugin> </plugins> ===================================== jackrabbit-jcr-rmi/pom.xml ===================================== --- a/jackrabbit-jcr-rmi/pom.xml +++ b/jackrabbit-jcr-rmi/pom.xml @@ -136,7 +136,7 @@ <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <argLine>-Xmx256m</argLine> + <argLine>${test.opts}</argLine> <fork>true</fork> <systemProperties> <property> ===================================== jackrabbit-jcr-server/pom.xml ===================================== --- a/jackrabbit-jcr-server/pom.xml +++ b/jackrabbit-jcr-server/pom.xml @@ -43,7 +43,7 @@ <include>**/*Test.java</include> </includes> <forkMode>once</forkMode> - <argLine>-Xmx128m -enableassertions</argLine> + <argLine>${test.opts}</argLine> <systemProperties> <property> <name>derby.stream.error.file</name> ===================================== jackrabbit-jcr2dav/pom.xml ===================================== --- a/jackrabbit-jcr2dav/pom.xml +++ b/jackrabbit-jcr2dav/pom.xml @@ -44,7 +44,7 @@ <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <argLine>-Xmx256m</argLine> + <argLine>${test.opts}</argLine> <fork>true</fork> <systemProperties> <property> ===================================== jackrabbit-parent/pom.xml ===================================== --- a/jackrabbit-parent/pom.xml +++ b/jackrabbit-parent/pom.xml @@ -43,6 +43,8 @@ </issueManagement> <properties> + <test.opts.memory>-Xmx256m</test.opts.memory> + <test.opts>${test.opts.memory} -enableassertions</test.opts> <jetty.version>6.1.22</jetty.version> <tika.version>1.7</tika.version> <project.reporting.outputEncoding>${project.build.sourceEncoding}</project.reporting.outputEncoding> ===================================== jackrabbit-spi2dav/pom.xml ===================================== --- a/jackrabbit-spi2dav/pom.xml +++ b/jackrabbit-spi2dav/pom.xml @@ -43,7 +43,7 @@ <include>**/TestAll.java</include> </includes> <forkMode>once</forkMode> - <argLine>-Xmx256m -enableassertions</argLine> + <argLine>${test.opts}</argLine> <systemProperties> <property> <name>known.issues</name> ===================================== jackrabbit-spi2jcr/pom.xml ===================================== --- a/jackrabbit-spi2jcr/pom.xml +++ b/jackrabbit-spi2jcr/pom.xml @@ -41,7 +41,7 @@ <include>**/TestAll.java</include> </includes> <forkMode>once</forkMode> - <argLine>-Xmx256m -enableassertions</argLine> + <argLine>${test.opts}</argLine> <systemProperties> <property> <name>derby.system.durability</name> ===================================== jackrabbit-webdav/pom.xml ===================================== --- a/jackrabbit-webdav/pom.xml +++ b/jackrabbit-webdav/pom.xml @@ -79,7 +79,7 @@ <include>**/*TestAll.java</include> </includes> <forkMode>once</forkMode> - <argLine>-Xmx128m -enableassertions</argLine> + <argLine>${test.opts}</argLine> </configuration> </plugin> </plugins> View it on GitLab: https://code.onehippo.org/cms-community/hippo-jackrabbit/commit/d574fe8d2016d4af9047a8e6d57782ab61f4ef53
_______________________________________________ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
