Repository: brooklyn-server Updated Branches: refs/heads/master dd9259a88 -> 4236ff272
Revert "Fix build issue due the the addition of k8s helm" This reverts commit dd9259a881445fd016f33ba5d8a67b3f370f0eff. Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/f6d10f17 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/f6d10f17 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/f6d10f17 Branch: refs/heads/master Commit: f6d10f173637fc4189e4fd6b3c69eb6a4127362e Parents: dd9259a Author: Thomas Bouron <thomas.bou...@cloudsoftcorp.com> Authored: Mon Apr 16 11:35:31 2018 +0100 Committer: Thomas Bouron <thomas.bou...@cloudsoftcorp.com> Committed: Mon Apr 16 11:35:31 2018 +0100 ---------------------------------------------------------------------- karaf/features/src/main/feature/feature.xml | 1 - locations/container/pom.xml | 2 +- pom.xml | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/f6d10f17/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 92c7cec..06d8963 100644 --- a/karaf/features/src/main/feature/feature.xml +++ b/karaf/features/src/main/feature/feature.xml @@ -272,7 +272,6 @@ </feature> <feature name="brooklyn-container-service" version="${project.version}" description="Brooklyn Container Service and Location Targets"> - <bundle start-level="85">wrap:mvn:org.microbean/microbean-helm/${microbean-helm.version}</bundle> <bundle start-level="85">mvn:org.apache.brooklyn/brooklyn-locations-container/${project.version}</bundle> <feature>kubernetes-client</feature> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/f6d10f17/locations/container/pom.xml ---------------------------------------------------------------------- diff --git a/locations/container/pom.xml b/locations/container/pom.xml index 158fe95..cc24aea 100644 --- a/locations/container/pom.xml +++ b/locations/container/pom.xml @@ -36,7 +36,7 @@ <!-- depends on io.fabric8:kubernetes-client, version should always match --> <groupId>org.microbean</groupId> <artifactId>microbean-helm</artifactId> - <version>${microbean-helm.version}</version> + <version>2.8.2.1.0.3</version> <exclusions> <!-- jclouds depends on a previous version --> <exclusion> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/f6d10f17/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index aaf50d0..22aff1c 100644 --- a/pom.xml +++ b/pom.xml @@ -104,7 +104,6 @@ <jclouds.version>2.1.0</jclouds.version> <!-- JCLOUDS_VERSION --> <logback.version>1.0.7</logback.version> <slf4j.version>1.7.25</slf4j.version> <!-- used for java.util.logging jul-to-slf4j interception --> - <microbean-helm.version>2.8.2.1.0.3</microbean-helm.version> <!-- Must match jclouds' version. From jclouds 1.9.3+ can be any version in the range [16-20) --> <guava.version>18.0</guava.version> <!--
