From cf3af83235ed9fd3129b93a63e90909d8a4a7dea Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Mon, 25 Sep 2017 12:12:36 +0200 Subject: [PATCH] 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 (cherry picked from commit b0e04a0c274d86ea3dbbd71f85ec148c383458f2) --- karaf/opendaylight-karaf-resources/pom.xml | 8 ++++---- ....9.patch => karaf-etc-startup-properties-4.0.10.patch} | 2 +- ...vax-mail-4.0.9.patch => karaf-javax-mail-4.0.10.patch} | 4 ++-- .../{karaf-karaf-4.0.9.patch => karaf-karaf-4.0.10.patch} | 0 .../src/main/patches/karaf-paxweb.patch | 6 +++--- ...raf-quiesce-4.0.9.patch => karaf-quiesce-4.0.10.patch} | 6 +++--- ...karaf-setenv-4.0.9.patch => karaf-setenv-4.0.10.patch} | 0 odlparent/pom.xml | 4 ++-- 8 files changed, 15 insertions(+), 15 deletions(-) rename karaf/opendaylight-karaf-resources/src/main/patches/{karaf-etc-startup-properties-4.0.9.patch => karaf-etc-startup-properties-4.0.10.patch} (97%) rename karaf/opendaylight-karaf-resources/src/main/patches/{karaf-javax-mail-4.0.9.patch => karaf-javax-mail-4.0.10.patch} (78%) rename karaf/opendaylight-karaf-resources/src/main/patches/{karaf-karaf-4.0.9.patch => karaf-karaf-4.0.10.patch} (100%) rename karaf/opendaylight-karaf-resources/src/main/patches/{karaf-quiesce-4.0.9.patch => karaf-quiesce-4.0.10.patch} (67%) rename karaf/opendaylight-karaf-resources/src/main/patches/{karaf-setenv-4.0.9.patch => karaf-setenv-4.0.10.patch} (100%) diff --git a/karaf/opendaylight-karaf-resources/pom.xml b/karaf/opendaylight-karaf-resources/pom.xml index 168e9dd72..e5a519b83 100644 --- a/karaf/opendaylight-karaf-resources/pom.xml +++ b/karaf/opendaylight-karaf-resources/pom.xml @@ -95,11 +95,11 @@ - - + mvn\:org.osgi/org.osgi.service.event/1.3.1 = 8 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 ca3732ac7..e3303461f 100644 --- 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 8b41acc66..d9bfddec1 100644 --- 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 @@ mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/2.7.0 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 760ff1421..3446d1e5f 100644 --- 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 @@ mvn:org.apache.geronimo.specs/geronimo-jta_1.1_spec/1.1.1 mvn:javax.annotation/javax.annotation-api/1.2 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 5566c7b3d..388bc4238 100644 --- 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 @@ mvn:org.apache.aries.blueprint/org.apache.aries.blueprint.cm/1.0.9 mvn:org.apache.aries.blueprint/org.apache.aries.blueprint.core.compatibility/1.0.0 @@ -7,4 +7,4 @@ + mvn:org.apache.aries.quiesce/org.apache.aries.quiesce.api/1.0.0 bundle - mvn:org.apache.karaf.bundle/org.apache.karaf.bundle.blueprintstate/4.0.9 + mvn:org.apache.karaf.bundle/org.apache.karaf.bundle.blueprintstate/4.0.10 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 7441d49b6..b3aa8bebc 100644 --- a/odlparent/pom.xml +++ b/odlparent/pom.xml @@ -88,8 +88,8 @@ 0.7.7.201606060606 - 4.0.9 - 4.0.9 + 4.0.10 + 4.0.10 2.8.1 -- 2.36.6