Resolves class loader problems during test
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/0a16033c Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/0a16033c Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/0a16033c Branch: refs/heads/USERGRID-486 Commit: 0a16033c3fa4c3f093a58bbdb39f323c2958e5a5 Parents: 8ea46ba Author: Todd Nine <[email protected]> Authored: Thu Mar 19 18:31:34 2015 -0600 Committer: Todd Nine <[email protected]> Committed: Thu Mar 19 19:47:22 2015 -0600 ---------------------------------------------------------------------- stack/core/pom.xml | 7 +++---- stack/pom.xml | 6 ++++-- stack/rest/pom.xml | 1 + stack/services/pom.xml | 1 + 4 files changed, 9 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/0a16033c/stack/core/pom.xml ---------------------------------------------------------------------- diff --git a/stack/core/pom.xml b/stack/core/pom.xml index 971ee62..d053211 100644 --- a/stack/core/pom.xml +++ b/stack/core/pom.xml @@ -88,10 +88,9 @@ <forkCount>${usergrid.it.forkCount}</forkCount> <threadCount>${usergrid.it.threads}</threadCount> <reuseForks>true</reuseForks> - <argLine>-Dtest.barrier.timestamp=${maven.build.timestamp} -Dtest.clean.storage=true -Xmx${ug.heapmax} - -Xms${ug.heapmin} -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8 - -javaagent:${settings.localRepository}/com/github/stephenc/jamm/0.2.5/jamm-0.2.5.jar ${ug.argline} - </argLine> + <argLine>-Dtest.barrier.timestamp=${maven.build.timestamp} -Dtest.clean.storage=true -Xmx${ug.heapmax} -Xms${ug.heapmin} -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8 -javaagent:${settings.localRepository}/com/github/stephenc/jamm/0.2.5/jamm-0.2.5.jar ${ug.argline} </argLine> + <!-- see this page for documentation on classloading issues http://maven.apache.org/surefire/maven-surefire-plugin/examples/class-loading.html --> + <useSystemClassLoader>false</useSystemClassLoader> <includes> <include>**/*IT.java</include> <include>**/*Test.java</include> http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/0a16033c/stack/pom.xml ---------------------------------------------------------------------- diff --git a/stack/pom.xml b/stack/pom.xml index f24917a..6126046 100644 --- a/stack/pom.xml +++ b/stack/pom.xml @@ -109,7 +109,7 @@ <jersey-version>1.18.1</jersey-version> <junit-version>4.12</junit-version> <log4j-version>1.2.16</log4j-version> - <org.springframework.version>3.1.2.RELEASE</org.springframework.version> + <org.springframework.version>3.2.13.RELEASE</org.springframework.version> <shiro-version>1.2.3</shiro-version> <slf4j-version>1.6.1</slf4j-version> <snakeyaml-version>1.8</snakeyaml-version> @@ -1461,6 +1461,8 @@ <forkCount>${usergrid.it.forkCount}</forkCount> <reuseForks>${usergrid.it.reuseForks}</reuseForks> <threadCount>${usergrid.it.forkCount}</threadCount> + <!-- see this page for documentation on classloading issues http://maven.apache.org/surefire/maven-surefire-plugin/examples/class-loading.html --> + <useSystemClassLoader>false</useSystemClassLoader> <argLine>-Xmx${ug.heapmax} -Xms${ug.heapmin} -javaagent:${settings.localRepository}/com/github/stephenc/jamm/0.2.5/jamm-0.2.5.jar ${ug.argline}</argLine> <testFailureIgnore>false</testFailureIgnore> </configuration> @@ -1471,7 +1473,7 @@ <dependencies> <dependency> <groupId>org.apache.maven.surefire</groupId> - <artifactId>surefire-junit4</artifactId> + <artifactId>${surefire.plugin.artifactName}</artifactId> <version>${surefire.plugin.version}</version> <!--<exclusions>--> http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/0a16033c/stack/rest/pom.xml ---------------------------------------------------------------------- diff --git a/stack/rest/pom.xml b/stack/rest/pom.xml index deb11f8..974945f 100644 --- a/stack/rest/pom.xml +++ b/stack/rest/pom.xml @@ -102,6 +102,7 @@ <parallel>methods</parallel> <forkCount>1</forkCount> <threadCount>${usergrid.rest.threads}</threadCount> + <useSystemClassLoader>false</useSystemClassLoader> <reuseForks>true</reuseForks> <argLine>-Dwebapp.directory=${basedir}/src/main/webapp -Dtest.barrier.timestamp=${maven.build.timestamp} -Dtest.clean.storage=true -Xmx${ug.heapmax} -Xms${ug.heapmin} -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8 -javaagent:${settings.localRepository}/com/github/stephenc/jamm/0.2.5/jamm-0.2.5.jar ${ug.argline} </argLine> http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/0a16033c/stack/services/pom.xml ---------------------------------------------------------------------- diff --git a/stack/services/pom.xml b/stack/services/pom.xml index 68f1a4a..6074e65 100644 --- a/stack/services/pom.xml +++ b/stack/services/pom.xml @@ -92,6 +92,7 @@ <forkCount>${usergrid.it.forkCount}</forkCount> <threadCount>${usergrid.it.threads}</threadCount> <reuseForks>${usergrid.it.reuseForks}</reuseForks> + <useSystemClassLoader>false</useSystemClassLoader> <argLine>-Dtest.barrier.timestamp=${maven.build.timestamp} -Dtest.clean.storage=true -Xmx${ug.heapmax} -Xms${ug.heapmin} -Dfile.encoding=UTF-8 -Dsun.jnu.encoding=UTF-8 -javaagent:${settings.localRepository}/com/github/stephenc/jamm/0.2.5/jamm-0.2.5.jar ${ug.argline} </argLine> <includes>
