12:08 p.m.
Author: pete.muir(a)jboss.org
Date: 2009-02-11 13:08:57 -0500 (Wed, 11 Feb 2009)
New Revision: 1486
Modified:
ri/trunk/jboss-tck-runner/pom.xml
ri/trunk/webbeans-ri-spi/pom.xml
ri/trunk/webbeans-ri/pom.xml
Log:
tidy up poms
Modified: ri/trunk/jboss-tck-runner/pom.xml
===================================================================
--- ri/trunk/jboss-tck-runner/pom.xml 2009-02-11 13:23:24 UTC (rev 1485)
+++ ri/trunk/jboss-tck-runner/pom.xml 2009-02-11 18:08:57 UTC (rev 1486)
@@ -82,6 +82,33 @@
</executions>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <suiteXmlFiles>
+ <suiteXmlFile>incontainer-tests.xml</suiteXmlFile>
+ </suiteXmlFiles>
+ <systemProperties>
+ <property>
+ <name>org.jboss.jsr299.tck.standalone</name>
+ <value>false</value>
+ </property>
+ <property>
+ <name>jbossHome</name>
+ <value>/Applications/jboss-5.0.0.GA</value>
+ </property>
+ <property>
+
<name>org.jboss.jsr299.tck.libraryDirectory</name>
+
<value>${project.build.directory}/dependency/lib</value>
+ </property>
+ <property>
+ <name>org.jboss.jsr299.tck.testClass</name>
+
<value>org.jboss.jsr299.tck.unit.definition.bean.BeanDefinitionTest</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
@@ -90,14 +117,14 @@
<phase>test</phase>
<configuration>
<tasks>
- <java classname="org.jboss.jsr299.tck.api.TCK"
classpathref="maven.test.classpath" failonerror="true"
fork="true">
+ <!-- <java
classname="org.jboss.jsr299.tck.api.TCK"
classpathref="maven.test.classpath" failonerror="true"
fork="true">
<jvmarg line="-DrunSuite=true"/>
<jvmarg
line="-Dorg.jboss.jsr299.tck.standalone=false"/>
<jvmarg
line="-DjbossHome=/Applications/jboss-5.0.0.GA"/>
- <jvmarg
line="-Dorg.jboss.jsr299.tck.deploymentDelay=8000"/>
+ <jvmarg
line="-Dorg.jboss.jsr299.tck.testClass=org.jboss.jsr299.tck.unit.definition.bean.BeanDefinitionTest"
/>
<jvmarg line="-DdumpConfiguration=true" />
<jvmarg
line="-Dorg.jboss.jsr299.tck.libraryDirectory=${project.build.directory}/dependency/lib"/>
- </java>
+ </java>-->
</tasks>
</configuration>
<goals>
Modified: ri/trunk/webbeans-ri/pom.xml
===================================================================
--- ri/trunk/webbeans-ri/pom.xml 2009-02-11 13:23:24 UTC (rev 1485)
+++ ri/trunk/webbeans-ri/pom.xml 2009-02-11 18:08:57 UTC (rev 1486)
@@ -25,6 +25,12 @@
<artifactId>testng</artifactId>
<scope>test</scope>
<classifier>jdk15</classifier>
+ <exclusions>
+ <exclusion>
+ <artifactId>junit</artifactId>
+ <groupId>junit</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
Modified: ri/trunk/webbeans-ri-spi/pom.xml
===================================================================
--- ri/trunk/webbeans-ri-spi/pom.xml 2009-02-11 13:23:24 UTC (rev 1485)
+++ ri/trunk/webbeans-ri-spi/pom.xml 2009-02-11 18:08:57 UTC (rev 1486)
@@ -26,6 +26,12 @@
<artifactId>testng</artifactId>
<scope>test</scope>
<classifier>jdk15</classifier>
+ <exclusions>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>