[JBPM-10221] Fix assembly for webc after RHPAM-4876 (#3018) (#3019)

Co-authored-by: Gonzalo Muñoz <[email protected]>
kiegroup · Jan 28, 2024 · e49a1dd · e49a1dd
1 parent 98cad78
commit e49a1dd
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/...java/org/kie/server/integrationtests/extension/custom/CustomExtensionIntegrationTest.java b/...java/org/kie/server/integrationtests/extension/custom/CustomExtensionIntegrationTest.java
@@ -33,13 +33,16 @@
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.junit.experimental.categories.Category;
 import org.kie.api.KieServices;
 import org.kie.api.runtime.ExecutionResults;
 import org.kie.server.api.marshalling.MarshallingFormat;
 import org.kie.server.api.model.ReleaseId;
 import org.kie.server.client.CustomExtensionClient;
 import org.kie.server.client.KieServicesClient;
 import org.kie.server.common.rest.Authenticator;
+import org.kie.server.integrationtests.category.JEEOnly;
+import org.kie.server.integrationtests.category.WildflyOnly;
 import org.kie.server.integrationtests.shared.KieServerDeployer;
 import org.kie.server.integrationtests.shared.KieServerReflections;
 import org.kie.server.integrationtests.shared.basetests.KieServerBaseIntegrationTest;
@@ -116,6 +119,7 @@ private Object createPersonInstance(String firstname, String surname, ClassLoade
     }
 
     @Test
+    @Category({JEEOnly.class, WildflyOnly.class})
     public void testCustomJsonResourceEndpoint() {
         // RHPAM-4876
         if (configuration.getMarshallingFormat() != MarshallingFormat.JSON) {

diff --git a/kie-server-parent/kie-server-wars/kie-server/src/main/assembly/assembly-ee7-container.xml b/kie-server-parent/kie-server-wars/kie-server/src/main/assembly/assembly-ee7-container.xml
@@ -87,9 +87,12 @@
 	<include>com.sun.xml.bind:jaxb-xjc</include>
 
         <include>org.yaml:snakeyaml</include>
+
+        <include>org.jboss.resteasy:resteasy-jackson2-provider</include>
       </includes>
       <excludes>
-        <exclude>org.jboss.resteasy:*</exclude>
+        <exclude>org.jboss.resteasy:resteasy-jackson-provider</exclude>
+        <exclude>org.jboss.resteasy:resteasy-jaxb-provider</exclude>
         <exclude>jakarta.annotation:*</exclude>
         <exclude>jakarta.ejb:*</exclude>
         <exclude>jakarta.interceptor:*</exclude>

diff --git a/...server-parent/kie-server-wars/kie-server/src/main/assembly/assembly-servlet-container.xml b/...server-parent/kie-server-wars/kie-server/src/main/assembly/assembly-servlet-container.xml
@@ -80,6 +80,9 @@
         <include>org.quartz-scheduler:quartz</include>
 
         <include>com.google.inject.extensions:guice-servlet</include>
+
+        <include>org.jboss.resteasy:resteasy-jackson2-provider</include>
+
       </includes>
       <outputDirectory>WEB-INF/lib</outputDirectory>
       <useTransitiveFiltering>true</useTransitiveFiltering>