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 2017/01/05 07:37:01 UTC
[1/2] camel git commit: Upgrade Zjsonpatch to version 0.3.0
Repository: camel
Updated Branches:
refs/heads/master 68ec2af95 -> ddb8d7f6c
Upgrade Zjsonpatch to version 0.3.0
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ddb8d7f6
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ddb8d7f6
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ddb8d7f6
Branch: refs/heads/master
Commit: ddb8d7f6cb7d21ffc8758c890cde7082069687c5
Parents: e9f804a
Author: Andrea Cosentino <an...@gmail.com>
Authored: Thu Jan 5 08:35:18 2017 +0100
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Thu Jan 5 08:35:52 2017 +0100
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/ddb8d7f6/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 0168221..49d904e 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -661,7 +661,7 @@
<xstream-version>1.4.9</xstream-version>
<xom-version>1.2.5</xom-version>
<yammer-metrics-version>2.2.0</yammer-metrics-version>
- <zjsonpatch-version>0.2.3</zjsonpatch-version>
+ <zjsonpatch-version>0.3.0</zjsonpatch-version>
<zookeeper-version>3.4.9</zookeeper-version>
<zookeeper-guava-version>16.0</zookeeper-guava-version>
<zxing-version>3.3.0</zxing-version>
[2/2] camel git commit: Upgrade Kubernetes/Openshift client to
version 1.4.31
Posted by ac...@apache.org.
Upgrade Kubernetes/Openshift client to version 1.4.31
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e9f804a4
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e9f804a4
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e9f804a4
Branch: refs/heads/master
Commit: e9f804a45fcbe11ecfa3a74119055b70db6d7df2
Parents: 68ec2af
Author: Andrea Cosentino <an...@gmail.com>
Authored: Thu Jan 5 08:27:56 2017 +0100
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Thu Jan 5 08:35:52 2017 +0100
----------------------------------------------------------------------
.../kubernetes/consumer/KubernetesNodesConsumerTest.java | 2 +-
.../kubernetes/consumer/KubernetesPodsConsumerTest.java | 2 +-
.../kubernetes/producer/KubernetesPodsProducerTest.java | 2 +-
parent/pom.xml | 4 ++--
4 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/e9f804a4/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesNodesConsumerTest.java
----------------------------------------------------------------------
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesNodesConsumerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesNodesConsumerTest.java
index e583556..43c6097 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesNodesConsumerTest.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesNodesConsumerTest.java
@@ -60,7 +60,7 @@ public class KubernetesNodesConsumerTest extends KubernetesTestSupport {
labels.put("this", "rocks");
exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_PODS_LABELS, labels);
PodSpec podSpec = new PodSpec();
- podSpec.setHost("172.28.128.4");
+ podSpec.setHostname("localhost");
Container cont = new Container();
cont.setImage("docker.io/jboss/wildfly:latest");
cont.setName("pippo");
http://git-wip-us.apache.org/repos/asf/camel/blob/e9f804a4/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesPodsConsumerTest.java
----------------------------------------------------------------------
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesPodsConsumerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesPodsConsumerTest.java
index cc31d70..b2fabb9 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesPodsConsumerTest.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/consumer/KubernetesPodsConsumerTest.java
@@ -61,7 +61,7 @@ public class KubernetesPodsConsumerTest extends KubernetesTestSupport {
labels.put("this", "rocks");
exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_PODS_LABELS, labels);
PodSpec podSpec = new PodSpec();
- podSpec.setHost("172.28.128.4");
+ podSpec.setHostname("localhost");
Container cont = new Container();
cont.setImage("docker.io/jboss/wildfly:latest");
cont.setName("pippo");
http://git-wip-us.apache.org/repos/asf/camel/blob/e9f804a4/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesPodsProducerTest.java
----------------------------------------------------------------------
diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesPodsProducerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesPodsProducerTest.java
index 6b9ce4b..d690045 100644
--- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesPodsProducerTest.java
+++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesPodsProducerTest.java
@@ -132,7 +132,7 @@ public class KubernetesPodsProducerTest extends KubernetesTestSupport {
exchange.getIn().setHeader(
KubernetesConstants.KUBERNETES_PODS_LABELS, labels);
PodSpec podSpec = new PodSpec();
- podSpec.setHost("172.28.128.4");
+ podSpec.setHostname("localhost");
Container cont = new Container();
cont.setImage("docker.io/jboss/wildfly:latest");
cont.setName("pippo");
http://git-wip-us.apache.org/repos/asf/camel/blob/e9f804a4/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 7217d94..0168221 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -385,7 +385,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.28</kubernetes-client-version>
+ <kubernetes-client-version>1.4.31</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>
@@ -473,7 +473,7 @@
<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.28</openshift-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>