BUG-9161: Bump karaf to 4.0.10

Upstream has delivered a speed up in initial repository indexing
and couple of other fixes. Bump karaf version to consume them.

Release notes:
https://github.com/apache/karaf/commit/a16c3b095a6f17fb3641c98cbe56b7e9f69418c5

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

diff --git a/karaf/opendaylight-karaf-resources/pom.xml b/karaf/opendaylight-karaf-resources/pom.xml
index 8df1df3b930722a11453c0f5871a8b3663ba3f7e..53aca7fc7d855d713b676decac67e9b2dc7c4acb 100644 (file)
--- a/karaf/opendaylight-karaf-resources/pom.xml
+++ b/karaf/opendaylight-karaf-resources/pom.xml
@@ -95,11 +95,11 @@
                 <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/4.3.0/pax-web-features-4.3.0-features.xml"
+                       originalfile="${project.build.directory}/assembly/system/org/ops4j/pax/web/pax-web-features/4.3.4/pax-web-features-4.3.4-features.xml"
                        failonerror="true"/>
-                <copy file="${project.build.directory}/assembly/system/org/ops4j/pax/web/pax-web-features/4.3.0/pax-web-features-4.3.0-features.xml"
-                      tofile="${project.build.directory}/classes/system/org/ops4j/pax/web/pax-web-features/4.3.0/pax-web-features-4.3.0-features.xml"/>
-                <patch patchfile="${project.basedir}/src/main/patches/karaf-etc-startup-properties-4.0.9.patch"
+                <copy file="${project.build.directory}/assembly/system/org/ops4j/pax/web/pax-web-features/4.3.4/pax-web-features-4.3.4-features.xml"
+                      tofile="${project.build.directory}/classes/system/org/ops4j/pax/web/pax-web-features/4.3.4/pax-web-features-4.3.4-features.xml"/>
+                <patch patchfile="${project.basedir}/src/main/patches/karaf-etc-startup-properties-${karaf.version}.patch"
                        originalfile="${project.build.directory}/assembly/etc/startup.properties"
                        failonerror="true"/>
                 <echo file="${project.build.directory}/assembly/etc/system.properties" append="true">mvn\:org.osgi/org.osgi.service.event/1.3.1 = 8</echo>

diff --git a/karaf/opendaylight-karaf-resources/src/main/patches/karaf-etc-startup-properties-4.0.9.patch b/karaf/opendaylight-karaf-resources/src/main/patches/karaf-etc-startup-properties-4.0.10.patch
similarity index 97%
rename from karaf/opendaylight-karaf-resources/src/main/patches/karaf-etc-startup-properties-4.0.9.patch
rename to karaf/opendaylight-karaf-resources/src/main/patches/karaf-etc-startup-properties-4.0.10.patch
index ca3732ac7401c60d888b1b271cdee777fde717b7..e3303461f36bae9d2733ede7ae10dd996f16016c 100644 (file)
--- a/karaf/opendaylight-karaf-resources/src/main/patches/karaf-etc-startup-properties-4.0.9.patch
+++ b/karaf/opendaylight-karaf-resources/src/main/patches/karaf-etc-startup-properties-4.0.10.patch
@@ -3,7 +3,7 @@
 @@ -7,3 +8,6 @@
  mvn\:org.apache.felix/org.apache.felix.fileinstall/3.5.8 = 11
  mvn\:org.ops4j.pax.url/pax-url-aether/2.5.2 = 5
- mvn\:org.apache.karaf.features/org.apache.karaf.features.core/4.0.9 = 15
+ mvn\:org.apache.karaf.features/org.apache.karaf.features.core/4.0.10 = 15
 +mvn\:org.osgi/org.osgi.service.event/1.3.1 = 7
 +mvn\:org.bouncycastle/bcprov-jdk15on/1.57 = 14
 +mvn\:org.bouncycastle/bcpkix-jdk15on/1.57 = 14

diff --git a/karaf/opendaylight-karaf-resources/src/main/patches/karaf-javax-mail-4.0.9.patch b/karaf/opendaylight-karaf-resources/src/main/patches/karaf-javax-mail-4.0.10.patch
similarity index 78%
rename from karaf/opendaylight-karaf-resources/src/main/patches/karaf-javax-mail-4.0.9.patch
rename to karaf/opendaylight-karaf-resources/src/main/patches/karaf-javax-mail-4.0.10.patch
index 8b41acc6688dcda2b0b7d97ef0352fe63836f3b8..d9bfddec1422dcc3a39ec5971d00a234b5de9599 100644 (file)
--- a/karaf/opendaylight-karaf-resources/src/main/patches/karaf-javax-mail-4.0.9.patch
+++ b/karaf/opendaylight-karaf-resources/src/main/patches/karaf-javax-mail-4.0.10.patch
@@ -1,5 +1,5 @@
---- system/org/apache/karaf/features/standard/4.0.9/standard-4.0.9-features.xml        2017-02-13 15:13:43.895825491 +0100
-+++ system/org/apache/karaf/features/standard/4.0.9/standard-4.0.9-features.xml        2017-02-13 15:40:10.593825491 +0100
+--- system/org/apache/karaf/features/standard/4.0.10/standard-4.0.10-features.xml      2017-02-13 15:13:43.895825491 +0100
++++ system/org/apache/karaf/features/standard/4.0.10/standard-4.0.10-features.xml      2017-02-13 15:40:10.593825491 +0100
 @@ -316,7 +316,7 @@
      <feature name="jetty" version="8.1.14.v20131031">
          <bundle start-level="30" dependency="true">mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/2.7.0</bundle>

diff --git a/karaf/opendaylight-karaf-resources/src/main/patches/karaf-karaf-4.0.9.patch b/karaf/opendaylight-karaf-resources/src/main/patches/karaf-karaf-4.0.10.patch
similarity index 100%
rename from karaf/opendaylight-karaf-resources/src/main/patches/karaf-karaf-4.0.9.patch
rename to karaf/opendaylight-karaf-resources/src/main/patches/karaf-karaf-4.0.10.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 760ff14216750583149e859831da3817403174ba..3446d1e5f9bc7adc1411d817dafcb1540d151abd 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,6 +1,6 @@
-diff -urN a/pax-web-features-4.3.0-features.xml b/pax-web-features-4.3.0-features.xml
---- system/org/ops4j/pax/web/pax-web-features/4.3.0/pax-web-features-4.3.0-features.xml        2017-05-05 01:32:43.260023036 +0200
-+++ system/org/ops4j/pax/web/pax-web-features/4.3.0/pax-web-features-4.3.0-features.xml        2017-05-05 01:35:46.437890587 +0200
+diff -urN a/pax-web-features-4.3.4-features.xml b/pax-web-features-4.3.0-features.xml
+--- system/org/ops4j/pax/web/pax-web-features/4.3.4/pax-web-features-4.3.0-features.xml        2017-05-05 01:32:43.260023036 +0200
++++ system/org/ops4j/pax/web/pax-web-features/4.3.4/pax-web-features-4.3.0-features.xml        2017-05-05 01:35:46.437890587 +0200
 @@ -8,7 +8,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>

diff --git a/karaf/opendaylight-karaf-resources/src/main/patches/karaf-quiesce-4.0.9.patch b/karaf/opendaylight-karaf-resources/src/main/patches/karaf-quiesce-4.0.10.patch
similarity index 67%
rename from karaf/opendaylight-karaf-resources/src/main/patches/karaf-quiesce-4.0.9.patch
rename to karaf/opendaylight-karaf-resources/src/main/patches/karaf-quiesce-4.0.10.patch
index 5566c7b3d3c2dd1bde69d3f16fe43e0814e5b8d9..388bc423884975373cc6bb9860914a42a0413ba1 100644 (file)
--- a/karaf/opendaylight-karaf-resources/src/main/patches/karaf-quiesce-4.0.9.patch
+++ b/karaf/opendaylight-karaf-resources/src/main/patches/karaf-quiesce-4.0.10.patch
@@ -1,5 +1,5 @@
---- system/org/apache/karaf/features/standard/4.0.9/standard-4.0.9-features.xml        2017-01-10 16:50:18.000000000 +0100
-+++ system/org/apache/karaf/features/standard/4.0.9/standard-4.0.9-features.xml        2017-02-06 07:51:32.804000000 +0100
+--- system/org/apache/karaf/features/standard/4.0.10/standard-4.0.10-features.xml      2017-01-10 16:50:18.000000000 +0100
++++ system/org/apache/karaf/features/standard/4.0.10/standard-4.0.10-features.xml      2017-02-06 07:51:32.804000000 +0100
 @@ -24,6 +24,7 @@
          <bundle start-level="20">mvn:org.apache.aries.blueprint/org.apache.aries.blueprint.cm/1.0.9</bundle>
          <bundle start-level="20">mvn:org.apache.aries.blueprint/org.apache.aries.blueprint.core.compatibility/1.0.0</bundle>
@@ -7,4 +7,4 @@
 +        <bundle start-level="20">mvn:org.apache.aries.quiesce/org.apache.aries.quiesce.api/1.0.0</bundle>
          <conditional>
              <condition>bundle</condition>
-             <bundle start-level="30">mvn:org.apache.karaf.bundle/org.apache.karaf.bundle.blueprintstate/4.0.9</bundle>
+             <bundle start-level="30">mvn:org.apache.karaf.bundle/org.apache.karaf.bundle.blueprintstate/4.0.10</bundle>

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

diff --git a/odlparent/pom.xml b/odlparent/pom.xml
index 4c18b87d07319aa9f111a8f0296a9f9cd2122e08..5a416aadb2c02e1543dcec32609f22c8568d1474 100644 (file)
--- a/odlparent/pom.xml
+++ b/odlparent/pom.xml
@@ -88,8 +88,8 @@
     <jacoco.version>0.7.7.201606060606</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.0.9</karaf.version>
-    <karaf.plugin.version>4.0.9</karaf.plugin.version>
+    <karaf.version>4.0.10</karaf.version>
+    <karaf.plugin.version>4.0.10</karaf.plugin.version>
     <!-- Used in lispflowmapping, snmp4sdn, vtn -->
     <projectinfo>2.8.1</projectinfo>
     <!-- Used in of-config; see also snmp4sdn -->