chore(deps): bump jackson-databind to 2.9.9.1

Related to CAM-10585
camunda · Jul 26, 2019 · de6bd01 · de6bd01
1 parent 3405345
commit de6bd01
Show file tree

Hide file tree

Showing 12 changed files with 49 additions and 10 deletions.
diff --git a/...sas7/modules/src/main/modules/com/fasterxml/jackson/core/jackson-databind/main/module.xml b/...sas7/modules/src/main/modules/com/fasterxml/jackson/core/jackson-databind/main/module.xml
@@ -1,6 +1,6 @@
 <module xmlns="urn:jboss:module:1.0" name="com.fasterxml.jackson.core.jackson-databind">
   <resources>
-    <resource-root path="jackson-databind-2.9.9.jar" />
+    <resource-root path="jackson-databind-2.9.9.1.jar" />
   </resources>
 
   <dependencies>

diff --git a/distro/wildfly/modules/pom.xml b/distro/wildfly/modules/pom.xml
@@ -14,6 +14,7 @@
   <properties>
     <org.jboss.shrinkwrap.resolver.version>1.0.0-beta-5</org.jboss.shrinkwrap.resolver.version>
     <version.jackson>2.9.9</version.jackson>
+    <version.jackson.databind>2.9.9.1</version.jackson.databind>
     <version.jackson.annotations>2.9.0</version.jackson.annotations>
   </properties>
 
@@ -206,6 +207,17 @@
                   </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" />
@@ -245,6 +257,10 @@
                   <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>

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

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@"/>
+    <module name="com.fasterxml.jackson.core.jackson-databind" slot="@version.jackson.databind@"/>
     <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@" />
+    <module name="com.fasterxml.jackson.core.jackson-databind" slot="@version.jackson.databind@" />
     <module name="com.jayway.jsonpath.json-path" />
   </dependencies>
 

diff --git a/distro/wildfly8/modules/pom.xml b/distro/wildfly8/modules/pom.xml
@@ -14,6 +14,7 @@
   <properties>
     <org.jboss.shrinkwrap.resolver.version>1.0.0-beta-5</org.jboss.shrinkwrap.resolver.version>
     <version.jackson>2.9.9</version.jackson>
+    <version.jackson.databind>2.9.9.1</version.jackson.databind>
     <version.jackson.annotations>2.9.0</version.jackson.annotations>
   </properties>
 
@@ -206,6 +207,17 @@
                   </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" />
@@ -245,6 +257,10 @@
                   <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>

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

diff --git a/distro/wildfly8/modules/src/main/modules/com/jayway/jsonpath/json-path/main/module.xml b/distro/wildfly8/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@"/>
+    <module name="com.fasterxml.jackson.core.jackson-databind" slot="@version.jackson.databind@"/>
     <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@" />
+    <module name="com.fasterxml.jackson.core.jackson-databind" slot="@version.jackson.databind@" />
     <module name="com.jayway.jsonpath.json-path" />
   </dependencies>
 

diff --git a/engine-rest/engine-rest/pom.xml b/engine-rest/engine-rest/pom.xml
@@ -39,6 +39,12 @@
       <version>${jackson.version}</version>
     </dependency>
 
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+      <version>${jackson.databind.version}</version>
+    </dependency>
+
     <!-- provided deps -->
     <dependency>
       <groupId>org.jboss.spec.javax.servlet</groupId>

diff --git a/engine-rest/pom.xml b/engine-rest/pom.xml
@@ -16,6 +16,7 @@
 
   <properties>
     <jackson.version>2.9.9</jackson.version>
+    <jackson.databind.version>2.9.9.1</jackson.databind.version>
   </properties>
 
   <modules>

diff --git a/...egration-tests-engine/src/test/resources-wildfly/jboss-deployment-structure-spin-json.xml b/...egration-tests-engine/src/test/resources-wildfly/jboss-deployment-structure-spin-json.xml
@@ -6,7 +6,7 @@
     </exclude-subsystems>
     <dependencies>
       <module name="org.camunda.spin.camunda-spin-dataformat-json-jackson" services="import" />
-      <module name="com.fasterxml.jackson.core.jackson-databind" slot="2.9.9" />
+      <module name="com.fasterxml.jackson.core.jackson-databind" slot="2.9.9.1" />
     </dependencies>
   </deployment>
 </jboss-deployment-structure>