modules/plugins/jboss-as-5/pom.xml | 67 ++++---------------------------------
modules/plugins/jboss-as/pom.xml | 9 ++++
2 files changed, 17 insertions(+), 59 deletions(-)
New commits:
commit 5d682b2eefabadf3c4376caae5ba6c3f4cb8dbc0
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Fri Oct 30 13:25:40 2009 -0400
always skip tests during test phase in as4 and as5 plugins; disable
'integration-tests' profile in as5 plugin by default to avoid failures in Hudson
due to lack of EAP5 instance
diff --git a/modules/plugins/jboss-as-5/pom.xml b/modules/plugins/jboss-as-5/pom.xml
index a7c4201..5530b39 100644
--- a/modules/plugins/jboss-as-5/pom.xml
+++ b/modules/plugins/jboss-as-5/pom.xml
@@ -29,8 +29,7 @@
<properties>
<scm.module.path>modules/plugins/jboss-as-5/</scm.module.path>
- <jbossas.version>5.2.0-SNAPSHOT</jbossas.version>
- <rhq.testng.excludedGroups>as5-plugin</rhq.testng.excludedGroups>
+ <jbossas.version>5.2.0-SNAPSHOT</jbossas.version>
</properties>
<dependencyManagement>
@@ -377,8 +376,7 @@
<plugins>
<plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- <version>2.0</version>
+ <artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
@@ -425,61 +423,12 @@
</plugin>
<plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- <executions>
- <execution>
- <id>surefire-it</id>
- <phase>integration-test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <skip>${maven.test.skip}</skip>
- <parallel>false</parallel>
-
<excludedGroups>${rhq.testng.excludedGroups}</excludedGroups>
-
<useSystemClassLoader>false</useSystemClassLoader>
- <additionalClasspathElements>
-
<additionalClasspathElement>${project.build.testSourceDirectory}/../jars/ejb2-test.jar</additionalClasspathElement>
-
<additionalClasspathElement>${project.build.testSourceDirectory}/../jars/ejb2-entity-bean-test.jar</additionalClasspathElement>
-
<additionalClasspathElement>${project.build.testSourceDirectory}/../jars/ejb2-sfsb-test.jar</additionalClasspathElement>
-
<additionalClasspathElement>${project.build.testSourceDirectory}/../jars/ejb3-slsb-test.jar</additionalClasspathElement>
-
<additionalClasspathElement>${project.build.testSourceDirectory}/../jars/ejb3-sfsb-test.jar</additionalClasspathElement>
-
<additionalClasspathElement>${project.build.testSourceDirectory}/../jars/ejb3-local-interface-test.jar</additionalClasspathElement>
- </additionalClasspathElements>
- <systemProperties>
- <property>
- <name>project.artifactId</name>
- <value>${project.artifactId}</value>
- </property>
- <property>
- <name>project.version</name>
- <value>${project.version}</value>
- </property>
- <property>
- <name>ejb2.test.jars.path</name>
-
<value>${project.build.testSourceDirectory}/../jars/ejb2-test.jar;${project.build.testSourceDirectory}/../jars/ejb2-entity-bean-test.jar;${project.build.testSourceDirectory}/../jars/ejb2-sfsb-test.jar</value>
- </property>
- <property>
- <name>ejb3.test.jars.path</name>
-
<value>${project.build.testSourceDirectory}/../jars/ejb3-slsb-test.jar;${project.build.testSourceDirectory}/../jars/ejb3-sfsb-test.jar;${project.build.testSourceDirectory}/../jars/ejb3-mdb-test.jar;${project.build.testSourceDirectory}/../jars/ejb3-embedded-test.ear;${project.build.testSourceDirectory}/../jars/ejb3-local-interface-test.jar</value>
- </property>
- <property>
- <name>principal</name>
- <value>admin</value>
- </property>
- <property>
- <name>credentials</name>
- <value>admin</value>
- </property>
- </systemProperties>
- </configuration>
- </execution>
- </executions>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
</plugin>
-
+
</plugins>
</build>
@@ -487,12 +436,14 @@
<profile>
<id>integration-tests</id>
+ <!--
<activation>
<property>
<name>maven.test.skip</name>
<value>!true</value>
</property>
</activation>
+ -->
<build>
<plugins>
diff --git a/modules/plugins/jboss-as/pom.xml b/modules/plugins/jboss-as/pom.xml
index c04f1fd..6ab67a4 100644
--- a/modules/plugins/jboss-as/pom.xml
+++ b/modules/plugins/jboss-as/pom.xml
@@ -89,7 +89,6 @@
<plugin>
<artifactId>maven-dependency-plugin</artifactId>
- <version>2.0</version>
<executions>
<execution>
<id>copy-dependencies</id>
@@ -132,6 +131,7 @@
<outputDirectory>${project.build.outputDirectory}/lib</outputDirectory>
</configuration>
</execution>
+
<execution>
<id>copy-dependencies-of-jbossas-common</id>
<phase>process-resources</phase>
@@ -166,6 +166,13 @@
</executions>
</plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+
</plugins>
</build>
Show replies by date