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-server.git
commit f0a2860da9c16ce1942f1cfd902c9da6c3af6379 Author: Alex Heneveld <[email protected]> AuthorDate: Thu Jan 6 16:52:15 2022 +0000 exclude servicemix jersey-core from jclouds (we use jakarta) doesn't break, but causes extra wiring pain --- karaf/features/src/main/feature/feature.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/karaf/features/src/main/feature/feature.xml b/karaf/features/src/main/feature/feature.xml index f624072..b13d1ab 100644 --- a/karaf/features/src/main/feature/feature.xml +++ b/karaf/features/src/main/feature/feature.xml @@ -337,7 +337,10 @@ <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.javax-inject/1_1</bundle> <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aopalliance/1.0_5</bundle> <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oauth-commons/20100527_1</bundle> - <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jersey-core/1.11_1</bundle> + + <!-- <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jersey-core/1.11_1</bundle> --> <!-- appears not to be used, and conflicts with jakarta.rs.ws --> + <bundle dependency="true">mvn:jakarta.ws.rs/jakarta.ws.rs-api/${jakarta.rs-api.version}</bundle> <!-- used (elsewhere) instead of above, but insist on here also --> + <!-- <bundle>mvn:org.yaml/snakeyaml/${snakeyaml.jclouds.version}</bundle> --> <!-- prefer our version --> <bundle>mvn:org.yaml/snakeyaml/${snakeyaml.version}</bundle>
