Bump Karaf to 4.2.10

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

Change-Id: Ib0cb358a8c6ee377b57ac545109516322222bf10
Signed-off-by: Stephen Kitt <skitt@redhat.com>

diff --git a/karaf/opendaylight-karaf-resources/pom.xml b/karaf/opendaylight-karaf-resources/pom.xml
index 69ba8cbed14f7b4991e44c9a780406a5d62d02d2..7ceda00930c29a15ffe8c7e905dbbe34e45e65ba 100644 (file)
--- a/karaf/opendaylight-karaf-resources/pom.xml
+++ b/karaf/opendaylight-karaf-resources/pom.xml
@@ -126,23 +126,19 @@
                 <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/apache/karaf/features/standard/${karaf.version}/standard-${karaf.version}-features.xml"
-                         token="commons-io/commons-io/2.6" value="commons-io/commons-io/2.8.0" failOnNoReplacements="true"/>
+                         token="commons-io/commons-io/2.7" value="commons-io/commons-io/2.8.0" 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.14" value="commons-codec/commons-codec/1.15" failOnNoReplacements="true"/>
-                <replace file="${project.build.directory}/assembly/system/org/apache/karaf/features/standard/${karaf.version}/standard-${karaf.version}-features.xml"
-                         token="org.apache.commons/commons-lang3/3.10" value="org.apache.commons/commons-lang3/3.11" failOnNoReplacements="true"/>
-                <replace file="${project.build.directory}/assembly/system/org/apache/karaf/features/standard/${karaf.version}/standard-${karaf.version}-features.xml"
-                         token="org.apache.felix.scr/2.1.20" value="org.apache.felix.scr/2.1.24" 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.16/pax-web-features-7.2.16-features.xml"
+                <replace file="${project.build.directory}/assembly/system/org/ops4j/pax/web/pax-web-features/7.2.19/pax-web-features-7.2.19-features.xml"
                          token="commons-codec/commons-codec/1.11" value="commons-codec/commons-codec/1.15" failOnNoReplacements="true"/>
-                <replace file="${project.build.directory}/assembly/system/org/ops4j/pax/web/pax-web-features/7.2.16/pax-web-features-7.2.16-features.xml"
+                <replace file="${project.build.directory}/assembly/system/org/ops4j/pax/web/pax-web-features/7.2.19/pax-web-features-7.2.19-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/ops4j/pax/web/pax-web-features/7.2.16/pax-web-features-7.2.16-features.xml"
-                      tofile="${project.build.directory}/classes/system/org/ops4j/pax/web/pax-web-features/7.2.16/pax-web-features-7.2.16-features.xml"/>
+                <copy file="${project.build.directory}/assembly/system/org/ops4j/pax/web/pax-web-features/7.2.19/pax-web-features-7.2.19-features.xml"
+                      tofile="${project.build.directory}/classes/system/org/ops4j/pax/web/pax-web-features/7.2.19/pax-web-features-7.2.19-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/pom.xml b/odlparent/pom.xml
index 896cf2747664b549aa0eaeb91605d340f2d753b9..61c5bdea8468fbbd0fa29a5837f70cb7435386eb 100644 (file)
--- a/odlparent/pom.xml
+++ b/odlparent/pom.xml
@@ -44,7 +44,7 @@
     <maven.compiler.release>11</maven.compiler.release>
 
     <!-- Used in controller, genius, infrautils, netconf, netvirt, ovsdb, serviceutils -->
-    <karaf.version>4.2.9</karaf.version>
+    <karaf.version>4.2.10</karaf.version>
 
     <!-- Supporting Libraries -->
     <!-- Only used internally -->