[jboss-svn-commits] JBoss Common SVN: r4491 - in arquillian/trunk: doc/reference/src/main/docbook/en-US and 3 other directories.

[jboss-svn-commits at lists.jboss.org]

Author: aslak
Date: 2010-06-10 14:45:08 -0400 (Thu, 10 Jun 2010)
New Revision: 4491

Modified:
   arquillian/trunk/build/pom.xml
   arquillian/trunk/doc/reference/src/main/docbook/en-US/gettingstarted.xml
   arquillian/trunk/examples/testng/pom.xml
   arquillian/trunk/testng/pom.xml
   arquillian/trunk/testng/src/main/java/org/jboss/arquillian/testng/TestNGDeploymentAppender.java
Log:
ARQ-86 Removed google-guice dependency. Packaged as part of TestNG jar.


Modified: arquillian/trunk/build/pom.xml
===================================================================
--- arquillian/trunk/build/pom.xml	2010-06-10 18:11:27 UTC (rev 4490)
+++ arquillian/trunk/build/pom.xml	2010-06-10 18:45:08 UTC (rev 4491)
@@ -225,11 +225,6 @@
 				<artifactId>testng</artifactId>
 				<version>${version.testng_testng}</version>
 			</dependency>
-			<dependency>
-				<groupId>com.google.inject</groupId> <!-- Needed by TestNG -->
-				<artifactId>guice</artifactId>
-				<version>2.0</version>
-			</dependency>
 
 			<dependency>
 				<groupId>org.mortbay.jetty</groupId>

Modified: arquillian/trunk/doc/reference/src/main/docbook/en-US/gettingstarted.xml
===================================================================
--- arquillian/trunk/doc/reference/src/main/docbook/en-US/gettingstarted.xml	2010-06-10 18:11:27 UTC (rev 4490)
+++ arquillian/trunk/doc/reference/src/main/docbook/en-US/gettingstarted.xml	2010-06-10 18:45:08 UTC (rev 4491)
@@ -77,12 +77,6 @@
    <version>5.12.1</version> 
    <scope>test</scope> 
 </dependency> 
-<dependency> <!-- Needed by TestNG -->
-   <groupId>com.google.inject</groupId> 
-   <artifactId>guice</artifactId> 
-   <version>2.0</version> 
-   <scope>provided</scope> 
-</dependency> 
 
 <dependency>
    <groupId>org.jboss.arquillian</groupId>

Modified: arquillian/trunk/examples/testng/pom.xml
===================================================================
--- arquillian/trunk/examples/testng/pom.xml	2010-06-10 18:11:27 UTC (rev 4490)
+++ arquillian/trunk/examples/testng/pom.xml	2010-06-10 18:45:08 UTC (rev 4491)
@@ -519,11 +519,6 @@
 			<scope>test</scope>
 		</dependency>
 
-		<dependency>
-			<groupId>com.google.inject</groupId> <!-- Needed by TestNG -->
-			<artifactId>guice</artifactId>
-			<scope>provided</scope>
-		</dependency>
 	</dependencies>
 
 

Modified: arquillian/trunk/testng/pom.xml
===================================================================
--- arquillian/trunk/testng/pom.xml	2010-06-10 18:11:27 UTC (rev 4490)
+++ arquillian/trunk/testng/pom.xml	2010-06-10 18:45:08 UTC (rev 4491)
@@ -49,12 +49,6 @@
 		</dependency>
 
 		<dependency>
-			<groupId>com.google.inject</groupId> <!-- Needed by TestNG -->
-			<artifactId>guice</artifactId>
-			<scope>provided</scope>
-		</dependency>
-
-		<dependency>
 			<groupId>ant</groupId>
 			<artifactId>ant</artifactId>
 			<version>1.6.5</version>

Modified: arquillian/trunk/testng/src/main/java/org/jboss/arquillian/testng/TestNGDeploymentAppender.java
===================================================================
--- arquillian/trunk/testng/src/main/java/org/jboss/arquillian/testng/TestNGDeploymentAppender.java	2010-06-10 18:11:27 UTC (rev 4490)
+++ arquillian/trunk/testng/src/main/java/org/jboss/arquillian/testng/TestNGDeploymentAppender.java	2010-06-10 18:45:08 UTC (rev 4491)
@@ -19,6 +19,8 @@
 import org.jboss.arquillian.spi.AuxiliaryArchiveAppender;
 import org.jboss.arquillian.spi.TestRunner;
 import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ArchivePath;
+import org.jboss.shrinkwrap.api.Filter;
 import org.jboss.shrinkwrap.api.Filters;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
@@ -40,11 +42,15 @@
       return ShrinkWrap.create("arquillian-testng.jar", JavaArchive.class)
                .addPackages(
                      true, 
-                     Filters.exclude("/org/testng/junit/.*"),
+                     // exclude com.sun.javadoc.Doclet loading, not in OpenJDK
+                     Filters.exclude("/org/testng/junit/.*"), 
                      TestNG.class.getPackage(),
-                     Inject.class.getPackage(),
                      Package.getPackage("org.jboss.arquillian.testng"))
-               .addPackage(TestNG.class.getPackage())
+               .addPackages(
+                     true,
+                     // exclude AOP Alliance reference, not provided as part of TestNG jar
+                     Filters.exclude(".*/InterceptorStackCallback\\$InterceptedMethodInvocation.*"),
+                     Inject.class.getPackage())
                .addServiceProvider(
                      TestRunner.class, 
                      TestNGTestRunner.class);