Repository: camel Updated Branches: refs/heads/master 6ec56e31a -> cbc64df48
Upgrade Kubernetes/Openshift client to version 1.3.81 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/cbc64df4 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/cbc64df4 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/cbc64df4 Branch: refs/heads/master Commit: cbc64df48d03126ba6373d0227015aaf736da124 Parents: 6ec56e3 Author: Andrea Cosentino <anco...@gmail.com> Authored: Wed Apr 6 16:43:06 2016 +0200 Committer: Andrea Cosentino <anco...@gmail.com> Committed: Thu Apr 7 09:29:06 2016 +0200 ---------------------------------------------------------------------- .../kubernetes/producer/KubernetesBuildConfigsProducer.java | 7 +++++-- parent/pom.xml | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/cbc64df4/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/producer/KubernetesBuildConfigsProducer.java ---------------------------------------------------------------------- diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/producer/KubernetesBuildConfigsProducer.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/producer/KubernetesBuildConfigsProducer.java index 154321e..39b5e5f 100644 --- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/producer/KubernetesBuildConfigsProducer.java +++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/producer/KubernetesBuildConfigsProducer.java @@ -20,6 +20,7 @@ import java.util.Map; import io.fabric8.kubernetes.client.dsl.ClientMixedOperation; import io.fabric8.kubernetes.client.dsl.ClientNonNamespaceOperation; +import io.fabric8.openshift.api.model.Build; import io.fabric8.openshift.api.model.BuildConfig; import io.fabric8.openshift.api.model.BuildConfigList; import io.fabric8.openshift.api.model.DoneableBuildConfig; @@ -88,7 +89,8 @@ public class KubernetesBuildConfigsProducer extends DefaultProducer { Map.class); String namespaceName = exchange.getIn().getHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, String.class); if (!ObjectHelper.isEmpty(namespaceName)) { - ClientNonNamespaceOperation<BuildConfig, BuildConfigList, DoneableBuildConfig, ClientBuildConfigResource<BuildConfig, DoneableBuildConfig, Void, Void>> buildConfigs; + ClientNonNamespaceOperation<BuildConfig, BuildConfigList, DoneableBuildConfig, + ClientBuildConfigResource<BuildConfig, DoneableBuildConfig, Void, Build>> buildConfigs; buildConfigs = getEndpoint().getKubernetesClient().adapt(OpenShiftClient.class).buildConfigs() .inNamespace(namespaceName); for (Map.Entry<String, String> entry : labels.entrySet()) { @@ -96,7 +98,8 @@ public class KubernetesBuildConfigsProducer extends DefaultProducer { } buildConfigsList = buildConfigs.list(); } else { - ClientMixedOperation<BuildConfig, BuildConfigList, DoneableBuildConfig, ClientBuildConfigResource<BuildConfig, DoneableBuildConfig, Void, Void>> buildConfigs; + ClientMixedOperation<BuildConfig, BuildConfigList, DoneableBuildConfig, + ClientBuildConfigResource<BuildConfig, DoneableBuildConfig, Void, Build>> buildConfigs; buildConfigs = getEndpoint().getKubernetesClient().adapt(OpenShiftClient.class).buildConfigs(); for (Map.Entry<String, String> entry : labels.entrySet()) { buildConfigs.withLabel(entry.getKey(), entry.getValue()); http://git-wip-us.apache.org/repos/asf/camel/blob/cbc64df4/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 3421f12..d38a1dc 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -356,7 +356,7 @@ <karaf4-version>4.0.4</karaf4-version> <kie-version>6.3.0.Final</kie-version> <krati-version>0.4.9</krati-version> - <kubernetes-client-version>1.3.78</kubernetes-client-version> + <kubernetes-client-version>1.3.81</kubernetes-client-version> <kubernetes-model-version>1.0.44</kubernetes-model-version> <kxml2-bundle-version>2.3.0_3</kxml2-bundle-version> <leveldbjni-version>1.8</leveldbjni-version> @@ -435,7 +435,7 @@ <openejb-version>4.7.4</openejb-version> <openjpa-version>2.4.1</openjpa-version> <openshift-java-client-version>2.7.0.Final</openshift-java-client-version> - <openshift-client-version>1.3.78</openshift-client-version> + <openshift-client-version>1.3.81</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>
