Merge pull request #25 from jamezp/issue24

[24] Upgrade to WildFly 25 and get the feature pack working with a pr…
resteasy · Nov 3, 2021 · d06d605 · d06d605
2 parents 42a1c3d + 881942f
commit d06d605
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/galleon-feature-pack/pom.xml b/galleon-feature-pack/pom.xml
@@ -95,6 +95,12 @@
             <artifactId>galleon-feature-pack</artifactId>
             <version>${version.org.jboss.resteasy}</version>
             <type>zip</type>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.wildfly</groupId>
+                    <artifactId>wildfly-ee-galleon-pack</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
     </dependencies>
 

diff --git a/galleon-feature-pack/wildfly-feature-pack-build.xml b/galleon-feature-pack/wildfly-feature-pack-build.xml
@@ -20,21 +20,13 @@
     <transitive>
         <dependency group-id="org.wildfly" artifact-id="wildfly-ee-galleon-pack" translate-to-fpl="true">
             <name>org.wildfly:wildfly-ee-galleon-pack</name>
-            <packages inherit="true">
-                <!-- Exclude modules no longer provided by RESTEasy -->
-                <exclude name="org.jboss.resteasy.resteasy-yaml-provider"/>
-                <exclude name="org.jboss.resteasy.resteasy-jettison-provider"/>
-                <exclude name="org.jboss.resteasy.resteasy-spring"/>
-            </packages>
-            <default-configs inherit="false"/>
+            <packages inherit="true"/>
         </dependency>
     </transitive>
     <dependencies>
         <dependency group-id="org.wildfly" artifact-id="wildfly-galleon-pack" translate-to-fpl="true">
             <name>org.wildfly:wildfly-galleon-pack</name>
-            <packages inherit="true">
-                <exclude name="microprofile-rest-client"/>
-            </packages>
+            <packages inherit="true"/>
         </dependency>
         <dependency group-id="org.jboss.resteasy" artifact-id="galleon-feature-pack" translate-to-fpl="true">
             <name>org.jboss.resteasy:galleon-feature-pack</name>

diff --git a/pom.xml b/pom.xml
@@ -70,7 +70,7 @@
         <version.org.jboss.logging.jboss-logging-tools>2.2.1.Final</version.org.jboss.logging.jboss-logging-tools>
         <version.org.jboss.resteasy>5.0.0.Beta2</version.org.jboss.resteasy>
 
-        <version.org.wildfly>24.0.1.Final</version.org.wildfly>
+        <version.org.wildfly>25.0.1.Final</version.org.wildfly>
         <!-- TODO (jrp) this can be removed when RESTEASY-2973 is resolved -->
         <version.org.wildfly.common>1.5.2.Final</version.org.wildfly.common>