You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2015/11/27 17:28:42 UTC
[2/5] camel git commit: Upgrade Kubernetes/Openshift client to
version 1.3.59 and Kubernetes-model to version 1.0.36
Upgrade Kubernetes/Openshift client to version 1.3.59 and Kubernetes-model to version 1.0.36
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/fad44664
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/fad44664
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/fad44664
Branch: refs/heads/master
Commit: fad446640575dd7ee2cc78a5a028d7b3c4b96fc2
Parents: 89975b1
Author: Andrea Cosentino <an...@gmail.com>
Authored: Fri Nov 27 17:21:34 2015 +0100
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Fri Nov 27 17:21:34 2015 +0100
----------------------------------------------------------------------
.../component/kubernetes/producer/KubernetesPodsProducer.java | 6 ++----
parent/pom.xml | 6 +++---
2 files changed, 5 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/fad44664/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/producer/KubernetesPodsProducer.java
----------------------------------------------------------------------
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/producer/KubernetesPodsProducer.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/producer/KubernetesPodsProducer.java
index 3c2d38d..7619357 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/producer/KubernetesPodsProducer.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/producer/KubernetesPodsProducer.java
@@ -24,10 +24,8 @@ import io.fabric8.kubernetes.api.model.Pod;
import io.fabric8.kubernetes.api.model.PodBuilder;
import io.fabric8.kubernetes.api.model.PodList;
import io.fabric8.kubernetes.api.model.PodSpec;
-import io.fabric8.kubernetes.client.KubernetesClient;
-import io.fabric8.kubernetes.client.dsl.ClientLoggableResource;
import io.fabric8.kubernetes.client.dsl.ClientMixedOperation;
-import io.fabric8.kubernetes.client.dsl.ClientOperation;
+import io.fabric8.kubernetes.client.dsl.ClientPodResource;
import org.apache.camel.Exchange;
import org.apache.camel.component.kubernetes.KubernetesConstants;
@@ -105,7 +103,7 @@ public class KubernetesPodsProducer extends DefaultProducer {
throw new IllegalArgumentException(
"Get pods by labels require specify a labels set");
}
- ClientMixedOperation<Pod, PodList, DoneablePod, ClientLoggableResource<Pod, DoneablePod>> pods;
+ ClientMixedOperation<Pod, PodList, DoneablePod, ClientPodResource<Pod, DoneablePod>> pods;
pods = getEndpoint().getKubernetesClient().pods();
for (Map.Entry<String, String> entry : labels.entrySet()) {
pods.withLabel(entry.getKey(), entry.getValue());
http://git-wip-us.apache.org/repos/asf/camel/blob/fad44664/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index b6a4f0a..d1cffd6 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -328,8 +328,8 @@
<karaf3-version>3.0.2</karaf3-version>
<kie-version>6.3.0.Final</kie-version>
<krati-version>0.4.9</krati-version>
- <kubernetes-client-version>1.3.58</kubernetes-client-version>
- <kubernetes-model-version>1.0.35</kubernetes-model-version>
+ <kubernetes-client-version>1.3.59</kubernetes-client-version>
+ <kubernetes-model-version>1.0.36</kubernetes-model-version>
<kxml2-bundle-version>2.3.0_2</kxml2-bundle-version>
<leveldbjni-version>1.8</leveldbjni-version>
<!-- virtual dependency only used by Eclipse m2e -->
@@ -398,7 +398,7 @@
<openejb-version>4.7.2</openejb-version>
<openjpa-version>2.4.0</openjpa-version>
<openshift-java-client-version>2.7.0.Final</openshift-java-client-version>
- <openshift-client-version>1.3.58</openshift-client-version>
+ <openshift-client-version>1.3.59</openshift-client-version>
<optaplanner-version>6.3.0.Final</optaplanner-version>
<oro-bundle-version>2.0.8_6</oro-bundle-version>
<oscache-bundle-version>2.4_5</oscache-bundle-version>