You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by jb...@apache.org on 2015/05/19 18:15:53 UTC
[1/2] activemq-artemis git commit: Add back extra test changes
accidently removed during rebase
Repository: activemq-artemis
Updated Branches:
refs/heads/master 9b7aa517d -> 892675f02
Add back extra test changes accidently removed during rebase
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/c30a8fe8
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/c30a8fe8
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/c30a8fe8
Branch: refs/heads/master
Commit: c30a8fe8994672f6d362a743fe497e419cce0b1b
Parents: 4b15793
Author: Martyn Taylor <mt...@redhat.com>
Authored: Tue May 19 15:57:15 2015 +0100
Committer: Martyn Taylor <mt...@redhat.com>
Committed: Tue May 19 16:00:34 2015 +0100
----------------------------------------------------------------------
tests/extra-tests/pom.xml | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/activemq-artemis/blob/c30a8fe8/tests/extra-tests/pom.xml
----------------------------------------------------------------------
diff --git a/tests/extra-tests/pom.xml b/tests/extra-tests/pom.xml
index 5c7e815..96fad8c 100644
--- a/tests/extra-tests/pom.xml
+++ b/tests/extra-tests/pom.xml
@@ -232,6 +232,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
+ <version>2.18.1</version>
<configuration>
<skipTests>${skipExtraTests}</skipTests>
<!-- ensure we don't inherit a byteman jar form any env settings -->
@@ -239,6 +240,14 @@
<BYTEMAN_HOME></BYTEMAN_HOME>
</environmentVariables>
<systemProperties>
+ <property>
+ <name>com.arjuna.ats.arjuna.objectstore.objectStoreDir</name>
+ <value>target/ObjectStore</value>
+ </property>
+ <property>
+ <name>ObjectStoreEnvironmentBean.objectStoreDir</name>
+ <value>target/ObjectStore</value>
+ </property>
<!--
<property>
<name>org.jboss.byteman.home</name>
@@ -260,7 +269,9 @@
</systemProperties>
<!-- make sure maven puts the byteman jar in the classpath rather than in a manifest jar -->
<useManifestOnlyJar>false</useManifestOnlyJar>
- <forkMode>once</forkMode>
+ <!-- when upgrading this plugin from 2.4 to 2.18.1 <forkMode>once</forkMode> was replaced with these: -->
+ <forkCount>1</forkCount>
+ <reuseForks>true</reuseForks>
<!--
<debugForkedProcess>true</debugForkedProcess>
-->
[2/2] activemq-artemis git commit: This closes #267 pom.xml fixes for
extra-tests
Posted by jb...@apache.org.
This closes #267 pom.xml fixes for extra-tests
Project: http://git-wip-us.apache.org/repos/asf/activemq-artemis/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-artemis/commit/892675f0
Tree: http://git-wip-us.apache.org/repos/asf/activemq-artemis/tree/892675f0
Diff: http://git-wip-us.apache.org/repos/asf/activemq-artemis/diff/892675f0
Branch: refs/heads/master
Commit: 892675f02ef7cc5c4b96e92f972a019da0d0f11a
Parents: 9b7aa51 c30a8fe
Author: jbertram <jb...@apache.org>
Authored: Tue May 19 11:15:11 2015 -0500
Committer: jbertram <jb...@apache.org>
Committed: Tue May 19 11:15:11 2015 -0500
----------------------------------------------------------------------
tests/extra-tests/pom.xml | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
----------------------------------------------------------------------