From aa5335660a20a1d24016f6a4456dbcb4f92b0f68 Mon Sep 17 00:00:00 2001
From: Alessio Soldano <asoldano@redhat.com>
Date: Mon, 12 Feb 2018 10:54:58 +0100
Subject: [PATCH] [WFLY-9128] JAXB 2.2 / 2.3 module switch to load the API that
 matches current EE version

---
 feature-pack/pom.xml                                |  5 +++++
 .../layers/base/javax/xml/bind/api/main/module.xml  | 13 +++++++++++--
 pom.xml                                             |  7 +++++++
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/feature-pack/pom.xml b/feature-pack/pom.xml
index 055d5287e7e4..8e5e3b1507b5 100644
--- a/feature-pack/pom.xml
+++ b/feature-pack/pom.xml
@@ -1281,6 +1281,11 @@
         </dependency>
 
 
+        <dependency>
+            <groupId>org.jboss.spec.javax.xml.bind</groupId>
+            <artifactId>jboss-jaxb-api_2.2_spec</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>org.jboss.spec.javax.xml.bind</groupId>
             <artifactId>jboss-jaxb-api_2.3_spec</artifactId>
diff --git a/feature-pack/src/main/resources/modules/system/layers/base/javax/xml/bind/api/main/module.xml b/feature-pack/src/main/resources/modules/system/layers/base/javax/xml/bind/api/main/module.xml
index e6204484a73c..f4cc0ffe5740 100644
--- a/feature-pack/src/main/resources/modules/system/layers/base/javax/xml/bind/api/main/module.xml
+++ b/feature-pack/src/main/resources/modules/system/layers/base/javax/xml/bind/api/main/module.xml
@@ -22,7 +22,7 @@
   ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
   -->
 
-<module xmlns="urn:jboss:module:1.5" name="javax.xml.bind.api">
+<module xmlns="urn:jboss:module:1.7" name="javax.xml.bind.api">
 
 
     <dependencies>
@@ -33,6 +33,15 @@
     </dependencies>
 
     <resources>
-        <artifact name="${org.jboss.spec.javax.xml.bind:jboss-jaxb-api_2.3_spec}"/>
+        <artifact name="${org.jboss.spec.javax.xml.bind:jboss-jaxb-api_2.3_spec}">
+            <conditions>
+              <property-equal name="ee8.preview.mode" value="true"/>
+            </conditions>
+        </artifact>
+        <artifact name="${org.jboss.spec.javax.xml.bind:jboss-jaxb-api_2.2_spec}">
+            <conditions>
+              <property-not-equal name="ee8.preview.mode" value="true"/>
+            </conditions>
+        </artifact>
     </resources>
 </module>
diff --git a/pom.xml b/pom.xml
index 35da7b7ea1f7..ee807dd17216 100644
--- a/pom.xml
+++ b/pom.xml
@@ -194,6 +194,7 @@
         <version.org.jboss.spec.javax.servlet.jsp.jboss-jsp-api_2.3_spec>1.0.3.Final</version.org.jboss.spec.javax.servlet.jsp.jboss-jsp-api_2.3_spec>
         <version.org.jboss.spec.javax.transaction.jboss-transaction-api_1.2_spec>1.1.1.Final</version.org.jboss.spec.javax.transaction.jboss-transaction-api_1.2_spec>
         <version.org.jboss.spec.javax.ws.jboss-jaxrs-api_2.0_spec>1.0.1.Final</version.org.jboss.spec.javax.ws.jboss-jaxrs-api_2.0_spec>
+        <version.org.jboss.spec.javax.xml.bind.jboss-jaxb-api_2.2_spec>1.0.5.Final</version.org.jboss.spec.javax.xml.bind.jboss-jaxb-api_2.2_spec>
         <version.org.jboss.spec.javax.xml.bind.jboss-jaxb-api_2.3_spec>1.0.1.Final</version.org.jboss.spec.javax.xml.bind.jboss-jaxb-api_2.3_spec>
         <version.org.jboss.spec.javax.xml.rpc.jboss-jaxrpc-api_1.1_spec>1.0.2.Final</version.org.jboss.spec.javax.xml.rpc.jboss-jaxrpc-api_1.1_spec>
         <version.org.jboss.spec.javax.xml.soap.jboss-saaj-api_1.3_spec>1.0.6.Final</version.org.jboss.spec.javax.xml.soap.jboss-saaj-api_1.3_spec>
@@ -5464,6 +5465,12 @@
                 <version>${version.org.jboss.spec.javax.ws.jboss-jaxrs-api_2.0_spec}</version>
             </dependency>
 
+            <dependency>
+                <groupId>org.jboss.spec.javax.xml.bind</groupId>
+                <artifactId>jboss-jaxb-api_2.2_spec</artifactId>
+                <version>${version.org.jboss.spec.javax.xml.bind.jboss-jaxb-api_2.2_spec}</version>
+            </dependency>
+
             <dependency>
                 <groupId>org.jboss.spec.javax.xml.bind</groupId>
                 <artifactId>jboss-jaxb-api_2.3_spec</artifactId>