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:41 UTC
[1/5] camel git commit: Upgrade Chunk templates to version 3.1.1
Repository: camel
Updated Branches:
refs/heads/master f4fa4a99c -> 41840d3dc
Upgrade Chunk templates to version 3.1.1
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/89975b14
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/89975b14
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/89975b14
Branch: refs/heads/master
Commit: 89975b14172bdc4edbf7898485389a13b152d601
Parents: f4fa4a9
Author: Andrea Cosentino <an...@gmail.com>
Authored: Fri Nov 27 17:21:23 2015 +0100
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Fri Nov 27 17:21:24 2015 +0100
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/89975b14/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 5d2e35e..b6a4f0a 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -89,7 +89,7 @@
<cdi-api-version>1.1</cdi-api-version>
<cglib-bundle-version>3.1_1</cglib-bundle-version>
<cglib-version>3.1</cglib-version>
- <chunk-templates-version>3.1.0</chunk-templates-version>
+ <chunk-templates-version>3.1.1</chunk-templates-version>
<classmate-version>1.3.1</classmate-version>
<cmis-version>0.13.0</cmis-version>
<cometd-bayeux-version>6.1.11</cometd-bayeux-version>
R: Re: [4/5] camel git commit: Upgrade Easymock to version 3.4
Posted by Andrea Cosentino <an...@yahoo.com.INVALID>.
I'll do some tests with 3.3. Sorry for the mistake :-)
Inviato da Yahoo Mail su Android
Il sab, 28 nov, 2015 alle 9:00, Claus Ibsen<cl...@gmail.com> ha scritto: I had to revert to version 3.2, as when using 3.4 then some JARs are
not in mvn central that causes camel-cxf to fail.
Maybe 3.3 works? Or there is some other JAR names for 3.4 or
something. I am not sure.
On Fri, Nov 27, 2015 at 5:28 PM, <ac...@apache.org> wrote:
> Upgrade Easymock to version 3.4
>
>
> Project: http://git-wip-us.apache.org/repos/asf/camel/repo
> Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/657ab26c
> Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/657ab26c
> Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/657ab26c
>
> Branch: refs/heads/master
> Commit: 657ab26cc5bc4ab418685482aa84b9674716e585
> Parents: 6890ae7
> Author: Andrea Cosentino <an...@gmail.com>
> Authored: Fri Nov 27 17:21:43 2015 +0100
> Committer: Andrea Cosentino <an...@gmail.com>
> Committed: Fri Nov 27 17:21:43 2015 +0100
>
> ----------------------------------------------------------------------
> parent/pom.xml | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
> ----------------------------------------------------------------------
>
>
> http://git-wip-us.apache.org/repos/asf/camel/blob/657ab26c/parent/pom.xml
> ----------------------------------------------------------------------
> diff --git a/parent/pom.xml b/parent/pom.xml
> index f1b45b6..27d109f 100644
> --- a/parent/pom.xml
> +++ b/parent/pom.xml
> @@ -138,7 +138,7 @@
> <dozer-version>5.5.1</dozer-version>
> <drools-version>6.3.0.Final</drools-version>
> <dropbox-version>1.8.2</dropbox-version>
> - <easymock-version>3.2</easymock-version>
> + <easymock-version>3.4</easymock-version>
> <eclipse-compiler-version>4.2.2</eclipse-compiler-version>
> <eclipse-equinox-common-version>3.3.0-v20070426</eclipse-equinox-common-version>
> <ehcache-version>2.10.1</ehcache-version>
>
--
Claus Ibsen
-----------------
http://davsclaus.com @davsclaus
Camel in Action 2: https://www.manning.com/ibsen2
Re: [4/5] camel git commit: Upgrade Easymock to version 3.4
Posted by Claus Ibsen <cl...@gmail.com>.
I had to revert to version 3.2, as when using 3.4 then some JARs are
not in mvn central that causes camel-cxf to fail.
Maybe 3.3 works? Or there is some other JAR names for 3.4 or
something. I am not sure.
On Fri, Nov 27, 2015 at 5:28 PM, <ac...@apache.org> wrote:
> Upgrade Easymock to version 3.4
>
>
> Project: http://git-wip-us.apache.org/repos/asf/camel/repo
> Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/657ab26c
> Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/657ab26c
> Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/657ab26c
>
> Branch: refs/heads/master
> Commit: 657ab26cc5bc4ab418685482aa84b9674716e585
> Parents: 6890ae7
> Author: Andrea Cosentino <an...@gmail.com>
> Authored: Fri Nov 27 17:21:43 2015 +0100
> Committer: Andrea Cosentino <an...@gmail.com>
> Committed: Fri Nov 27 17:21:43 2015 +0100
>
> ----------------------------------------------------------------------
> parent/pom.xml | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
> ----------------------------------------------------------------------
>
>
> http://git-wip-us.apache.org/repos/asf/camel/blob/657ab26c/parent/pom.xml
> ----------------------------------------------------------------------
> diff --git a/parent/pom.xml b/parent/pom.xml
> index f1b45b6..27d109f 100644
> --- a/parent/pom.xml
> +++ b/parent/pom.xml
> @@ -138,7 +138,7 @@
> <dozer-version>5.5.1</dozer-version>
> <drools-version>6.3.0.Final</drools-version>
> <dropbox-version>1.8.2</dropbox-version>
> - <easymock-version>3.2</easymock-version>
> + <easymock-version>3.4</easymock-version>
> <eclipse-compiler-version>4.2.2</eclipse-compiler-version>
> <eclipse-equinox-common-version>3.3.0-v20070426</eclipse-equinox-common-version>
> <ehcache-version>2.10.1</ehcache-version>
>
--
Claus Ibsen
-----------------
http://davsclaus.com @davsclaus
Camel in Action 2: https://www.manning.com/ibsen2
[4/5] camel git commit: Upgrade Easymock to version 3.4
Posted by ac...@apache.org.
Upgrade Easymock to version 3.4
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/657ab26c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/657ab26c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/657ab26c
Branch: refs/heads/master
Commit: 657ab26cc5bc4ab418685482aa84b9674716e585
Parents: 6890ae7
Author: Andrea Cosentino <an...@gmail.com>
Authored: Fri Nov 27 17:21:43 2015 +0100
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Fri Nov 27 17:21:43 2015 +0100
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/657ab26c/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index f1b45b6..27d109f 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -138,7 +138,7 @@
<dozer-version>5.5.1</dozer-version>
<drools-version>6.3.0.Final</drools-version>
<dropbox-version>1.8.2</dropbox-version>
- <easymock-version>3.2</easymock-version>
+ <easymock-version>3.4</easymock-version>
<eclipse-compiler-version>4.2.2</eclipse-compiler-version>
<eclipse-equinox-common-version>3.3.0-v20070426</eclipse-equinox-common-version>
<ehcache-version>2.10.1</ehcache-version>
[5/5] camel git commit: Upgrade Undertow to version 1.3.7.Final
Posted by ac...@apache.org.
Upgrade Undertow to version 1.3.7.Final
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/41840d3d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/41840d3d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/41840d3d
Branch: refs/heads/master
Commit: 41840d3dc1d971fa09283c58f26bc9397cea1d6e
Parents: 657ab26c
Author: Andrea Cosentino <an...@gmail.com>
Authored: Fri Nov 27 17:21:47 2015 +0100
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Fri Nov 27 17:21:47 2015 +0100
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/41840d3d/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 27d109f..b29bf7c 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -508,7 +508,7 @@
<testng-version>6.8.21</testng-version>
<twitter4j-bundle-version>4.0.4_1</twitter4j-bundle-version>
<twitter4j-version>4.0.4</twitter4j-version>
- <undertow-version>1.3.6.Final</undertow-version>
+ <undertow-version>1.3.7.Final</undertow-version>
<univocity-parsers-version>1.5.6</univocity-parsers-version>
<unix-socket-factory-version>2015-01-27T15-02-14</unix-socket-factory-version>
<unix-socket-factory-bundle-version>1.0.0</unix-socket-factory-bundle-version>
[3/5] camel git commit: Upgrade to Facebook4j to version 2.4.1
Posted by ac...@apache.org.
Upgrade to Facebook4j to version 2.4.1
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/6890ae74
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6890ae74
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6890ae74
Branch: refs/heads/master
Commit: 6890ae74cef3328a53dd59bac3bbb2197204f0ce
Parents: fad4466
Author: Andrea Cosentino <an...@gmail.com>
Authored: Fri Nov 27 17:21:38 2015 +0100
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Fri Nov 27 17:21:38 2015 +0100
----------------------------------------------------------------------
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/6890ae74/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index d1cffd6..f1b45b6 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -151,7 +151,7 @@
<embedmongo-version>1.50.0</embedmongo-version>
<exec-maven-plugin-version>1.4.0</exec-maven-plugin-version>
<ezmorph-bundle-version>1.0.6_1</ezmorph-bundle-version>
- <facebook4j-core-version>2.3.2</facebook4j-core-version>
+ <facebook4j-core-version>2.4.1</facebook4j-core-version>
<fastinfoset-version>1.2.13_1</fastinfoset-version>
<felix-configadmin-version>1.8.8</felix-configadmin-version>
<felix-connect-version>0.1.0</felix-connect-version>
[2/5] camel git commit: Upgrade Kubernetes/Openshift client to
version 1.3.59 and Kubernetes-model to version 1.0.36
Posted by ac...@apache.org.
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>