From 727ea510fee3ae10eb18e92829b51af89b099af0 Mon Sep 17 00:00:00 2001
From: Antonin Stefanutti <antonin@stefanutti.fr>
Date: Thu, 18 Aug 2016 15:31:26 +0200
Subject: [PATCH] Upgrade Weld embedded Arquillian adapter to version
 2.0.0.Beta2

---
 envs/ee/pom.xml |  2 +-
 envs/pom.xml    |  1 -
 envs/se/pom.xml | 10 +++++++++-
 pom.xml         | 11 ++---------
 samples/pom.xml |  2 +-
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/envs/ee/pom.xml b/envs/ee/pom.xml
index fba6adc..6011b02 100644
--- a/envs/ee/pom.xml
+++ b/envs/ee/pom.xml
@@ -80,7 +80,7 @@
 
                 <dependency>
                     <groupId>org.jboss.arquillian.container</groupId>
-                    <artifactId>arquillian-weld-ee-embedded-1.1</artifactId>
+                    <artifactId>arquillian-weld-embedded</artifactId>
                 </dependency>
 
             </dependencies>
diff --git a/envs/pom.xml b/envs/pom.xml
index 3c7a901..6074566 100644
--- a/envs/pom.xml
+++ b/envs/pom.xml
@@ -111,7 +111,6 @@
         <dependency>
             <groupId>org.jboss.arquillian.junit</groupId>
             <artifactId>arquillian-junit-container</artifactId>
-            <scope>test</scope>
         </dependency>
 
         <dependency>
diff --git a/envs/se/pom.xml b/envs/se/pom.xml
index 9e0dee2..4ec3ed7 100644
--- a/envs/se/pom.xml
+++ b/envs/se/pom.xml
@@ -56,7 +56,15 @@
 
                 <dependency>
                     <groupId>org.jboss.arquillian.container</groupId>
-                    <artifactId>arquillian-weld-se-embedded-1.1</artifactId>
+                    <artifactId>arquillian-weld-embedded</artifactId>
+                </dependency>
+                <!-- FIXME: The Weld embedded Arquillian adapter requires JTA
+                     see https://issues.jboss.org/browse/ARQ-2040 -->
+                <dependency>
+                    <groupId>javax.transaction</groupId>
+                    <artifactId>jta</artifactId>
+                    <version>1.1</version>
+                    <scope>test</scope>
                 </dependency>
 
             </dependencies>
diff --git a/pom.xml b/pom.xml
index a76ded6..d7f424e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -99,7 +99,7 @@
         <wildfly-camel.version>4.2.0</wildfly-camel.version>
         <arquillian.version>1.1.11.Final</arquillian.version>
         <arquillian-osgi.version>2.1.0.CR18</arquillian-osgi.version>
-        <arquillian.weld.version>1.0.0.CR9</arquillian.weld.version>
+        <arquillian.weld.version>2.0.0.Beta2</arquillian.weld.version>
         <shrinkwrap.resolver.version>2.2.2</shrinkwrap.resolver.version>
         <shrinkwrap.descriptors.version>2.0.0-alpha-10</shrinkwrap.descriptors.version>
         <activemq.version>5.12.1</activemq.version>
@@ -452,14 +452,7 @@
 
             <dependency>
                 <groupId>org.jboss.arquillian.container</groupId>
-                <artifactId>arquillian-weld-se-embedded-1.1</artifactId>
-                <version>${arquillian.weld.version}</version>
-                <scope>test</scope>
-            </dependency>
-
-            <dependency>
-                <groupId>org.jboss.arquillian.container</groupId>
-                <artifactId>arquillian-weld-ee-embedded-1.1</artifactId>
+                <artifactId>arquillian-weld-embedded</artifactId>
                 <version>${arquillian.weld.version}</version>
                 <scope>test</scope>
             </dependency>
diff --git a/samples/pom.xml b/samples/pom.xml
index 40d1c5e..2d9dccf 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -134,7 +134,7 @@
 
                 <dependency>
                     <groupId>org.jboss.arquillian.container</groupId>
-                    <artifactId>arquillian-weld-se-embedded-1.1</artifactId>
+                    <artifactId>arquillian-weld-embedded</artifactId>
                     <optional>true</optional>
                 </dependency>
             </dependencies>