Bump karaf to 4.1.4

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

of which most notable is jetty version alignment.

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

diff --git a/feature-repo-parent/pom.xml b/feature-repo-parent/pom.xml
index 4a2c6405866a6f9367d5ba9d5df46ac306bfd62a..d50fc6bfb97f41d9709a0ad4ba9877b5b260676e 100644 (file)
--- a/feature-repo-parent/pom.xml
+++ b/feature-repo-parent/pom.xml
@@ -118,7 +118,7 @@
                       <pluginExecutionFilter>
                         <groupId>org.apache.karaf.tooling</groupId>
                         <artifactId>karaf-maven-plugin</artifactId>
-                        <versionRange>[4.1.3,)</versionRange>
+                        <versionRange>[4.1.4,)</versionRange>
                         <goals>
                           <goal>verify</goal>
                         </goals>

diff --git a/karaf/opendaylight-karaf-resources/pom.xml b/karaf/opendaylight-karaf-resources/pom.xml
index 758513fb9455917acf6d6f2c3c6e3093a14723c1..b46ee06f321c6eedebf896f91cfd97a6c8de5dbd 100644 (file)
--- a/karaf/opendaylight-karaf-resources/pom.xml
+++ b/karaf/opendaylight-karaf-resources/pom.xml
@@ -107,10 +107,10 @@
                 <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"/>
                 <patch patchfile="${project.basedir}/src/main/patches/karaf-paxweb.patch"
-                       originalfile="${project.build.directory}/assembly/system/org/ops4j/pax/web/pax-web-features/6.0.7/pax-web-features-6.0.7-features.xml"
+                       originalfile="${project.build.directory}/assembly/system/org/ops4j/pax/web/pax-web-features/6.0.9/pax-web-features-6.0.9-features.xml"
                        failonerror="true"/>
-                <copy file="${project.build.directory}/assembly/system/org/ops4j/pax/web/pax-web-features/6.0.7/pax-web-features-6.0.7-features.xml"
-                      tofile="${project.build.directory}/classes/system/org/ops4j/pax/web/pax-web-features/6.0.7/pax-web-features-6.0.7-features.xml"/>
+                <copy file="${project.build.directory}/assembly/system/org/ops4j/pax/web/pax-web-features/6.0.9/pax-web-features-6.0.9-features.xml"
+                      tofile="${project.build.directory}/classes/system/org/ops4j/pax/web/pax-web-features/6.0.9/pax-web-features-6.0.9-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/karaf/opendaylight-karaf-resources/src/main/patches/karaf-inc-4.1.3.patch b/karaf/opendaylight-karaf-resources/src/main/patches/karaf-inc-4.1.4.patch
similarity index 100%
rename from karaf/opendaylight-karaf-resources/src/main/patches/karaf-inc-4.1.3.patch
rename to karaf/opendaylight-karaf-resources/src/main/patches/karaf-inc-4.1.4.patch

diff --git a/karaf/opendaylight-karaf-resources/src/main/patches/karaf-javax-mail-4.1.3.patch b/karaf/opendaylight-karaf-resources/src/main/patches/karaf-javax-mail-4.1.4.patch
similarity index 100%
rename from karaf/opendaylight-karaf-resources/src/main/patches/karaf-javax-mail-4.1.3.patch
rename to karaf/opendaylight-karaf-resources/src/main/patches/karaf-javax-mail-4.1.4.patch

diff --git a/karaf/opendaylight-karaf-resources/src/main/patches/karaf-karaf-4.1.3.patch b/karaf/opendaylight-karaf-resources/src/main/patches/karaf-karaf-4.1.4.patch
similarity index 100%
rename from karaf/opendaylight-karaf-resources/src/main/patches/karaf-karaf-4.1.3.patch
rename to karaf/opendaylight-karaf-resources/src/main/patches/karaf-karaf-4.1.4.patch

diff --git a/karaf/opendaylight-karaf-resources/src/main/patches/karaf-paxweb.patch b/karaf/opendaylight-karaf-resources/src/main/patches/karaf-paxweb.patch
index 32dd290a8e469d59666f96e98565cb10f0e9ad78..95a519e282fdd5bc27b40e936e6006a2bd2d98ae 100644 (file)
--- a/karaf/opendaylight-karaf-resources/src/main/patches/karaf-paxweb.patch
+++ b/karaf/opendaylight-karaf-resources/src/main/patches/karaf-paxweb.patch
@@ -1,5 +1,5 @@
---- target/assembly/system/org/ops4j/pax/web/pax-web-features/6.0.7/pax-web-features-6.0.7-features.xml        2017-09-19 11:18:05.698766852 +0200
-+++ target/assembly/system/org/ops4j/pax/web/pax-web-features/6.0.7/pax-web-features-6.0.7-features.xml        2017-09-19 11:19:06.084943939 +0200
+--- target/assembly/system/org/ops4j/pax/web/pax-web-features/6.0.9/pax-web-features-6.0.9-features.xml        2017-09-19 11:18:05.698766852 +0200
++++ target/assembly/system/org/ops4j/pax/web/pax-web-features/6.0.9/pax-web-features-6.0.9-features.xml        2017-09-19 11:19:06.084943939 +0200
 @@ -25,7 +25,7 @@
          <bundle dependency="true" start-level="30">mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1</bundle>
                <bundle dependency="true" start-level="30">mvn:javax.annotation/javax.annotation-api/1.2</bundle>
@@ -8,7 +8,7 @@
 +        <bundle dependency="true" start-level="30">mvn:org.ow2.asm/asm-all/5.0.4</bundle>
          <bundle dependency="true" start-level="30">mvn:org.apache.aries.spifly/org.apache.aries.spifly.dynamic.bundle/1.0.2</bundle>
          <bundle dependency="true" start-level="30">mvn:org.apache.aries/org.apache.aries.util/1.1.0</bundle>
-         <bundle start-level="30">mvn:org.eclipse.jetty/jetty-continuation/9.3.14.v20161028</bundle>
+         <bundle start-level="30">mvn:org.eclipse.jetty/jetty-continuation/9.3.21.v20170918</bundle>
 @@ -99,7 +99,7 @@
          <feature>scr</feature>
          <feature version="[9.3,10.0)">pax-jetty</feature>

diff --git a/karaf/opendaylight-karaf-resources/src/main/patches/karaf-quiesce-4.1.3.patch b/karaf/opendaylight-karaf-resources/src/main/patches/karaf-quiesce-4.1.4.patch
similarity index 100%
rename from karaf/opendaylight-karaf-resources/src/main/patches/karaf-quiesce-4.1.3.patch
rename to karaf/opendaylight-karaf-resources/src/main/patches/karaf-quiesce-4.1.4.patch

diff --git a/karaf/opendaylight-karaf-resources/src/main/patches/karaf-setenv-4.1.3.patch b/karaf/opendaylight-karaf-resources/src/main/patches/karaf-setenv-4.1.4.patch
similarity index 100%
rename from karaf/opendaylight-karaf-resources/src/main/patches/karaf-setenv-4.1.3.patch
rename to karaf/opendaylight-karaf-resources/src/main/patches/karaf-setenv-4.1.4.patch

diff --git a/odlparent/pom.xml b/odlparent/pom.xml
index 21b939992651bcb963eba6825a486faa4123edce..4c8a122058fae85fce5ffa87f495ef577c2333b9 100644 (file)
--- a/odlparent/pom.xml
+++ b/odlparent/pom.xml
@@ -87,8 +87,8 @@
     <jacoco.version>0.7.9</jacoco.version>
     <!-- Used in aaa, controller, coretutorials, integration/distribution, l2switch, lacp, lispflowmapping, netide,
          nic, openflowplugin, ovsdb, persistence, sfc, snbi, snmp4sdn?, sxp, topoprocessing, unimgr, vtn -->
-    <karaf.version>4.1.3</karaf.version>
-    <karaf.plugin.version>4.1.3</karaf.plugin.version>
+    <karaf.version>4.1.4</karaf.version>
+    <karaf.plugin.version>4.1.4</karaf.plugin.version>
     <!-- Used in lispflowmapping, snmp4sdn, vtn -->
     <projectinfo>2.8.1</projectinfo>
     <!-- Used in of-config; see also snmp4sdn -->

diff --git a/untested-single-feature-parent/pom.xml b/untested-single-feature-parent/pom.xml
index 2cfe0015706be46109a5326e05ada7eeb7083a53..5585d037b6ee9be7f234111e64445b012ae3b34c 100644 (file)
--- a/untested-single-feature-parent/pom.xml
+++ b/untested-single-feature-parent/pom.xml
@@ -100,7 +100,7 @@
                       <pluginExecutionFilter>
                         <groupId>org.apache.karaf.tooling</groupId>
                         <artifactId>karaf-maven-plugin</artifactId>
-                        <versionRange>[4.1.3,)</versionRange>
+                        <versionRange>[4.1.4,)</versionRange>
                         <goals>
                           <goal>verify</goal>
                         </goals>