Fix Jackson 2.16 packaging

Update feature description and patch pax-web to use Jackson 2.16.2
instead of 2.15.3.

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

diff --git a/features/odl-jackson-2/pom.xml b/features/odl-jackson-2/pom.xml
index af1e4699e3b8d34751c4006579ce2194015a085e..cb4e34af69733b04055fd714cb3fbb99afe323a5 100644 (file)
--- a/features/odl-jackson-2/pom.xml
+++ b/features/odl-jackson-2/pom.xml
@@ -22,8 +22,8 @@
     <artifactId>odl-jackson-2</artifactId>
     <packaging>feature</packaging>
 
-    <name>OpenDaylight :: Jackson 2.15.x</name>
-    <description>Jackson 2.15</description>
+    <name>OpenDaylight :: Jackson 2.16.x</name>
+    <description>Jackson 2.16</description>
 
     <properties>
         <checkDependencyChange>true</checkDependencyChange>

diff --git a/karaf/opendaylight-karaf-resources/pom.xml b/karaf/opendaylight-karaf-resources/pom.xml
index 044be5e3d3698b1161d538569ba148e7a8f5e7f9..8b0b52ed5ebd8baf142434cb2ed217a9a97fc278 100644 (file)
--- a/karaf/opendaylight-karaf-resources/pom.xml
+++ b/karaf/opendaylight-karaf-resources/pom.xml
@@ -126,6 +126,10 @@
                       tofile="${project.build.directory}/classes/system/org/apache/karaf/features/standard/${karaf.version}/standard-${karaf.version}-features.xml"/>
                 <copy file="${project.build.directory}/assembly/system/org/apache/karaf/features/framework/${karaf.version}/framework-${karaf.version}-features.xml"
                       tofile="${project.build.directory}/classes/system/org/apache/karaf/features/framework/${karaf.version}/framework-${karaf.version}-features.xml"/>
+                <replace file="${project.build.directory}/assembly/system/org/ops4j/pax/web/pax-web-features/8.0.24/pax-web-features-8.0.24-features.xml"
+                         token="/2.15.3" value="/2.16.2" failOnNoReplacements="true"/>
+                <copy file="${project.build.directory}/assembly/system/org/ops4j/pax/web/pax-web-features/8.0.24/pax-web-features-8.0.24-features.xml"
+                      tofile="${project.build.directory}/classes/system/org/ops4j/pax/web/pax-web-features/8.0.24/pax-web-features-8.0.24-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