Author: jharting Date: 2010-07-28 05:05:52 -0400 (Wed, 28 Jul 2010) New Revision: 13521 Modified: modules/resteasy/trunk/impl/src/test/java/org/jboss/seam/resteasy/test/SeamResteasyClientTest.java modules/resteasy/trunk/impl/src/test/java/org/jboss/seam/resteasy/test/validation/ValidationTest.java modules/resteasy/trunk/pom.xml Log: Upgrade to Arquillian Alpha 3 + get tests running on JBoss 6 M4 Modified: modules/resteasy/trunk/impl/src/test/java/org/jboss/seam/resteasy/test/SeamResteasyClientTest.java =================================================================== --- modules/resteasy/trunk/impl/src/test/java/org/jboss/seam/resteasy/test/SeamResteasyClientTest.java 2010-07-27 20:04:10 UTC (rev 13520) +++ modules/resteasy/trunk/impl/src/test/java/org/jboss/seam/resteasy/test/SeamResteasyClientTest.java 2010-07-28 09:05:52 UTC (rev 13521) @@ -36,18 +36,17 @@ public static JavaArchive createSeamResteasyLibrary() { - JavaArchive jar = ShrinkWrap.create("seam-resteasy.jar", JavaArchive.class); + JavaArchive jar = ShrinkWrap.create(JavaArchive.class, "seam-resteasy.jar"); jar.addManifestResource("META-INF/web-fragment.xml", "web-fragment.xml"); jar.addManifestResource("META-INF/beans.xml", ArchivePaths.create("beans.xml")); jar.addPackage(SeamResteasyConfiguration.class.getPackage()); jar.addPackage(ValidateRequest.class.getPackage()); - jar.addPackage(SeamResteasyClientTest.class.getPackage()); return jar; } public static WebArchive createTestApplication() { - WebArchive war = ShrinkWrap.create("test.war", WebArchive.class); + WebArchive war = ShrinkWrap.create(WebArchive.class, "test.war"); war.addClass(CustomSeamResteasyConfiguration.class); war.addClass(EntityNotFoundException.class); war.addClass(TestProvider.class); Modified: modules/resteasy/trunk/impl/src/test/java/org/jboss/seam/resteasy/test/validation/ValidationTest.java =================================================================== --- modules/resteasy/trunk/impl/src/test/java/org/jboss/seam/resteasy/test/validation/ValidationTest.java 2010-07-27 20:04:10 UTC (rev 13520) +++ modules/resteasy/trunk/impl/src/test/java/org/jboss/seam/resteasy/test/validation/ValidationTest.java 2010-07-28 09:05:52 UTC (rev 13521) @@ -23,7 +23,7 @@ @Deployment public static JavaArchive createDeployment() { - JavaArchive jar = ShrinkWrap.create("test.jar", JavaArchive.class); + JavaArchive jar = ShrinkWrap.create(JavaArchive.class, "test.jar"); jar.addManifestResource("org/jboss/seam/resteasy/test/validation/beans.xml", ArchivePaths.create("beans.xml")); jar.addPackage(ValidateRequest.class.getPackage()); jar.addPackage(ValidationTest.class.getPackage()); Modified: modules/resteasy/trunk/pom.xml =================================================================== --- modules/resteasy/trunk/pom.xml 2010-07-27 20:04:10 UTC (rev 13520) +++ modules/resteasy/trunk/pom.xml 2010-07-28 09:05:52 UTC (rev 13521) @@ -17,6 +17,7 @@ <properties> <seam.version>3.0.0.b01</seam.version> + <arquillian.version>1.0.0.Alpha3</arquillian.version> </properties> <url>http://www.seamframework.org</url> @@ -37,6 +38,7 @@ <module>impl</module> </modules> + <dependencyManagement> <dependencies> <dependency> @@ -50,25 +52,29 @@ </dependencyManagement> <dependencies> - <!-- CDI (JSR-299) --> + <!-- + We will need this once we implement ValidationInterceptor check. + Will be implemented once packing maven dependencies with ShrinkWrap gets easier <dependency> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-extensions</artifactId> + </dependency> --> + <!-- Provided dependencies --> + <dependency> <groupId>javax.enterprise</groupId> <artifactId>cdi-api</artifactId> <scope>provided</scope> </dependency> - <!-- Bean validation --> <dependency> <groupId>javax.validation</groupId> <artifactId>validation-api</artifactId> <scope>provided</scope> </dependency> - <!-- Interceptors --> <dependency> <groupId>org.jboss.spec.javax.interceptor</groupId> <artifactId>jboss-interceptors-api_1.1_spec</artifactId> <scope>provided</scope> </dependency> - <!-- RESTEasy --> <dependency> <groupId>org.jboss.resteasy</groupId> <artifactId>resteasy-jaxrs</artifactId> @@ -95,15 +101,16 @@ </dependency> <dependency> <groupId>org.jboss.arquillian.container</groupId> - <artifactId>arquillian-jbossas-remote-60</artifactId> + <artifactId>arquillian-jbossas-remote-6</artifactId> <version>${arquillian.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.jboss.jbossas</groupId> <artifactId>jboss-as-client</artifactId> - <version>6.0.0-SNAPSHOT</version> +<!-- <version>6.0.0-SNAPSHOT</version>--> <!-- <version>6.0.0.20100429-M3</version>--> + <version>6.0.0.20100721-M4</version> <type>pom</type> <scope>test</scope> </dependency> @@ -116,8 +123,7 @@ <dependency> <groupId>org.testng</groupId> <artifactId>testng</artifactId> - <classifier>jdk15</classifier> - <version>5.10</version> + <version>5.12.1</version> <scope>test</scope> </dependency> </dependencies>