You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2018/07/31 11:51:09 UTC
[3/8] brooklyn-server git commit: change fabric8 k8s feature include
and bump snakeyaml
change fabric8 k8s feature include and bump snakeyaml
newer snakeyaml needed for new jackson.
and fabric8 k8s features want older jackson version so just pull in the bundles we want manually instead.
an older snakeyaml still creeps in via byon, working on that
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/e85d8720
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/e85d8720
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/e85d8720
Branch: refs/heads/master
Commit: e85d872060881171272fa902d2ade37271d0c4c8
Parents: 08a2b4a
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Tue Jul 24 12:18:04 2018 +0100
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Fri Jul 27 14:21:27 2018 +0100
----------------------------------------------------------------------
karaf/features/src/main/feature/feature.xml | 33 ++++++++++++++++++++++++
locations/container/pom.xml | 5 ++++
pom.xml | 2 +-
3 files changed, 39 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e85d8720/karaf/features/src/main/feature/feature.xml
----------------------------------------------------------------------
diff --git a/karaf/features/src/main/feature/feature.xml b/karaf/features/src/main/feature/feature.xml
index 06d8963..73003dc 100644
--- a/karaf/features/src/main/feature/feature.xml
+++ b/karaf/features/src/main/feature/feature.xml
@@ -252,6 +252,7 @@
<feature name="brooklyn-locations-jclouds" version="${project.version}" description="Brooklyn Jclouds Location Targets">
<bundle>mvn:org.apache.jclouds/jclouds-loadbalancer/${jclouds.version}</bundle>
+ <feature>brooklyn-core</feature>
<feature>jclouds-services</feature>
<feature>jclouds-driver-sshj</feature>
<feature>jclouds-driver-slf4j</feature>
@@ -274,8 +275,40 @@
<feature name="brooklyn-container-service" version="${project.version}" description="Brooklyn Container Service and Location Targets">
<bundle start-level="85">mvn:org.apache.brooklyn/brooklyn-locations-container/${project.version}</bundle>
+ <feature>brooklyn-core</feature>
+<!-- previously we used these, but they pull in wrong versions - jackson 2.7.5 and snakeyaml 1.17
+ <feature>kubernetes-client</feature>
+ <feature>openshift-client</feature>
+-->
+<!-- these are pulled in elsewhere
+ <bundle dependency='true'>mvn:javax.validation/validation-api/1.1.0.Final</bundle>
+ <bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/3.1.0</bundle>
+-->
+<!-- these are wrong version, right version pulled in elsewhere
+ <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/2.7.5</bundle>
+ <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-annotations/2.7.5</bundle>
+ <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/2.7.5</bundle>
+ <bundle dependency='true'>mvn:com.fasterxml.jackson.module/jackson-module-jaxb-annotations/2.7.5</bundle>
+ <bundle dependency='true'>mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-base/2.7.5</bundle>
+ <bundle dependency='true'>mvn:com.fasterxml.jackson.jaxrs/jackson-jaxrs-json-provider/2.7.5</bundle>
+ <bundle dependency='true'>mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/2.7.5</bundle>
+ <bundle dependency='true'>mvn:org.yaml/snakeyaml/1.17</bundle>
+-->
+<!-- these are needed -->
+ <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.generex/1.0.1_1</bundle>
+ <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.automaton/1.11-8_1</bundle>
+<!-- these are pulled at very different versions elsewhere but let's use these versions too -->
+ <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.okio/1.9.0_1</bundle>
+ <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.okhttp/3.4.1_1</bundle>
+<!-- main required bundles -->
+ <bundle>mvn:io.fabric8/kubernetes-model/1.0.64</bundle>
+ <bundle>mvn:io.fabric8/zjsonpatch/0.2.3</bundle>
+ <bundle>mvn:io.fabric8/kubernetes-client/1.4.27/jar/bundle</bundle>
+ <bundle>mvn:io.fabric8/openshift-client/1.4.27/jar/bundle</bundle>
+<!-- previously we used these, but they pull in wrong versions - jackson 2.7.5 and snakeyaml 1.17
<feature>kubernetes-client</feature>
<feature>openshift-client</feature>
+-->
</feature>
<feature name="brooklyn-test-framework" version="${project.version}" description="Brooklyn Test Framework" >
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e85d8720/locations/container/pom.xml
----------------------------------------------------------------------
diff --git a/locations/container/pom.xml b/locations/container/pom.xml
index 6bd4be1..7761880 100644
--- a/locations/container/pom.xml
+++ b/locations/container/pom.xml
@@ -42,10 +42,15 @@
<version>${kubernetes-client.version}</version>
<classifier>bundle</classifier>
<exclusions>
+ <!-- we use newer versions -->
<exclusion>
<groupId>com.squareup.okio</groupId>
<artifactId>okio</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.yaml</groupId>
+ <artifactId>snakeyaml</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e85d8720/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index ae3ca53..bcd02ca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -125,7 +125,7 @@
<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>
- <snakeyaml.version>1.17</snakeyaml.version>
+ <snakeyaml.version>1.21</snakeyaml.version>
<!-- Next version of swagger requires changes to how path mapping and scanner injection are done. -->
<swagger.version>1.5.6</swagger.version>
<jansi.version>1.2.1</jansi.version>