Add container service to Karaf feature
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/0ce7a0ea Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/0ce7a0ea Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/0ce7a0ea Branch: refs/heads/master Commit: 0ce7a0ea65264ee06e6c615e14c85c9d99d7f227 Parents: ebe7534 Author: Andrew Donald Kennedy <[email protected]> Authored: Fri Jun 16 13:37:22 2017 +0100 Committer: Andrew Donald Kennedy <[email protected]> Committed: Thu Jun 29 14:54:31 2017 +0100 ---------------------------------------------------------------------- karaf/features/src/main/feature/feature.xml | 9 +++++++++ locations/container/pom.xml | 1 + parent/pom.xml | 20 ++++++++++++++++++-- pom.xml | 1 + 4 files changed, 29 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0ce7a0ea/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 de91681..515ebce 100644 --- a/karaf/features/src/main/feature/feature.xml +++ b/karaf/features/src/main/feature/feature.xml @@ -24,6 +24,7 @@ <repository>mvn:org.apache.karaf.features/standard/${karaf.version}/xml/features</repository> <repository>mvn:org.apache.jclouds.karaf/jclouds-karaf/${jclouds.version}/xml/features</repository> <repository>mvn:org.apache.cxf.karaf/apache-cxf/${cxf.version}/xml/features</repository> + <repository>mvn:io.fabric8.kubernetes/kubernetes-karaf/${kubernetes-client.version}/xml/features</repository> <feature name="swagger" version="${swagger.version}" description="Swagger Annotations+Core+JAXRS+Models"> <bundle dependency='true'>mvn:com.google.guava/guava/${guava-swagger.version}</bundle> @@ -313,6 +314,13 @@ <bundle>mvn:org.apache.jclouds.provider/google-compute-engine/${jclouds.version}</bundle> </feature> + <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>kubernetes-client</feature> + <feature>openshift-client</feature> + </feature> + <feature name="brooklyn-test-framework" version="${project.version}" description="Brooklyn Test Framework" > <bundle>mvn:org.apache.brooklyn/brooklyn-test-framework/${project.version}</bundle> </feature> @@ -328,6 +336,7 @@ <feature>brooklyn-core</feature> <feature>brooklyn-server-software-all</feature> <feature>brooklyn-locations-jclouds</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> </feature> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0ce7a0ea/locations/container/pom.xml ---------------------------------------------------------------------- diff --git a/locations/container/pom.xml b/locations/container/pom.xml index b5dd506..862d888 100644 --- a/locations/container/pom.xml +++ b/locations/container/pom.xml @@ -33,6 +33,7 @@ <properties> <kubernetes-client.version>1.4.27</kubernetes-client.version> </properties> + <dependencies> <dependency> <groupId>io.fabric8</groupId> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0ce7a0ea/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index dfb79b7..b31e1a6 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -513,8 +513,24 @@ <artifactId>cxf-rt-rs-client</artifactId> <version>${cxf.version}</version> </dependency> - </dependencies> - </dependencyManagement> + <dependency> + <groupId>io.fabric8</groupId> + <artifactId>kubernetes-client</artifactId> + <version>${kubernetes-client.version}</version> + <exclusions> + <exclusion> + <groupId>com.squareup.okio</groupId> + <artifactId>okio</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>io.fabric8</groupId> + <artifactId>openshift-client</artifactId> + <version>${kubernetes-client.version}</version> + </dependency> + </dependencies> + </dependencyManagement> <build> <testSourceDirectory>src/test/java</testSourceDirectory> http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/0ce7a0ea/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 7706760..2139529 100644 --- a/pom.xml +++ b/pom.xml @@ -173,6 +173,7 @@ <karaf.version>4.0.8</karaf.version> <karaf.plugin.version>${karaf.version}</karaf.plugin.version> <felix-osgi-compendium.version>1.4.0</felix-osgi-compendium.version> + <kubernetes-client.version>1.4.27</kubernetes-client.version> <!-- Transitive dependencies, declared explicitly to avoid version mismatch --> <clojure.version>1.4.0</clojure.version> <zookeeper.version>3.3.4</zookeeper.version>
