From 59b91691b119ac759adb50597e0f140b5d6d05ca Mon Sep 17 00:00:00 2001
From: Martin Kouba <mkouba@redhat.com>
Date: Tue, 30 Jul 2013 13:08:56 +0200
Subject: [PATCH] Upgrade Arquillian Jetty container adapter to 1.0.0.CR2, add
 Jetty 9 support

---
 environments/servlet/tests/jetty/pom.xml | 39 +++++++++++++++++++-----
 pom.xml                                  |  8 ++++-
 2 files changed, 39 insertions(+), 8 deletions(-)

diff --git a/environments/servlet/tests/jetty/pom.xml b/environments/servlet/tests/jetty/pom.xml
index 81c8d69c554..75f532bd39f 100644
--- a/environments/servlet/tests/jetty/pom.xml
+++ b/environments/servlet/tests/jetty/pom.xml
@@ -94,9 +94,8 @@
         <profile>
             <id>default</id>
             <activation>
-                <activeByDefault>true</activeByDefault>
                 <property>
-                    <name>default</name>
+                    <name>!incontainer</name>
                 </property>
             </activation>
             <build>
@@ -120,11 +119,6 @@
                 </property>
             </activation>
             <dependencies>
-                <dependency>
-                    <groupId>org.jboss.arquillian.container</groupId>
-                    <artifactId>arquillian-jetty-embedded-7</artifactId>
-                    <scope>test</scope>
-                </dependency>
 
                 <dependency>
                     <groupId>org.jboss.shrinkwrap.descriptors</groupId>
@@ -190,6 +184,37 @@
 
             </dependencies>
         </profile>
+        <profile>
+        	<id>jetty-embedded-7</id>
+        	<activation>
+        		<property>
+        			<name>!jetty-embedded-9</name>
+        		</property>
+        	</activation>
+        	<dependencies>
+        		<dependency>
+                    <groupId>org.jboss.arquillian.container</groupId>
+                    <artifactId>arquillian-jetty-embedded-7</artifactId>
+                    <scope>test</scope>
+                </dependency>
+        	</dependencies>
+        </profile>
+        <profile>
+        	<id>jetty-embedded-9</id>
+        	<activation>
+                <activeByDefault>false</activeByDefault>
+                <property>
+                    <name>jetty-embedded-9</name>
+                </property>
+            </activation>
+        	<dependencies>
+        		<dependency>
+                    <groupId>org.jboss.arquillian.container</groupId>
+                    <artifactId>arquillian-jetty-embedded-9</artifactId>
+                    <scope>test</scope>
+                </dependency>
+        	</dependencies>
+        </profile>
     </profiles>
 
 </project>
diff --git a/pom.xml b/pom.xml
index 4a82f2a42b5..553fd9322d9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,7 +32,7 @@
         <arquillian.weld.version>1.0.0.CR7</arquillian.weld.version>
         <arquillian.tomcat.version>1.0.0.CR4</arquillian.tomcat.version>
         <arquillian.tomcat7.version>1.0.0.CR4</arquillian.tomcat7.version>
-        <arquillian.jetty.version>1.0.0.CR1</arquillian.jetty.version>
+        <arquillian.jetty.version>1.0.0.CR2</arquillian.jetty.version>
         <arquillian.glassfish.version>1.0.0.CR1</arquillian.glassfish.version>
         <arquillian.jboss6.version>1.0.0.CR2</arquillian.jboss6.version>
         <atinject.tck.version>1</atinject.tck.version>
@@ -291,6 +291,12 @@
                 <version>${arquillian.jetty.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>org.jboss.arquillian.container</groupId>
+                <artifactId>arquillian-jetty-embedded-9</artifactId>
+                <version>${arquillian.jetty.version}</version>
+            </dependency>
+
             <dependency>
                 <groupId>org.jboss.arquillian.container</groupId>
                 <artifactId>arquillian-glassfish-embedded-3.1</artifactId>