chore(engine-rest): consolidate engine-rest artifacts

Merges the functionality of the `org.camunda.bpm:camunda-engine-rest-jaxrs2` artifact into the `org.camunda.bpm:camunda-engine-rest-core` artifact. Previously, only the `jaxrs2` artifact had the long-polling capability. Since we dropped support for IBM WebSphere Application Server 8.5, we no longer need to maintain two artifacts. related to CAM-14862, closes camunda#2011
spenggch · Sep 16, 2022 · b1ce8bd · b1ce8bd
1 parent 42d3fca
commit b1ce8bd
Show file tree

Hide file tree

Showing 53 changed files with 71 additions and 1,957 deletions.
diff --git a/.ci/config/matrices.yaml b/.ci/config/matrices.yaml
@@ -32,8 +32,6 @@ engine-rest:
   - 'engine-rest-unit-jersey-2'
   - 'engine-rest-unit-resteasy'
   - 'engine-rest-unit-cxf'
-  - 'engine-rest-unit-jaxrs2-jersey-2'
-  - 'engine-rest-unit-jaxrs2-resteasy'
   - 'engine-rest-unit-compatibility-wildfly'
   - 'engine-rest-IT-embedded-wildfly'
 daily-stages:

diff --git a/.ci/config/stage-types.yaml b/.ci/config/stage-types.yaml
@@ -127,22 +127,6 @@ engine-rest-unit-cxf:
   labels:
   - 'rest-api'
   nodeLabel: 'h2'
-engine-rest-unit-jaxrs2-jersey-2:
-  directory: 'engine-rest/engine-rest-jaxrs2'
-  command: 'clean install -Pjersey2'
-  stash:
-    runtimeStash: true
-  labels:
-  - 'rest-api'
-  nodeLabel: 'h2'
-engine-rest-unit-jaxrs2-resteasy:
-  directory: 'engine-rest/engine-rest-jaxrs2'
-  command: 'clean install -Presteasy'
-  stash:
-    runtimeStash: true
-  labels:
-  - 'rest-api'
-  nodeLabel: 'h2'
 engine-rest-unit-compatibility-wildfly:
   directory: 'engine-rest/engine-rest'
   command: 'clean install -Pwildfly-compatibility'

diff --git a/bom/pom.xml b/bom/pom.xml
@@ -68,11 +68,6 @@
         <artifactId>camunda-engine-rest</artifactId>
         <version>${project.version}</version>
       </dependency>
-      <dependency>
-        <groupId>org.camunda.bpm</groupId>
-        <artifactId>camunda-engine-rest-jaxrs2</artifactId>
-        <version>${project.version}</version>
-      </dependency>
       <dependency>
         <groupId>org.camunda.bpm.identity</groupId>
         <artifactId>camunda-identity-ldap</artifactId>

diff --git a/distro/run/modules/pom.xml b/distro/run/modules/pom.xml
@@ -84,7 +84,7 @@
       </dependency>
       <dependency>
         <groupId>org.camunda.bpm</groupId>
-        <artifactId>camunda-engine-rest-jaxrs2</artifactId>
+        <artifactId>camunda-engine-rest-core</artifactId>
         <scope>provided</scope>
       </dependency>
     </dependencies>

diff --git a/engine-rest/assembly/assembly-war-tomcat.xml b/engine-rest/assembly/assembly-war-tomcat.xml
@@ -17,11 +17,15 @@
       <useTransitiveFiltering>true</useTransitiveFiltering>
       <scope>provided</scope>
       <includes>
-        <include>org.camunda.bpm:camunda-engine-rest-jaxrs2:jar:*</include>
+        <include>org.camunda.bpm:camunda-engine-rest-core:jar</include>
         <include>org.jboss.resteasy:resteasy-jaxrs:jar:*</include>
         <include>org.jboss.resteasy:async-http-servlet-3.0:jar:*</include>
         <include>org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_2.1_spec:jar:*</include>
       </includes>
+      <excludes>
+        <exclude>org.camunda.bpm:camunda-engine-rest-core:jar:tests</exclude>
+        <exclude>org.camunda.bpm:camunda-engine-rest-core:jar:sources</exclude>
+      </excludes>
     </dependencySet>
 
     <dependencySet>
@@ -32,8 +36,7 @@
       <unpack>true</unpack>   
       <unpackOptions>
         <excludes>
-          <exclude>**/web.xml</exclude> 
-          <exclude>**/camunda-engine-rest-core-*</exclude>        
+          <exclude>**/web.xml</exclude>  
         </excludes>
       </unpackOptions>   
     </dependencySet>    

diff --git a/engine-rest/assembly/assembly-war-was9.xml b/engine-rest/assembly/assembly-war-was9.xml
@@ -24,18 +24,21 @@
       <useTransitiveFiltering>true</useTransitiveFiltering>
       <scope>provided</scope>
       <includes>
-        <include>org.camunda.bpm:camunda-engine-rest-jaxrs2:jar:*</include>
+        <include>org.camunda.bpm:camunda-engine-rest-core:jar</include>
         <include>org.glassfish.jersey.containers:jersey-container-servlet:*</include>
         <include>org.glassfish.jersey.inject:jersey-hk2:*</include>
       </includes>
+      <excludes>
+        <exclude>org.camunda.bpm:camunda-engine-rest-core:jar:tests</exclude>
+        <exclude>org.camunda.bpm:camunda-engine-rest-core:jar:sources</exclude>
+      </excludes>
     </dependencySet>
     <dependencySet>
       <outputDirectory>/</outputDirectory>
       <unpack>true</unpack>
       <unpackOptions>
         <excludes>
           <exclude>**/web.xml</exclude>
-          <exclude>**/camunda-engine-rest-core-*</exclude>
         </excludes>
       </unpackOptions>
       <includes>

diff --git a/engine-rest/assembly/assembly-war-wildfly.xml b/engine-rest/assembly/assembly-war-wildfly.xml
@@ -24,8 +24,12 @@
       <useTransitiveFiltering>true</useTransitiveFiltering>
       <scope>provided</scope>
       <includes>
-        <include>org.camunda.bpm:camunda-engine-rest-jaxrs2:jar:*</include>
+        <include>org.camunda.bpm:camunda-engine-rest-core:jar</include>
       </includes>
+      <excludes>
+        <exclude>org.camunda.bpm:camunda-engine-rest-core:jar:tests</exclude>
+        <exclude>org.camunda.bpm:camunda-engine-rest-core:jar:sources</exclude>
+      </excludes>
     </dependencySet>
 
     <dependencySet>
@@ -38,7 +42,6 @@
         <excludes>
           <exclude>**/jboss-deployment-structure.xml</exclude>
           <exclude>**/web.xml</exclude>
-          <exclude>**/camunda-engine-rest-core-*</exclude>
         </excludes>
       </unpackOptions>   
     </dependencySet>    

diff --git a/engine-rest/assembly/assembly-war-wls.xml b/engine-rest/assembly/assembly-war-wls.xml
@@ -24,10 +24,14 @@
       <useTransitiveFiltering>true</useTransitiveFiltering>
       <scope>provided</scope>
       <includes>
-        <include>org.camunda.bpm:camunda-engine-rest-jaxrs2:jar:*</include>
+        <include>org.camunda.bpm:camunda-engine-rest-core:jar</include>
         <include>org.glassfish.jersey.containers:jersey-container-servlet:*</include>
         <include>org.glassfish.jersey.inject:jersey-hk2:*</include>
       </includes>
+      <excludes>
+        <exclude>org.camunda.bpm:camunda-engine-rest-core:jar:tests</exclude>
+        <exclude>org.camunda.bpm:camunda-engine-rest-core:jar:sources</exclude>
+      </excludes>
     </dependencySet>
 
     <dependencySet>
@@ -36,7 +40,6 @@
       <unpackOptions>
         <excludes>
           <exclude>**/web.xml</exclude>
-          <exclude>**/camunda-engine-rest-core-*</exclude>
         </excludes>
       </unpackOptions>
       <includes>

diff --git a/engine-rest/assembly/pom.xml b/engine-rest/assembly/pom.xml
@@ -27,13 +27,6 @@
       <version>${project.version}</version>
     </dependency>
 
-    <dependency>
-      <groupId>org.camunda.bpm</groupId>
-      <artifactId>camunda-engine-rest-jaxrs2</artifactId>
-      <version>${project.version}</version>
-      <scope>provided</scope>
-    </dependency>
-
     <!-- dependencies only used for assemblies should be scope provided -->
     <dependency>
       <groupId>org.camunda.bpm</groupId>