camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From acosent...@apache.org
Subject camel git commit: Upgrade Kubernetes client to version 1.4.33 and unified the Kubernetes/Openshift client version property in only one entry
Date Fri, 06 Jan 2017 13:50:06 GMT
Repository: camel
Updated Branches:
  refs/heads/master 2bca93918 -> b0e3a5d8d


Upgrade Kubernetes client to version 1.4.33 and unified the Kubernetes/Openshift client version
property in only one entry


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b0e3a5d8
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b0e3a5d8
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b0e3a5d8

Branch: refs/heads/master
Commit: b0e3a5d8d77d10934069afc1a5be831d9780869d
Parents: 2bca939
Author: Andrea Cosentino <ancosen@gmail.com>
Authored: Fri Jan 6 14:42:45 2017 +0100
Committer: Andrea Cosentino <ancosen@gmail.com>
Committed: Fri Jan 6 14:49:47 2017 +0100

----------------------------------------------------------------------
 components/camel-kubernetes/pom.xml                      | 2 +-
 parent/pom.xml                                           | 3 +--
 platforms/karaf/features/src/main/resources/features.xml | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/b0e3a5d8/components/camel-kubernetes/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-kubernetes/pom.xml b/components/camel-kubernetes/pom.xml
index 99966e8..2be203e 100644
--- a/components/camel-kubernetes/pom.xml
+++ b/components/camel-kubernetes/pom.xml
@@ -47,7 +47,7 @@
     <dependency>
       <groupId>io.fabric8</groupId>
       <artifactId>openshift-client</artifactId>
-      <version>${openshift-client-version}</version>
+      <version>${kubernetes-client-version}</version>
     </dependency>
     <!-- testing -->
     <dependency>

http://git-wip-us.apache.org/repos/asf/camel/blob/b0e3a5d8/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 8c10e80..d3e6c04 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -386,7 +386,7 @@
     <karaf4-version>4.0.8</karaf4-version>
     <kie-version>6.5.0.Final</kie-version>
     <krati-version>0.4.9</krati-version>
-    <kubernetes-client-version>1.4.31</kubernetes-client-version>
+    <kubernetes-client-version>1.4.33</kubernetes-client-version>
     <kubernetes-model-version>1.0.65</kubernetes-model-version>
     <kxml2-bundle-version>2.3.0_3</kxml2-bundle-version>
     <leveldbjni-version>1.8</leveldbjni-version>
@@ -474,7 +474,6 @@
     <openhft-lang-version>6.8.2</openhft-lang-version>
     <openjpa-version>2.4.1</openjpa-version>
     <openshift-java-client-version>2.7.0.Final</openshift-java-client-version>
-    <openshift-client-version>1.4.31</openshift-client-version>
     <openstack4j-version>3.0.2</openstack4j-version>
     <openstack4j-guava-version>17.0</openstack4j-guava-version>
     <ops4j-base-version>1.5.0</ops4j-base-version>

http://git-wip-us.apache.org/repos/asf/camel/blob/b0e3a5d8/platforms/karaf/features/src/main/resources/features.xml
----------------------------------------------------------------------
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index 724e294..25b7119 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1142,7 +1142,7 @@
     <bundle dependency='true'>mvn:io.fabric8/zjsonpatch/${zjsonpatch-version}</bundle>
     <bundle dependency='true'>mvn:io.fabric8/kubernetes-model/${kubernetes-model-version}</bundle>
     <bundle dependency='true'>mvn:io.fabric8/kubernetes-client/${kubernetes-client-version}/jar/bundle</bundle>
-    <bundle dependency='true'>mvn:io.fabric8/openshift-client/${openshift-client-version}/jar/bundle</bundle>
+    <bundle dependency='true'>mvn:io.fabric8/openshift-client/${kubernetes-client-version}/jar/bundle</bundle>
     <bundle>mvn:org.apache.camel/camel-kubernetes/${project.version}</bundle>
   </feature>
   <feature name='camel-ldap' version='${project.version}' resolver='(obr)' start-level='50'>


Mime
View raw message