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 5c8d5a83a40c416c4d46ba13d56d2aaf4d6e30a8 Author: Alex Heneveld <[email protected]> AuthorDate: Thu Nov 18 11:54:07 2021 +0000 rejig startup sequence to avoid rewiring rewiring causes javax.annotation chain problems; but if groovy is delayed there is no rewiring --- karaf/features/src/main/feature/feature.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/karaf/features/src/main/feature/feature.xml b/karaf/features/src/main/feature/feature.xml index df875a5..a8af358 100644 --- a/karaf/features/src/main/feature/feature.xml +++ b/karaf/features/src/main/feature/feature.xml @@ -53,7 +53,6 @@ <bundle>mvn:com.google.guava/failureaccess/${failureaccess.version}</bundle> <bundle>mvn:com.google.guava/guava/${guava.version}</bundle> - <bundle>mvn:org.codehaus.groovy/groovy-all/${groovy.version}</bundle> <bundle>mvn:commons-io/commons-io/${commons-io.version}</bundle> <bundle>mvn:commons-codec/commons-codec/${commons-codec.version}</bundle> <bundle>mvn:org.yaml/snakeyaml/${snakeyaml.version}</bundle> @@ -166,6 +165,8 @@ <bundle>mvn:com.fasterxml.jackson.core/jackson-databind/${fasterxml.jackson.version}</bundle> <bundle>mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/${fasterxml.jackson.version}</bundle> <bundle>mvn:com.fasterxml.jackson.core/jackson-annotations/${fasterxml.jackson.version}</bundle> + <bundle>mvn:com.thoughtworks.xstream/xstream/${xstream.version}</bundle> + <bundle>mvn:org.codehaus.groovy/groovy-all/${groovy.version}</bundle> <bundle>mvn:net.minidev/json-smart/${jsonSmart.version}</bundle> <bundle>mvn:net.minidev/accessors-smart/${minidev.accessors-smart.version}</bundle> @@ -178,7 +179,6 @@ <bundle>mvn:org.ops4j.pax.web/pax-web-spi/${pax-web.version}</bundle> <bundle>mvn:org.apache.geronimo.specs/geronimo-ws-metadata_2.0_spec/${geronimo-ws-metadata_2.0_spec.version}</bundle> - <bundle>mvn:com.thoughtworks.xstream/xstream/${xstream.version}</bundle> <bundle>mvn:org.freemarker/freemarker/${freemarker.version}</bundle> <bundle>mvn:commons-codec/commons-codec/${commons-codec.version}</bundle> @@ -314,6 +314,7 @@ <bundle>wrap:mvn:com.squareup.okhttp3/logging-interceptor/3.12.6$Bundle-SymbolicName=squareup-okhttp3-logging-interceptor&Bundle-Version=3.12.6&Import-Package=*;resolution:=mandatory</bundle> <!-- <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jsr305/${jsr305.bundle.version}</bundle> --> <!-- see note in dist; complements javax.annotation --> <!-- <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.okhttp/3.12.1_1</bundle> --> <!-- note this is okhttp3 --> + <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.conscrypt-openjdk/1.4.2_1</bundle> <!-- optional to okhttp, but wire in now to avoid refresh when fabric8 pulls it in --> <!-- upstream dependencies, needed --> <bundle dependency="true">mvn:com.google.inject/guice/${guice.version}</bundle>
