Upgrade to karaf-4.2.8

Release notes:
https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12311140&version=12345539

This includes some important upgrades:
- jackson from 2.9.10 to 2.10.2
- jetty from 9.4.20.v20190813 to 9.4.22.v20191022

Change-Id: I295b6e3719c44907cbdb13b6d7f511f216d81abe
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/features/features-odlparent/pom.xml b/features/features-odlparent/pom.xml
index 7a7ae2e1e8df0cdedbc3c026d1933fcad53ab8a5..ccf6944b1c3b68f4acb82a59c72e592ae6bf1d60 100644 (file)
--- a/features/features-odlparent/pom.xml
+++ b/features/features-odlparent/pom.xml
@@ -117,7 +117,7 @@
 
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>odl-jackson-2.9</artifactId>
+            <artifactId>odl-jackson-2.10</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>

diff --git a/features/odl-jackson-2.9/pom.xml b/features/odl-jackson-2.10/pom.xml
similarity index 95%
rename from features/odl-jackson-2.9/pom.xml
rename to features/odl-jackson-2.10/pom.xml
index 1f24d35b2b5a85dcd0c7db301ba132be59d60e5a..64c343536b6e11fcc89f0a54c8d9bbefbf604d67 100644 (file)
--- a/features/odl-jackson-2.9/pom.xml
+++ b/features/odl-jackson-2.10/pom.xml
@@ -19,12 +19,12 @@
     </parent>
 
     <groupId>org.opendaylight.odlparent</groupId>
-    <artifactId>odl-jackson-2.9</artifactId>
+    <artifactId>odl-jackson-2.10</artifactId>
     <version>7.0.0-SNAPSHOT</version>
     <packaging>feature</packaging>
 
-    <name>OpenDaylight :: Jackson 2.9.x</name>
-    <description>Jackson 2.9</description>
+    <name>OpenDaylight :: Jackson 2.10.x</name>
+    <description>Jackson 2.10</description>
 
     <properties>
         <checkDependencyChange>true</checkDependencyChange>

diff --git a/features/odl-jackson-2.9/src/main/history/dependencies.xml b/features/odl-jackson-2.10/src/main/history/dependencies.xml
similarity index 75%
rename from features/odl-jackson-2.9/src/main/history/dependencies.xml
rename to features/odl-jackson-2.10/src/main/history/dependencies.xml
index a689ba756451e9819ce4c8616817dc4c9d7e0c13..6c48f69e3927ffb4fccec27917a041cdb0ce741e 100644 (file)
--- a/features/odl-jackson-2.9/src/main/history/dependencies.xml
+++ b/features/odl-jackson-2.10/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.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.2</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>
+        <bundle>mvn:com.fasterxml.jackson.core/jackson-annotations/2.10.2</bundle>
+        <bundle>mvn:com.fasterxml.jackson.core/jackson-core/2.10.2</bundle>
+        <bundle>mvn:com.fasterxml.jackson.core/jackson-databind/2.10.2</bundle>
+        <bundle>mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-xml/2.10.2</bundle>
+        <bundle>mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base/2.10.2</bundle>
+        <bundle>mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/2.10.2</bundle>
+        <bundle>mvn:com.fasterxml.jackson.module/jackson-module-jaxb-annotations/2.10.2</bundle>
     </feature>
 </features>

diff --git a/features/pom.xml b/features/pom.xml
index 5530f4dab81f944910955429c8bfc37dbd1da2e2..61d2f42da86b634c613abfb7d748418562a575c0 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -50,7 +50,7 @@
         <module>odl-dropwizard-metrics</module>
         <module>odl-gson</module>
         <module>odl-guava</module>
-        <module>odl-jackson-2.9</module>
+        <module>odl-jackson-2.10</module>
         <module>odl-javassist-3</module>
         <module>odl-jersey-2</module>
         <module>odl-jung-2.1</module>

diff --git a/karaf/opendaylight-karaf-resources/pom.xml b/karaf/opendaylight-karaf-resources/pom.xml
index 7418436ee384fcfb99f6ff2c4e7d16ea7d57d5e6..d14063338b9e7b62d43415e45d372418a3f7010a 100644 (file)
--- a/karaf/opendaylight-karaf-resources/pom.xml
+++ b/karaf/opendaylight-karaf-resources/pom.xml
@@ -114,22 +114,18 @@
                 <patch patchfile="${project.basedir}/src/main/patches/karaf-quiesce.patch"
                        originalfile="${project.build.directory}/assembly/system/org/apache/karaf/features/standard/${karaf.version}/standard-${karaf.version}-features.xml"
                        failonerror="true"/>
-                <replace file="${project.build.directory}/assembly/system/org/apache/karaf/features/standard/${karaf.version}/standard-${karaf.version}-features.xml"
-                         token="org.jolokia/jolokia-osgi/1.6.1" value="org.jolokia/jolokia-osgi/1.6.2" failOnNoReplacements="true"/>
                 <replace file="${project.build.directory}/assembly/system/org/apache/karaf/features/standard/${karaf.version}/standard-${karaf.version}-features.xml"
                          token="commons-codec/commons-codec/1.13" value="commons-codec/commons-codec/1.14" failOnNoReplacements="true"/>
                 <replace file="${project.build.directory}/assembly/system/org/apache/karaf/features/standard/${karaf.version}/standard-${karaf.version}-features.xml"
                          token="javax.annotation/javax.annotation-api/1.3&lt;" value="javax.annotation/javax.annotation-api/1.3.1&lt;" failOnNoReplacements="true"/>
                 <copy file="${project.build.directory}/assembly/system/org/apache/karaf/features/standard/${karaf.version}/standard-${karaf.version}-features.xml"
                       tofile="${project.build.directory}/classes/system/org/apache/karaf/features/standard/${karaf.version}/standard-${karaf.version}-features.xml"/>
-                <replace file="${project.build.directory}/assembly/system/org/ops4j/pax/web/pax-web-features/7.2.11/pax-web-features-7.2.11-features.xml"
+                <replace file="${project.build.directory}/assembly/system/org/ops4j/pax/web/pax-web-features/7.2.14/pax-web-features-7.2.14-features.xml"
                          token="commons-codec/commons-codec/1.11" value="commons-codec/commons-codec/1.14" failOnNoReplacements="true"/>
-                <replace file="${project.build.directory}/assembly/system/org/ops4j/pax/web/pax-web-features/7.2.11/pax-web-features-7.2.11-features.xml"
+                <replace file="${project.build.directory}/assembly/system/org/ops4j/pax/web/pax-web-features/7.2.14/pax-web-features-7.2.14-features.xml"
                          token="javax.annotation/javax.annotation-api/1.3&lt;" value="javax.annotation/javax.annotation-api/1.3.1&lt;" failOnNoReplacements="true"/>
-                <replace file="${project.build.directory}/assembly/system/org/ops4j/pax/web/pax-web-features/7.2.11/pax-web-features-7.2.11-features.xml"
-                         token="org.apache.aries.spifly/org.apache.aries.spifly.dynamic.bundle/1.2" value="org.apache.aries.spifly/org.apache.aries.spifly.dynamic.bundle/1.2.2" failOnNoReplacements="true"/>
-                <copy file="${project.build.directory}/assembly/system/org/ops4j/pax/web/pax-web-features/7.2.11/pax-web-features-7.2.11-features.xml"
-                      tofile="${project.build.directory}/classes/system/org/ops4j/pax/web/pax-web-features/7.2.11/pax-web-features-7.2.11-features.xml"/>
+                <copy file="${project.build.directory}/assembly/system/org/ops4j/pax/web/pax-web-features/7.2.14/pax-web-features-7.2.14-features.xml"
+                      tofile="${project.build.directory}/classes/system/org/ops4j/pax/web/pax-web-features/7.2.14/pax-web-features-7.2.14-features.xml"/>
                 <!-- Add startup bundles to startup.properties — order is significant, bundles are wired in declaration order -->
                 <echo file="${project.build.directory}/assembly/etc/startup.properties" append="true">
 # The following are added by opendaylight-karaf-resources

diff --git a/odlparent-artifacts/pom.xml b/odlparent-artifacts/pom.xml
index ee38cc1d8406434c76a393af12dfc99110faba70..4a3775658b47a4f03cb4fa02640939b3dda34c9b 100644 (file)
--- a/odlparent-artifacts/pom.xml
+++ b/odlparent-artifacts/pom.xml
@@ -149,7 +149,7 @@
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.odlparent</groupId>
-                <artifactId>odl-jackson-2.9</artifactId>
+                <artifactId>odl-jackson-2.10</artifactId>
                 <version>${project.version}</version>
                 <classifier>features</classifier>
                 <type>xml</type>

diff --git a/odlparent-dependency-check/pom.xml b/odlparent-dependency-check/pom.xml
index c31930f25155c4e760942635332be2d6518e09ac..cf3a3133364b494239a97859390d2edc9fcd3db6 100644 (file)
--- 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.10.20200103</version>
+            <version>2.10.2</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.woodstox</groupId>
@@ -382,7 +382,7 @@
             <groupId>org.eclipse.jetty</groupId>
             <artifactId>jetty-bom</artifactId>
             <type>pom</type>
-            <version>9.4.20.v20190813</version>
+            <version>9.4.22.v20191022</version>
         </dependency>
         <dependency>
             <groupId>org.eclipse.persistence</groupId>

diff --git a/odlparent/pom.xml b/odlparent/pom.xml
index 44adc1c3cdc2e0d77564c33476fbb6ed7241264b..41b15b6731128e4980790a739b091bea328d398b 100644 (file)
--- a/odlparent/pom.xml
+++ b/odlparent/pom.xml
@@ -46,7 +46,7 @@
     <!-- Used in openflowplugin -->
     <enforcer.version>3.0.0-M2</enforcer.version>
     <!-- Used in controller, genius, infrautils, netconf, netvirt, ovsdb, serviceutils -->
-    <karaf.version>4.2.7</karaf.version>
+    <karaf.version>4.2.8</karaf.version>
     <!-- Used in bgpcep, lispflowmapping -->
     <projectinfo>2.8.1</projectinfo>
 
@@ -438,7 +438,7 @@
       <dependency>
         <groupId>com.fasterxml.jackson</groupId>
         <artifactId>jackson-bom</artifactId>
-        <version>2.9.10.20200103</version>
+        <version>2.10.2</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
@@ -874,7 +874,7 @@
         <groupId>org.ops4j.pax.web</groupId>
         <artifactId>pax-web-api</artifactId>
         <!-- Note: keep this version synchronized with karaf -->
-        <version>7.2.11</version>
+        <version>7.2.14</version>
       </dependency>
 
       <dependency>
@@ -922,7 +922,7 @@
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-bom</artifactId>
-        <version>9.4.20.v20190813</version>
+        <version>9.4.22.v20191022</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

diff --git a/untested-single-feature-parent/pom.xml b/untested-single-feature-parent/pom.xml
index 35423a94909f3b3f100bd08c2470ca223aff6373..cc8f8ac9efbde6ef892e43a3ca363bb3e1f18bc0 100644 (file)
--- a/untested-single-feature-parent/pom.xml
+++ b/untested-single-feature-parent/pom.xml
@@ -84,8 +84,10 @@
                         <!-- JAXB -->
                         <excludedArtifactId>jaxb-api</excludedArtifactId>
                         <excludedArtifactId>jaxb-runtime</excludedArtifactId>
+                        <excludedArtifactId>jakarta.xml.bind-api</excludedArtifactId>
                         <!-- javax.annotation -->
                         <excludedArtifactId>activation</excludedArtifactId>
+                        <excludedArtifactId>jakarta.activation-api</excludedArtifactId>
                     </excludedArtifactIds>
                 </configuration>
             </plugin>