camel git commit: Upgrade Kubernetes Client to version 2.5.2

2017-07-04 Thread acosentino 
Repository: camel
Updated Branches:
  refs/heads/master b515840bd -> 3dbe62592


Upgrade Kubernetes Client to version 2.5.2


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

Branch: refs/heads/master
Commit: 3dbe6259248b93963cbf6f8acc3ae7626dc09cb5
Parents: b515840
Author: Andrea Cosentino 
Authored: Tue Jul 4 16:20:35 2017 +0200
Committer: Andrea Cosentino 
Committed: Tue Jul 4 16:20:35 2017 +0200

--
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/3dbe6259/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 068cad9..2f5bf37 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -425,7 +425,7 @@
 4.1.1
 6.5.0.Final
 0.4.9
-2.5.1
+2.5.2
 1.0.78
 2.3.0_3
 1.8

camel git commit: Optimise - Do faster check for boolean type

2017-07-04 Thread davsclaus 
Repository: camel
Updated Branches:
  refs/heads/master b28c4da09 -> b515840bd


Optimise - Do faster check for boolean type


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

Branch: refs/heads/master
Commit: b515840bdb25cd0038aaee871864601f455be756
Parents: b28c4da
Author: Claus Ibsen 
Authored: Tue Jul 4 13:35:45 2017 +0200
Committer: Claus Ibsen 
Committed: Tue Jul 4 13:35:45 2017 +0200

--
 .../src/main/java/org/apache/camel/impl/DefaultMessage.java| 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/b515840b/camel-core/src/main/java/org/apache/camel/impl/DefaultMessage.java
--
diff --git a/camel-core/src/main/java/org/apache/camel/impl/DefaultMessage.java 
b/camel-core/src/main/java/org/apache/camel/impl/DefaultMessage.java
index 06040ba..e226de0 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultMessage.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultMessage.java
@@ -93,7 +93,7 @@ public class DefaultMessage extends MessageSupport {
 Object value = getHeader(name);
 if (value == null) {
 // lets avoid NullPointerException when converting to boolean for 
null values
-if (boolean.class.isAssignableFrom(type)) {
+if (boolean.class == type) {
 return (T) Boolean.FALSE;
 }
 return null;
@@ -118,7 +118,7 @@ public class DefaultMessage extends MessageSupport {
 Object value = getHeader(name, defaultValue);
 if (value == null) {
 // lets avoid NullPointerException when converting to boolean for 
null values
-if (boolean.class.isAssignableFrom(type)) {
+if (boolean.class == type) {
 return (T) Boolean.FALSE;
 }
 return null;
@@ -146,7 +146,7 @@ public class DefaultMessage extends MessageSupport {
 Object value = getHeader(name, defaultValueSupplier);
 if (value == null) {
 // lets avoid NullPointerException when converting to boolean for 
null values
-if (boolean.class.isAssignableFrom(type)) {
+if (boolean.class == type) {
 return (T) Boolean.FALSE;
 }
 return null;

[1/3] camel git commit: Polished

2017-07-04 Thread davsclaus 
Repository: camel
Updated Branches:
  refs/heads/camel-2.19.x bb07bcd25 -> 1a23895dd
  refs/heads/master 0bab270c8 -> b28c4da09


Polished


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

Branch: refs/heads/master
Commit: 4bef6b29db9696707583d92be8bb25e17af33ebd
Parents: 0bab270
Author: Claus Ibsen 
Authored: Tue Jul 4 11:38:35 2017 +0200
Committer: Claus Ibsen 
Committed: Tue Jul 4 11:38:35 2017 +0200

--
 .../src/main/java/org/apache/camel/impl/DefaultCamelContext.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/4bef6b29/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java 
b/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
index 26a865d..ef50425 100644
--- a/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
+++ b/camel-core/src/main/java/org/apache/camel/impl/DefaultCamelContext.java
@@ -3262,7 +3262,7 @@ public class DefaultCamelContext extends ServiceSupport 
implements ModelCamelCon
 validatorRegistry = new DefaultValidatorRegistry(this, validators);
 addService(validatorRegistry, true, true);
 
-// optimised to not include runtimeEndpointRegistry unless its enabled 
or JMX statis is in extended mode
+// optimised to not include runtimeEndpointRegistry unless its enabled 
or JMX statistics is in extended mode
 if (runtimeEndpointRegistry == null && getManagementStrategy() != null 
&& getManagementStrategy().getManagementAgent() != null) {
 Boolean isEnabled = 
getManagementStrategy().getManagementAgent().getEndpointRuntimeStatisticsEnabled();
 boolean isExtended = 
getManagementStrategy().getManagementAgent().getStatisticsLevel().isExtended();
@@ -3341,7 +3341,7 @@ public class DefaultCamelContext extends ServiceSupport 
implements ModelCamelCon
 
 // start routes
 if (doNotStartRoutesOnFirstStart) {
-log.debug("Skip starting of routes as CamelContext has been 
configured with autoStartup=false");
+log.debug("Skip starting routes as CamelContext has been 
configured with autoStartup=false");
 }
 
 // invoke this logic to warmup the routes and if possible also start 
the routes

[2/3] camel git commit: CAMEL-11506: camel-catalog-maven should use Apache Commons http-client 3.1 to download http/https as it has support for timeout which the basic handler from the JDK does not.

2017-07-04 Thread davsclaus 
CAMEL-11506: camel-catalog-maven should use Apache Commons http-client 3.1 to 
download http/https as it has support for timeout which the basic handler from 
the JDK does not.


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

Branch: refs/heads/master
Commit: b28c4da094c665ce7f19a6cd6a7695b45a4e1dc0
Parents: 4bef6b2
Author: Claus Ibsen 
Authored: Tue Jul 4 12:46:51 2017 +0200
Committer: Claus Ibsen 
Committed: Tue Jul 4 12:46:51 2017 +0200

--
 .../catalog/maven/MavenVersionManager.java  |  2 +-
 .../catalog/maven/PatchedHttpClientHandler.java | 72 
 .../catalog/maven/TimeoutHttpClientHandler.java | 72 
 3 files changed, 73 insertions(+), 73 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/b28c4da0/platforms/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/MavenVersionManager.java
--
diff --git 
a/platforms/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/MavenVersionManager.java
 
b/platforms/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/MavenVersionManager.java
index d9cfa1a..39fe059 100644
--- 
a/platforms/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/MavenVersionManager.java
+++ 
b/platforms/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/MavenVersionManager.java
@@ -37,7 +37,7 @@ import org.apache.ivy.util.url.URLHandlerRegistry;
 public class MavenVersionManager implements VersionManager {
 
 private final ClassLoader classLoader = new GroovyClassLoader();
-private final PatchedHttpClientHandler httpClient = new 
PatchedHttpClientHandler();
+private final TimeoutHttpClientHandler httpClient = new 
TimeoutHttpClientHandler();
 private String version;
 private String runtimeProviderVersion;
 private String cacheDirectory;

http://git-wip-us.apache.org/repos/asf/camel/blob/b28c4da0/platforms/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/PatchedHttpClientHandler.java
--
diff --git 
a/platforms/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/PatchedHttpClientHandler.java
 
b/platforms/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/PatchedHttpClientHandler.java
deleted file mode 100644
index 499ed58..000
--- 
a/platforms/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/PatchedHttpClientHandler.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.catalog.maven;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-
-import org.apache.ivy.util.url.BasicURLHandler;
-import org.apache.ivy.util.url.HttpClientHandler;
-
-/**
- * A patched {@link HttpClientHandler} which allows to use HttpClient for 
downloading via http/https
- * and have support for timeouts which is not supported out of the box by 
default.
- */
-public class PatchedHttpClientHandler extends HttpClientHandler {
-
-// use basic handler for non http/https as it can load from jar/file etc
-private BasicURLHandler basic = new BasicURLHandler();
-
-private int timeout = 1;
-
-public int getTimeout() {
-return timeout;
-}
-
-/**
- * Sets the timeout in millis (http.socket.timeout) when downloading via 
http/https protocols.
- * 
- * The default value is 1
- */
-public void setTimeout(int timeout) {
-this.timeout = timeout;
-}
-
-@Override
-public URLInfo getURLInfo(URL url) {
-// ensure we always use a timeout
-String protocol = url.getProtocol();
-if ("http".equals(protocol) || "https".equals(protocol)) {
-return

[3/3] camel git commit: CAMEL-11506: camel-catalog-maven should use Apache Commons http-client 3.1 to download http/https as it has support for timeout which the basic handler from the JDK does not.

2017-07-04 Thread davsclaus 
CAMEL-11506: camel-catalog-maven should use Apache Commons http-client 3.1 to 
download http/https as it has support for timeout which the basic handler from 
the JDK does not.


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

Branch: refs/heads/camel-2.19.x
Commit: 1a23895dd5e51014bdf8720b3a3d18ea5ebb72a4
Parents: bb07bcd
Author: Claus Ibsen 
Authored: Tue Jul 4 12:46:51 2017 +0200
Committer: Claus Ibsen 
Committed: Tue Jul 4 12:47:39 2017 +0200

--
 .../catalog/maven/MavenVersionManager.java  |  2 +-
 .../catalog/maven/PatchedHttpClientHandler.java | 72 
 .../catalog/maven/TimeoutHttpClientHandler.java | 72 
 3 files changed, 73 insertions(+), 73 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/1a23895d/platforms/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/MavenVersionManager.java
--
diff --git 
a/platforms/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/MavenVersionManager.java
 
b/platforms/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/MavenVersionManager.java
index d9cfa1a..39fe059 100644
--- 
a/platforms/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/MavenVersionManager.java
+++ 
b/platforms/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/MavenVersionManager.java
@@ -37,7 +37,7 @@ import org.apache.ivy.util.url.URLHandlerRegistry;
 public class MavenVersionManager implements VersionManager {
 
 private final ClassLoader classLoader = new GroovyClassLoader();
-private final PatchedHttpClientHandler httpClient = new 
PatchedHttpClientHandler();
+private final TimeoutHttpClientHandler httpClient = new 
TimeoutHttpClientHandler();
 private String version;
 private String runtimeProviderVersion;
 private String cacheDirectory;

http://git-wip-us.apache.org/repos/asf/camel/blob/1a23895d/platforms/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/PatchedHttpClientHandler.java
--
diff --git 
a/platforms/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/PatchedHttpClientHandler.java
 
b/platforms/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/PatchedHttpClientHandler.java
deleted file mode 100644
index 499ed58..000
--- 
a/platforms/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/PatchedHttpClientHandler.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.catalog.maven;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-
-import org.apache.ivy.util.url.BasicURLHandler;
-import org.apache.ivy.util.url.HttpClientHandler;
-
-/**
- * A patched {@link HttpClientHandler} which allows to use HttpClient for 
downloading via http/https
- * and have support for timeouts which is not supported out of the box by 
default.
- */
-public class PatchedHttpClientHandler extends HttpClientHandler {
-
-// use basic handler for non http/https as it can load from jar/file etc
-private BasicURLHandler basic = new BasicURLHandler();
-
-private int timeout = 1;
-
-public int getTimeout() {
-return timeout;
-}
-
-/**
- * Sets the timeout in millis (http.socket.timeout) when downloading via 
http/https protocols.
- * 
- * The default value is 1
- */
-public void setTimeout(int timeout) {
-this.timeout = timeout;
-}
-
-@Override
-public URLInfo getURLInfo(URL url) {
-// ensure we always use a timeout
-String protocol = url.getProtocol();
-if ("http".equals(protocol) || "https".equals(protocol)) {
-return

[2/4] camel git commit: Polished test

2017-07-04 Thread davsclaus 
Polished test


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

Branch: refs/heads/master
Commit: 756e56c81fa8e1bcf426b201a788a5243087e518
Parents: 5c08aef
Author: Claus Ibsen 
Authored: Tue Jul 4 10:43:55 2017 +0200
Committer: Claus Ibsen 
Committed: Tue Jul 4 10:52:19 2017 +0200

--
 .../camel/catalog/maven/MavenVersionManagerTest.java  | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/756e56c8/platforms/camel-catalog-maven/src/test/java/org/apache/camel/catalog/maven/MavenVersionManagerTest.java
--
diff --git 
a/platforms/camel-catalog-maven/src/test/java/org/apache/camel/catalog/maven/MavenVersionManagerTest.java
 
b/platforms/camel-catalog-maven/src/test/java/org/apache/camel/catalog/maven/MavenVersionManagerTest.java
index e9cdcb0..bf5fe2f 100644
--- 
a/platforms/camel-catalog-maven/src/test/java/org/apache/camel/catalog/maven/MavenVersionManagerTest.java
+++ 
b/platforms/camel-catalog-maven/src/test/java/org/apache/camel/catalog/maven/MavenVersionManagerTest.java
@@ -156,13 +156,13 @@ public class MavenVersionManagerTest extends TestCase {
 System.out.println("2.18.1 has " + components + " components");
 assertFalse("Should not have ejb component", 
catalog.findComponentNames().contains("ejb"));
 
-loaded = catalog.loadVersion("2.19.0-SNAPSHOT");
-assertTrue("Unable to switch to Camel Catalog 2.19.0-SNAPSHOT", 
loaded);
-loaded = catalog.loadRuntimeProviderVersion("org.apache.camel", 
"camel-catalog-provider-karaf", "2.19.0-SNAPSHOT");
-assertTrue("Unable to load Karaf Provider Camel Catalog 
2.19.0-SNAPSHOT", loaded);
+loaded = catalog.loadVersion("2.19.1");
+assertTrue("Unable to switch to Camel Catalog 2.19.1", loaded);
+loaded = catalog.loadRuntimeProviderVersion("org.apache.camel", 
"camel-catalog-provider-karaf", "2.19.1");
+assertTrue("Unable to load Karaf Provider Camel Catalog 2.19.1", 
loaded);
 int componentsNewer = catalog.findComponentNames().size();
 assertTrue("Both catalog versions shouldn't have the same count of 
components.", components != componentsNewer);
-System.out.println("2.19.0-SNAPSHOT has " + componentsNewer + " 
components");
+System.out.println("2.19.1 has " + componentsNewer + " components");
 assertFalse("Should not have ejb component", 
catalog.findComponentNames().contains("ejb"));
 
 loaded = catalog.loadVersion("2.18.1");

[3/4] camel git commit: CAMEL-11506: camel-catalog-maven should use Apache Commons http-client 3.1 to download http/https as it has support for timeout which the basic handler from the JDK does not.

2017-07-04 Thread davsclaus 
CAMEL-11506: camel-catalog-maven should use Apache Commons http-client 3.1 to 
download http/https as it has support for timeout which the basic handler from 
the JDK does not.


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

Branch: refs/heads/master
Commit: 5c08aef8b0f279b82cb1e9ae0f0ce97f81c6ae5e
Parents: 717edf8
Author: Claus Ibsen 
Authored: Tue Jul 4 10:39:16 2017 +0200
Committer: Claus Ibsen 
Committed: Tue Jul 4 10:52:19 2017 +0200

--
 platforms/camel-catalog-maven/pom.xml   |  7 ++
 .../catalog/maven/MavenVersionManager.java  | 15 
 .../catalog/maven/PatchedHttpClientHandler.java | 72 
 3 files changed, 94 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/5c08aef8/platforms/camel-catalog-maven/pom.xml
--
diff --git a/platforms/camel-catalog-maven/pom.xml 
b/platforms/camel-catalog-maven/pom.xml
index 6551506..a45735c 100644
--- a/platforms/camel-catalog-maven/pom.xml
+++ b/platforms/camel-catalog-maven/pom.xml
@@ -61,6 +61,13 @@
   ${ivy-version}
 
 
+
+
+  commons-httpclient
+  commons-httpclient
+  ${httpclient-version}
+
+
 
 
   junit

http://git-wip-us.apache.org/repos/asf/camel/blob/5c08aef8/platforms/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/MavenVersionManager.java
--
diff --git 
a/platforms/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/MavenVersionManager.java
 
b/platforms/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/MavenVersionManager.java
index 066b7ca..d9cfa1a 100644
--- 
a/platforms/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/MavenVersionManager.java
+++ 
b/platforms/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/MavenVersionManager.java
@@ -26,6 +26,7 @@ import java.util.Map;
 import groovy.grape.Grape;
 import groovy.lang.GroovyClassLoader;
 import org.apache.camel.catalog.VersionManager;
+import org.apache.ivy.util.url.URLHandlerRegistry;
 
 /**
  * A {@link VersionManager} that can load the resources using Maven to 
download needed artifacts from
@@ -36,6 +37,7 @@ import org.apache.camel.catalog.VersionManager;
 public class MavenVersionManager implements VersionManager {
 
 private final ClassLoader classLoader = new GroovyClassLoader();
+private final PatchedHttpClientHandler httpClient = new 
PatchedHttpClientHandler();
 private String version;
 private String runtimeProviderVersion;
 private String cacheDirectory;
@@ -61,6 +63,15 @@ public class MavenVersionManager implements VersionManager {
 }
 
 /**
+ * Sets the timeout in millis (http.socket.timeout) when downloading via 
http/https protocols.
+ * 
+ * The default value is 1
+ */
+public void setHttpClientTimeout(int timeout) {
+httpClient.setTimeout(timeout);
+}
+
+/**
  * To add a 3rd party Maven repository.
  *
  * @param name the repository name
@@ -81,6 +92,8 @@ public class MavenVersionManager implements VersionManager {
 @Override
 public boolean loadVersion(String version) {
 try {
+URLHandlerRegistry.setDefault(httpClient);
+
 if (cacheDirectory != null) {
 System.setProperty("grape.root", cacheDirectory);
 }
@@ -113,6 +126,8 @@ public class MavenVersionManager implements VersionManager {
 @Override
 public boolean loadRuntimeProviderVersion(String groupId, String 
artifactId, String version) {
 try {
+URLHandlerRegistry.setDefault(httpClient);
+
 Grape.setEnableAutoDownload(true);
 
 Map param = new HashMap<>();

http://git-wip-us.apache.org/repos/asf/camel/blob/5c08aef8/platforms/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/PatchedHttpClientHandler.java
--
diff --git 
a/platforms/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/PatchedHttpClientHandler.java
 
b/platforms/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/PatchedHttpClientHandler.java
new file mode 100644
index 000..66a26f4
--- /dev/null
+++ 
b/platforms/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/PatchedHttpClientHandler.java
@@ -0,0 +1,72 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file

[4/4] camel git commit: Fixed CS

2017-07-04 Thread davsclaus 
Fixed CS


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

Branch: refs/heads/camel-2.19.x
Commit: bb07bcd25f3d985ef834fed5d1446529e8214bce
Parents: 26085bb
Author: Claus Ibsen 
Authored: Tue Jul 4 10:52:12 2017 +0200
Committer: Claus Ibsen 
Committed: Tue Jul 4 10:52:40 2017 +0200

--
 .../apache/camel/catalog/maven/PatchedHttpClientHandler.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/bb07bcd2/platforms/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/PatchedHttpClientHandler.java
--
diff --git 
a/platforms/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/PatchedHttpClientHandler.java
 
b/platforms/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/PatchedHttpClientHandler.java
index 66a26f4..499ed58 100644
--- 
a/platforms/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/PatchedHttpClientHandler.java
+++ 
b/platforms/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/PatchedHttpClientHandler.java
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

[1/4] camel git commit: Fixed CS

2017-07-04 Thread davsclaus 
Repository: camel
Updated Branches:
  refs/heads/camel-2.19.x 26085bb4b -> bb07bcd25
  refs/heads/master 717edf803 -> 0bab270c8


Fixed CS


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

Branch: refs/heads/master
Commit: 0bab270c89f95d3f1ab3657df1af78ed11fe2992
Parents: 756e56c
Author: Claus Ibsen 
Authored: Tue Jul 4 10:52:12 2017 +0200
Committer: Claus Ibsen 
Committed: Tue Jul 4 10:52:19 2017 +0200

--
 .../apache/camel/catalog/maven/PatchedHttpClientHandler.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/0bab270c/platforms/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/PatchedHttpClientHandler.java
--
diff --git 
a/platforms/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/PatchedHttpClientHandler.java
 
b/platforms/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/PatchedHttpClientHandler.java
index 66a26f4..499ed58 100644
--- 
a/platforms/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/PatchedHttpClientHandler.java
+++ 
b/platforms/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/PatchedHttpClientHandler.java
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
+ *  http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

[3/3] camel git commit: Polished test

2017-07-04 Thread davsclaus 
Polished test


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

Branch: refs/heads/camel-2.19.x
Commit: 26085bb4b30a586b47310e281ab8da2c6c227df9
Parents: 1e3afa5
Author: Claus Ibsen 
Authored: Tue Jul 4 10:43:55 2017 +0200
Committer: Claus Ibsen 
Committed: Tue Jul 4 10:51:05 2017 +0200

--
 .../camel/catalog/maven/MavenVersionManagerTest.java  | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/26085bb4/platforms/camel-catalog-maven/src/test/java/org/apache/camel/catalog/maven/MavenVersionManagerTest.java
--
diff --git 
a/platforms/camel-catalog-maven/src/test/java/org/apache/camel/catalog/maven/MavenVersionManagerTest.java
 
b/platforms/camel-catalog-maven/src/test/java/org/apache/camel/catalog/maven/MavenVersionManagerTest.java
index e9cdcb0..bf5fe2f 100644
--- 
a/platforms/camel-catalog-maven/src/test/java/org/apache/camel/catalog/maven/MavenVersionManagerTest.java
+++ 
b/platforms/camel-catalog-maven/src/test/java/org/apache/camel/catalog/maven/MavenVersionManagerTest.java
@@ -156,13 +156,13 @@ public class MavenVersionManagerTest extends TestCase {
 System.out.println("2.18.1 has " + components + " components");
 assertFalse("Should not have ejb component", 
catalog.findComponentNames().contains("ejb"));
 
-loaded = catalog.loadVersion("2.19.0-SNAPSHOT");
-assertTrue("Unable to switch to Camel Catalog 2.19.0-SNAPSHOT", 
loaded);
-loaded = catalog.loadRuntimeProviderVersion("org.apache.camel", 
"camel-catalog-provider-karaf", "2.19.0-SNAPSHOT");
-assertTrue("Unable to load Karaf Provider Camel Catalog 
2.19.0-SNAPSHOT", loaded);
+loaded = catalog.loadVersion("2.19.1");
+assertTrue("Unable to switch to Camel Catalog 2.19.1", loaded);
+loaded = catalog.loadRuntimeProviderVersion("org.apache.camel", 
"camel-catalog-provider-karaf", "2.19.1");
+assertTrue("Unable to load Karaf Provider Camel Catalog 2.19.1", 
loaded);
 int componentsNewer = catalog.findComponentNames().size();
 assertTrue("Both catalog versions shouldn't have the same count of 
components.", components != componentsNewer);
-System.out.println("2.19.0-SNAPSHOT has " + componentsNewer + " 
components");
+System.out.println("2.19.1 has " + componentsNewer + " components");
 assertFalse("Should not have ejb component", 
catalog.findComponentNames().contains("ejb"));
 
 loaded = catalog.loadVersion("2.18.1");

[2/3] camel git commit: CAMEL-11506: camel-catalog-maven should use Apache Commons http-client 3.1 to download http/https as it has support for timeout which the basic handler from the JDK does not.

2017-07-04 Thread davsclaus 
CAMEL-11506: camel-catalog-maven should use Apache Commons http-client 3.1 to 
download http/https as it has support for timeout which the basic handler from 
the JDK does not.


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

Branch: refs/heads/camel-2.19.x
Commit: 1e3afa580ef01c4bb840691ac8882b32dec6a6b6
Parents: 45bce30
Author: Claus Ibsen 
Authored: Tue Jul 4 10:39:16 2017 +0200
Committer: Claus Ibsen 
Committed: Tue Jul 4 10:50:59 2017 +0200

--
 platforms/camel-catalog-maven/pom.xml   |  7 ++
 .../catalog/maven/MavenVersionManager.java  | 15 
 .../catalog/maven/PatchedHttpClientHandler.java | 72 
 3 files changed, 94 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/1e3afa58/platforms/camel-catalog-maven/pom.xml
--
diff --git a/platforms/camel-catalog-maven/pom.xml 
b/platforms/camel-catalog-maven/pom.xml
index 53c29be..7c7ffa2 100644
--- a/platforms/camel-catalog-maven/pom.xml
+++ b/platforms/camel-catalog-maven/pom.xml
@@ -58,6 +58,13 @@
   ${ivy-version}
 
 
+
+
+  commons-httpclient
+  commons-httpclient
+  ${httpclient-version}
+
+
 
 
   junit

http://git-wip-us.apache.org/repos/asf/camel/blob/1e3afa58/platforms/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/MavenVersionManager.java
--
diff --git 
a/platforms/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/MavenVersionManager.java
 
b/platforms/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/MavenVersionManager.java
index 066b7ca..d9cfa1a 100644
--- 
a/platforms/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/MavenVersionManager.java
+++ 
b/platforms/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/MavenVersionManager.java
@@ -26,6 +26,7 @@ import java.util.Map;
 import groovy.grape.Grape;
 import groovy.lang.GroovyClassLoader;
 import org.apache.camel.catalog.VersionManager;
+import org.apache.ivy.util.url.URLHandlerRegistry;
 
 /**
  * A {@link VersionManager} that can load the resources using Maven to 
download needed artifacts from
@@ -36,6 +37,7 @@ import org.apache.camel.catalog.VersionManager;
 public class MavenVersionManager implements VersionManager {
 
 private final ClassLoader classLoader = new GroovyClassLoader();
+private final PatchedHttpClientHandler httpClient = new 
PatchedHttpClientHandler();
 private String version;
 private String runtimeProviderVersion;
 private String cacheDirectory;
@@ -61,6 +63,15 @@ public class MavenVersionManager implements VersionManager {
 }
 
 /**
+ * Sets the timeout in millis (http.socket.timeout) when downloading via 
http/https protocols.
+ * 
+ * The default value is 1
+ */
+public void setHttpClientTimeout(int timeout) {
+httpClient.setTimeout(timeout);
+}
+
+/**
  * To add a 3rd party Maven repository.
  *
  * @param name the repository name
@@ -81,6 +92,8 @@ public class MavenVersionManager implements VersionManager {
 @Override
 public boolean loadVersion(String version) {
 try {
+URLHandlerRegistry.setDefault(httpClient);
+
 if (cacheDirectory != null) {
 System.setProperty("grape.root", cacheDirectory);
 }
@@ -113,6 +126,8 @@ public class MavenVersionManager implements VersionManager {
 @Override
 public boolean loadRuntimeProviderVersion(String groupId, String 
artifactId, String version) {
 try {
+URLHandlerRegistry.setDefault(httpClient);
+
 Grape.setEnableAutoDownload(true);
 
 Map param = new HashMap<>();

http://git-wip-us.apache.org/repos/asf/camel/blob/1e3afa58/platforms/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/PatchedHttpClientHandler.java
--
diff --git 
a/platforms/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/PatchedHttpClientHandler.java
 
b/platforms/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/PatchedHttpClientHandler.java
new file mode 100644
index 000..66a26f4
--- /dev/null
+++ 
b/platforms/camel-catalog-maven/src/main/java/org/apache/camel/catalog/maven/PatchedHttpClientHandler.java
@@ -0,0 +1,72 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE

[1/3] camel git commit: CAMEL-11506: Added unit test

2017-07-04 Thread davsclaus 
Repository: camel
Updated Branches:
  refs/heads/camel-2.19.x 54f77196e -> 26085bb4b


CAMEL-11506: Added unit test


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

Branch: refs/heads/camel-2.19.x
Commit: 45bce300166e4f88b8e4c5b61f5f10196f8545b5
Parents: 54f7719
Author: Claus Ibsen 
Authored: Tue Jul 4 09:23:14 2017 +0200
Committer: Claus Ibsen 
Committed: Tue Jul 4 10:50:52 2017 +0200

--
 .../camel/catalog/maven/MavenVersionManagerTest.java| 12 
 1 file changed, 12 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/45bce300/platforms/camel-catalog-maven/src/test/java/org/apache/camel/catalog/maven/MavenVersionManagerTest.java
--
diff --git 
a/platforms/camel-catalog-maven/src/test/java/org/apache/camel/catalog/maven/MavenVersionManagerTest.java
 
b/platforms/camel-catalog-maven/src/test/java/org/apache/camel/catalog/maven/MavenVersionManagerTest.java
index 8342d2a..e9cdcb0 100644
--- 
a/platforms/camel-catalog-maven/src/test/java/org/apache/camel/catalog/maven/MavenVersionManagerTest.java
+++ 
b/platforms/camel-catalog-maven/src/test/java/org/apache/camel/catalog/maven/MavenVersionManagerTest.java
@@ -175,4 +175,16 @@ public class MavenVersionManagerTest extends TestCase {
 
 System.out.println("2.18.1 has " + components3 + " components");
 }
+
+@Test
+public void testLoadUnknownVersion() throws Exception {
+MavenVersionManager manager = new MavenVersionManager();
+String current = manager.getLoadedVersion();
+assertNull(current);
+
+// version 2.99 does not exists and cannot be loaded
+boolean loaded = manager.loadVersion("2.99");
+assertFalse(loaded);
+}
+
 }

camel git commit: Upgrade Fastjson to version 1.2.34

2017-07-04 Thread acosentino 
Repository: camel
Updated Branches:
  refs/heads/master 51d845b61 -> 717edf803


Upgrade Fastjson to version 1.2.34


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

Branch: refs/heads/master
Commit: 717edf80314b8b3edb94b17af14f29f6e639541c
Parents: 51d845b
Author: Andrea Cosentino 
Authored: Tue Jul 4 10:12:33 2017 +0200
Committer: Andrea Cosentino 
Committed: Tue Jul 4 10:13:16 2017 +0200

--
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/717edf80/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 27f78a1..068cad9 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -211,7 +211,7 @@
 2.4.9
 2.4.9_1
 1.2.13_1
-1.2.33
+1.2.34
 1.8.8
 0.1.0
 3.5.2

camel git commit: CAMEL-11506: Added unit test

2017-07-04 Thread davsclaus 
Repository: camel
Updated Branches:
  refs/heads/master cbaeb0481 -> 51d845b61


CAMEL-11506: Added unit test


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

Branch: refs/heads/master
Commit: 51d845b610543a278ea2f37304c6d385bf82998a
Parents: cbaeb04
Author: Claus Ibsen 
Authored: Tue Jul 4 09:23:14 2017 +0200
Committer: Claus Ibsen 
Committed: Tue Jul 4 09:23:14 2017 +0200

--
 .../camel/catalog/maven/MavenVersionManagerTest.java| 12 
 1 file changed, 12 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/51d845b6/platforms/camel-catalog-maven/src/test/java/org/apache/camel/catalog/maven/MavenVersionManagerTest.java
--
diff --git 
a/platforms/camel-catalog-maven/src/test/java/org/apache/camel/catalog/maven/MavenVersionManagerTest.java
 
b/platforms/camel-catalog-maven/src/test/java/org/apache/camel/catalog/maven/MavenVersionManagerTest.java
index 8342d2a..e9cdcb0 100644
--- 
a/platforms/camel-catalog-maven/src/test/java/org/apache/camel/catalog/maven/MavenVersionManagerTest.java
+++ 
b/platforms/camel-catalog-maven/src/test/java/org/apache/camel/catalog/maven/MavenVersionManagerTest.java
@@ -175,4 +175,16 @@ public class MavenVersionManagerTest extends TestCase {
 
 System.out.println("2.18.1 has " + components3 + " components");
 }
+
+@Test
+public void testLoadUnknownVersion() throws Exception {
+MavenVersionManager manager = new MavenVersionManager();
+String current = manager.getLoadedVersion();
+assertNull(current);
+
+// version 2.99 does not exists and cannot be loaded
+boolean loaded = manager.loadVersion("2.99");
+assertFalse(loaded);
+}
+
 }

camel git commit: [CAMEL-11487] provided support for resources load through custom defined protocols by registering custom UrlHandlers

2017-07-04 Thread davsclaus 
Repository: camel
Updated Branches:
  refs/heads/master 6826e7a47 -> cbaeb0481


[CAMEL-11487] provided support for resources load through custom defined 
protocols by registering custom UrlHandlers


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

Branch: refs/heads/master
Commit: cbaeb048175938b4268741a0ebf7f4aeaedbed22
Parents: 6826e7a
Author: Andrea Tarocchi 
Authored: Fri Jun 30 16:18:15 2017 +0200
Committer: Claus Ibsen 
Committed: Tue Jul 4 09:14:16 2017 +0200

--
 .../org/apache/camel/util/ResourceHelper.java   |  10 ++
 .../test/java/org/apache/camel/TestSupport.java |  34 +-
 .../ValidatorEndpointClearCachedSchemaTest.java |  68 +--
 .../apache/camel/urlhandler/custom/Handler.java |  42 +++
 .../org/apache/camel/urlhandler/pd/Handler.java | 113 +++
 .../apache/camel/util/ResourceHelperTest.java   |  74 
 6 files changed, 272 insertions(+), 69 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/cbaeb048/camel-core/src/main/java/org/apache/camel/util/ResourceHelper.java
--
diff --git a/camel-core/src/main/java/org/apache/camel/util/ResourceHelper.java 
b/camel-core/src/main/java/org/apache/camel/util/ResourceHelper.java
index 316c179..6f28dac 100644
--- a/camel-core/src/main/java/org/apache/camel/util/ResourceHelper.java
+++ b/camel-core/src/main/java/org/apache/camel/util/ResourceHelper.java
@@ -128,6 +128,8 @@ public final class ResourceHelper {
  * http:uri - to load the resource using HTTP
  * ref:nameOfBean - to lookup the resource in the {@link 
org.apache.camel.spi.Registry}
  * bean:nameOfBean.methodName - to lookup a bean in the {@link 
org.apache.camel.spi.Registry} and call the method
+ * :uri - to lookup the resource using a custom 
{@link java.net.URLStreamHandler} registered for the ,
+ * on how to register it @see java.net.URL#URL(java.lang.String, 
java.lang.String, int, java.lang.String)
  * 
  * If no prefix has been given, then the resource is loaded from the 
classpath
  * 
@@ -236,6 +238,11 @@ public final class ResourceHelper {
 } else if (uri.startsWith("classpath:")) {
 uri = ObjectHelper.after(uri, "classpath:");
 uri = tryDecodeUri(uri);
+} else if (uri.contains(":")) {
+LOG.trace("Loading resource: {} with UrlHandler for protocol {}", 
uri, uri.split(":")[0]);
+URL url = new URL(uri);
+URLConnection con = url.openConnection();
+return con.getInputStream();
 }
 
 // load from classpath by default
@@ -288,6 +295,9 @@ public final class ResourceHelper {
 } else if (uri.startsWith("classpath:")) {
 uri = ObjectHelper.after(uri, "classpath:");
 uri = tryDecodeUri(uri);
+} else if (uri.contains(":")) {
+LOG.trace("Loading resource: {} with UrlHandler for protocol {}", 
uri, uri.split(":")[0]);
+return new URL(uri);
 }
 
 // load from classpath by default

http://git-wip-us.apache.org/repos/asf/camel/blob/cbaeb048/camel-core/src/test/java/org/apache/camel/TestSupport.java
--
diff --git a/camel-core/src/test/java/org/apache/camel/TestSupport.java 
b/camel-core/src/test/java/org/apache/camel/TestSupport.java
index 85a710c..70ee0bf 100644
--- a/camel-core/src/test/java/org/apache/camel/TestSupport.java
+++ b/camel-core/src/test/java/org/apache/camel/TestSupport.java
@@ -74,7 +74,7 @@ public abstract class TestSupport extends TestCase {
 
 /**
  * Returns a value builder for the given exchange property
- * 
+ *
  * @deprecated use {@link #exchangeProperty(String)}
  */
 @Deprecated
@@ -107,7 +107,7 @@ public abstract class TestSupport extends TestCase {
 /**
  * Returns a predicate and value builder for the outbound body on an
  * exchange
- * 
+ *
  * @deprecated use {@link #body()}
  */
 @Deprecated
@@ -118,7 +118,7 @@ public abstract class TestSupport extends TestCase {
 /**
  * Returns a predicate and value builder for the outbound message body as a
  * specific type
- * 
+ *
  * @deprecated use {@link #bodyAs(Class)}
  */
 @Deprecated
@@ -137,7 +137,7 @@ public abstract class TestSupport extends TestCase {
 /**
  * Returns a predicate and value builder for the fault message body as a
  * specific type
- * 
+ *
  * @deprecated use {@link #bodyAs(Class)}

[1/2] camel git commit: Upgrade Kubernetes client to version 2.5.1

2017-07-04 Thread acosentino 
Repository: camel
Updated Branches:
  refs/heads/master 0996ee39f -> 6826e7a47


Upgrade Kubernetes client to version 2.5.1


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

Branch: refs/heads/master
Commit: c1b0a33a3525d228147d8b0e1c5a2dc2f0f343db
Parents: 0996ee3
Author: Andrea Cosentino 
Authored: Tue Jul 4 08:18:54 2017 +0200
Committer: Andrea Cosentino 
Committed: Tue Jul 4 08:18:54 2017 +0200

--
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/c1b0a33a/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 60cc86c..729b829 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -425,7 +425,7 @@
 4.1.1
 6.5.0.Final
 0.4.9
-2.4.1
+2.5.1
 1.0.74
 2.3.0_3
 1.8

[2/2] camel git commit: Upgrade Kubernetes model to version 1.0.78

2017-07-04 Thread acosentino 
Upgrade Kubernetes model to version 1.0.78


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

Branch: refs/heads/master
Commit: 6826e7a4726c10436272bed105a51666fbad0a02
Parents: c1b0a33
Author: Andrea Cosentino 
Authored: Tue Jul 4 08:19:39 2017 +0200
Committer: Andrea Cosentino 
Committed: Tue Jul 4 08:19:39 2017 +0200

--
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/6826e7a4/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 729b829..27f78a1 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -426,7 +426,7 @@
 6.5.0.Final
 0.4.9
 2.5.1
-1.0.74
+1.0.78
 2.3.0_3
 1.8
 0.9