Merge pull request #16112 from jamezp/WFLY-17045

[WFLY-17045] Move RESTEasy Spring to WildFly Preview as there is not …
wildfly · Sep 27, 2022 · 8e61af3 · 8e61af3
2 parents d21a827 + 934b70f
commit 8e61af3
Show file tree

Hide file tree

Showing 11 changed files with 40 additions and 39 deletions.
diff --git a/boms/preview-ee/pom.xml b/boms/preview-ee/pom.xml
@@ -74,6 +74,18 @@
                     </exclusion>
                 </exclusions>
             </dependency>
+
+            <dependency>
+                <groupId>org.jboss.resteasy.spring</groupId>
+                <artifactId>resteasy-spring</artifactId>
+                <version>${preview.version.org.jboss.resteasy.spring}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>*</groupId>
+                        <artifactId>*</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 

diff --git a/boms/standard-ee/pom.xml b/boms/standard-ee/pom.xml
@@ -2571,18 +2571,6 @@
                 <version>${version.org.jboss.resteasy}</version>
             </dependency>
 
-            <dependency>
-                <groupId>org.jboss.resteasy.spring</groupId>
-                <artifactId>resteasy-spring</artifactId>
-                <version>${version.org.jboss.resteasy.spring}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>*</groupId>
-                        <artifactId>*</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-
             <dependency>
                 <groupId>org.jboss.spec.jakarta.el</groupId>
                 <artifactId>jboss-el-api_5.0_spec</artifactId>

diff --git a/ee-9/common/pom.xml b/ee-9/common/pom.xml
@@ -53,6 +53,11 @@
             <artifactId>hibernate-search-mapper-orm-coordination-outbox-polling-orm6</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.jboss.resteasy.spring</groupId>
+            <artifactId>resteasy-spring</artifactId>
+        </dependency>
+
     </dependencies>
 
     <build>

diff --git a/ee-9/common/src/main/resources/license/preview-feature-pack-common-licenses.xml b/ee-9/common/src/main/resources/license/preview-feature-pack-common-licenses.xml
@@ -437,6 +437,17 @@
         </license>
       </licenses>
     </dependency>
+    <dependency>
+      <groupId>org.jboss.resteasy.spring</groupId>
+      <artifactId>resteasy-spring</artifactId>
+      <licenses>
+        <license>
+          <name>Apache License 2.0</name>
+          <url>http://www.apache.org/licenses/LICENSE-2.0</url>
+          <distribution>repo</distribution>
+        </license>
+      </licenses>
+    </dependency>
     <dependency>
       <groupId>org.jboss.spec.javax.annotation</groupId>
       <artifactId>jboss-annotations-api_1.3_spec</artifactId>

diff --git a/.../resteasy/resteasy-spring/main/module.xml → .../resteasy/resteasy-spring/main/module.xml b/.../resteasy/resteasy-spring/main/module.xml → .../resteasy/resteasy-spring/main/module.xml
diff --git a/ee-9/galleon-content/src/main/resources/feature_groups/jaxrs.xml b/ee-9/galleon-content/src/main/resources/feature_groups/jaxrs.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature-group-spec name="jaxrs" xmlns="urn:jboss:galleon:feature-group:1.0">
+    <feature spec="subsystem.jaxrs"/>
+    <packages>
+        <package name="org.jboss.resteasy.resteasy-spring" optional="true"/>
+    </packages>
+</feature-group-spec>
+
diff --git a/...easy.resteasy-spring/pm/wildfly/tasks.xml → ...easy.resteasy-spring/pm/wildfly/tasks.xml b/...easy.resteasy-spring/pm/wildfly/tasks.xml → ...easy.resteasy-spring/pm/wildfly/tasks.xml
diff --git a/ee-feature-pack/common/pom.xml b/ee-feature-pack/common/pom.xml
@@ -2475,17 +2475,6 @@
             </exclusions>
         </dependency>
 
-        <dependency>
-            <groupId>org.jboss.resteasy.spring</groupId>
-            <artifactId>resteasy-spring</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>*</groupId>
-                    <artifactId>*</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
         <dependency>
             <groupId>org.jboss.seam.integration</groupId>
             <artifactId>jboss-seam-int-jbossas</artifactId>

diff --git a/ee-feature-pack/common/src/main/resources/license/ee-feature-pack-common-licenses.xml b/ee-feature-pack/common/src/main/resources/license/ee-feature-pack-common-licenses.xml
@@ -3907,17 +3907,6 @@
         </license>
       </licenses>
     </dependency>
-    <dependency>
-      <groupId>org.jboss.resteasy.spring</groupId>
-      <artifactId>resteasy-spring</artifactId>
-      <licenses>
-        <license>
-          <name>Apache License 2.0</name>
-          <url>http://www.apache.org/licenses/LICENSE-2.0</url>
-          <distribution>repo</distribution>
-        </license>
-      </licenses>
-    </dependency>
     <dependency>
       <groupId>org.jboss.seam.integration</groupId>
       <artifactId>jboss-seam-int-jbossas</artifactId>

diff --git a/jaxrs/src/main/java/org/jboss/as/jaxrs/JaxrsSubsystemDefinition.java b/jaxrs/src/main/java/org/jboss/as/jaxrs/JaxrsSubsystemDefinition.java
@@ -85,9 +85,10 @@ public void registerAdditionalRuntimePackages(ManagementResourceRegistration res
                     RuntimePackageDependency.optional(RESTEASY_MULTIPART.getName()),
                     RuntimePackageDependency.optional(RESTEASY_CRYPTO.getName()),
                     RuntimePackageDependency.optional(JACKSON_DATATYPE_JDK8.getName()),
-                    RuntimePackageDependency.optional(JACKSON_DATATYPE_JSR310.getName()),
+                    RuntimePackageDependency.optional(JACKSON_DATATYPE_JSR310.getName()));
                     // The following ones are optional dependencies located in org.jboss.as.jaxrs module.xml
                     // To be provisioned, they need to be explicitly added as optional packages.
-                    RuntimePackageDependency.optional("org.jboss.resteasy.resteasy-spring"));
+                    // TODO this needs to be added back once RESTEasy Spring is moved back from WildFly Preview
+                    //RuntimePackageDependency.optional("org.jboss.resteasy.resteasy-spring"));
     }
 }
diff --git a/pom.xml b/pom.xml
@@ -513,7 +513,6 @@
         <legacy.version.org.jboss.resteasy>4.7.4.Final</legacy.version.org.jboss.resteasy>
         <version.org.jboss.resteasy>6.2.0.Final</version.org.jboss.resteasy>
         <version.org.jboss.resteasy.microprofile>2.0.0.Final</version.org.jboss.resteasy.microprofile>
-        <version.org.jboss.resteasy.spring>3.0.0.Beta1</version.org.jboss.resteasy.spring>
         <version.org.jboss.seam.int>7.0.0.GA</version.org.jboss.seam.int>
         <!-- only needed here until wildfly-arquillian has this version properly synced with arquillian itslef  -->
         <version.org.jboss.shrinkwrap.descriptors>2.0.0</version.org.jboss.shrinkwrap.descriptors>
@@ -594,8 +593,7 @@
             WildFly Preview version properties.
             Property names should be in the form 'preview.version.xxx'. 
         -->
-
-        <!-- currently none-->
+        <preview.version.org.jboss.resteasy.spring>3.0.0.Beta1</preview.version.org.jboss.resteasy.spring>
 
     </properties>