chore(engine): bump jackson to 2.13.1

* Drop Resteast 2.3.x.Final and Wink from CI and Maven profiles. There are no Camunda distros that use Resteasy 2 or Wink. Furthermore, Jackson 2.13.x drops support for JAX-RS1, which is used by Resteasy 2.3 and Wink. * Rename the resteasy3 properties and profiles to resteasy. It is now the single supported Resteasy version. * Refactor the Jackson Maven properties into a single version.jackson property located in our parent pom.xml. Related to CAM-14218, CAM-14379; closes camunda#1762
yhao3 · Feb 28, 2022 · 545c148 · 545c148
1 parent 6372936
commit 545c148
Show file tree

Hide file tree

Showing 19 changed files with 30 additions and 293 deletions.
diff --git a/.ci/config/matrices.yaml b/.ci/config/matrices.yaml
@@ -31,11 +31,9 @@ engine-rest:
   stages:
   - 'engine-rest-unit-jersey-2'
   - 'engine-rest-unit-resteasy'
-  - 'engine-rest-unit-resteasy3'
   - 'engine-rest-unit-cxf'
-  - 'engine-rest-unit-wink'
   - 'engine-rest-unit-jaxrs2-jersey-2'
-  - 'engine-rest-unit-jaxrs2-resteasy3'
+  - '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
@@ -119,14 +119,6 @@ engine-rest-unit-resteasy:
   labels:
   - 'rest-api'
   nodeLabel: 'h2'
-engine-rest-unit-resteasy3:
-  directory: 'engine-rest/engine-rest'
-  command: 'clean install -Presteasy3'
-  stash:
-    runtimeStash: true
-  labels:
-  - 'rest-api'
-  nodeLabel: 'h2'
 engine-rest-unit-cxf:
   directory: 'engine-rest/engine-rest'
   command: 'clean install -Pcxf'
@@ -135,14 +127,6 @@ engine-rest-unit-cxf:
   labels:
   - 'rest-api'
   nodeLabel: 'h2'
-engine-rest-unit-wink:
-  directory: 'engine-rest/engine-rest'
-  command: 'clean install -Pwink'
-  stash:
-    runtimeStash: true
-  labels:
-  - 'rest-api'
-  nodeLabel: 'h2'
 engine-rest-unit-jaxrs2-jersey-2:
   directory: 'engine-rest/engine-rest-jaxrs2'
   command: 'clean install -Pjersey2'
@@ -151,9 +135,9 @@ engine-rest-unit-jaxrs2-jersey-2:
   labels:
   - 'rest-api'
   nodeLabel: 'h2'
-engine-rest-unit-jaxrs2-resteasy3:
+engine-rest-unit-jaxrs2-resteasy:
   directory: 'engine-rest/engine-rest-jaxrs2'
-  command: 'clean install -Presteasy3'
+  command: 'clean install -Presteasy'
   stash:
     runtimeStash: true
   labels:

diff --git a/clients/java/client/pom.xml b/clients/java/client/pom.xml
@@ -15,7 +15,6 @@
 
   <properties>
     <version.httpclient>4.5.9</version.httpclient>
-    <version.jackson>2.12.1</version.jackson>
 
     <engine.runtime>${project.build.directory}/camunda-tomcat</engine.runtime>
     <tomcat.runtime>${engine.runtime}/server/apache-tomcat-${version.tomcat}</tomcat.runtime>

diff --git a/database/pom.xml b/database/pom.xml
@@ -577,7 +577,7 @@
         <dependency>
           <artifactId>jackson-annotations</artifactId>
           <groupId>com.fasterxml.jackson.core</groupId>
-          <version>2.12.1</version>
+          <version>${version.jackson}</version>
           <scope>test</scope>
         </dependency>
       </dependencies>

diff --git a/distro/tomcat/webapp/pom.xml b/distro/tomcat/webapp/pom.xml
@@ -27,7 +27,7 @@
     <dependency>
       <groupId>org.jboss.resteasy</groupId>
       <artifactId>resteasy-jaxrs</artifactId>
-      <version>${version.resteasy3}</version>
+      <version>${version.resteasy}</version>
     </dependency>
   </dependencies>
 

diff --git a/distro/wildfly/modules/pom.xml b/distro/wildfly/modules/pom.xml
@@ -13,9 +13,6 @@
 
   <properties>
     <org.jboss.shrinkwrap.resolver.version>1.0.0-beta-5</org.jboss.shrinkwrap.resolver.version>
-    <version.jackson>2.12.1</version.jackson>
-    <version.jackson.databind>${version.jackson}</version.jackson.databind>
-    <version.jackson.annotations>${version.jackson}</version.jackson.annotations>
     <version.json-path>2.6.0</version.json-path>
     <version.json-smart>2.4.7</version.json-smart>
     <!-- generate a bom of compile time dependencies for the license book.
@@ -221,28 +218,6 @@
                   </mapper>
                 </copy>
 
-                <delete dir="target/modules/com/fasterxml/jackson/core/jackson-databind" />
-                <copy todir="target/modules" flatten="false">
-                  <fileset refid="maven.project.dependencies" />
-                  <mapper>
-                    <chainedmapper>
-                      <regexpmapper from="^(.*)/([^/]+)/([^/]*)$$" to="\1/${version.jackson.databind}/\3" handledirsep="yes" />
-                      <regexpmapper from="^(com.fasterxml.jackson.core.jackson-databind/.*.jar)$$" to="\1" handledirsep="yes" />
-                    </chainedmapper>
-                  </mapper>
-                </copy>
-
-                <delete dir="target/modules/com/fasterxml/jackson/core/jackson-annotations" />
-                <copy todir="target/modules" flatten="false">
-                  <fileset refid="maven.project.dependencies" />
-                  <mapper>
-                    <chainedmapper>
-                      <regexpmapper from="^(.*)/([^/]+)/([^/]*)$$" to="\1/${version.jackson.annotations}/\3" handledirsep="yes" />
-                      <regexpmapper from="^(com.fasterxml.jackson.core.jackson-annotations/.*.jar)$$" to="\1" handledirsep="yes" />
-                    </chainedmapper>
-                  </mapper>
-                </copy>
-
                 <copy todir="target/modules" flatten="false">
                   <fileset dir="src/main/modules" />
                 </copy>
@@ -275,14 +250,6 @@
                   <include name="**/module.xml" />
                 </replace>
 
-                <replace dir="target/modules" token="@version.jackson.databind@" value="${version.jackson.databind}">
-                  <include name="**/module.xml" />
-                </replace>
-
-                <replace dir="target/modules" token="@version.jackson.annotations@" value="${version.jackson.annotations}">
-                  <include name="**/module.xml" />
-                </replace>
-
                 <replace dir="target/modules" token="@version.json-path@" value="${version.json-path}">
                   <include name="**/module.xml" />
                 </replace>

diff --git a/...ore/jackson-annotations/2.12.1/module.xml → ...ore/jackson-annotations/2.13.1/module.xml b/...ore/jackson-annotations/2.12.1/module.xml → ...ore/jackson-annotations/2.13.1/module.xml
@@ -1,6 +1,6 @@
-<module xmlns="urn:jboss:module:1.0" name="com.fasterxml.jackson.core.jackson-annotations" slot="@version.jackson.annotations@" >
+<module xmlns="urn:jboss:module:1.0" name="com.fasterxml.jackson.core.jackson-annotations" slot="@version.jackson@" >
   <resources>
-    <resource-root path="jackson-annotations-@version.jackson.annotations@.jar" />
+    <resource-root path="jackson-annotations-@version.jackson@.jar" />
   </resources>
 
   <dependencies>

diff --git a/...ckson/core/jackson-core/2.12.1/module.xml → ...ckson/core/jackson-core/2.13.1/module.xml b/...ckson/core/jackson-core/2.12.1/module.xml → ...ckson/core/jackson-core/2.13.1/module.xml
diff --git a/...n/core/jackson-databind/2.12.1/module.xml → ...n/core/jackson-databind/2.13.1/module.xml b/...n/core/jackson-databind/2.12.1/module.xml → ...n/core/jackson-databind/2.13.1/module.xml
@@ -1,13 +1,13 @@
-<module xmlns="urn:jboss:module:1.0" name="com.fasterxml.jackson.core.jackson-databind" slot="@version.jackson.databind@" >
+<module xmlns="urn:jboss:module:1.0" name="com.fasterxml.jackson.core.jackson-databind" slot="@version.jackson@" >
   <resources>
-    <resource-root path="jackson-databind-@version.jackson.databind@.jar" />
+    <resource-root path="jackson-databind-@version.jackson@.jar" />
   </resources>
 
   <dependencies>
 
     <module name="javax.api" />
     <module name="com.fasterxml.jackson.core.jackson-core" export="true" slot="@version.jackson@" />
-    <module name="com.fasterxml.jackson.core.jackson-annotations" export="true" slot="@version.jackson.annotations@" />
+    <module name="com.fasterxml.jackson.core.jackson-annotations" export="true" slot="@version.jackson@" />
 
   </dependencies>
 </module>
diff --git a/distro/wildfly/modules/src/main/modules/com/jayway/jsonpath/json-path/main/module.xml b/distro/wildfly/modules/src/main/modules/com/jayway/jsonpath/json-path/main/module.xml
@@ -6,7 +6,7 @@
   <dependencies>
 
     <module name="javax.api" />
-    <module name="com.fasterxml.jackson.core.jackson-databind" slot="@version.jackson.databind@"/>
+    <module name="com.fasterxml.jackson.core.jackson-databind" slot="@version.jackson@"/>
     <module name="org.slf4j" />
     <module name="net.minidev.json-smart" />
 

diff --git a/...es/src/main/modules/org/camunda/spin/camunda-spin-dataformat-json-jackson/main/module.xml b/...es/src/main/modules/org/camunda/spin/camunda-spin-dataformat-json-jackson/main/module.xml
@@ -11,7 +11,7 @@
     <module name="org.camunda.commons.camunda-commons-utils" />
     <module name="org.camunda.commons.camunda-commons-typed-values" />
 
-    <module name="com.fasterxml.jackson.core.jackson-databind" slot="@version.jackson.databind@" />
+    <module name="com.fasterxml.jackson.core.jackson-databind" slot="@version.jackson@" />
     <module name="com.jayway.jsonpath.json-path" />
   </dependencies>
 

diff --git a/engine-rest/assembly/pom.xml b/engine-rest/assembly/pom.xml
@@ -54,7 +54,7 @@
     <dependency>
       <groupId>org.jboss.resteasy</groupId>
       <artifactId>resteasy-jaxrs</artifactId>
-      <version>${version.resteasy3}</version>
+      <version>${version.resteasy}</version>
       <scope>provided</scope>
     </dependency>
 

diff --git a/engine-rest/engine-rest-jaxrs2/pom.xml b/engine-rest/engine-rest-jaxrs2/pom.xml
@@ -132,14 +132,14 @@
         <dependency>
           <groupId>org.jboss.resteasy</groupId>
           <artifactId>resteasy-netty4</artifactId>
-          <version>${version.resteasy3}</version>
+          <version>${version.resteasy}</version>
           <scope>test</scope>
         </dependency>
 
         <dependency>
           <groupId>org.jboss.resteasy</groupId>
           <artifactId>resteasy-jaxrs</artifactId>
-          <version>${version.resteasy3}</version>
+          <version>${version.resteasy}</version>
           <scope>test</scope>
           <exclusions>
             <exclusion>
@@ -152,7 +152,7 @@
         <dependency>
           <groupId>org.jboss.resteasy</groupId>
           <artifactId>resteasy-client</artifactId>
-          <version>${version.resteasy3}</version>
+          <version>${version.resteasy}</version>
           <scope>test</scope>
         </dependency>
       </dependencies>