usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sfeld...@apache.org
Subject [5/5] usergrid git commit: Merge branch 'master' into jacoco
Date Mon, 26 Oct 2015 16:10:32 GMT
Merge branch 'master' into jacoco

Conflicts:
	stack/pom.xml


Project: http://git-wip-us.apache.org/repos/asf/usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/usergrid/commit/690110ef
Tree: http://git-wip-us.apache.org/repos/asf/usergrid/tree/690110ef
Diff: http://git-wip-us.apache.org/repos/asf/usergrid/diff/690110ef

Branch: refs/heads/master
Commit: 690110ef83867ae3810e4207b17d0a1e137efde8
Parents: b2f62a2 a616075
Author: Dave Johnson <snoopdave@apache.org>
Authored: Mon Oct 26 11:13:20 2015 -0400
Committer: Dave Johnson <snoopdave@apache.org>
Committed: Mon Oct 26 11:13:20 2015 -0400

----------------------------------------------------------------------
 .../org/apache/usergrid/corepersistence/CpEntityManager.java     | 4 ++--
 .../corepersistence/asyncevents/AmazonAsyncEventService.java     | 2 +-
 stack/pom.xml                                                    | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/usergrid/blob/690110ef/stack/pom.xml
----------------------------------------------------------------------
diff --cc stack/pom.xml
index 395175c,a08a4d7..c1ded77
--- a/stack/pom.xml
+++ b/stack/pom.xml
@@@ -1334,12 -1472,12 +1334,13 @@@
                            <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 -->
 +
 +                          <!-- see this page for documentation on classloading issues
 +                          http://maven.apache.org/surefire/maven-surefire-plugin/examples/class-loading.html
-->
-                           <useSystemClassLoader>false</useSystemClassLoader>
 +
+                           <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>-->
 -                          <argLine>-Xmx${ug.heapmax} -Xms${ug.heapmin} -javaagent:${settings.localRepository}/org/jacoco/org.jacoco.agent/${jacoco.version}/org.jacoco.agent-${jacoco.version}-runtime.jar=destfile=${project.build.directory}/jacoco.exec
 -javaagent:${settings.localRepository}/com/github/stephenc/jamm/0.2.5/jamm-0.2.5.jar ${ug.argline}</argLine>
+                           <testFailureIgnore>false</testFailureIgnore>
 -
 +                          <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>
                            <systemPropertyVariables>
                                <jacoco-agent.destfile>target/jacoco.exec</jacoco-agent.destfile>
                            </systemPropertyVariables>


Mime
View raw message