You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by an...@apache.org on 2018/04/13 16:16:26 UTC
brooklyn-server git commit: Fix build issue due the the addition of
k8s helm
Repository: brooklyn-server
Updated Branches:
refs/heads/master 0debf391d -> dd9259a88
Fix build issue due the the addition of k8s helm
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/dd9259a8
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/dd9259a8
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/dd9259a8
Branch: refs/heads/master
Commit: dd9259a881445fd016f33ba5d8a67b3f370f0eff
Parents: 0debf39
Author: Thomas Bouron <th...@cloudsoftcorp.com>
Authored: Fri Apr 13 14:55:04 2018 +0100
Committer: andreaturli <an...@gmail.com>
Committed: Fri Apr 13 17:46:45 2018 +0200
----------------------------------------------------------------------
karaf/features/src/main/feature/feature.xml | 1 +
locations/container/pom.xml | 2 +-
pom.xml | 1 +
3 files changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/dd9259a8/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..92c7cec 100644
--- a/karaf/features/src/main/feature/feature.xml
+++ b/karaf/features/src/main/feature/feature.xml
@@ -272,6 +272,7 @@
</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/dd9259a8/locations/container/pom.xml
----------------------------------------------------------------------
diff --git a/locations/container/pom.xml b/locations/container/pom.xml
index cc24aea..158fe95 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>2.8.2.1.0.3</version>
+ <version>${microbean-helm.version}</version>
<exclusions>
<!-- jclouds depends on a previous version -->
<exclusion>
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/dd9259a8/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 22aff1c..aaf50d0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -104,6 +104,7 @@
<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>
<!--