camel git commit: camel-spring-batch: migrate tests from commons-lang 2 to commons-lang 3

2017-09-29 Thread lburgazzoli 
Repository: camel
Updated Branches:
  refs/heads/master 4553bb6f8 -> 4233b61f2


camel-spring-batch: migrate tests from commons-lang 2 to commons-lang 3


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

Branch: refs/heads/master
Commit: 4233b61f2579d72d8944ba38f0d7942ee280bcd4
Parents: 4553bb6
Author: Pascal Schumacher 
Authored: Fri Sep 29 21:41:46 2017 +0200
Committer: Pascal Schumacher 
Committed: Fri Sep 29 21:41:46 2017 +0200

--
 components/camel-spring-batch/pom.xml  | 6 +++---
 .../camel/component/spring/batch/SpringBatchEndpointTest.java  | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/4233b61f/components/camel-spring-batch/pom.xml
--
diff --git a/components/camel-spring-batch/pom.xml 
b/components/camel-spring-batch/pom.xml
index ceae415..d553e29 100644
--- a/components/camel-spring-batch/pom.xml
+++ b/components/camel-spring-batch/pom.xml
@@ -65,9 +65,9 @@
 test
 
 
-commons-lang
-commons-lang
-${commons-lang-version}
+org.apache.commons
+commons-lang3
+${commons-lang3-version}
 test
 
 

http://git-wip-us.apache.org/repos/asf/camel/blob/4233b61f/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchEndpointTest.java
--
diff --git 
a/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchEndpointTest.java
 
b/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchEndpointTest.java
index da09770..36a8822 100644
--- 
a/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchEndpointTest.java
+++ 
b/components/camel-spring-batch/src/test/java/org/apache/camel/component/spring/batch/SpringBatchEndpointTest.java
@@ -30,7 +30,7 @@ import org.apache.camel.impl.DefaultCamelContext;
 import org.apache.camel.impl.JndiRegistry;
 import org.apache.camel.impl.SimpleRegistry;
 import org.apache.camel.test.junit4.CamelTestSupport;
-import org.apache.commons.lang.reflect.FieldUtils;
+import org.apache.commons.lang3.reflect.FieldUtils;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.ArgumentCaptor;

[2/2] camel git commit: Enable tests that now pass on JDK9 GA

2017-09-29 Thread lburgazzoli 
Enable tests that now pass on JDK9 GA


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

Branch: refs/heads/master
Commit: 4553bb6f8fc04e6b9f9c0397790eb020d28011fd
Parents: b354ebb
Author: jpoth 
Authored: Fri Sep 29 13:03:57 2017 +0200
Committer: jpoth 
Committed: Fri Sep 29 13:03:57 2017 +0200

--
 components/camel-cxf/pom.xml|  2 +-
 components/camel-jcr/pom.xml| 22 
 components/camel-opentracing/pom.xml| 38 +---
 components/camel-script/pom.xml | 24 -
 examples/camel-example-cdi-xml/pom.xml  | 22 
 examples/camel-example-cxf/pom.xml  |  2 +-
 .../pom.xml |  2 +-
 tests/camel-blueprint-cxf-test/pom.xml  |  2 +-
 8 files changed, 5 insertions(+), 109 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/4553bb6f/components/camel-cxf/pom.xml
--
diff --git a/components/camel-cxf/pom.xml b/components/camel-cxf/pom.xml
index 44bd26a..2a92745 100644
--- a/components/camel-cxf/pom.xml
+++ b/components/camel-cxf/pom.xml
@@ -498,7 +498,7 @@
 maven-surefire-plugin
 
   
-
+
 **/**
   
 

http://git-wip-us.apache.org/repos/asf/camel/blob/4553bb6f/components/camel-jcr/pom.xml
--
diff --git a/components/camel-jcr/pom.xml b/components/camel-jcr/pom.xml
index a19bfdc..f087837 100644
--- a/components/camel-jcr/pom.xml
+++ b/components/camel-jcr/pom.xml
@@ -110,26 +110,4 @@
   
 
   
-
-  
-
-  jdk9-build
-  
-9
-  
-  
-
-  
-maven-surefire-plugin
-
-  
-
-**/**.java
-  
-
-  
-
-  
-
-  
 

http://git-wip-us.apache.org/repos/asf/camel/blob/4553bb6f/components/camel-opentracing/pom.xml
--
diff --git a/components/camel-opentracing/pom.xml 
b/components/camel-opentracing/pom.xml
index 1fd5ffe..6265208 100644
--- a/components/camel-opentracing/pom.xml
+++ b/components/camel-opentracing/pom.xml
@@ -150,7 +150,7 @@
 
   
 -javaagent:${opentracing-agent.lib}/opentracing-agent.jar
--Dorg.jboss.byteman.verbose
+-Dorg.jboss.byteman.verbose ${camel.surefire.fork.vmargs}
   
 
 
@@ -175,40 +175,4 @@
   
 
   
-
-  
-
-  jdk9-build
-  
-9
-  
-  
-
-  
-maven-surefire-plugin
-
-  --add-modules java.xml.bind --add-opens 
java.base/java.lang=ALL-UNNAMED
-
-  
-  
-maven-failsafe-plugin
-
-  
-run-integration-tests
-
-  integration-test
-
-
-  
-
-**/**Groovy**.java
-**/**Ruby**.java
-
-
-
-
-
-
-
-
 

http://git-wip-us.apache.org/repos/asf/camel/blob/4553bb6f/examples/camel-example-cdi-xml/pom.xml
--
diff --git a/examples/camel-example-cdi-xml/pom.xml 
b/examples/camel-example-cdi-xml/pom.xml
index 19664a3..3babec4 100755
--- a/examples/camel-example-cdi-xml/pom.xml
+++ b/examples/camel-example-cdi-xml/pom.xml
@@ -122,26 +122,4 @@
   
 
   
-
-  
-
-  jdk9-build
-  
-9
-  
-  
-
-  
-org.apache.maven.plugins
-maven-surefire-plugin
-
-2.19.1
-
-  --add-modules java.xml.bind --add-opens 
java.base/java.lang=ALL-UNNAMED
-
-  
-
-  
-
-  
 

http://git-wip-us.apache.org/repos/asf/camel/blob/4553bb6f/examples/camel-example-cxf/pom.xml
--
diff --git a/examples/camel-example-cxf/pom.xml 
b/examples/camel-example-cxf/pom.xml
index cb18f28..3df492b 100644
--- a/examples/camel-example-cxf/pom.xml
+++ b/examples/camel-example-cxf/pom.xml
@@ -255,7 +255,7 @@
 maven-surefire-plugin

[1/2] camel git commit: Upgrade maven-surefire-plugin which fixes SUREFIRE-1265 on JDK9 GA

2017-09-29 Thread lburgazzoli 
Repository: camel
Updated Branches:
  refs/heads/master e09e5239f -> 4553bb6f8


Upgrade maven-surefire-plugin which fixes SUREFIRE-1265 on JDK9 GA


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

Branch: refs/heads/master
Commit: b354ebbbfaeefeca49a05e02a4b1e59e2fcdfe90
Parents: e09e523
Author: jpoth 
Authored: Fri Sep 29 12:56:46 2017 +0200
Committer: jpoth 
Committed: Fri Sep 29 12:56:46 2017 +0200

--
 components/camel-elsql/pom.xml| 22 --
 components/camel-soap/pom.xml |  8 
 components/camel-spring-cloud-netflix/pom.xml | 21 -
 components/camel-spring-cloud/pom.xml | 21 -
 components/camel-sql/pom.xml  | 22 --
 parent/pom.xml|  2 --
 pom.xml   |  2 +-
 7 files changed, 1 insertion(+), 97 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/b354ebbb/components/camel-elsql/pom.xml
--
diff --git a/components/camel-elsql/pom.xml b/components/camel-elsql/pom.xml
index a736f20..0786ce1 100644
--- a/components/camel-elsql/pom.xml
+++ b/components/camel-elsql/pom.xml
@@ -116,26 +116,4 @@
   
 
   
-
-  
-
-  jdk9-build
-  
-9
-  
-  
-
-  
-maven-surefire-plugin
-
-  
3000
-  --add-modules java.sql,java.xml.bind --add-opens 
java.base/java.lang=ALL-UNNAMED --add-opens 
java.base/java.lang.reflect=ALL-UNNAMED
-  
-  true
-
-  
-
-  
-
-  
 

http://git-wip-us.apache.org/repos/asf/camel/blob/b354ebbb/components/camel-soap/pom.xml
--
diff --git a/components/camel-soap/pom.xml b/components/camel-soap/pom.xml
index 095f170..637ae93 100644
--- a/components/camel-soap/pom.xml
+++ b/components/camel-soap/pom.xml
@@ -292,14 +292,6 @@
 
 
 
-
-maven-surefire-plugin
-
---add-modules java.xml.bind,java.xml.ws 
--add-opens java.base/java.lang=ALL-UNNAMED
-

-true
-
-
 
 
 

http://git-wip-us.apache.org/repos/asf/camel/blob/b354ebbb/components/camel-spring-cloud-netflix/pom.xml
--
diff --git a/components/camel-spring-cloud-netflix/pom.xml 
b/components/camel-spring-cloud-netflix/pom.xml
index cc10d14..bd83956 100644
--- a/components/camel-spring-cloud-netflix/pom.xml
+++ b/components/camel-spring-cloud-netflix/pom.xml
@@ -135,25 +135,4 @@
   
 
   
-
-  
-
-  jdk9-build
-  
-9
-  
-  
-
-  
-maven-surefire-plugin
-
-  --add-modules java.xml.bind --add-opens 
java.base/java.lang=ALL-UNNAMED
-  
-  true
-
-  
-
-  
-
-  
 

http://git-wip-us.apache.org/repos/asf/camel/blob/b354ebbb/components/camel-spring-cloud/pom.xml
--
diff --git a/components/camel-spring-cloud/pom.xml 
b/components/camel-spring-cloud/pom.xml
index d9faf51..6f61bf6 100644
--- a/components/camel-spring-cloud/pom.xml
+++ b/components/camel-spring-cloud/pom.xml
@@ -131,25 +131,4 @@
   
 
   
-
-  
-
-  jdk9-build
-  
-9
-  
-  
-
-  
-maven-surefire-plugin
-
-  --add-modules java.xml.bind --add-opens 
java.base/java.lang=ALL-UNNAMED
-  
-  true
-
-  
-
-  
-
-  
 

http://git-wip-us.apache.org/repos/asf/camel/blob/b354ebbb/components/camel-sql/pom.xml
--
diff --git a/components/camel-sql/pom.xml b/components/camel-sql/pom.xml
index df67355..f45339d 100644
--- a/components/camel-sql/pom.xml
+++ b/components/camel-sql/pom.xml
@@ -137,26 +137,4 @@
 
 
   
-
-  
-
-  jdk9-build
-  
-9
-  
-  
-
-  
-maven-surefire-plugin
-
-  
3000
-  --add-modules java.sql,java.xml.bind --add-opens

camel git commit: update log4j2 to 2.9.1

2017-09-29 Thread lburgazzoli 
Repository: camel
Updated Branches:
  refs/heads/master 3a2d5e626 -> e09e5239f


update log4j2 to 2.9.1


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

Branch: refs/heads/master
Commit: e09e5239f191ab8110d6175f208265c9216d0715
Parents: 3a2d5e6
Author: Pascal Schumacher 
Authored: Fri Sep 29 09:54:42 2017 +0200
Committer: lburgazzoli 
Committed: Fri Sep 29 09:58:58 2017 +0200

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


http://git-wip-us.apache.org/repos/asf/camel/blob/e09e5239/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 5b57f0c..bff5568 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -449,8 +449,7 @@
 
 1.0.0
 1.2.17
-
-2.9.0
+2.9.1
 2.5
 1.2.0
 3.6.0_1

camel git commit: Fix CS

2017-09-29 Thread lburgazzoli 
Repository: camel
Updated Branches:
  refs/heads/master ee2909e8a -> 3a2d5e626


Fix CS


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

Branch: refs/heads/master
Commit: 3a2d5e6269000e6209c67d5cc01f323a7ddf6ba8
Parents: ee2909e
Author: lburgazzoli 
Authored: Fri Sep 29 09:53:21 2017 +0200
Committer: lburgazzoli 
Committed: Fri Sep 29 09:53:21 2017 +0200

--
 .../apache/camel/component/zookeeper/ha/ZooKeeperMasterMain.java  | 3 +++
 1 file changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/3a2d5e62/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ha/ZooKeeperMasterMain.java
--
diff --git 
a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ha/ZooKeeperMasterMain.java
 
b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ha/ZooKeeperMasterMain.java
index 1c70ff0..479c6f1 100644
--- 
a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ha/ZooKeeperMasterMain.java
+++ 
b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ha/ZooKeeperMasterMain.java
@@ -26,6 +26,9 @@ import org.apache.camel.main.Main;
 import org.apache.camel.main.MainListenerSupport;
 
 public final class ZooKeeperMasterMain {
+private ZooKeeperMasterMain() {
+}
+
 public static void main(String[] args) throws Exception {
 final String nodeId = UUID.randomUUID().toString();
 final String address = args[0];

[3/3] camel git commit: Fix Checkstyle issue

2017-09-29 Thread gzurowski 
Fix Checkstyle issue


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

Branch: refs/heads/master
Commit: dff19f5c40b38b8e3c2a73b1e97f66aea210c9da
Parents: 19d2ba5
Author: Gregor Zurowski 
Authored: Fri Sep 29 09:10:01 2017 +0200
Committer: Gregor Zurowski 
Committed: Fri Sep 29 09:23:43 2017 +0200

--
 .../src/main/java/org/apache/camel/maven/CamelSalesforceMojo.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/dff19f5c/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/java/org/apache/camel/maven/CamelSalesforceMojo.java
--
diff --git 
a/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/java/org/apache/camel/maven/CamelSalesforceMojo.java
 
b/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/java/org/apache/camel/maven/CamelSalesforceMojo.java
index 3b46f7f..33db2be 100644
--- 
a/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/java/org/apache/camel/maven/CamelSalesforceMojo.java
+++ 
b/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/java/org/apache/camel/maven/CamelSalesforceMojo.java
@@ -68,8 +68,8 @@ import org.apache.camel.impl.DefaultCamelContext;
 import org.apache.camel.util.IntrospectionSupport;
 import org.apache.camel.util.ObjectHelper;
 import org.apache.camel.util.jsse.SSLContextParameters;
-import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringEscapeUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.log4j.Logger;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;

[1/3] camel git commit: Fix Checkstyle issues / add missing license header

2017-09-29 Thread gzurowski 
Repository: camel
Updated Branches:
  refs/heads/master 19d2ba5a9 -> ee2909e8a


Fix Checkstyle issues / add missing license header


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

Branch: refs/heads/master
Commit: ee2909e8a79e4eddf146390a890ad606f7771891
Parents: c0a5c9f
Author: Gregor Zurowski 
Authored: Fri Sep 29 09:18:30 2017 +0200
Committer: Gregor Zurowski 
Committed: Fri Sep 29 09:23:43 2017 +0200

--
 ...ingZooKeeperClusteredRouteConfigurationTest.java | 16 
 1 file changed, 16 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/ee2909e8/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ha/SpringZooKeeperClusteredRouteConfigurationTest.java
--
diff --git 
a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ha/SpringZooKeeperClusteredRouteConfigurationTest.java
 
b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ha/SpringZooKeeperClusteredRouteConfigurationTest.java
index f02df61..c472e84 100644
--- 
a/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ha/SpringZooKeeperClusteredRouteConfigurationTest.java
+++ 
b/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ha/SpringZooKeeperClusteredRouteConfigurationTest.java
@@ -1,3 +1,19 @@
+/**
+ * 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.component.zookeeper.ha;
 
 import org.apache.camel.ha.CamelClusterService;

[2/3] camel git commit: [Minor] Remove unused imports

2017-09-29 Thread gzurowski 
[Minor] Remove unused imports


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

Branch: refs/heads/master
Commit: c0a5c9fdb63a0bf8834271d813cec1cdf0764e81
Parents: dff19f5
Author: Gregor Zurowski 
Authored: Fri Sep 29 09:11:18 2017 +0200
Committer: Gregor Zurowski 
Committed: Fri Sep 29 09:23:43 2017 +0200

--
 .../src/main/java/org/apache/camel/maven/CamelSalesforceMojo.java   | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/c0a5c9fd/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/java/org/apache/camel/maven/CamelSalesforceMojo.java
--
diff --git 
a/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/java/org/apache/camel/maven/CamelSalesforceMojo.java
 
b/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/java/org/apache/camel/maven/CamelSalesforceMojo.java
index 33db2be..1afaa44 100644
--- 
a/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/java/org/apache/camel/maven/CamelSalesforceMojo.java
+++ 
b/components/camel-salesforce/camel-salesforce-maven-plugin/src/main/java/org/apache/camel/maven/CamelSalesforceMojo.java
@@ -89,7 +89,6 @@ import org.eclipse.jetty.client.api.Authentication;
 import org.eclipse.jetty.client.util.BasicAuthentication;
 import org.eclipse.jetty.client.util.DigestAuthentication;
 import org.eclipse.jetty.util.ssl.SslContextFactory;
-import org.slf4j.LoggerFactory;
 
 /**
  * Goal to generate DTOs for Salesforce SObjects

[1/2] camel git commit: CAMEL-11845: Migrate easymock and powermock to mockito

2017-09-29 Thread davsclaus 
Repository: camel
Updated Branches:
  refs/heads/master 74ed07d6a -> 19d2ba5a9


CAMEL-11845: Migrate easymock and powermock to mockito

Migrate some camel-core tests from easymock to mockito.


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

Branch: refs/heads/master
Commit: 19d2ba5a9a86c9ba9336195f0a201f56eea65f96
Parents: 60b4f1a
Author: Pascal Schumacher 
Authored: Thu Sep 28 22:46:50 2017 +0200
Committer: Claus Ibsen 
Committed: Fri Sep 29 08:47:27 2017 +0200

--
 camel-core/pom.xml  |  6 +++
 .../camel/builder/xml/XPathTransformTest.java   | 48 +++-
 .../builder/xml/XsltTestErrorListenerTest.java  | 21 +++--
 .../camel/processor/ThroughPutLoggerTest.java   | 20 
 .../AbstractCamelCatalogTest.java   | 29 
 5 files changed, 47 insertions(+), 77 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/19d2ba5a/camel-core/pom.xml
--
diff --git a/camel-core/pom.xml b/camel-core/pom.xml
index 9f3ea68..ab1f62f 100644
--- a/camel-core/pom.xml
+++ b/camel-core/pom.xml
@@ -196,6 +196,12 @@
   test
 
 
+
+  org.mockito
+  mockito-core
+  test
+
+
 
 
   com.fasterxml.jackson.core

http://git-wip-us.apache.org/repos/asf/camel/blob/19d2ba5a/camel-core/src/test/java/org/apache/camel/builder/xml/XPathTransformTest.java
--
diff --git 
a/camel-core/src/test/java/org/apache/camel/builder/xml/XPathTransformTest.java 
b/camel-core/src/test/java/org/apache/camel/builder/xml/XPathTransformTest.java
index f0d194a..657c8aa 100644
--- 
a/camel-core/src/test/java/org/apache/camel/builder/xml/XPathTransformTest.java
+++ 
b/camel-core/src/test/java/org/apache/camel/builder/xml/XPathTransformTest.java
@@ -23,18 +23,17 @@ import org.w3c.dom.Document;
 import org.w3c.dom.NodeList;
 
 import org.apache.camel.ContextTestSupport;
-import org.easymock.Capture;
-import org.easymock.CaptureType;
 import org.slf4j.Logger;
 
-import static org.easymock.EasyMock.anyObject;
-import static org.easymock.EasyMock.capture;
-import static org.easymock.EasyMock.contains;
-import static org.easymock.EasyMock.createNiceMock;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.expectLastCall;
-import static org.easymock.EasyMock.replay;
-import static org.easymock.EasyMock.verify;
+import static org.hamcrest.Matchers.containsString;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.argThat;
+import static org.mockito.Mockito.anyString;
+import static org.mockito.Mockito.atLeastOnce;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 
 /**
@@ -58,13 +57,9 @@ public class XPathTransformTest extends ContextTestSupport {
 }
 
 public void testXPathNamespaceLoggingEnabledJavaDSL() throws Exception {
-Logger l = createNiceMock(Logger.class);
+Logger l = mock(Logger.class);
 
-expect(l.isInfoEnabled()).andReturn(true).anyTimes();
-
-l.info(contains("Namespaces discovered in message"), 
anyObject(Object.class));
-expectLastCall().times(1);
-replay(l);
+when(l.isInfoEnabled()).thenReturn(true);
 
 String body = "http://namespacec.net\;>http://namespacea.net\;>Hello|there|Camel"
 + "http://namespaceb.net\;>Hello|there|Camelhttp://namespaceb.net\;>Hello|there|Camel"
@@ -82,19 +77,13 @@ public class XPathTransformTest extends ContextTestSupport {
 NodeList list = XPathBuilder.xpath("//*", 
NodeList.class).logNamespaces().evaluate(context, doc, NodeList.class);
 assertNotNull(list);
 
-verify(l);
+verify(l).info(argThat(containsString("Namespaces discovered in 
message")), any(Object.class));
 }
 
 public void testXPathNamespaceLoggingDisabledJavaDSL() throws Exception {
-Logger l = createNiceMock(Logger.class);
-
-expect(l.isInfoEnabled()).andReturn(true).anyTimes();
+Logger l = mock(Logger.class);
 
-Capture captures = new Capture(CaptureType.ALL);
-l.info(capture(captures), anyObject(Object.class));
-expectLastCall().anyTimes();
-
-replay(l);
+when(l.isInfoEnabled()).thenReturn(true);
 
 String body = "http://namespacec.net\;>http://namespacea.net\;>Hello|there|Camel"
 +

[2/2] camel git commit: camel-cxf-transport: make CxfMessageHelperTest pass on windows operating systems

2017-09-29 Thread davsclaus 
camel-cxf-transport: make CxfMessageHelperTest pass on windows operating systems


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

Branch: refs/heads/master
Commit: 60b4f1ab1a1346c2caf3be413004ebc9f8c59b8b
Parents: 74ed07d
Author: Pascal Schumacher 
Authored: Thu Sep 28 21:24:22 2017 +0200
Committer: Claus Ibsen 
Committed: Fri Sep 29 08:47:27 2017 +0200

--
 .../camel/component/cxf/common/message/CxfMessageHelperTest.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/60b4f1ab/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/common/message/CxfMessageHelperTest.java
--
diff --git 
a/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/common/message/CxfMessageHelperTest.java
 
b/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/common/message/CxfMessageHelperTest.java
index 136adbb..09ebe64 100644
--- 
a/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/common/message/CxfMessageHelperTest.java
+++ 
b/components/camel-cxf-transport/src/test/java/org/apache/camel/component/cxf/common/message/CxfMessageHelperTest.java
@@ -108,7 +108,7 @@ public class CxfMessageHelperTest extends Assert {
 IOHelper.copy(is, os);
 is.close();
 os.writeCacheTo(out);
-return out.toString().replaceAll("(?s)<\\?.*\\?>", 
"").replaceAll("(?s)", "").replaceAll("\\n", "");
+return out.toString().replaceAll("(?s)<\\?.*\\?>", 
"").replaceAll("(?s)", "").replaceAll("(\\r)?\\n", "");
 
 }

[2/2] camel git commit: [Minor] Remove unnecessary explicit type arguments

2017-09-29 Thread gzurowski 
[Minor] Remove unnecessary explicit type arguments

Signed-off-by: Gregor Zurowski 


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

Branch: refs/heads/master
Commit: 74ed07d6ae20800d0c5b03eaec2e213a8b3dd00f
Parents: 07dfe71
Author: Gregor Zurowski 
Authored: Fri Sep 29 08:43:30 2017 +0200
Committer: Gregor Zurowski 
Committed: Fri Sep 29 08:43:30 2017 +0200

--
 .../apache/camel/impl/DefaultComponentTest.java | 34 ++--
 1 file changed, 17 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/74ed07d6/camel-core/src/test/java/org/apache/camel/impl/DefaultComponentTest.java
--
diff --git 
a/camel-core/src/test/java/org/apache/camel/impl/DefaultComponentTest.java 
b/camel-core/src/test/java/org/apache/camel/impl/DefaultComponentTest.java
index b0dd1d7..cb1079e 100644
--- a/camel-core/src/test/java/org/apache/camel/impl/DefaultComponentTest.java
+++ b/camel-core/src/test/java/org/apache/camel/impl/DefaultComponentTest.java
@@ -46,28 +46,28 @@ public class DefaultComponentTest extends 
ContextTestSupport {
 }
 
 public void testGetAndRemoveParameterEmptyMap() {
-Map parameters = new HashMap();
+Map parameters = new HashMap<>();
 MyComponent my = new MyComponent(this.context);
 Integer value = my.getAndRemoveParameter(parameters, "size", 
Integer.class);
 assertNull(value);
 }
 
 public void testGetAndRemoveParameterEmptyMapDefault() {
-Map parameters = new HashMap();
+Map parameters = new HashMap<>();
 MyComponent my = new MyComponent(this.context);
 Integer value = my.getAndRemoveParameter(parameters, "size", 
Integer.class, 5);
 assertEquals(value.intValue(), 5);
 }
 
 public void testGetAndRemoveParameterEmptyMapDefaultIsNull() {
-Map parameters = new HashMap();
+Map parameters = new HashMap<>();
 MyComponent my = new MyComponent(this.context);
 Integer value = my.getAndRemoveParameter(parameters, "size", 
Integer.class, null);
 assertNull(value);
 }
 
 public void testGetAndRemoveParameterToInteger() {
-Map parameters = new HashMap();
+Map parameters = new HashMap<>();
 parameters.put("size", 200);
 MyComponent my = new MyComponent(this.context);
 Integer value = my.getAndRemoveParameter(parameters, "size", 
Integer.class);
@@ -75,7 +75,7 @@ public class DefaultComponentTest extends ContextTestSupport {
 }
 
 public void testGetAndRemoveParameterToIntegerDefault() {
-Map parameters = new HashMap();
+Map parameters = new HashMap<>();
 parameters.put("size", 200);
 MyComponent my = new MyComponent(this.context);
 Integer value = my.getAndRemoveParameter(parameters, "level", 
Integer.class, 4);
@@ -83,7 +83,7 @@ public class DefaultComponentTest extends ContextTestSupport {
 }
 
 public void testResolveAndRemoveReferenceParameter() {
-Map parameters = new HashMap();
+Map parameters = new HashMap<>();
 parameters.put("date", "#beginning");
 MyComponent my = new MyComponent(this.context);
 Date value = my.resolveAndRemoveReferenceParameter(parameters, "date", 
Date.class);
@@ -95,7 +95,7 @@ public class DefaultComponentTest extends ContextTestSupport {
 }
 
 public void testResolveAndRemoveReferenceParameterWithConversion() {
-Map parameters = new HashMap();
+Map parameters = new HashMap<>();
 parameters.put("number", "#numeric");
 MyComponent my = new MyComponent(this.context);
 Integer value = my.resolveAndRemoveReferenceParameter(parameters, 
"number", Integer.class);
@@ -103,7 +103,7 @@ public class DefaultComponentTest extends 
ContextTestSupport {
 }
 
 public void testResolveAndRemoveReferenceParameterWithFailedConversion() {
-Map parameters = new HashMap();
+Map parameters = new HashMap<>();
 parameters.put("number", "#non-numeric");
 MyComponent my = new MyComponent(this.context);
 try {
@@ -116,7 +116,7 @@ public class

[1/2] camel git commit: Fix Checkstyle issue

2017-09-29 Thread gzurowski 
Repository: camel
Updated Branches:
  refs/heads/master 7b39fa9bd -> 74ed07d6a


Fix Checkstyle issue

Signed-off-by: Gregor Zurowski 


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

Branch: refs/heads/master
Commit: 07dfe716e86a8ab3f4f51f0eee6c9c2d66ec4c22
Parents: 7b39fa9
Author: Gregor Zurowski 
Authored: Fri Sep 29 08:38:33 2017 +0200
Committer: Gregor Zurowski 
Committed: Fri Sep 29 08:38:33 2017 +0200

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


http://git-wip-us.apache.org/repos/asf/camel/blob/07dfe716/camel-core/src/test/java/org/apache/camel/impl/DefaultComponentTest.java
--
diff --git 
a/camel-core/src/test/java/org/apache/camel/impl/DefaultComponentTest.java 
b/camel-core/src/test/java/org/apache/camel/impl/DefaultComponentTest.java
index 0be63bb..b0dd1d7 100644
--- a/camel-core/src/test/java/org/apache/camel/impl/DefaultComponentTest.java
+++ b/camel-core/src/test/java/org/apache/camel/impl/DefaultComponentTest.java
@@ -109,9 +109,9 @@ public class DefaultComponentTest extends 
ContextTestSupport {
 try {
 my.resolveAndRemoveReferenceParameter(parameters, "number", 
Integer.class);
 } catch (TypeConversionException ex) {
-assertEquals("Error during type conversion from type: 
java.lang.String " +
-"to the required type: java.lang.Integer " +
-"with value abc due For input string: \"abc\"", 
ex.getMessage());
+assertEquals("Error during type conversion from type: 
java.lang.String "
++ "to the required type: java.lang.Integer "
++ "with value abc due For input string: \"abc\"", 
ex.getMessage());
 }
 }