karaf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject karaf-cellar git commit: [KARAF-4191] Use kubernetes-client feature and update to kubernetes-client 1.4.7
Date Mon, 05 Sep 2016 05:49:48 GMT
Repository: karaf-cellar
Updated Branches:
  refs/heads/master 0340b4e5a -> 17e45594c


[KARAF-4191] Use kubernetes-client feature and update to kubernetes-client 1.4.7


Project: http://git-wip-us.apache.org/repos/asf/karaf-cellar/repo
Commit: http://git-wip-us.apache.org/repos/asf/karaf-cellar/commit/17e45594
Tree: http://git-wip-us.apache.org/repos/asf/karaf-cellar/tree/17e45594
Diff: http://git-wip-us.apache.org/repos/asf/karaf-cellar/diff/17e45594

Branch: refs/heads/master
Commit: 17e45594c61bd4f40027dc0da9677319cd890253
Parents: 0340b4e
Author: Jean-Baptiste Onofré <jbonofre@apache.org>
Authored: Mon Sep 5 07:49:23 2016 +0200
Committer: Jean-Baptiste Onofré <jbonofre@apache.org>
Committed: Mon Sep 5 07:49:23 2016 +0200

----------------------------------------------------------------------
 assembly/src/main/resources/features.xml | 4 ++--
 pom.xml                                  | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/17e45594/assembly/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/assembly/src/main/resources/features.xml b/assembly/src/main/resources/features.xml
index 7b2dcab..de63be2 100644
--- a/assembly/src/main/resources/features.xml
+++ b/assembly/src/main/resources/features.xml
@@ -16,7 +16,7 @@
 <features name="karaf-cellar-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.3.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.3.0
http://karaf.apache.org/xmlns/features/v1.3.0">
 
     <repository>mvn:org.apache.jclouds.karaf/jclouds-karaf/${jclouds.version}/xml/features</repository>
-    <repository>mvn:io.fabric8/karaf-features/${fabric8.version}/xml/features</repository>
+    <repository>mvn:io.fabric8.kubernetes/kubernetes-karaf/${fabric8.kubernetes-client.version}/xml/features</repository>
     
     <feature name="cellar-core" description="Karaf clustering core" version="${project.version}">
         <feature>aries-proxy</feature>
@@ -100,7 +100,7 @@
 
     <feature name="cellar-kubernetes" description="Cellar Kubernetes support" version="${project.version}">
         <feature>cellar-core</feature>
-        <feature>fabric8-kubernetes-api</feature>
+        <feature>kubernetes-client</feature>
         <bundle>mvn:org.apache.karaf.cellar/org.apache.karaf.cellar.kubernetes/${project.version}</bundle>
     </feature>
 

http://git-wip-us.apache.org/repos/asf/karaf-cellar/blob/17e45594/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index fb57e24..68d65a0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,8 +36,7 @@
 
     <properties>
         <easymock.version>3.4</easymock.version>
-        <fabric8.version>2.2.23</fabric8.version>
-        <fabric8.kubernetes-client.version>1.3.22</fabric8.kubernetes-client.version>
+        <fabric8.kubernetes-client.version>1.4.7</fabric8.kubernetes-client.version>
         <felix.bundlerepository.version>2.0.6</felix.bundlerepository.version>
         <felix.utils.version>1.8.0</felix.utils.version>
         <felix.webconsole.version>4.2.14</felix.webconsole.version>


Mime
View raw message