[brooklyn-dist] 01/04: fix kubernetes osgi import, fix osgi package confusion, tidy features

[he...@apache.org]

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 452731cd8b44b66ed8c0a451664314eed128ffc0
Author: Alex Heneveld <al...@cloudsoftcorp.com>
AuthorDate: Wed Nov 17 12:32:58 2021 +0000

    fix kubernetes osgi import, fix osgi package confusion, tidy features
    
    declare fewer things as dependency=true to speed up startup and make things (eg guava) available when needed;
    some things still declared as dependency=true are needed to prevent confusion though
    
    also take care to minimize confusion of packages vis-a-vis javax.annotation, ws, and rs-api
    
    seems to be working!
---
 .../resources/etc/org.apache.karaf.features.xml    | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 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 e147bc5..e8062a6 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
@@ -58,9 +58,12 @@
        - https://stackoverflow.com/a/53589206
     -->
     <bundleReplacements>
-        <!-- Several things declare javax for annotation-api, but jakarta replaces those; having just one speeds up dependency resolution -->
-        <bundle originalUri="mvn:javax.annotation/javax.annotation-api/[1.3,1.4)"
+        <!-- JSR305 complements javax.annotation with more classes in same package and new subpackages eg meta;
+             both have multiple providers; we have standardized on the replacements below -->
+        <bundle originalUri="mvn:javax.annotation/javax.annotation-api/(0,999]"
                 replacement="mvn:jakarta.annotation/jakarta.annotation-api/${jakarta.annotation-api.version}" />
+        <bundle originalUri="mvn:com.google.code.findbugs/jsr305/(0,999]"
+                replacement="mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jsr305/${jsr305.bundle.version}" />
 
         <!-- For crypto, both the karaf ssh feature and jclouds use lower versions than we want;
              (some lower versions may have CVEs, and in any case it is preferable to have one version where compatible) -->
@@ -170,6 +173,12 @@
                 replacement="mvn:org.eclipse.jetty/jetty-webapp/${jetty.version}" />
         <bundle originalUri="mvn:org.eclipse.jetty/jetty-xml/[9.4,${jetty.version}]"
                 replacement="mvn:org.eclipse.jetty/jetty-xml/${jetty.version}" />
+        <bundle originalUri="mvn:org.XXXapache.aries.spifly/org.apache.aries.spifly.dynamic.bundle/[1.2,${spifly.version})"
+                replacement="mvn:org.XXXapache.aries.spifly/org.apache.aries.spifly.dynamic.bundle/${spifly.version}" />
+
+        <!-- cxf uses servicemix's variant; other use javax standard one -->
+        <bundle originalUri="mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxrs-api-2.1/(0,3)"
+                replacement="mvn:javax.ws.rs/javax.ws.rs-api/${jax-rs-api.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,
@@ -189,7 +198,6 @@
     </bundleReplacements>
 
     <blacklistedBundles>
-        <bundle>mvn:javax.annotation/javax.annotation-api/[1.3,1.4)</bundle>
         <bundle>mvn:org.bouncycastle/bcprov-jdk15on/[1.51,${bouncycastle.version})</bundle>
         <bundle>mvn:org.bouncycastle/bcprov-ext-jdk15on/[1.51,${bouncycastle.version})</bundle>
         <bundle>mvn:org.bouncycastle/bcpkix-jdk15on/[1.51,${bouncycastle.version})</bundle>
@@ -203,7 +211,9 @@
         <bundle>mvn:com.fasterxml.jackson.core/jackson-databind/[2.10,${fasterxml.jackson.version})</bundle>
         <bundle>mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/[2.10,${fasterxml.jackson.version})</bundle>
         <bundle>mvn:javax.mail/mail/[1.4.4,${javax.mail.version})</bundle>
+
         <bundle>mvn:javax.ws.rs/javax.ws.rs-api/[2,${jax-rs-api.version})</bundle>
+        <bundle>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxrs-api-2.1/[0,3)</bundle> <!-- use javax above -->
 
         <!-- Blacklisted bundles must be pulled in elsewhere at the correct version.
              This might mean explicit dependencies declared in a feature. -->
@@ -237,6 +247,12 @@
         <bundle>mvn:org.eclipse.jetty/jetty-util/[9.4,${jetty.version})</bundle>
         <bundle>mvn:org.eclipse.jetty/jetty-webapp/[9.4,${jetty.version})</bundle>
         <bundle>mvn:org.eclipse.jetty/jetty-xml/[9.4,${jetty.version})</bundle>
+
+        <!-- we supply wrapped versions -->
+        <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.servicemix.bundles/org.apache.servicemix.bundles.jsr305/(0,999]</bundle>
+
     </blacklistedBundles>
 
 </featuresProcessing>