4:02 a.m.
Author: aslak
Date: 2010-07-28 05:02:02 -0400 (Wed, 28 Jul 2010)
New Revision: 6818
Modified:
core/trunk/parent/pom.xml
core/trunk/tests-arquillian/pom.xml
Log:
WELD-493 Updated to Arquillian Alpha3
Modified: core/trunk/parent/pom.xml
===================================================================
--- core/trunk/parent/pom.xml 2010-07-27 01:51:49 UTC (rev 6817)
+++ core/trunk/parent/pom.xml 2010-07-28 09:02:02 UTC (rev 6818)
@@ -77,7 +77,7 @@
<!-- Testing deps -->
<testng.version>5.10</testng.version>
<jboss.test.harness.version>1.1.0-SNAPSHOT</jboss.test.harness.version>
- <jboss.arquillian.version>1.0.0.Alpha2</jboss.arquillian.version>
+ <jboss.arquillian.version>1.0.0.Alpha3</jboss.arquillian.version>
<jboss.metadata.version>1.0.0.CR16</jboss.metadata.version>
<jboss.mdr.version>2.0.1.GA</jboss.mdr.version>
<jboss.spec.servlet.version>1.0.0.Beta2</jboss.spec.servlet.version>
@@ -143,19 +143,19 @@
<dependency>
<groupId>org.jboss.arquillian.container</groupId>
- <artifactId>arquillian-weld-embedded</artifactId>
+ <artifactId>arquillian-weld-ee-embedded-1.1</artifactId>
<version>${jboss.arquillian.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.container</groupId>
- <artifactId>arquillian-jbossas-local-60</artifactId>
+ <artifactId>arquillian-jbossas-managed-6</artifactId>
<version>${jboss.arquillian.version}</version>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.container</groupId>
- <artifactId>arquillian-jbossas-remote-60</artifactId>
+ <artifactId>arquillian-jbossas-remote-6</artifactId>
<version>${jboss.arquillian.version}</version>
</dependency>
Modified: core/trunk/tests-arquillian/pom.xml
===================================================================
--- core/trunk/tests-arquillian/pom.xml 2010-07-27 01:51:49 UTC (rev 6817)
+++ core/trunk/tests-arquillian/pom.xml 2010-07-28 09:02:02 UTC (rev 6818)
@@ -42,7 +42,7 @@
<dependency>
<groupId>org.jboss.metadata</groupId>
- <artifactId>jboss-metadata</artifactId>
+ <artifactId>jboss-metadata</artifactId>
</dependency>
<dependency>
@@ -151,7 +151,6 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <test>org.jboss.weld.tests.NormalSuite</test>
<!--
Set parallel none to force a more modern JUnitCore provider that
understands Suites,
http://old.nabble.com/Maven-Surefire-and-newer-junit-features-td28539796....
@@ -167,12 +166,16 @@
<id>defualt</id>
<activation>
<activeByDefault>true</activeByDefault>
+ <property>
+ <name>default</name>
+ </property>
</activation>
<dependencies>
<dependency>
<groupId>org.jboss.arquillian.container</groupId>
- <artifactId>arquillian-weld-embedded</artifactId>
- <scope>test</scope>
+ <artifactId>arquillian-weld-ee-embedded-1.1</artifactId>
+ <scope>provided</scope> <!-- should be test, but we need
shrinkwrap-impl for compiling BeanArchive,
+ having this in test scopes override the shrinkwrap-api scope. ?? -->
</dependency>
</dependencies>
<build>
@@ -190,6 +193,7 @@
<profile>
<id>incontainer</id>
<activation>
+ <activeByDefault>false</activeByDefault>
<property>
<name>incontainer</name>
</property>
@@ -197,11 +201,17 @@
<dependencies>
<dependency>
<groupId>org.jboss.arquillian.container</groupId>
- <artifactId>arquillian-jbossas-remote-60</artifactId>
+ <artifactId>arquillian-jbossas-managed-6</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.jbossas</groupId>
+ <artifactId>jboss-server-manager</artifactId>
+ <version>1.0.3.GA</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.jbossas</groupId>
<artifactId>jboss-as-client</artifactId>
<version>6.0.0.20100429-M3</version>
<type>pom</type>
@@ -215,6 +225,7 @@
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<test>org.jboss.weld.tests.IntegrationSuite</test>
+ <parallel>none</parallel>
</configuration>
</plugin>
</plugins>