Bump jackson to 2.9.10

https://github.com/FasterXML/jackson/wiki/Jackson-Release-2.9.10 This release also accidentally bumps woodstox-core dependency to 5.3.0, which forces us to upgrade stax2-api to 4.2: https://github.com/FasterXML/woodstox/wiki/Woodstox-Release-5.1 https://github.com/FasterXML/woodstox/wiki/Woodstox-Release-5.2 https://github.com/FasterXML/woodstox/wiki/Woodstox-Release-5.3 https://github.com/FasterXML/stax2-api/blob/master/release-notes/VERSION Unfurtunate, but we need this for CVE fixes. Change-Id: If1bb6b237342f80616dd25cfeb5cb63b4e0d169f Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
opendaylight · Oct 7, 2019 · b86374f · b86374f
1 parent aa4be4b
commit b86374f
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 15 deletions.
diff --git a/features/odl-jackson-2.9/src/main/history/dependencies.xml b/features/odl-jackson-2.9/src/main/history/dependencies.xml
@@ -3,12 +3,12 @@
     <feature version="0.0.0">
         <feature>odl-woodstox</feature>
         <feature>odl-ws-rs-api</feature>
-        <bundle>mvn:com.fasterxml.jackson.core/jackson-annotations/2.9.0</bundle>
-        <bundle>mvn:com.fasterxml.jackson.core/jackson-core/2.9.9</bundle>
-        <bundle>mvn:com.fasterxml.jackson.core/jackson-databind/2.9.9.3</bundle>
-        <bundle>mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-xml/2.9.9</bundle>
-        <bundle>mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base/2.9.9</bundle>
-        <bundle>mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/2.9.9</bundle>
-        <bundle>mvn:com.fasterxml.jackson.module/jackson-module-jaxb-annotations/2.9.9</bundle>
+        <bundle>mvn:com.fasterxml.jackson.core/jackson-annotations/2.9.10</bundle>
+        <bundle>mvn:com.fasterxml.jackson.core/jackson-core/2.9.10</bundle>
+        <bundle>mvn:com.fasterxml.jackson.core/jackson-databind/2.9.10</bundle>
+        <bundle>mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-xml/2.9.10</bundle>
+        <bundle>mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base/2.9.10</bundle>
+        <bundle>mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/2.9.10</bundle>
+        <bundle>mvn:com.fasterxml.jackson.module/jackson-module-jaxb-annotations/2.9.10</bundle>
     </feature>
 </features>
diff --git a/features/odl-stax2-api/src/main/history/dependencies.xml b/features/odl-stax2-api/src/main/history/dependencies.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.5.0" name="odl-stax2-api">
     <feature version="0.0.0">
-        <bundle>mvn:org.codehaus.woodstox/stax2-api/3.1.4</bundle>
+        <bundle>mvn:org.codehaus.woodstox/stax2-api/4.2</bundle>
     </feature>
 </features>
diff --git a/features/odl-woodstox/src/main/history/dependencies.xml b/features/odl-woodstox/src/main/history/dependencies.xml
@@ -2,6 +2,6 @@
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.5.0" name="odl-woodstox">
     <feature version="0.0.0">
         <feature>odl-stax2-api</feature>
-        <bundle>mvn:com.fasterxml.woodstox/woodstox-core/5.0.3</bundle>
+        <bundle>mvn:com.fasterxml.woodstox/woodstox-core/5.3.0</bundle>
     </feature>
 </features>
diff --git a/odlparent-dependency-check/pom.xml b/odlparent-dependency-check/pom.xml
@@ -45,7 +45,7 @@
             <groupId>com.fasterxml.jackson</groupId>
             <artifactId>jackson-bom</artifactId>
             <type>pom</type>
-            <version>2.9.9.20190807</version>
+            <version>2.9.10</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.woodstox</groupId>

diff --git a/odlparent/pom.xml b/odlparent/pom.xml
@@ -457,23 +457,23 @@
       </dependency>
 
       <!-- These three need to be consistent:
-        jackson-2.9 needs woodstox-5.0.x
-        woodstox-5.0 needs stax2-api-3.1.x
+        jackson-2.9.10 needs woodstox-5.3.x
+        woodstox-5.3 needs stax2-api-4.2.x
         -->
       <dependency>
         <groupId>org.codehaus.woodstox</groupId>
         <artifactId>stax2-api</artifactId>
-        <version>3.1.4</version>
+        <version>4.2</version>
       </dependency>
       <dependency>
         <groupId>com.fasterxml.woodstox</groupId>
         <artifactId>woodstox-core</artifactId>
-        <version>5.0.3</version>
+        <version>5.3.0</version>
       </dependency>
       <dependency>
         <groupId>com.fasterxml.jackson</groupId>
         <artifactId>jackson-bom</artifactId>
-        <version>2.9.9.20190807</version>
+        <version>2.9.10</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>