Revision: 5a22e2dac2f0 Author: Alexandre Mendonça <ammendonca> Date: Thu Jan 24 19:01:21 2013Log: Forcing maven surefire plugin to use JUnit instead of TestNG (from SCTP)
http://code.google.com/p/jdiameter/source/detail?r=5a22e2dac2f0 Modified: /testsuite/load/core/pom.xml /testsuite/pom.xml /testsuite/test-framework/pom.xml /testsuite/tests/pom.xml ======================================= --- /testsuite/load/core/pom.xml Thu Apr 7 16:58:25 2011 +++ /testsuite/load/core/pom.xml Thu Jan 24 19:01:21 2013 @@ -78,72 +78,48 @@ <artifactId>jdiameter-api</artifactId> <type>jar</type> <overWrite>true</overWrite> - <outputDirectory> - ${project.build.directory}/run - </outputDirectory> - <destFileName> - jdiameter-api.jar - </destFileName>+ <outputDirectory>${project.build.directory}/run</outputDirectory>
+
<destFileName>jdiameter-api.jar</destFileName>
</artifactItem>
<artifactItem>
<groupId>org.mobicents.servers.diameter</groupId>
<artifactId>jdiameter-impl</artifactId>
<type>jar</type>
<overWrite>true</overWrite>
-
<outputDirectory>
-
${project.build.directory}/run
- </outputDirectory>
-
<destFileName>
-
jdiameter-impl.jar
- </destFileName>
+
<outputDirectory>${project.build.directory}/run</outputDirectory>
+
<destFileName>jdiameter-impl.jar</destFileName>
</artifactItem>
<artifactItem>
<artifactId>picocontainer</artifactId>
<groupId>picocontainer</groupId>
<type>jar</type>
<overWrite>true</overWrite>
-
<outputDirectory>
-
${project.build.directory}/run
- </outputDirectory>
-
<destFileName>
-
picocontainer.jar
- </destFileName>
+
<outputDirectory>${project.build.directory}/run</outputDirectory>
+
<destFileName>picocontainer.jar</destFileName>
</artifactItem>
<artifactItem>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<type>jar</type>
<overWrite>true</overWrite>
-
<outputDirectory>
-
${project.build.directory}/run
- </outputDirectory>
-
<destFileName>
-
junit.jar
- </destFileName>
+
<outputDirectory>${project.build.directory}/run</outputDirectory>
+
<destFileName>junit.jar</destFileName>
</artifactItem>
<artifactItem>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<type>jar</type>
<overWrite>true</overWrite>
-
<outputDirectory>
-
${project.build.directory}/run
- </outputDirectory>
-
<destFileName>
-
slf4j-api.jar
- </destFileName>
+
<outputDirectory>${project.build.directory}/run</outputDirectory>
+
<destFileName>slf4j-api.jar</destFileName>
</artifactItem>
<artifactItem>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<type>jar</type>
<overWrite>true</overWrite>
-
<outputDirectory>
-
${project.build.directory}/run
- </outputDirectory>
-
<destFileName>
-
slf4j-log4j12.jar
- </destFileName>
+
<outputDirectory>${project.build.directory}/run</outputDirectory>
+
<destFileName>slf4j-log4j12.jar</destFileName>
</artifactItem>
<artifactItem>
@@ -151,24 +127,16 @@
<artifactId>java-getopt</artifactId>
<type>jar</type>
<overWrite>true</overWrite>
-
<outputDirectory>
-
${project.build.directory}/run
- </outputDirectory>
-
<destFileName>
-
java-getopt.jar
- </destFileName>
+
<outputDirectory>${project.build.directory}/run</outputDirectory>
+
<destFileName>java-getopt.jar</destFileName>
</artifactItem>
<artifactItem>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<type>jar</type>
<overWrite>true</overWrite>
-
<outputDirectory>
-
${project.build.directory}/run
- </outputDirectory>
-
<destFileName>
-
log4j.jar
- </destFileName>
+
<outputDirectory>${project.build.directory}/run</outputDirectory>
+
<destFileName>log4j.jar</destFileName>
</artifactItem>
<artifactItem>
@@ -186,12 +154,8 @@
<version>1.4.0-SNAPSHOT</version>
<type>jar</type>
<overWrite>true</overWrite>
-
<outputDirectory>
-
${project.build.directory}/run
- </outputDirectory>
-
<destFileName>
-
testsuite-load.jar
- </destFileName>
+
<outputDirectory>${project.build.directory}/run</outputDirectory>
+
<destFileName>testsuite-load.jar</destFileName>
</artifactItem>
</artifactItems>
</configuration>
=======================================
--- /testsuite/pom.xml Wed Oct 10 17:17:00 2012
+++ /testsuite/pom.xml Thu Jan 24 19:01:21 2013
@@ -25,7 +25,7 @@
<get.opt.version>1.0.9</get.opt.version>
<picocontainer.version>2.13.5</picocontainer.version>
<slf4j.version>1.5.8</slf4j.version>
- <junit.version>4.10</junit.version>
+ <junit.version>4.11</junit.version>
<version.jboss.microcontainer>2.2.0.M2</version.jboss.microcontainer>
<version.jboss.aop>2.1.8.GA</version.jboss.aop>
<version.aop.asintegration.mc>2.1.8.GA</version.aop.asintegration.mc>
@@ -146,15 +146,15 @@
</dependencyManagement>
<profiles>
- <profile>
- <id>default</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <modules>
- <module>tests</module>
- </modules>
- </profile>
+ <profile>
+ <id>default</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <modules>
+ <module>tests</module>
+ </modules>
+ </profile>
<profile>
<id>load</id>
<activation>
=======================================
--- /testsuite/test-framework/pom.xml Wed Oct 10 17:17:00 2012
+++ /testsuite/test-framework/pom.xml Thu Jan 24 19:01:21 2013
@@ -74,6 +74,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
+ <!-- Force JUnit by making
TestNG invalid.. -->
+
<testNGArtifactName>none:none</testNGArtifactName>
<forkMode>pertest</forkMode>
<excludes>
<exclude>**/*$*</exclude>
=======================================
--- /testsuite/tests/pom.xml Wed Oct 10 17:34:19 2012
+++ /testsuite/tests/pom.xml Thu Jan 24 19:01:21 2013
@@ -59,6 +59,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
+ <!-- Force JUnit -->
+
<testNGArtifactName>none:none</testNGArtifactName>
<argLine>-Djava.net.preferIPv4Stack=true</argLine>
<forkMode>pertest</forkMode>
<excludes>
--
