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 c531c65e5303db935a3fb59258bd94e6e5955326 Author: Alex Heneveld <[email protected]> AuthorDate: Wed Nov 10 10:56:28 2021 +0000 tweaks to feature defs etc, trying to make it start nicely --- karaf/features/src/main/feature/feature.xml | 27 +++++++++++++++------------ parent/pom.xml | 4 ++-- pom.xml | 4 ++-- 3 files changed, 19 insertions(+), 16 deletions(-) diff --git a/karaf/features/src/main/feature/feature.xml b/karaf/features/src/main/feature/feature.xml index ce50a27..886300c 100644 --- a/karaf/features/src/main/feature/feature.xml +++ b/karaf/features/src/main/feature/feature.xml @@ -307,7 +307,6 @@ <bundle dependency='true'>mvn:com.jcraft/jsch.agentproxy.sshagent/${jsch.agentproxy.version}</bundle> <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jzlib/${jzlib.bundle.version}</bundle> <bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jsch-agentproxy-sshj/${jsch.agentproxy.bundle.version}</bundle> - <!-- upstream dependencies, maybe not needed --> <bundle dependency="true">mvn:javax.ws.rs/javax.ws.rs-api/${jax-rs-api.version}</bundle> @@ -315,6 +314,9 @@ <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.aopalliance/1.0_5</bundle> <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.oauth-commons/20100527_1</bundle> <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jersey-core/1.11_1</bundle> + <!-- jclouds uses this version; but probably not needed + <bundle dependency='true'>mvn:org.yaml/snakeyaml/${snakeyaml.jclouds.version}</bundle> + --> <!-- jclouds bundles --> <bundle>mvn:org.apache.jclouds.api/atmos/${jclouds.version}</bundle> @@ -372,8 +374,6 @@ <bundle>mvn:org.apache.jclouds.provider/skalicloud-sdg-my/${jclouds.version}</bundle> <bundle>mvn:org.apache.jclouds.provider/softlayer/${jclouds.version}</bundle> - <bundle dependency='true'>mvn:org.yaml/snakeyaml/1.26</bundle> <!-- jclouds uses this version now; we might not need to include it, but trying for good measure --> - <!-- exclude vcac; not available in 2.4.0, and not widely used or tested. <bundle>mvn:org.apache.jclouds.labs/vcac/${jclouds.version}</bundle> --> @@ -385,20 +385,23 @@ <feature name="brooklyn-container-service" version="${project.version}" description="Brooklyn Container Service and Location Targets"> <feature>brooklyn-core</feature> + <!-- shared dependencies --> <bundle dependency='true'>mvn:com.fasterxml.jackson.module/jackson-module-jaxb-annotations/${fasterxml.jackson.version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/${fasterxml.jackson.version}</bundle> <bundle dependency='true'>mvn:com.fasterxml.jackson.datatype/jackson-datatype-jsr310/${fasterxml.jackson.version}</bundle> - <!-- (1) --> - <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jsr305/3.0.2_1</bundle> + <!-- new dependencies --> + <!-- provides javax.annotation.meta etc but also javax.annotation which we don't want --> + <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jsr305/${jsr305.bundle.version}</bundle> <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.generex/1.0.2_1</bundle> <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.automaton/1.11-8_1</bundle> - <!-- (2) --> - <bundle dependency='true'>wrap:mvn:com.squareup.okio/okio/1.15.0$Bundle-SymbolicName=squareup-okio&Bundle-Version=1.15.0&Export-Package=okio;version=1.15.0</bundle> - <!-- (3) --> - <bundle dependency='true'>wrap:mvn:com.squareup.okhttp3/okhttp/3.12.6$Bundle-SymbolicName=squareup-okhttp3&Bundle-Version=3.12.6&Import-Package=okio;version=1.15,*;resolution:=optional</bundle> - <bundle dependency='true'>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> - <!-- (4) --> + <bundle dependency='true'>mvn:com.squareup.okio/okio/1.15.0</bundle> + <bundle dependency='true'>mvn:com.squareup.okhttp3/okhttp/3.12.6</bundle> + <bundle dependency='true'>mvn:com.squareup.okhttp3/logging-interceptor/3.12.6</bundle> +<!-- <bundle dependency='true'>wrap:mvn:com.squareup.okio/okio/1.15.0$Bundle-SymbolicName=squareup-okio&Bundle-Version=1.15.0&Export-Package=okio;version=1.15.0</bundle>--> +<!-- <bundle dependency='true'>wrap:mvn:com.squareup.okhttp3/okhttp/3.12.6$Bundle-SymbolicName=squareup-okhttp3&Bundle-Version=3.12.6&Import-Package=okio;version=1.15,*;resolution:=optional</bundle>--> +<!-- <bundle dependency='true'>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>--> + <!-- these are the main required bundles for these features above --> <bundle>mvn:io.fabric8/zjsonpatch/0.3.0</bundle> <bundle>mvn:io.fabric8/kubernetes-model/${kubernetes-client.version}</bundle> @@ -424,7 +427,7 @@ <feature>brooklyn-core</feature> <feature>brooklyn-server-software-all</feature> <feature>brooklyn-locations-jclouds</feature> - <feature>brooklyn-container-service</feature> +<!-- <feature>brooklyn-container-service</feature>--> <bundle dependency="true">mvn:org.apache.brooklyn/brooklyn-launcher-common/${project.version}</bundle> <bundle start-level="90">mvn:org.apache.brooklyn/brooklyn-karaf-init/${project.version}</bundle> <bundle start-level="90">mvn:org.apache.brooklyn/brooklyn-karaf-start/${project.version}</bundle> diff --git a/parent/pom.xml b/parent/pom.xml index 7f453db..d2211af 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -202,7 +202,7 @@ <dependency> <groupId>com.google.code.findbugs</groupId> <artifactId>jsr305</artifactId> - <version>${jsr305.version}</version> + <version>${google.findbugs.jsr305.version}</version> </dependency> <dependency> <groupId>org.codehaus.groovy</groupId> @@ -1486,7 +1486,7 @@ </Export-Package> <!-- By default import automatically, but constrain some versions which confuse karaf at runtime --> <Import-Package> - <!-- force this version to exclude servicemix which provides this at 1.1; but which we need as it provides others eg .meta --> + <!-- force this version to exclude servicemix --> javax.annotation;version="[1.2,2)", * </Import-Package> diff --git a/pom.xml b/pom.xml index a211c12..7f17035 100644 --- a/pom.xml +++ b/pom.xml @@ -132,9 +132,8 @@ <httpclient.version>4.5.13</httpclient.version> <!-- kept for compatibility in 0.11.0-SNAPSHOT, remove after --> <commons-lang3.version>3.3.2</commons-lang3.version> <groovy.version>2.4.15</groovy.version> <!-- Version 2.4.7 supported by https://github.com/groovy/groovy-eclipse/wiki/Groovy-Eclipse-2.9.1-Release-Notes; not sure what more recent will be --> - <jsr305.version>2.0.1</jsr305.version> - <!-- JClouds 2.2.0 imports snakeyaml 1.17 --> <snakeyaml.version>1.27</snakeyaml.version> <!-- 1.27 matches cxf-jackson 3.3.9 --> + <snakeyaml.jclouds.version>1.26</snakeyaml.jclouds.version> <!-- jclouds 2.4 imports this --> <!-- Next version of swagger requires changes to how path mapping and scanner injection are done. --> <swagger.version>1.6.2</swagger.version> <mx4j.version>3.0.1</mx4j.version> @@ -159,6 +158,7 @@ <jopt.version>4.3</jopt.version> <jcip-annotations.bundle.version>1.0_2</jcip-annotations.bundle.version> <jsr305.bundle.version>3.0.2_1</jsr305.bundle.version> + <google.findbugs.jsr305.version>2.0.1</google.findbugs.jsr305.version> <!-- only used for pojo build --> <javax-servlet.version>3.1.0</javax-servlet.version> <javax-servlet-jsp.version>2.0</javax-servlet-jsp.version> <xml-apis.version>1.0.b2</xml-apis.version>
