This is an automated email from the ASF dual-hosted git repository. heneveld pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-dist.git
commit 2ee360a3950cbbbc16ffb41bd5b282a13b8caa11 Author: Alex Heneveld <[email protected]> AuthorDate: Thu Nov 18 12:29:43 2021 +0000 use spifly 1.3.2 not 1.3.0 to fix activator NPE with fabric8 continue to use spifly 1.2.4 with karaf --- .../filtered-resources/resources/etc/org.apache.karaf.features.xml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/karaf/features/src/main/filtered-resources/resources/etc/org.apache.karaf.features.xml b/karaf/features/src/main/filtered-resources/resources/etc/org.apache.karaf.features.xml index 366bdf8..cd209d7 100644 --- a/karaf/features/src/main/filtered-resources/resources/etc/org.apache.karaf.features.xml +++ b/karaf/features/src/main/filtered-resources/resources/etc/org.apache.karaf.features.xml @@ -179,10 +179,9 @@ <bundle originalUri="mvn:org.eclipse.jetty/jetty-xml/[9.4,${jetty.version}]" replacement="mvn:org.eclipse.jetty/jetty-xml/${jetty.version}" /> - <!-- this would be nice, but without it we get missing requirement [org.eclipse.jetty.security.jaspi/...] - <bundle originalUri="mvn:org.apache.aries.spifly/org.apache.aries.spifly.dynamic.bundle/[1.2,${spifly.version}]" + <!-- would be nice to map 1.2, but without that we get missing requirement [org.eclipse.jetty.security.jaspi/...] --> + <bundle originalUri="mvn:org.apache.aries.spifly/org.apache.aries.spifly.dynamic.bundle/[1.3,${spifly.version}]" replacement="mvn:org.apache.aries.spifly/org.apache.aries.spifly.dynamic.bundle/${spifly.version}" /> - --> <!-- the objectweb (dis)assembly jars are usually needed at multiple major version levels; see brooklyn-server/pom.xml for discussion; no choice but to allow the multiple versions, @@ -235,7 +234,7 @@ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.okhttp/3.12.1_1</bundle> <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.okio/1.15.0_1</bundle> - <!-- <bundle>mvn:org.apache.aries.spifly/org.apache.aries.spifly.dynamic.bundle/[1.2,${spifly.version})</bundle> --> <!-- see spifly above --> + <bundle>mvn:org.apache.aries.spifly/org.apache.aries.spifly.dynamic.bundle/[1.3,${spifly.version})</bundle> <!-- see spifly above --> <!-- Blacklisted bundles must be pulled in elsewhere at the correct version. Note that replacements might need blacklisting also.
