Updated Branches: refs/heads/trunk f5e54cf75 -> c02755203
Upgraded surefire plugin to 2.16. AMQ-5006 Project: http://git-wip-us.apache.org/repos/asf/activemq/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq/commit/c0275520 Tree: http://git-wip-us.apache.org/repos/asf/activemq/tree/c0275520 Diff: http://git-wip-us.apache.org/repos/asf/activemq/diff/c0275520 Branch: refs/heads/trunk Commit: c027552035afe8bde9db7fc277cc91c749746eb3 Parents: f5e54cf Author: Kevin Earls <[email protected]> Authored: Thu Jan 30 14:22:44 2014 +0100 Committer: Kevin Earls <[email protected]> Committed: Thu Jan 30 14:22:44 2014 +0100 ---------------------------------------------------------------------- activemq-broker/pom.xml | 3 ++- activemq-camel/pom.xml | 3 ++- activemq-client/pom.xml | 3 ++- activemq-console/pom.xml | 3 ++- activemq-http/pom.xml | 3 ++- activemq-jdbc-store/pom.xml | 3 ++- activemq-kahadb-store/pom.xml | 3 ++- activemq-karaf-itest/pom.xml | 3 ++- activemq-leveldb-store/pom.xml | 1 - activemq-mqtt/pom.xml | 3 ++- activemq-ra/pom.xml | 4 +++- activemq-rar/pom.xml | 3 ++- activemq-runtime-config/pom.xml | 3 ++- activemq-stomp/pom.xml | 3 ++- activemq-unit-tests/pom.xml | 3 ++- assembly/pom.xml | 3 ++- pom.xml | 5 +++-- 17 files changed, 34 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq/blob/c0275520/activemq-broker/pom.xml ---------------------------------------------------------------------- diff --git a/activemq-broker/pom.xml b/activemq-broker/pom.xml index f942a3d..1c7c346 100755 --- a/activemq-broker/pom.xml +++ b/activemq-broker/pom.xml @@ -174,7 +174,8 @@ <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <forkMode>always</forkMode> + <forkCount>1</forkCount> + <reuseForks>false</reuseForks> <argLine>${surefire.argLine}</argLine> <runOrder>alphabetical</runOrder> <systemProperties> http://git-wip-us.apache.org/repos/asf/activemq/blob/c0275520/activemq-camel/pom.xml ---------------------------------------------------------------------- diff --git a/activemq-camel/pom.xml b/activemq-camel/pom.xml index b6bc4fb..6d27cca 100755 --- a/activemq-camel/pom.xml +++ b/activemq-camel/pom.xml @@ -178,7 +178,8 @@ <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <forkMode>pertest</forkMode> + <forkCount>1</forkCount> + <reuseForks>false</reuseForks> <childDelegation>false</childDelegation> <useFile>true</useFile> <argLine>-Xmx512M</argLine> http://git-wip-us.apache.org/repos/asf/activemq/blob/c0275520/activemq-client/pom.xml ---------------------------------------------------------------------- diff --git a/activemq-client/pom.xml b/activemq-client/pom.xml index f4ff115..18f940b 100755 --- a/activemq-client/pom.xml +++ b/activemq-client/pom.xml @@ -200,7 +200,8 @@ <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <forkMode>always</forkMode> + <forkCount>1</forkCount> + <reuseForks>false</reuseForks> <argLine>${surefire.argLine}</argLine> <runOrder>alphabetical</runOrder> <systemProperties> http://git-wip-us.apache.org/repos/asf/activemq/blob/c0275520/activemq-console/pom.xml ---------------------------------------------------------------------- diff --git a/activemq-console/pom.xml b/activemq-console/pom.xml index ef50ba0..643269f 100644 --- a/activemq-console/pom.xml +++ b/activemq-console/pom.xml @@ -154,7 +154,8 @@ <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <forkMode>pertest</forkMode> + <forkCount>1</forkCount> + <reuseForks>false</reuseForks> <childDelegation>false</childDelegation> <useFile>true</useFile> <systemProperties> http://git-wip-us.apache.org/repos/asf/activemq/blob/c0275520/activemq-http/pom.xml ---------------------------------------------------------------------- diff --git a/activemq-http/pom.xml b/activemq-http/pom.xml index 907d485..3ed05a2 100755 --- a/activemq-http/pom.xml +++ b/activemq-http/pom.xml @@ -154,7 +154,8 @@ <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <forkMode>always</forkMode> + <forkCount>1</forkCount> + <reuseForks>false</reuseForks> </configuration> </plugin> </plugins> http://git-wip-us.apache.org/repos/asf/activemq/blob/c0275520/activemq-jdbc-store/pom.xml ---------------------------------------------------------------------- diff --git a/activemq-jdbc-store/pom.xml b/activemq-jdbc-store/pom.xml index 15122cc..52cf40d 100755 --- a/activemq-jdbc-store/pom.xml +++ b/activemq-jdbc-store/pom.xml @@ -70,7 +70,8 @@ <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <forkMode>always</forkMode> + <forkCount>1</forkCount> + <reuseForks>false</reuseForks> <argLine>${surefire.argLine}</argLine> <runOrder>alphabetical</runOrder> <systemProperties> http://git-wip-us.apache.org/repos/asf/activemq/blob/c0275520/activemq-kahadb-store/pom.xml ---------------------------------------------------------------------- diff --git a/activemq-kahadb-store/pom.xml b/activemq-kahadb-store/pom.xml index 79185ac..e2fffc5 100755 --- a/activemq-kahadb-store/pom.xml +++ b/activemq-kahadb-store/pom.xml @@ -176,7 +176,8 @@ <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <forkMode>always</forkMode> + <forkCount>1</forkCount> + <reuseForks>false</reuseForks> <argLine>${surefire.argLine}</argLine> <runOrder>alphabetical</runOrder> http://git-wip-us.apache.org/repos/asf/activemq/blob/c0275520/activemq-karaf-itest/pom.xml ---------------------------------------------------------------------- diff --git a/activemq-karaf-itest/pom.xml b/activemq-karaf-itest/pom.xml index 7622ac6..0a819f2 100644 --- a/activemq-karaf-itest/pom.xml +++ b/activemq-karaf-itest/pom.xml @@ -190,7 +190,8 @@ <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <forkMode>pertest</forkMode> + <forkCount>1</forkCount> + <reuseForks>false</reuseForks> <redirectTestOutputToFile>false</redirectTestOutputToFile> <argLine>-Xmx256m</argLine> <excludes> http://git-wip-us.apache.org/repos/asf/activemq/blob/c0275520/activemq-leveldb-store/pom.xml ---------------------------------------------------------------------- diff --git a/activemq-leveldb-store/pom.xml b/activemq-leveldb-store/pom.xml index 0e4502f..1b7bbaa 100644 --- a/activemq-leveldb-store/pom.xml +++ b/activemq-leveldb-store/pom.xml @@ -382,7 +382,6 @@ <configuration> <!-- we must turn off the use of system class loader so our tests can find stuff - otherwise ScalaSupport compiler can't find stuff --> <useSystemClassLoader>false</useSystemClassLoader> - <!--forkMode>pertest</forkMode--> <childDelegation>false</childDelegation> <useFile>true</useFile> <failIfNoTests>false</failIfNoTests> http://git-wip-us.apache.org/repos/asf/activemq/blob/c0275520/activemq-mqtt/pom.xml ---------------------------------------------------------------------- diff --git a/activemq-mqtt/pom.xml b/activemq-mqtt/pom.xml index a1205e2..022fc7c 100755 --- a/activemq-mqtt/pom.xml +++ b/activemq-mqtt/pom.xml @@ -207,7 +207,8 @@ <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <forkMode>always</forkMode> + <forkCount>1</forkCount> + <reuseForks>false</reuseForks> <argLine>${surefire.argLine}</argLine> <runOrder>alphabetical</runOrder> <!-- Note: if you want to see log messages on the console window remove the following comment --> http://git-wip-us.apache.org/repos/asf/activemq/blob/c0275520/activemq-ra/pom.xml ---------------------------------------------------------------------- diff --git a/activemq-ra/pom.xml b/activemq-ra/pom.xml index 9ccfe93..efcdf4d 100755 --- a/activemq-ra/pom.xml +++ b/activemq-ra/pom.xml @@ -131,7 +131,9 @@ <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <forkMode>pertest</forkMode> + <!--forkMode>pertest</forkMode--> + <forkCount>1</forkCount> + <reuseForks>false</reuseForks> <childDelegation>false</childDelegation> <useFile>true</useFile> <includes> http://git-wip-us.apache.org/repos/asf/activemq/blob/c0275520/activemq-rar/pom.xml ---------------------------------------------------------------------- diff --git a/activemq-rar/pom.xml b/activemq-rar/pom.xml index 48c9751..2daf449 100644 --- a/activemq-rar/pom.xml +++ b/activemq-rar/pom.xml @@ -364,7 +364,8 @@ <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <forkMode>pertest</forkMode> + <forkCount>1</forkCount> + <reuseForks>false</reuseForks> <childDelegation>false</childDelegation> </configuration> </plugin> http://git-wip-us.apache.org/repos/asf/activemq/blob/c0275520/activemq-runtime-config/pom.xml ---------------------------------------------------------------------- diff --git a/activemq-runtime-config/pom.xml b/activemq-runtime-config/pom.xml index d66656f..9a69ff1 100755 --- a/activemq-runtime-config/pom.xml +++ b/activemq-runtime-config/pom.xml @@ -177,7 +177,8 @@ <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <forkMode>always</forkMode> + <forkCount>1</forkCount> + <reuseForks>false</reuseForks> <argLine>-Xmx512M -Djava.awt.headless=true</argLine> <systemProperties> <property> http://git-wip-us.apache.org/repos/asf/activemq/blob/c0275520/activemq-stomp/pom.xml ---------------------------------------------------------------------- diff --git a/activemq-stomp/pom.xml b/activemq-stomp/pom.xml index e24da4b..b23e027 100755 --- a/activemq-stomp/pom.xml +++ b/activemq-stomp/pom.xml @@ -112,7 +112,8 @@ <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <forkMode>always</forkMode> + <forkCount>1</forkCount> + <reuseForks>false</reuseForks> <argLine>${surefire.argLine}</argLine> <runOrder>alphabetical</runOrder> <failIfNoTests>false</failIfNoTests> http://git-wip-us.apache.org/repos/asf/activemq/blob/c0275520/activemq-unit-tests/pom.xml ---------------------------------------------------------------------- diff --git a/activemq-unit-tests/pom.xml b/activemq-unit-tests/pom.xml index dcda22f..a86e51b 100755 --- a/activemq-unit-tests/pom.xml +++ b/activemq-unit-tests/pom.xml @@ -427,7 +427,8 @@ <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <forkMode>always</forkMode> + <forkCount>1</forkCount> + <reuseForks>false</reuseForks> <argLine>${surefire.argLine}</argLine> <runOrder>alphabetical</runOrder> <systemProperties> http://git-wip-us.apache.org/repos/asf/activemq/blob/c0275520/assembly/pom.xml ---------------------------------------------------------------------- diff --git a/assembly/pom.xml b/assembly/pom.xml index 42b6c1a..96593b88 100755 --- a/assembly/pom.xml +++ b/assembly/pom.xml @@ -477,7 +477,8 @@ <goal>test</goal> </goals> <configuration> - <forkMode>pertest</forkMode> + <forkCount>1</forkCount> + <reuseForks>false</reuseForks> <environmentVariables> <ACTIVEMQ_ENCRYPTION_PASSWORD>activemq</ACTIVEMQ_ENCRYPTION_PASSWORD> </environmentVariables> http://git-wip-us.apache.org/repos/asf/activemq/blob/c0275520/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index e3a0b3c..d16dce3 100755 --- a/pom.xml +++ b/pom.xml @@ -143,7 +143,7 @@ <!-- Maven Plugin Version for this Project --> <maven-bundle-plugin-version>2.3.7</maven-bundle-plugin-version> - <maven-surefire-plugin-version>2.10</maven-surefire-plugin-version> + <maven-surefire-plugin-version>2.16</maven-surefire-plugin-version> <maven-antrun-plugin-version>1.3</maven-antrun-plugin-version> <maven-assembly-plugin-version>2.4</maven-assembly-plugin-version> <maven-release-plugin-version>2.4.1</maven-release-plugin-version> @@ -1133,7 +1133,8 @@ <version>${maven-surefire-plugin-version}</version> <configuration> <redirectTestOutputToFile>true</redirectTestOutputToFile> - <forkMode>once</forkMode> + <forkCount>1</forkCount> + <reuseForks>true</reuseForks> <argLine>-enableassertions</argLine> <failIfNoTests>false</failIfNoTests> </configuration>
