From 545c148990d0ebe372011ee6d9d73db87e7e1eef Mon Sep 17 00:00:00 2001 From: Nikola Koevski Date: Mon, 28 Feb 2022 08:27:39 +0100 Subject: [PATCH] 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 #1762 --- .ci/config/matrices.yaml | 4 +- .ci/config/stage-types.yaml | 20 +- clients/java/client/pom.xml | 1 - database/pom.xml | 2 +- distro/tomcat/webapp/pom.xml | 2 +- distro/wildfly/modules/pom.xml | 33 --- .../{2.12.1 => 2.13.1}/module.xml | 4 +- .../{2.12.1 => 2.13.1}/module.xml | 0 .../{2.12.1 => 2.13.1}/module.xml | 6 +- .../jayway/jsonpath/json-path/main/module.xml | 2 +- .../main/module.xml | 2 +- engine-rest/assembly/pom.xml | 2 +- engine-rest/engine-rest-jaxrs2/pom.xml | 6 +- engine-rest/engine-rest/pom.xml | 224 +----------------- engine-rest/pom.xml | 5 - parent/pom.xml | 4 +- pom.xml | 2 +- qa/integration-tests-engine/pom.xml | 2 +- .../jboss-deployment-structure-spin-json.xml | 2 +- 19 files changed, 30 insertions(+), 293 deletions(-) rename distro/wildfly/modules/src/main/modules/com/fasterxml/jackson/core/jackson-annotations/{2.12.1 => 2.13.1}/module.xml (63%) rename distro/wildfly/modules/src/main/modules/com/fasterxml/jackson/core/jackson-core/{2.12.1 => 2.13.1}/module.xml (100%) rename distro/wildfly/modules/src/main/modules/com/fasterxml/jackson/core/jackson-databind/{2.12.1 => 2.13.1}/module.xml (63%) diff --git a/.ci/config/matrices.yaml b/.ci/config/matrices.yaml index 8a857664e1e..6f1b53c0863 100644 --- 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 index 2287475bfa2..c5d5f504ce1 100644 --- 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 index 73e4a626252..ebf93c4f237 100644 --- a/clients/java/client/pom.xml +++ b/clients/java/client/pom.xml @@ -15,7 +15,6 @@ 4.5.9 - 2.12.1 ${project.build.directory}/camunda-tomcat ${engine.runtime}/server/apache-tomcat-${version.tomcat} diff --git a/database/pom.xml b/database/pom.xml index 63775beb601..1d29c42a6c0 100644 --- a/database/pom.xml +++ b/database/pom.xml @@ -577,7 +577,7 @@ jackson-annotations com.fasterxml.jackson.core - 2.12.1 + ${version.jackson} test diff --git a/distro/tomcat/webapp/pom.xml b/distro/tomcat/webapp/pom.xml index bb72b4b5d25..20cc42d88c4 100644 --- a/distro/tomcat/webapp/pom.xml +++ b/distro/tomcat/webapp/pom.xml @@ -27,7 +27,7 @@ org.jboss.resteasy resteasy-jaxrs - ${version.resteasy3} + ${version.resteasy} diff --git a/distro/wildfly/modules/pom.xml b/distro/wildfly/modules/pom.xml index 57b7689f12a..dd8e7c0509f 100644 --- a/distro/wildfly/modules/pom.xml +++ b/distro/wildfly/modules/pom.xml @@ -13,9 +13,6 @@ 1.0.0-beta-5 - 2.12.1 - ${version.jackson} - ${version.jackson} 2.6.0 2.4.7 7.0.50 38080 - - ${version.resteasy} - 2.3.6.Final - 1.1.1-incubating 1.17.1 1.1.1 @@ -39,7 +35,7 @@ com.fasterxml.jackson.jaxrs jackson-jaxrs-json-provider - ${jackson.version} + ${version.jackson} @@ -309,7 +305,7 @@ org.jboss.spec.javax.ws.rs:jboss-jaxrs-api_1.1_spec - ${resteasy.version} + ${version.resteasy} @@ -446,106 +442,6 @@ resteasy - - - org.jboss.spec.javax.ws.rs - jboss-jaxrs-api_1.1_spec - provided - - - org.jboss.resteasy - resteasy-jaxrs - ${resteasy.version} - test - - - httpclient - org.apache.httpcomponents - - - - - - org.jboss.resteasy - resteasy-netty - ${resteasy.netty.version} - test - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - **/TaskRestServiceInteractionTest.java - **/NoServletEmptyBodyFilterTest.java - **/ServletEmptyBodyFilterTest.java - - true - - - - encoding-test - test - - test - - - -Dfile.encoding=ISO-8859-1 - - **/ProcessDefinitionRestServiceInteractionTest.java - **/ResteasyTaskRestServiceInteractionTest.java - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - add-test-source - generate-test-sources - - add-test-source - - - - src/test/java-resteasy - - - - - add-test-resource - generate-test-resources - - add-test-resource - - - - - - src/test/resources-resteasy - - - - - - - - - - - - - - resteasy3 - - ${version.resteasy3} - org.jboss.spec.javax.ws.rs @@ -556,7 +452,7 @@ org.jboss.resteasy resteasy-jaxrs - ${version.resteasy3} + ${version.resteasy} test @@ -576,7 +472,7 @@ org.jboss.resteasy resteasy-netty4 - ${version.resteasy3} + ${version.resteasy} test @@ -648,109 +544,6 @@ - - wink - - 1.5.11 - 0.9.20 - - - - org.jboss.spec.javax.ws.rs - jboss-jaxrs-api_1.1_spec - provided - - - org.apache.wink - wink-server - ${wink.version} - test - - - org.slf4j - slf4j-api - ${version.slf4j} - test - - - org.slf4j - jcl-over-slf4j - ${version.slf4j} - test - - - ch.qos.logback - logback-classic - ${version.logback} - test - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - **/rest/standalone/** - - true - - - - encoding-test - test - - test - - - -Dfile.encoding=ISO-8859-1 - - **/ProcessDefinitionRestServiceInteractionTest.java - **/TaskRestServiceInteractionTest.java - - - - - - - org.codehaus.mojo - build-helper-maven-plugin - - - add-test-source - generate-test-sources - - add-test-source - - - - src/test/java-wink - - - - - add-test-resource - generate-test-resources - - add-test-resource - - - - - - src/test/resources-wink - - - - - - - - - - - jersey2 @@ -957,8 +750,9 @@ wildfly-compatibility - 3.0.14.Final - ${resteasy.version} + + 3.0.16.Final diff --git a/engine-rest/pom.xml b/engine-rest/pom.xml index be948111ef0..8f203e589a2 100644 --- a/engine-rest/pom.xml +++ b/engine-rest/pom.xml @@ -13,11 +13,6 @@ pom Camunda Platform - engine - REST - Root - - 2.12.1 - ${jackson.version} - - diff --git a/parent/pom.xml b/parent/pom.xml index 4d293a4d64b..a10a9fd1d75 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -22,8 +22,7 @@ 5.2.19.RELEASE 2.6.3 3.0.3 - 2.3.5.Final - 3.14.0.Final + 3.14.0.Final 2.34 2.4.13 21.1.0 @@ -32,6 +31,7 @@ 2.4.3 5.4.18.Final 4.0.3 + 2.13.1 1.7.26 1.2.10 diff --git a/pom.xml b/pom.xml index 50265fad7ff..eb72bc758a3 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ 3.2.0 1.10.0 1.5.2 - 1.13.0 + 1.13.1 2.1.0 1.1.0 1.13.3 diff --git a/qa/integration-tests-engine/pom.xml b/qa/integration-tests-engine/pom.xml index fac9af4bfc7..e72a4206ffb 100644 --- a/qa/integration-tests-engine/pom.xml +++ b/qa/integration-tests-engine/pom.xml @@ -171,7 +171,7 @@ com.fasterxml.jackson.datatype jackson-datatype-joda - 2.12.1 + ${version.jackson}