date:20170520

[1/5] camel git commit: [maven-release-plugin] prepare for next development iteration

2017-05-20 Thread gzurowski

Repository: camel
Updated Branches:
  refs/heads/camel-2.18.x 609347c52 -> e938fab1a


http://git-wip-us.apache.org/repos/asf/camel/blob/e938fab1/examples/camel-example-cdi-rest-servlet/pom.xml
--
diff --git a/examples/camel-example-cdi-rest-servlet/pom.xml 
b/examples/camel-example-cdi-rest-servlet/pom.xml
index ab3cfcf..586ec05 100755
--- a/examples/camel-example-cdi-rest-servlet/pom.xml
+++ b/examples/camel-example-cdi-rest-servlet/pom.xml
@@ -22,7 +22,7 @@
   
 org.apache.camel
 examples
-2.18.4
+2.18.5-SNAPSHOT
   
 
   camel-example-cdi-rest-servlet

http://git-wip-us.apache.org/repos/asf/camel/blob/e938fab1/examples/camel-example-cdi-test/pom.xml
--
diff --git a/examples/camel-example-cdi-test/pom.xml 
b/examples/camel-example-cdi-test/pom.xml
index 3d2215d..9705315 100644
--- a/examples/camel-example-cdi-test/pom.xml
+++ b/examples/camel-example-cdi-test/pom.xml
@@ -21,7 +21,7 @@
   
 org.apache.camel
 examples
-2.18.4
+2.18.5-SNAPSHOT
   
 
   camel-example-cdi-test

http://git-wip-us.apache.org/repos/asf/camel/blob/e938fab1/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 edbf445..031c056 100755
--- a/examples/camel-example-cdi-xml/pom.xml
+++ b/examples/camel-example-cdi-xml/pom.xml
@@ -22,7 +22,7 @@
   
 org.apache.camel
 examples
-2.18.4
+2.18.5-SNAPSHOT
   
 
   camel-example-cdi-xml

http://git-wip-us.apache.org/repos/asf/camel/blob/e938fab1/examples/camel-example-cdi/pom.xml
--
diff --git a/examples/camel-example-cdi/pom.xml 
b/examples/camel-example-cdi/pom.xml
index 023be32..024c34e 100644
--- a/examples/camel-example-cdi/pom.xml
+++ b/examples/camel-example-cdi/pom.xml
@@ -21,7 +21,7 @@
   
 org.apache.camel
 examples
-2.18.4
+2.18.5-SNAPSHOT
   
 
   camel-example-cdi

http://git-wip-us.apache.org/repos/asf/camel/blob/e938fab1/examples/camel-example-console/pom.xml
--
diff --git a/examples/camel-example-console/pom.xml 
b/examples/camel-example-console/pom.xml
index 89f3fd6..602bf93 100644
--- a/examples/camel-example-console/pom.xml
+++ b/examples/camel-example-console/pom.xml
@@ -22,7 +22,7 @@
   
 org.apache.camel
 examples
-2.18.4
+2.18.5-SNAPSHOT
   
 
   camel-example-console

http://git-wip-us.apache.org/repos/asf/camel/blob/e938fab1/examples/camel-example-cxf-blueprint/pom.xml
--
diff --git a/examples/camel-example-cxf-blueprint/pom.xml 
b/examples/camel-example-cxf-blueprint/pom.xml
index 6ea7b35..b0424383 100644
--- a/examples/camel-example-cxf-blueprint/pom.xml
+++ b/examples/camel-example-cxf-blueprint/pom.xml
@@ -22,7 +22,7 @@
   
 org.apache.camel
 examples
-2.18.4
+2.18.5-SNAPSHOT
   
 
   camel-example-cxf-blueprint

http://git-wip-us.apache.org/repos/asf/camel/blob/e938fab1/examples/camel-example-cxf-osgi/pom.xml
--
diff --git a/examples/camel-example-cxf-osgi/pom.xml 
b/examples/camel-example-cxf-osgi/pom.xml
index 071530c..e29ea5c 100644
--- a/examples/camel-example-cxf-osgi/pom.xml
+++ b/examples/camel-example-cxf-osgi/pom.xml
@@ -22,7 +22,7 @@
   
 org.apache.camel
 examples
-2.18.4
+2.18.5-SNAPSHOT
   
 
   camel-example-cxf-osgi

http://git-wip-us.apache.org/repos/asf/camel/blob/e938fab1/examples/camel-example-cxf-proxy/pom.xml
--
diff --git a/examples/camel-example-cxf-proxy/pom.xml 
b/examples/camel-example-cxf-proxy/pom.xml
index d3c6129..c7cb383 100755
--- a/examples/camel-example-cxf-proxy/pom.xml
+++ b/examples/camel-example-cxf-proxy/pom.xml
@@ -22,7 +22,7 @@
   
 org.apache.camel
 examples
-2.18.4
+2.18.5-SNAPSHOT
   
 
   camel-example-cxf-proxy

http://git-wip-us.apache.org/repos/asf/camel/blob/e938fab1/examples/camel-example-cxf-tomcat/pom.xml
--
diff --git a/examples/camel-example-cxf-tomcat/pom.xml 
b/examples/camel-example-cxf-tomcat/pom.xml
index 1161932..677fa54 100755
--- a/examples/camel-example-cxf-tomcat/pom.xml
+++ b/examples/camel-example-cxf-tomcat/pom.xml
@@ -22,7 +22,7 @@
   
 org.apache.camel
 examples
-2.18.4
+2.18.5-SNAPSHOT
   
 
   camel-example-cxf-tomcat

http://git-wip-us.apache.org/repos/asf/camel/blob/e938fab1/examples/camel-example-cxf/pom.xml
--
diff --git a/examples/camel-example-cxf/pom.xml 
b/examples/camel-example-cxf/pom.xm

[2/5] camel git commit: [maven-release-plugin] prepare release camel-2.18.4

2017-05-20 Thread gzurowski

http://git-wip-us.apache.org/repos/asf/camel/blob/609347c5/components/camel-kura/pom.xml
--
diff --git a/components/camel-kura/pom.xml b/components/camel-kura/pom.xml
index 9544d13..afe2b11 100644
--- a/components/camel-kura/pom.xml
+++ b/components/camel-kura/pom.xml
@@ -24,7 +24,7 @@
 
 org.apache.camel
 components
-2.18.4-SNAPSHOT
+2.18.4
 
 
 camel-kura

http://git-wip-us.apache.org/repos/asf/camel/blob/609347c5/components/camel-ldap/pom.xml
--
diff --git a/components/camel-ldap/pom.xml b/components/camel-ldap/pom.xml
index f9002c6..a6a5b9e 100644
--- a/components/camel-ldap/pom.xml
+++ b/components/camel-ldap/pom.xml
@@ -23,7 +23,7 @@
 
 org.apache.camel
 components
-2.18.4-SNAPSHOT
+2.18.4
 
 
 camel-ldap

http://git-wip-us.apache.org/repos/asf/camel/blob/609347c5/components/camel-leveldb/pom.xml
--
diff --git a/components/camel-leveldb/pom.xml b/components/camel-leveldb/pom.xml
index b8d1d32..4c133b9 100644
--- a/components/camel-leveldb/pom.xml
+++ b/components/camel-leveldb/pom.xml
@@ -21,7 +21,7 @@
 
 org.apache.camel
 components
-2.18.4-SNAPSHOT
+2.18.4
 
 
 camel-leveldb

http://git-wip-us.apache.org/repos/asf/camel/blob/609347c5/components/camel-linkedin/camel-linkedin-api/pom.xml
--
diff --git a/components/camel-linkedin/camel-linkedin-api/pom.xml 
b/components/camel-linkedin/camel-linkedin-api/pom.xml
index 2ac6f2b..6f0b710 100644
--- a/components/camel-linkedin/camel-linkedin-api/pom.xml
+++ b/components/camel-linkedin/camel-linkedin-api/pom.xml
@@ -22,7 +22,7 @@
   
 org.apache.camel
 camel-linkedin-parent
-2.18.4-SNAPSHOT
+2.18.4
   
 
   camel-linkedin-api

http://git-wip-us.apache.org/repos/asf/camel/blob/609347c5/components/camel-linkedin/camel-linkedin-component/pom.xml
--
diff --git a/components/camel-linkedin/camel-linkedin-component/pom.xml 
b/components/camel-linkedin/camel-linkedin-component/pom.xml
index 31e085e..0a9222a 100644
--- a/components/camel-linkedin/camel-linkedin-component/pom.xml
+++ b/components/camel-linkedin/camel-linkedin-component/pom.xml
@@ -22,7 +22,7 @@
   
 org.apache.camel
 camel-linkedin-parent
-2.18.4-SNAPSHOT
+2.18.4
   
 
   camel-linkedin

http://git-wip-us.apache.org/repos/asf/camel/blob/609347c5/components/camel-linkedin/pom.xml
--
diff --git a/components/camel-linkedin/pom.xml 
b/components/camel-linkedin/pom.xml
index da7ee42..f94 100644
--- a/components/camel-linkedin/pom.xml
+++ b/components/camel-linkedin/pom.xml
@@ -22,7 +22,7 @@
   
 components
 org.apache.camel
-2.18.4-SNAPSHOT
+2.18.4
   
 
   camel-linkedin-parent

http://git-wip-us.apache.org/repos/asf/camel/blob/609347c5/components/camel-lucene/pom.xml
--
diff --git a/components/camel-lucene/pom.xml b/components/camel-lucene/pom.xml
index d0c6e5d..14705aa 100644
--- a/components/camel-lucene/pom.xml
+++ b/components/camel-lucene/pom.xml
@@ -20,7 +20,7 @@

org.apache.camel
components
-   2.18.4-SNAPSHOT
+   2.18.4

 
camel-lucene

http://git-wip-us.apache.org/repos/asf/camel/blob/609347c5/components/camel-lumberjack/pom.xml
--
diff --git a/components/camel-lumberjack/pom.xml 
b/components/camel-lumberjack/pom.xml
index bab15ac..abe9f48 100644
--- a/components/camel-lumberjack/pom.xml
+++ b/components/camel-lumberjack/pom.xml
@@ -23,7 +23,7 @@
   
 org.apache.camel
 components
-2.18.4-SNAPSHOT
+2.18.4
   
 
   camel-lumberjack

http://git-wip-us.apache.org/repos/asf/camel/blob/609347c5/components/camel-lzf/pom.xml
--
diff --git a/components/camel-lzf/pom.xml b/components/camel-lzf/pom.xml
index 34b062a..719c1ed 100644
--- a/components/camel-lzf/pom.xml
+++ b/components/camel-lzf/pom.xml
@@ -21,7 +21,7 @@
   
 org.apache.camel
 components
-2.18.4-SNAPSHOT
+2.18.4
   
 
   camel-lzf

http://git-wip-us.apache.org/repos/asf/camel/blob/609347c5/components/camel-mail/pom.xml
--
diff --git a/components/camel-mail/pom.xml b/components/camel-mail/pom.xml
index 46c4a3e..e7e7359 100644
--- a/components/camel-mail/pom.xml
+++ b/components/camel-mail/pom.xml
@@ -21,7 +21,7 @@
 
 org.apache.camel
 components
-2.18.4-SNA

[3/5] camel git commit: [maven-release-plugin] prepare release camel-2.18.4

2017-05-20 Thread gzurowski

http://git-wip-us.apache.org/repos/asf/camel/blob/609347c5/components-starter/camel-syslog-starter/pom.xml
--
diff --git a/components-starter/camel-syslog-starter/pom.xml 
b/components-starter/camel-syslog-starter/pom.xml
index 2a7d765..cc9d3e3 100644
--- a/components-starter/camel-syslog-starter/pom.xml
+++ b/components-starter/camel-syslog-starter/pom.xml
@@ -20,7 +20,7 @@
   
 org.apache.camel
 components-starter
-2.18.4-SNAPSHOT
+2.18.4
   
   camel-syslog-starter
   jar

http://git-wip-us.apache.org/repos/asf/camel/blob/609347c5/components-starter/camel-tagsoup-starter/pom.xml
--
diff --git a/components-starter/camel-tagsoup-starter/pom.xml 
b/components-starter/camel-tagsoup-starter/pom.xml
index a09a424..360fece 100644
--- a/components-starter/camel-tagsoup-starter/pom.xml
+++ b/components-starter/camel-tagsoup-starter/pom.xml
@@ -20,7 +20,7 @@
   
 org.apache.camel
 components-starter
-2.18.4-SNAPSHOT
+2.18.4
   
   camel-tagsoup-starter
   jar

http://git-wip-us.apache.org/repos/asf/camel/blob/609347c5/components-starter/camel-tarfile-starter/pom.xml
--
diff --git a/components-starter/camel-tarfile-starter/pom.xml 
b/components-starter/camel-tarfile-starter/pom.xml
index 7450945..6580e8c 100644
--- a/components-starter/camel-tarfile-starter/pom.xml
+++ b/components-starter/camel-tarfile-starter/pom.xml
@@ -20,7 +20,7 @@
   
 org.apache.camel
 components-starter
-2.18.4-SNAPSHOT
+2.18.4
   
   camel-tarfile-starter
   jar

http://git-wip-us.apache.org/repos/asf/camel/blob/609347c5/components-starter/camel-telegram-starter/pom.xml
--
diff --git a/components-starter/camel-telegram-starter/pom.xml 
b/components-starter/camel-telegram-starter/pom.xml
index 9b5ad36..0db96be 100644
--- a/components-starter/camel-telegram-starter/pom.xml
+++ b/components-starter/camel-telegram-starter/pom.xml
@@ -20,7 +20,7 @@
   
 org.apache.camel
 components-starter
-2.18.4-SNAPSHOT
+2.18.4
   
   camel-telegram-starter
   jar

http://git-wip-us.apache.org/repos/asf/camel/blob/609347c5/components-starter/camel-twitter-starter/pom.xml
--
diff --git a/components-starter/camel-twitter-starter/pom.xml 
b/components-starter/camel-twitter-starter/pom.xml
index a5b036b..69a04be 100644
--- a/components-starter/camel-twitter-starter/pom.xml
+++ b/components-starter/camel-twitter-starter/pom.xml
@@ -20,7 +20,7 @@
   
 org.apache.camel
 components-starter
-2.18.4-SNAPSHOT
+2.18.4
   
   camel-twitter-starter
   jar

http://git-wip-us.apache.org/repos/asf/camel/blob/609347c5/components-starter/camel-undertow-starter/pom.xml
--
diff --git a/components-starter/camel-undertow-starter/pom.xml 
b/components-starter/camel-undertow-starter/pom.xml
index 3ee451c..2b173da 100644
--- a/components-starter/camel-undertow-starter/pom.xml
+++ b/components-starter/camel-undertow-starter/pom.xml
@@ -20,7 +20,7 @@
   
 org.apache.camel
 components-starter
-2.18.4-SNAPSHOT
+2.18.4
   
   camel-undertow-starter
   jar

http://git-wip-us.apache.org/repos/asf/camel/blob/609347c5/components-starter/camel-univocity-parsers-starter/pom.xml
--
diff --git a/components-starter/camel-univocity-parsers-starter/pom.xml 
b/components-starter/camel-univocity-parsers-starter/pom.xml
index 4c76396..63dd37b 100644
--- a/components-starter/camel-univocity-parsers-starter/pom.xml
+++ b/components-starter/camel-univocity-parsers-starter/pom.xml
@@ -20,7 +20,7 @@
   
 org.apache.camel
 components-starter
-2.18.4-SNAPSHOT
+2.18.4
   
   camel-univocity-parsers-starter
   jar

http://git-wip-us.apache.org/repos/asf/camel/blob/609347c5/components-starter/camel-urlrewrite-starter/pom.xml
--
diff --git a/components-starter/camel-urlrewrite-starter/pom.xml 
b/components-starter/camel-urlrewrite-starter/pom.xml
index 47e6d50..f62adba 100644
--- a/components-starter/camel-urlrewrite-starter/pom.xml
+++ b/components-starter/camel-urlrewrite-starter/pom.xml
@@ -20,7 +20,7 @@
   
 org.apache.camel
 components-starter
-2.18.4-SNAPSHOT
+2.18.4
   
   camel-urlrewrite-starter
   jar

http://git-wip-us.apache.org/repos/asf/camel/blob/609347c5/components-starter/camel-velocity-starter/pom.xml
--
diff --git a/components-starter/camel-velocity-starter/pom.xml 
b/components-starter/camel-velocity-starter/pom.xml
index db0b152..7a71118 100644
--- a/components-star

[3/5] camel git commit: [maven-release-plugin] prepare for next development iteration

2017-05-20 Thread gzurowski

http://git-wip-us.apache.org/repos/asf/camel/blob/e938fab1/components-starter/camel-spring-javaconfig-starter/pom.xml
--
diff --git a/components-starter/camel-spring-javaconfig-starter/pom.xml 
b/components-starter/camel-spring-javaconfig-starter/pom.xml
index 041dfc8..d8f9e7d 100644
--- a/components-starter/camel-spring-javaconfig-starter/pom.xml
+++ b/components-starter/camel-spring-javaconfig-starter/pom.xml
@@ -20,7 +20,7 @@
   
 org.apache.camel
 components-starter
-2.18.4
+2.18.5-SNAPSHOT
   
   camel-spring-javaconfig-starter
   jar

http://git-wip-us.apache.org/repos/asf/camel/blob/e938fab1/components-starter/camel-spring-ldap-starter/pom.xml
--
diff --git a/components-starter/camel-spring-ldap-starter/pom.xml 
b/components-starter/camel-spring-ldap-starter/pom.xml
index a6979f0..6728852 100644
--- a/components-starter/camel-spring-ldap-starter/pom.xml
+++ b/components-starter/camel-spring-ldap-starter/pom.xml
@@ -20,7 +20,7 @@
   
 org.apache.camel
 components-starter
-2.18.4
+2.18.5-SNAPSHOT
   
   camel-spring-ldap-starter
   jar

http://git-wip-us.apache.org/repos/asf/camel/blob/e938fab1/components-starter/camel-spring-redis-starter/pom.xml
--
diff --git a/components-starter/camel-spring-redis-starter/pom.xml 
b/components-starter/camel-spring-redis-starter/pom.xml
index f741b1c..9e6af5b 100644
--- a/components-starter/camel-spring-redis-starter/pom.xml
+++ b/components-starter/camel-spring-redis-starter/pom.xml
@@ -20,7 +20,7 @@
   
 org.apache.camel
 components-starter
-2.18.4
+2.18.5-SNAPSHOT
   
   camel-spring-redis-starter
   jar

http://git-wip-us.apache.org/repos/asf/camel/blob/e938fab1/components-starter/camel-spring-security-starter/pom.xml
--
diff --git a/components-starter/camel-spring-security-starter/pom.xml 
b/components-starter/camel-spring-security-starter/pom.xml
index cd454d0..2e760ee 100644
--- a/components-starter/camel-spring-security-starter/pom.xml
+++ b/components-starter/camel-spring-security-starter/pom.xml
@@ -20,7 +20,7 @@
   
 org.apache.camel
 components-starter
-2.18.4
+2.18.5-SNAPSHOT
   
   camel-spring-security-starter
   jar

http://git-wip-us.apache.org/repos/asf/camel/blob/e938fab1/components-starter/camel-spring-starter/pom.xml
--
diff --git a/components-starter/camel-spring-starter/pom.xml 
b/components-starter/camel-spring-starter/pom.xml
index 859e3fd..6647d0b 100644
--- a/components-starter/camel-spring-starter/pom.xml
+++ b/components-starter/camel-spring-starter/pom.xml
@@ -20,7 +20,7 @@
   
 org.apache.camel
 components-starter
-2.18.4
+2.18.5-SNAPSHOT
   
   camel-spring-starter
   jar

http://git-wip-us.apache.org/repos/asf/camel/blob/e938fab1/components-starter/camel-spring-ws-starter/pom.xml
--
diff --git a/components-starter/camel-spring-ws-starter/pom.xml 
b/components-starter/camel-spring-ws-starter/pom.xml
index f3d470c..e414e16 100644
--- a/components-starter/camel-spring-ws-starter/pom.xml
+++ b/components-starter/camel-spring-ws-starter/pom.xml
@@ -20,7 +20,7 @@
   
 org.apache.camel
 components-starter
-2.18.4
+2.18.5-SNAPSHOT
   
   camel-spring-ws-starter
   jar

http://git-wip-us.apache.org/repos/asf/camel/blob/e938fab1/components-starter/camel-sql-starter/pom.xml
--
diff --git a/components-starter/camel-sql-starter/pom.xml 
b/components-starter/camel-sql-starter/pom.xml
index f3a5c88..fa2cbe5 100644
--- a/components-starter/camel-sql-starter/pom.xml
+++ b/components-starter/camel-sql-starter/pom.xml
@@ -20,7 +20,7 @@
   
 org.apache.camel
 components-starter
-2.18.4
+2.18.5-SNAPSHOT
   
   camel-sql-starter
   jar

http://git-wip-us.apache.org/repos/asf/camel/blob/e938fab1/components-starter/camel-ssh-starter/pom.xml
--
diff --git a/components-starter/camel-ssh-starter/pom.xml 
b/components-starter/camel-ssh-starter/pom.xml
index 4561e03..04763d0 100644
--- a/components-starter/camel-ssh-starter/pom.xml
+++ b/components-starter/camel-ssh-starter/pom.xml
@@ -20,7 +20,7 @@
   
 org.apache.camel
 components-starter
-2.18.4
+2.18.5-SNAPSHOT
   
   camel-ssh-starter
   jar

http://git-wip-us.apache.org/repos/asf/camel/blob/e938fab1/components-starter/camel-stax-starter/pom.xml
--
diff --git a/components-starter/camel-stax-starter/pom.xml 
b/components-starter/camel-stax-starter/pom.xml
index 23b10ae..e9ffb50 1006

[5/5] camel git commit: [maven-release-plugin] prepare for next development iteration

2017-05-20 Thread gzurowski

[maven-release-plugin] prepare for next development iteration


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

Branch: refs/heads/camel-2.18.x
Commit: e938fab1a0b820927dddb4e4d2018f88da048e65
Parents: 609347c
Author: Gregor Zurowski 
Authored: Sat May 20 18:23:37 2017 +
Committer: Gregor Zurowski 
Committed: Sat May 20 18:23:37 2017 +

--
 apache-camel/pom.xml | 2 +-
 buildingtools/pom.xml| 2 +-
 camel-core/pom.xml   | 2 +-
 components-starter/camel-ahc-starter/pom.xml | 2 +-
 components-starter/camel-ahc-ws-starter/pom.xml  | 2 +-
 components-starter/camel-amqp-starter/pom.xml| 2 +-
 components-starter/camel-apns-starter/pom.xml| 2 +-
 components-starter/camel-asterisk-starter/pom.xml| 2 +-
 components-starter/camel-atmos-starter/pom.xml   | 2 +-
 components-starter/camel-atmosphere-websocket-starter/pom.xml| 2 +-
 components-starter/camel-atom-starter/pom.xml| 2 +-
 components-starter/camel-avro-starter/pom.xml| 2 +-
 components-starter/camel-aws-starter/pom.xml | 2 +-
 components-starter/camel-bam-starter/pom.xml | 2 +-
 components-starter/camel-barcode-starter/pom.xml | 2 +-
 components-starter/camel-base64-starter/pom.xml  | 2 +-
 components-starter/camel-bean-validator-starter/pom.xml  | 2 +-
 components-starter/camel-beanio-starter/pom.xml  | 2 +-
 components-starter/camel-beanstalk-starter/pom.xml   | 2 +-
 components-starter/camel-bindy-starter/pom.xml   | 2 +-
 components-starter/camel-boon-starter/pom.xml| 2 +-
 components-starter/camel-box-starter/pom.xml | 2 +-
 components-starter/camel-braintree-starter/pom.xml   | 2 +-
 components-starter/camel-cache-starter/pom.xml   | 2 +-
 components-starter/camel-cassandraql-starter/pom.xml | 2 +-
 components-starter/camel-castor-starter/pom.xml  | 2 +-
 components-starter/camel-chronicle-starter/pom.xml   | 2 +-
 components-starter/camel-chunk-starter/pom.xml   | 2 +-
 components-starter/camel-cm-sms-starter/pom.xml  | 2 +-
 components-starter/camel-cmis-starter/pom.xml| 2 +-
 components-starter/camel-coap-starter/pom.xml| 2 +-
 components-starter/camel-cometd-starter/pom.xml  | 2 +-
 components-starter/camel-consul-starter/pom.xml  | 2 +-
 components-starter/camel-context-starter/pom.xml | 2 +-
 components-starter/camel-core-starter/pom.xml| 2 +-
 components-starter/camel-core-xml-starter/pom.xml| 2 +-
 components-starter/camel-couchdb-starter/pom.xml | 2 +-
 components-starter/camel-crypto-starter/pom.xml  | 2 +-
 components-starter/camel-csv-starter/pom.xml | 2 +-
 components-starter/camel-cxf-starter/pom.xml | 2 +-
 components-starter/camel-cxf-transport-starter/pom.xml   | 2 +-
 components-starter/camel-disruptor-starter/pom.xml   | 2 +-
 components-starter/camel-dns-starter/pom.xml | 2 +-
 components-starter/camel-docker-starter/pom.xml  | 2 +-
 components-starter/camel-dozer-starter/pom.xml   | 2 +-
 components-starter/camel-dropbox-starter/pom.xml | 2 +-
 components-starter/camel-eclipse-starter/pom.xml | 2 +-
 components-starter/camel-ehcache-starter/pom.xml | 2 +-
 components-starter/camel-elasticsearch-starter/pom.xml   | 2 +-
 components-starter/camel-elsql-starter/pom.xml   | 2 +-
 components-starter/camel-etcd-starter/pom.xml| 2 +-
 components-starter/camel-exec-starter/pom.xml| 2 +-
 components-starter/camel-facebook-starter/pom.xml| 2 +-
 components-starter/camel-flatpack-starter/pom.xml| 2 +-
 components-starter/camel-flink-starter/pom.xml   | 2 +-
 components-starter/camel-fop-starter/pom.xml | 2 +-
 components-starter/camel-freemarker-starter/pom.xml  | 2 +-
 components-starter/camel-ftp-starter/pom.xml | 2 +-
 components-starter/camel-ganglia-starter/pom.xml | 2 +-
 components-starter/camel-geocoder-starter/pom.xml

[1/5] camel git commit: [maven-release-plugin] prepare release camel-2.18.4

2017-05-20 Thread gzurowski

Repository: camel
Updated Branches:
  refs/heads/camel-2.18.x 091ed28d0 -> 609347c52


http://git-wip-us.apache.org/repos/asf/camel/blob/609347c5/examples/camel-example-hystrix/service1/pom.xml
--
diff --git a/examples/camel-example-hystrix/service1/pom.xml 
b/examples/camel-example-hystrix/service1/pom.xml
index e1fbc45..faa2511 100644
--- a/examples/camel-example-hystrix/service1/pom.xml
+++ b/examples/camel-example-hystrix/service1/pom.xml
@@ -22,7 +22,7 @@
   
 org.apache.camel
 camel-example-hystrix
-2.18.4-SNAPSHOT
+2.18.4
   
 
   camel-example-hystrix-service1

http://git-wip-us.apache.org/repos/asf/camel/blob/609347c5/examples/camel-example-hystrix/service2/pom.xml
--
diff --git a/examples/camel-example-hystrix/service2/pom.xml 
b/examples/camel-example-hystrix/service2/pom.xml
index 783e40b..4fd9702 100644
--- a/examples/camel-example-hystrix/service2/pom.xml
+++ b/examples/camel-example-hystrix/service2/pom.xml
@@ -22,7 +22,7 @@
   
 org.apache.camel
 camel-example-hystrix
-2.18.4-SNAPSHOT
+2.18.4
   
 
   camel-example-hystrix-service2

http://git-wip-us.apache.org/repos/asf/camel/blob/609347c5/examples/camel-example-java8-rx/pom.xml
--
diff --git a/examples/camel-example-java8-rx/pom.xml 
b/examples/camel-example-java8-rx/pom.xml
index 11d87db..522c9cc 100644
--- a/examples/camel-example-java8-rx/pom.xml
+++ b/examples/camel-example-java8-rx/pom.xml
@@ -22,7 +22,7 @@
   
 org.apache.camel
 examples
-2.18.4-SNAPSHOT
+2.18.4
   
 
   camel-example-java8-rx

http://git-wip-us.apache.org/repos/asf/camel/blob/609347c5/examples/camel-example-java8/pom.xml
--
diff --git a/examples/camel-example-java8/pom.xml 
b/examples/camel-example-java8/pom.xml
index d33924f..8c27604 100644
--- a/examples/camel-example-java8/pom.xml
+++ b/examples/camel-example-java8/pom.xml
@@ -22,7 +22,7 @@
   
 org.apache.camel
 examples
-2.18.4-SNAPSHOT
+2.18.4
   
 
   camel-example-java8

http://git-wip-us.apache.org/repos/asf/camel/blob/609347c5/examples/camel-example-jdbc/pom.xml
--
diff --git a/examples/camel-example-jdbc/pom.xml 
b/examples/camel-example-jdbc/pom.xml
index 5cc6e76..07a0307 100644
--- a/examples/camel-example-jdbc/pom.xml
+++ b/examples/camel-example-jdbc/pom.xml
@@ -22,7 +22,7 @@
   
 org.apache.camel
 examples
-2.18.4-SNAPSHOT
+2.18.4
   
 
   camel-example-jdbc

http://git-wip-us.apache.org/repos/asf/camel/blob/609347c5/examples/camel-example-jms-file/pom.xml
--
diff --git a/examples/camel-example-jms-file/pom.xml 
b/examples/camel-example-jms-file/pom.xml
index 84bb88f..45c2ab3 100755
--- a/examples/camel-example-jms-file/pom.xml
+++ b/examples/camel-example-jms-file/pom.xml
@@ -22,7 +22,7 @@
   
 org.apache.camel
 examples
-2.18.4-SNAPSHOT
+2.18.4
   
 
   camel-example-jms-file

http://git-wip-us.apache.org/repos/asf/camel/blob/609347c5/examples/camel-example-jmx/pom.xml
--
diff --git a/examples/camel-example-jmx/pom.xml 
b/examples/camel-example-jmx/pom.xml
index 55b6753..1eca2db 100644
--- a/examples/camel-example-jmx/pom.xml
+++ b/examples/camel-example-jmx/pom.xml
@@ -22,7 +22,7 @@
   
 org.apache.camel
 examples
-2.18.4-SNAPSHOT
+2.18.4
   
 
   camel-example-jmx

http://git-wip-us.apache.org/repos/asf/camel/blob/609347c5/examples/camel-example-loadbalancing/pom.xml
--
diff --git a/examples/camel-example-loadbalancing/pom.xml 
b/examples/camel-example-loadbalancing/pom.xml
index 218d493..d78d5e1 100644
--- a/examples/camel-example-loadbalancing/pom.xml
+++ b/examples/camel-example-loadbalancing/pom.xml
@@ -22,7 +22,7 @@
   
 org.apache.camel
 examples
-2.18.4-SNAPSHOT
+2.18.4
   
 
   camel-example-loadbalancing

http://git-wip-us.apache.org/repos/asf/camel/blob/609347c5/examples/camel-example-loan-broker/pom.xml
--
diff --git a/examples/camel-example-loan-broker/pom.xml 
b/examples/camel-example-loan-broker/pom.xml
index 31d07a7..2388236 100644
--- a/examples/camel-example-loan-broker/pom.xml
+++ b/examples/camel-example-loan-broker/pom.xml
@@ -22,7 +22,7 @@
   
 org.apache.camel
 examples
-2.18.4-SNAPSHOT
+2.18.4
   
 
   camel-example-loan-broker

http://git-wip-us.apache.org/repos/asf/camel/blob/609347c5/examples/camel-example-management/pom.xml
--
diff --git a/examples/camel-exampl

[4/5] camel git commit: [maven-release-plugin] prepare for next development iteration

2017-05-20 Thread gzurowski

http://git-wip-us.apache.org/repos/asf/camel/blob/e938fab1/components-starter/camel-google-calendar-starter/pom.xml
--
diff --git a/components-starter/camel-google-calendar-starter/pom.xml 
b/components-starter/camel-google-calendar-starter/pom.xml
index 8407faa..4500be2 100644
--- a/components-starter/camel-google-calendar-starter/pom.xml
+++ b/components-starter/camel-google-calendar-starter/pom.xml
@@ -20,7 +20,7 @@
   
 org.apache.camel
 components-starter
-2.18.4
+2.18.5-SNAPSHOT
   
   camel-google-calendar-starter
   jar

http://git-wip-us.apache.org/repos/asf/camel/blob/e938fab1/components-starter/camel-google-drive-starter/pom.xml
--
diff --git a/components-starter/camel-google-drive-starter/pom.xml 
b/components-starter/camel-google-drive-starter/pom.xml
index 93541eb..5b230b1 100644
--- a/components-starter/camel-google-drive-starter/pom.xml
+++ b/components-starter/camel-google-drive-starter/pom.xml
@@ -20,7 +20,7 @@
   
 org.apache.camel
 components-starter
-2.18.4
+2.18.5-SNAPSHOT
   
   camel-google-drive-starter
   jar

http://git-wip-us.apache.org/repos/asf/camel/blob/e938fab1/components-starter/camel-google-mail-starter/pom.xml
--
diff --git a/components-starter/camel-google-mail-starter/pom.xml 
b/components-starter/camel-google-mail-starter/pom.xml
index bed1a7e..9220f3c 100644
--- a/components-starter/camel-google-mail-starter/pom.xml
+++ b/components-starter/camel-google-mail-starter/pom.xml
@@ -20,7 +20,7 @@
   
 org.apache.camel
 components-starter
-2.18.4
+2.18.5-SNAPSHOT
   
   camel-google-mail-starter
   jar

http://git-wip-us.apache.org/repos/asf/camel/blob/e938fab1/components-starter/camel-gora-starter/pom.xml
--
diff --git a/components-starter/camel-gora-starter/pom.xml 
b/components-starter/camel-gora-starter/pom.xml
index 0ae0e55..4816909 100644
--- a/components-starter/camel-gora-starter/pom.xml
+++ b/components-starter/camel-gora-starter/pom.xml
@@ -20,7 +20,7 @@
   
 org.apache.camel
 components-starter
-2.18.4
+2.18.5-SNAPSHOT
   
   camel-gora-starter
   jar

http://git-wip-us.apache.org/repos/asf/camel/blob/e938fab1/components-starter/camel-grape-starter/pom.xml
--
diff --git a/components-starter/camel-grape-starter/pom.xml 
b/components-starter/camel-grape-starter/pom.xml
index d95e518..6c709e6 100644
--- a/components-starter/camel-grape-starter/pom.xml
+++ b/components-starter/camel-grape-starter/pom.xml
@@ -20,7 +20,7 @@
   
 org.apache.camel
 components-starter
-2.18.4
+2.18.5-SNAPSHOT
   
   camel-grape-starter
   jar

http://git-wip-us.apache.org/repos/asf/camel/blob/e938fab1/components-starter/camel-groovy-starter/pom.xml
--
diff --git a/components-starter/camel-groovy-starter/pom.xml 
b/components-starter/camel-groovy-starter/pom.xml
index ea396f2..213137e 100644
--- a/components-starter/camel-groovy-starter/pom.xml
+++ b/components-starter/camel-groovy-starter/pom.xml
@@ -20,7 +20,7 @@
   
 org.apache.camel
 components-starter
-2.18.4
+2.18.5-SNAPSHOT
   
   camel-groovy-starter
   jar

http://git-wip-us.apache.org/repos/asf/camel/blob/e938fab1/components-starter/camel-gson-starter/pom.xml
--
diff --git a/components-starter/camel-gson-starter/pom.xml 
b/components-starter/camel-gson-starter/pom.xml
index d3ec65a..ae4ecbb 100644
--- a/components-starter/camel-gson-starter/pom.xml
+++ b/components-starter/camel-gson-starter/pom.xml
@@ -20,7 +20,7 @@
   
 org.apache.camel
 components-starter
-2.18.4
+2.18.5-SNAPSHOT
   
   camel-gson-starter
   jar

http://git-wip-us.apache.org/repos/asf/camel/blob/e938fab1/components-starter/camel-guava-eventbus-starter/pom.xml
--
diff --git a/components-starter/camel-guava-eventbus-starter/pom.xml 
b/components-starter/camel-guava-eventbus-starter/pom.xml
index c87e24e..9d43c34 100644
--- a/components-starter/camel-guava-eventbus-starter/pom.xml
+++ b/components-starter/camel-guava-eventbus-starter/pom.xml
@@ -20,7 +20,7 @@
   
 org.apache.camel
 components-starter
-2.18.4
+2.18.5-SNAPSHOT
   
   camel-guava-eventbus-starter
   jar

http://git-wip-us.apache.org/repos/asf/camel/blob/e938fab1/components-starter/camel-guice-starter/pom.xml
--
diff --git a/components-starter/camel-guice-starter/pom.xml 
b/components-starter/camel-guice-starter/pom.xml
index 161a4bf..8d75208 100644
--- a/components-starter

[2/5] camel git commit: [maven-release-plugin] prepare for next development iteration

2017-05-20 Thread gzurowski

http://git-wip-us.apache.org/repos/asf/camel/blob/e938fab1/components/camel-jira/pom.xml
--
diff --git a/components/camel-jira/pom.xml b/components/camel-jira/pom.xml
index e26a4db..8c63d23 100644
--- a/components/camel-jira/pom.xml
+++ b/components/camel-jira/pom.xml
@@ -16,7 +16,7 @@
   
 org.apache.camel
 components
-2.18.4
+2.18.5-SNAPSHOT
   
 
   camel-jira

http://git-wip-us.apache.org/repos/asf/camel/blob/e938fab1/components/camel-jms/pom.xml
--
diff --git a/components/camel-jms/pom.xml b/components/camel-jms/pom.xml
index bf8a547..851443d 100644
--- a/components/camel-jms/pom.xml
+++ b/components/camel-jms/pom.xml
@@ -21,7 +21,7 @@
 
 org.apache.camel
 components
-2.18.4
+2.18.5-SNAPSHOT
 
 
 camel-jms

http://git-wip-us.apache.org/repos/asf/camel/blob/e938fab1/components/camel-jmx/pom.xml
--
diff --git a/components/camel-jmx/pom.xml b/components/camel-jmx/pom.xml
index 590fdf5..8323ffb 100644
--- a/components/camel-jmx/pom.xml
+++ b/components/camel-jmx/pom.xml
@@ -21,7 +21,7 @@
 
 org.apache.camel
 components
-2.18.4
+2.18.5-SNAPSHOT
 
 
 camel-jmx

http://git-wip-us.apache.org/repos/asf/camel/blob/e938fab1/components/camel-johnzon/pom.xml
--
diff --git a/components/camel-johnzon/pom.xml b/components/camel-johnzon/pom.xml
index 9d7ef43..47a70fc 100644
--- a/components/camel-johnzon/pom.xml
+++ b/components/camel-johnzon/pom.xml
@@ -21,7 +21,7 @@
 
 org.apache.camel
 components
-2.18.4
+2.18.5-SNAPSHOT
 
 
 camel-johnzon

http://git-wip-us.apache.org/repos/asf/camel/blob/e938fab1/components/camel-jolt/pom.xml
--
diff --git a/components/camel-jolt/pom.xml b/components/camel-jolt/pom.xml
index 31844c6..a8a6048 100644
--- a/components/camel-jolt/pom.xml
+++ b/components/camel-jolt/pom.xml
@@ -22,7 +22,7 @@
   
 components
 org.apache.camel
-2.18.4
+2.18.5-SNAPSHOT
   
 
   camel-jolt

http://git-wip-us.apache.org/repos/asf/camel/blob/e938fab1/components/camel-josql/pom.xml
--
diff --git a/components/camel-josql/pom.xml b/components/camel-josql/pom.xml
index 220b98c..c0360e3 100644
--- a/components/camel-josql/pom.xml
+++ b/components/camel-josql/pom.xml
@@ -21,7 +21,7 @@
   
 org.apache.camel
 components
-2.18.4
+2.18.5-SNAPSHOT
   
 
   camel-josql

http://git-wip-us.apache.org/repos/asf/camel/blob/e938fab1/components/camel-jpa/pom.xml
--
diff --git a/components/camel-jpa/pom.xml b/components/camel-jpa/pom.xml
index deeeb34..ec196f2 100644
--- a/components/camel-jpa/pom.xml
+++ b/components/camel-jpa/pom.xml
@@ -21,7 +21,7 @@
   
 org.apache.camel
 components
-2.18.4
+2.18.5-SNAPSHOT
   
 
   camel-jpa

http://git-wip-us.apache.org/repos/asf/camel/blob/e938fab1/components/camel-jsch/pom.xml
--
diff --git a/components/camel-jsch/pom.xml b/components/camel-jsch/pom.xml
index a1847ee..6c926ba 100644
--- a/components/camel-jsch/pom.xml
+++ b/components/camel-jsch/pom.xml
@@ -23,7 +23,7 @@
   
 org.apache.camel
 components
-2.18.4
+2.18.5-SNAPSHOT
   
 
   camel-jsch

http://git-wip-us.apache.org/repos/asf/camel/blob/e938fab1/components/camel-jsonpath/pom.xml
--
diff --git a/components/camel-jsonpath/pom.xml 
b/components/camel-jsonpath/pom.xml
index 07f756e..9129144 100644
--- a/components/camel-jsonpath/pom.xml
+++ b/components/camel-jsonpath/pom.xml
@@ -22,7 +22,7 @@
   
 org.apache.camel
 components
-2.18.4
+2.18.5-SNAPSHOT
   
 
   camel-jsonpath

http://git-wip-us.apache.org/repos/asf/camel/blob/e938fab1/components/camel-jt400/pom.xml
--
diff --git a/components/camel-jt400/pom.xml b/components/camel-jt400/pom.xml
index 134ac9c..2d46905 100644
--- a/components/camel-jt400/pom.xml
+++ b/components/camel-jt400/pom.xml
@@ -21,7 +21,7 @@
   
 org.apache.camel
 components
-2.18.4
+2.18.5-SNAPSHOT
   
 
   camel-jt400

http://git-wip-us.apache.org/repos/asf/camel/blob/e938fab1/components/camel-juel/pom.xml
--
diff --git a/components/camel-juel/pom.xml b/components/camel-juel/pom.xml
index ae5cee5..2c1e86a 100644
--- a/components/camel-juel/pom.xml
+++ b/components/camel-juel/pom.xml
@@ -21,7 +21,7 @@
   
 org.apache.camel

[camel] Git Push Summary

2017-05-20 Thread gzurowski

Repository: camel
Updated Tags:  refs/tags/camel-2.18.4 [created] c65ad3381

[5/5] camel git commit: [maven-release-plugin] prepare release camel-2.18.4

2017-05-20 Thread gzurowski

[maven-release-plugin] prepare release camel-2.18.4


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

Branch: refs/heads/camel-2.18.x
Commit: 609347c52c1fc4f4d623353f5f1e6cfe3f586676
Parents: 091ed28
Author: Gregor Zurowski 
Authored: Sat May 20 18:23:05 2017 +
Committer: Gregor Zurowski 
Committed: Sat May 20 18:23:05 2017 +

--
 apache-camel/pom.xml|  2 +-
 buildingtools/pom.xml   |  2 +-
 camel-core/pom.xml  |  2 +-
 components-starter/camel-ahc-starter/pom.xml|  2 +-
 components-starter/camel-ahc-ws-starter/pom.xml |  2 +-
 components-starter/camel-amqp-starter/pom.xml   |  2 +-
 components-starter/camel-apns-starter/pom.xml   |  2 +-
 .../camel-asterisk-starter/pom.xml  |  2 +-
 components-starter/camel-atmos-starter/pom.xml  |  2 +-
 .../camel-atmosphere-websocket-starter/pom.xml  |  2 +-
 components-starter/camel-atom-starter/pom.xml   |  2 +-
 components-starter/camel-avro-starter/pom.xml   |  2 +-
 components-starter/camel-aws-starter/pom.xml|  2 +-
 components-starter/camel-bam-starter/pom.xml|  2 +-
 .../camel-barcode-starter/pom.xml   |  2 +-
 components-starter/camel-base64-starter/pom.xml |  2 +-
 .../camel-bean-validator-starter/pom.xml|  2 +-
 components-starter/camel-beanio-starter/pom.xml |  2 +-
 .../camel-beanstalk-starter/pom.xml |  2 +-
 components-starter/camel-bindy-starter/pom.xml  |  2 +-
 components-starter/camel-boon-starter/pom.xml   |  2 +-
 components-starter/camel-box-starter/pom.xml|  2 +-
 .../camel-braintree-starter/pom.xml |  2 +-
 components-starter/camel-cache-starter/pom.xml  |  2 +-
 .../camel-cassandraql-starter/pom.xml   |  2 +-
 components-starter/camel-castor-starter/pom.xml |  2 +-
 .../camel-chronicle-starter/pom.xml |  2 +-
 components-starter/camel-chunk-starter/pom.xml  |  2 +-
 components-starter/camel-cm-sms-starter/pom.xml |  2 +-
 components-starter/camel-cmis-starter/pom.xml   |  2 +-
 components-starter/camel-coap-starter/pom.xml   |  2 +-
 components-starter/camel-cometd-starter/pom.xml |  2 +-
 components-starter/camel-consul-starter/pom.xml |  2 +-
 .../camel-context-starter/pom.xml   |  2 +-
 components-starter/camel-core-starter/pom.xml   |  2 +-
 .../camel-core-xml-starter/pom.xml  |  2 +-
 .../camel-couchdb-starter/pom.xml   |  2 +-
 components-starter/camel-crypto-starter/pom.xml |  2 +-
 components-starter/camel-csv-starter/pom.xml|  2 +-
 components-starter/camel-cxf-starter/pom.xml|  2 +-
 .../camel-cxf-transport-starter/pom.xml |  2 +-
 .../camel-disruptor-starter/pom.xml |  2 +-
 components-starter/camel-dns-starter/pom.xml|  2 +-
 components-starter/camel-docker-starter/pom.xml |  2 +-
 components-starter/camel-dozer-starter/pom.xml  |  2 +-
 .../camel-dropbox-starter/pom.xml   |  2 +-
 .../camel-eclipse-starter/pom.xml   |  2 +-
 .../camel-ehcache-starter/pom.xml   |  2 +-
 .../camel-elasticsearch-starter/pom.xml |  2 +-
 components-starter/camel-elsql-starter/pom.xml  |  2 +-
 components-starter/camel-etcd-starter/pom.xml   |  2 +-
 components-starter/camel-exec-starter/pom.xml   |  2 +-
 .../camel-facebook-starter/pom.xml  |  2 +-
 .../camel-flatpack-starter/pom.xml  |  2 +-
 components-starter/camel-flink-starter/pom.xml  |  2 +-
 components-starter/camel-fop-starter/pom.xml|  2 +-
 .../camel-freemarker-starter/pom.xml|  2 +-
 components-starter/camel-ftp-starter/pom.xml|  2 +-
 .../camel-ganglia-starter/pom.xml   |  2 +-
 .../camel-geocoder-starter/pom.xml  |  2 +-
 components-starter/camel-git-starter/pom.xml|  2 +-
 components-starter/camel-github-starter/pom.xml |  2 +-
 .../camel-google-calendar-starter/pom.xml   |  2 +-
 .../camel-google-drive-starter/pom.xml  |  2 +-
 .../camel-google-mail-starter/pom.xml   |  2 +-
 components-starter/camel-gora-starter/pom.xml   |  2 +-
 components-starter/camel-grape-starter/pom.xml  |  2 +-
 components-starter/camel-groovy-starter/pom.xml |  2 +-
 components-starter/camel-gson-starter/pom.xml   |  2 +-
 .../camel-guava-eventbus-starter/pom.xml|  2 +-
 components-starter/camel-guice-starter/pom.xml  |  2 +-
 components-starter/camel-hawtdb-starter/pom.xml |  2 +-
 .../camel-hazelcast-starter/pom.xml |  2 +-
 components-starter/camel-hbase-starter/pom.xml  |  2 +-
 components-starter/camel-hdfs-starter/pom.xml   |  2 +-
 components-starter/camel-hdfs2-starter/pom.xml  |  2 +-
 .../camel-hessian-starter/pom.xml

[4/5] camel git commit: [maven-release-plugin] prepare release camel-2.18.4

2017-05-20 Thread gzurowski

http://git-wip-us.apache.org/repos/asf/camel/blob/609347c5/components-starter/camel-hessian-starter/pom.xml
--
diff --git a/components-starter/camel-hessian-starter/pom.xml 
b/components-starter/camel-hessian-starter/pom.xml
index a80df1a..d1b6854 100644
--- a/components-starter/camel-hessian-starter/pom.xml
+++ b/components-starter/camel-hessian-starter/pom.xml
@@ -20,7 +20,7 @@
   
 org.apache.camel
 components-starter
-2.18.4-SNAPSHOT
+2.18.4
   
   camel-hessian-starter
   jar

http://git-wip-us.apache.org/repos/asf/camel/blob/609347c5/components-starter/camel-hipchat-starter/pom.xml
--
diff --git a/components-starter/camel-hipchat-starter/pom.xml 
b/components-starter/camel-hipchat-starter/pom.xml
index 2eb91ee..b67661e 100644
--- a/components-starter/camel-hipchat-starter/pom.xml
+++ b/components-starter/camel-hipchat-starter/pom.xml
@@ -20,7 +20,7 @@
   
 org.apache.camel
 components-starter
-2.18.4-SNAPSHOT
+2.18.4
   
   camel-hipchat-starter
   jar

http://git-wip-us.apache.org/repos/asf/camel/blob/609347c5/components-starter/camel-hl7-starter/pom.xml
--
diff --git a/components-starter/camel-hl7-starter/pom.xml 
b/components-starter/camel-hl7-starter/pom.xml
index 333a48f..52cbdd4 100644
--- a/components-starter/camel-hl7-starter/pom.xml
+++ b/components-starter/camel-hl7-starter/pom.xml
@@ -20,7 +20,7 @@
   
 org.apache.camel
 components-starter
-2.18.4-SNAPSHOT
+2.18.4
   
   camel-hl7-starter
   jar

http://git-wip-us.apache.org/repos/asf/camel/blob/609347c5/components-starter/camel-http-common-starter/pom.xml
--
diff --git a/components-starter/camel-http-common-starter/pom.xml 
b/components-starter/camel-http-common-starter/pom.xml
index ebe3c9c..bf741df 100644
--- a/components-starter/camel-http-common-starter/pom.xml
+++ b/components-starter/camel-http-common-starter/pom.xml
@@ -20,7 +20,7 @@
   
 org.apache.camel
 components-starter
-2.18.4-SNAPSHOT
+2.18.4
   
   camel-http-common-starter
   jar

http://git-wip-us.apache.org/repos/asf/camel/blob/609347c5/components-starter/camel-http-starter/pom.xml
--
diff --git a/components-starter/camel-http-starter/pom.xml 
b/components-starter/camel-http-starter/pom.xml
index 16ec312..2135a9e 100644
--- a/components-starter/camel-http-starter/pom.xml
+++ b/components-starter/camel-http-starter/pom.xml
@@ -20,7 +20,7 @@
   
 org.apache.camel
 components-starter
-2.18.4-SNAPSHOT
+2.18.4
   
   camel-http-starter
   jar

http://git-wip-us.apache.org/repos/asf/camel/blob/609347c5/components-starter/camel-http4-starter/pom.xml
--
diff --git a/components-starter/camel-http4-starter/pom.xml 
b/components-starter/camel-http4-starter/pom.xml
index 0eab7b3..4c5a77f 100644
--- a/components-starter/camel-http4-starter/pom.xml
+++ b/components-starter/camel-http4-starter/pom.xml
@@ -20,7 +20,7 @@
   
 org.apache.camel
 components-starter
-2.18.4-SNAPSHOT
+2.18.4
   
   camel-http4-starter
   jar

http://git-wip-us.apache.org/repos/asf/camel/blob/609347c5/components-starter/camel-hystrix-starter/pom.xml
--
diff --git a/components-starter/camel-hystrix-starter/pom.xml 
b/components-starter/camel-hystrix-starter/pom.xml
index 06d67ce..5520fe5 100644
--- a/components-starter/camel-hystrix-starter/pom.xml
+++ b/components-starter/camel-hystrix-starter/pom.xml
@@ -20,7 +20,7 @@
   
 org.apache.camel
 components-starter
-2.18.4-SNAPSHOT
+2.18.4
   
   camel-hystrix-starter
   jar

http://git-wip-us.apache.org/repos/asf/camel/blob/609347c5/components-starter/camel-ical-starter/pom.xml
--
diff --git a/components-starter/camel-ical-starter/pom.xml 
b/components-starter/camel-ical-starter/pom.xml
index 303373f..b380175 100644
--- a/components-starter/camel-ical-starter/pom.xml
+++ b/components-starter/camel-ical-starter/pom.xml
@@ -20,7 +20,7 @@
   
 org.apache.camel
 components-starter
-2.18.4-SNAPSHOT
+2.18.4
   
   camel-ical-starter
   jar

http://git-wip-us.apache.org/repos/asf/camel/blob/609347c5/components-starter/camel-ignite-starter/pom.xml
--
diff --git a/components-starter/camel-ignite-starter/pom.xml 
b/components-starter/camel-ignite-starter/pom.xml
index a32af2a..8363200 100644
--- a/components-starter/camel-ignite-starter/pom.xml
+++ b/components-starter/camel-ignite-starter/pom.xml
@@ -20,7 +20,7 @@
   
 org.apache.camel
 co

[04/16] camel git commit: Regen spring-boot components-starter

2017-05-20 Thread lburgazzoli

http://git-wip-us.apache.org/repos/asf/camel/blob/cd54a966/platforms/spring-boot/components-starter/camel-paho-starter/src/main/java/org/apache/camel/component/paho/springboot/PahoComponentAutoConfiguration.java
--
diff --git 
a/platforms/spring-boot/components-starter/camel-paho-starter/src/main/java/org/apache/camel/component/paho/springboot/PahoComponentAutoConfiguration.java
 
b/platforms/spring-boot/components-starter/camel-paho-starter/src/main/java/org/apache/camel/component/paho/springboot/PahoComponentAutoConfiguration.java
index 44f2995..7c8c9c0 100644
--- 
a/platforms/spring-boot/components-starter/camel-paho-starter/src/main/java/org/apache/camel/component/paho/springboot/PahoComponentAutoConfiguration.java
+++ 
b/platforms/spring-boot/components-starter/camel-paho-starter/src/main/java/org/apache/camel/component/paho/springboot/PahoComponentAutoConfiguration.java
@@ -25,6 +25,7 @@ import org.apache.camel.component.paho.PahoComponent;
 import org.apache.camel.spi.ComponentCustomizer;
 import org.apache.camel.spring.boot.CamelAutoConfiguration;
 import org.apache.camel.spring.boot.ComponentConfigurationProperties;
+import 
org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.GroupCondition;
 import org.apache.camel.util.IntrospectionSupport;
 import org.apache.camel.util.ObjectHelper;
@@ -32,9 +33,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
-import org.springframework.boot.autoconfigure.condition.AllNestedConditions;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import 
org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import 
org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
@@ -47,11 +46,12 @@ import org.springframework.context.annotation.Lazy;
  */
 @Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo")
 @Configuration
-@Conditional(PahoComponentAutoConfiguration.Condition.class)
+@Conditional({ConditionalOnCamelContextAndAutoConfigurationBeans.class,
+PahoComponentAutoConfiguration.GroupConditions.class})
 @AutoConfigureAfter(CamelAutoConfiguration.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,
 PahoComponentConfiguration.class})
-public class PahoComponentAutoConfiguration extends AllNestedConditions {
+public class PahoComponentAutoConfiguration {
 
 private static final Logger LOGGER = LoggerFactory
 .getLogger(PahoComponentAutoConfiguration.class);
@@ -64,27 +64,14 @@ public class PahoComponentAutoConfiguration extends 
AllNestedConditions {
 @Autowired
 private PahoComponentConfiguration componentConfiguration;
 
-public PahoComponentAutoConfiguration() {
-super(ConfigurationPhase.REGISTER_BEAN);
-}
-
-@ConditionalOnBean(CamelContext.class)
-public static class OnCamelContext {
-}
-
-@ConditionalOnBean(CamelAutoConfiguration.class)
-public static class OnCamelAutoConfiguration {
-}
-
-public static class Condition extends GroupCondition {
-public Condition() {
+static class GroupConditions extends GroupCondition {
+public GroupConditions() {
 super("camel.component", "camel.component.paho");
 }
 }
 
 @Lazy
 @Bean(name = "paho-component")
-@ConditionalOnClass(CamelContext.class)
 @ConditionalOnMissingBean(PahoComponent.class)
 public PahoComponent configurePahoComponent() throws Exception {
 PahoComponent component = new PahoComponent();

http://git-wip-us.apache.org/repos/asf/camel/blob/cd54a966/platforms/spring-boot/components-starter/camel-pdf-starter/src/main/java/org/apache/camel/component/pdf/springboot/PdfComponentAutoConfiguration.java
--
diff --git 
a/platforms/spring-boot/components-starter/camel-pdf-starter/src/main/java/org/apache/camel/component/pdf/springboot/PdfComponentAutoConfiguration.java
 
b/platforms/spring-boot/components-starter/camel-pdf-starter/src/main/java/org/apache/camel/component/pdf/springboot/PdfComponentAutoConfiguration.java
index d0b50b1..5744d96 100644
--- 
a/platforms/spring-boot/components-starter/camel-pdf-starter/src/main/java/org/apache/camel/component/pdf/springboot/PdfComponentAutoConfiguration.java
+++ 
b/platforms/spring-boot/components-starter/camel-pdf-starter/src/main/java/org/apache/camel/component/pdf/springboot/PdfComponentAutoConfiguration.java
@@ -25,6 +25,7 @@ import org.apache.camel.component.pdf.PdfComponent;
 import org.apache.camel.spi.ComponentCustomizer;
 im

[14/16] camel git commit: Regen spring-boot components-starter

2017-05-20 Thread lburgazzoli

http://git-wip-us.apache.org/repos/asf/camel/blob/cd54a966/platforms/spring-boot/components-starter/camel-aws-starter/src/main/java/org/apache/camel/component/aws/sdb/springboot/SdbComponentAutoConfiguration.java
--
diff --git 
a/platforms/spring-boot/components-starter/camel-aws-starter/src/main/java/org/apache/camel/component/aws/sdb/springboot/SdbComponentAutoConfiguration.java
 
b/platforms/spring-boot/components-starter/camel-aws-starter/src/main/java/org/apache/camel/component/aws/sdb/springboot/SdbComponentAutoConfiguration.java
index b31381d..1cacacb 100644
--- 
a/platforms/spring-boot/components-starter/camel-aws-starter/src/main/java/org/apache/camel/component/aws/sdb/springboot/SdbComponentAutoConfiguration.java
+++ 
b/platforms/spring-boot/components-starter/camel-aws-starter/src/main/java/org/apache/camel/component/aws/sdb/springboot/SdbComponentAutoConfiguration.java
@@ -25,6 +25,7 @@ import org.apache.camel.component.aws.sdb.SdbComponent;
 import org.apache.camel.spi.ComponentCustomizer;
 import org.apache.camel.spring.boot.CamelAutoConfiguration;
 import org.apache.camel.spring.boot.ComponentConfigurationProperties;
+import 
org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.GroupCondition;
 import org.apache.camel.util.IntrospectionSupport;
 import org.apache.camel.util.ObjectHelper;
@@ -32,9 +33,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
-import org.springframework.boot.autoconfigure.condition.AllNestedConditions;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import 
org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import 
org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
@@ -47,11 +46,12 @@ import org.springframework.context.annotation.Lazy;
  */
 @Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo")
 @Configuration
-@Conditional(SdbComponentAutoConfiguration.Condition.class)
+@Conditional({ConditionalOnCamelContextAndAutoConfigurationBeans.class,
+SdbComponentAutoConfiguration.GroupConditions.class})
 @AutoConfigureAfter(CamelAutoConfiguration.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,
 SdbComponentConfiguration.class})
-public class SdbComponentAutoConfiguration extends AllNestedConditions {
+public class SdbComponentAutoConfiguration {
 
 private static final Logger LOGGER = LoggerFactory
 .getLogger(SdbComponentAutoConfiguration.class);
@@ -64,27 +64,14 @@ public class SdbComponentAutoConfiguration extends 
AllNestedConditions {
 @Autowired
 private SdbComponentConfiguration componentConfiguration;
 
-public SdbComponentAutoConfiguration() {
-super(ConfigurationPhase.REGISTER_BEAN);
-}
-
-@ConditionalOnBean(CamelContext.class)
-public static class OnCamelContext {
-}
-
-@ConditionalOnBean(CamelAutoConfiguration.class)
-public static class OnCamelAutoConfiguration {
-}
-
-public static class Condition extends GroupCondition {
-public Condition() {
+static class GroupConditions extends GroupCondition {
+public GroupConditions() {
 super("camel.component", "camel.component.aws-sdb");
 }
 }
 
 @Lazy
 @Bean(name = "aws-sdb-component")
-@ConditionalOnClass(CamelContext.class)
 @ConditionalOnMissingBean(SdbComponent.class)
 public SdbComponent configureSdbComponent() throws Exception {
 SdbComponent component = new SdbComponent();

http://git-wip-us.apache.org/repos/asf/camel/blob/cd54a966/platforms/spring-boot/components-starter/camel-aws-starter/src/main/java/org/apache/camel/component/aws/ses/springboot/SesComponentAutoConfiguration.java
--
diff --git 
a/platforms/spring-boot/components-starter/camel-aws-starter/src/main/java/org/apache/camel/component/aws/ses/springboot/SesComponentAutoConfiguration.java
 
b/platforms/spring-boot/components-starter/camel-aws-starter/src/main/java/org/apache/camel/component/aws/ses/springboot/SesComponentAutoConfiguration.java
index 742c777..da9954e 100644
--- 
a/platforms/spring-boot/components-starter/camel-aws-starter/src/main/java/org/apache/camel/component/aws/ses/springboot/SesComponentAutoConfiguration.java
+++ 
b/platforms/spring-boot/components-starter/camel-aws-starter/src/main/java/org/apache/camel/component/aws/ses/springboot/SesComponentAutoConfiguration.java
@@ -25,6 +25,7 @@ import org.apache.camel.component.aws.ses.SesComponent;
 import org.apache.camel.spi.C

[13/16] camel git commit: Regen spring-boot components-starter

2017-05-20 Thread lburgazzoli

http://git-wip-us.apache.org/repos/asf/camel/blob/cd54a966/platforms/spring-boot/components-starter/camel-castor-starter/src/main/java/org/apache/camel/dataformat/castor/springboot/CastorDataFormatAutoConfiguration.java
--
diff --git 
a/platforms/spring-boot/components-starter/camel-castor-starter/src/main/java/org/apache/camel/dataformat/castor/springboot/CastorDataFormatAutoConfiguration.java
 
b/platforms/spring-boot/components-starter/camel-castor-starter/src/main/java/org/apache/camel/dataformat/castor/springboot/CastorDataFormatAutoConfiguration.java
index 66a8cd3..d9b1f9d 100644
--- 
a/platforms/spring-boot/components-starter/camel-castor-starter/src/main/java/org/apache/camel/dataformat/castor/springboot/CastorDataFormatAutoConfiguration.java
+++ 
b/platforms/spring-boot/components-starter/camel-castor-starter/src/main/java/org/apache/camel/dataformat/castor/springboot/CastorDataFormatAutoConfiguration.java
@@ -29,6 +29,7 @@ import org.apache.camel.spi.DataFormatCustomizer;
 import org.apache.camel.spi.DataFormatFactory;
 import org.apache.camel.spring.boot.CamelAutoConfiguration;
 import org.apache.camel.spring.boot.DataFormatConfigurationProperties;
+import 
org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.GroupCondition;
 import org.apache.camel.util.IntrospectionSupport;
 import org.apache.camel.util.ObjectHelper;
@@ -36,9 +37,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
-import org.springframework.boot.autoconfigure.condition.AllNestedConditions;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import 
org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import 
org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
@@ -50,11 +49,12 @@ import org.springframework.context.annotation.Configuration;
  */
 @Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo")
 @Configuration
-@Conditional(CastorDataFormatAutoConfiguration.Condition.class)
+@Conditional({ConditionalOnCamelContextAndAutoConfigurationBeans.class,
+CastorDataFormatAutoConfiguration.GroupConditions.class})
 @AutoConfigureAfter(name = 
"org.apache.camel.spring.boot.CamelAutoConfiguration")
 @EnableConfigurationProperties({DataFormatConfigurationProperties.class,
 CastorDataFormatConfiguration.class})
-public class CastorDataFormatAutoConfiguration extends AllNestedConditions {
+public class CastorDataFormatAutoConfiguration {
 
 private static final Logger LOGGER = LoggerFactory
 .getLogger(CastorDataFormatAutoConfiguration.class);
@@ -67,31 +67,18 @@ public class CastorDataFormatAutoConfiguration extends 
AllNestedConditions {
 @Autowired
 private CastorDataFormatConfiguration dataformatConfiguration;
 
-public CastorDataFormatAutoConfiguration() {
-super(ConfigurationPhase.REGISTER_BEAN);
-}
-
-@ConditionalOnBean(CamelContext.class)
-public static class OnCamelContext {
-}
-
-@ConditionalOnBean(CamelAutoConfiguration.class)
-public static class OnCamelAutoConfiguration {
-}
-
-@ConditionalOnBean(CamelAutoConfiguration.class)
-public static class Condition extends GroupCondition {
-public Condition() {
+static class GroupConditions extends GroupCondition {
+public GroupConditions() {
 super("camel.dataformat", "camel.dataformat.castor");
 }
 }
 
 @Bean(name = "castor-dataformat-factory")
-@ConditionalOnClass(CamelContext.class)
 @ConditionalOnMissingBean(CastorDataFormat.class)
 public DataFormatFactory configureCastorDataFormatFactory()
 throws Exception {
 return new DataFormatFactory() {
+@Override
 public DataFormat newInstance() {
 CastorDataFormat dataformat = new CastorDataFormat();
 if (CamelContextAware.class

http://git-wip-us.apache.org/repos/asf/camel/blob/cd54a966/platforms/spring-boot/components-starter/camel-chronicle-starter/src/main/java/org/apache/camel/component/chronicle/engine/springboot/ChronicleEngineComponentAutoConfiguration.java
--
diff --git 
a/platforms/spring-boot/components-starter/camel-chronicle-starter/src/main/java/org/apache/camel/component/chronicle/engine/springboot/ChronicleEngineComponentAutoConfiguration.java
 
b/platforms/spring-boot/components-starter/camel-chronicle-starter/src/main/java/org/apache/camel/component/chronicle/engine/springboot/ChronicleEngineComponentAutoConfiguration.java
index 45

[09/16] camel git commit: Regen spring-boot components-starter

2017-05-20 Thread lburgazzoli

http://git-wip-us.apache.org/repos/asf/camel/blob/cd54a966/platforms/spring-boot/components-starter/camel-google-mail-starter/src/main/java/org/apache/camel/component/google/mail/springboot/GoogleMailComponentAutoConfiguration.java
--
diff --git 
a/platforms/spring-boot/components-starter/camel-google-mail-starter/src/main/java/org/apache/camel/component/google/mail/springboot/GoogleMailComponentAutoConfiguration.java
 
b/platforms/spring-boot/components-starter/camel-google-mail-starter/src/main/java/org/apache/camel/component/google/mail/springboot/GoogleMailComponentAutoConfiguration.java
index e8b433a..a78f345 100644
--- 
a/platforms/spring-boot/components-starter/camel-google-mail-starter/src/main/java/org/apache/camel/component/google/mail/springboot/GoogleMailComponentAutoConfiguration.java
+++ 
b/platforms/spring-boot/components-starter/camel-google-mail-starter/src/main/java/org/apache/camel/component/google/mail/springboot/GoogleMailComponentAutoConfiguration.java
@@ -25,6 +25,7 @@ import 
org.apache.camel.component.google.mail.GoogleMailComponent;
 import org.apache.camel.spi.ComponentCustomizer;
 import org.apache.camel.spring.boot.CamelAutoConfiguration;
 import org.apache.camel.spring.boot.ComponentConfigurationProperties;
+import 
org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.GroupCondition;
 import org.apache.camel.util.IntrospectionSupport;
 import org.apache.camel.util.ObjectHelper;
@@ -32,9 +33,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
-import org.springframework.boot.autoconfigure.condition.AllNestedConditions;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import 
org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import 
org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
@@ -47,11 +46,12 @@ import org.springframework.context.annotation.Lazy;
  */
 @Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo")
 @Configuration
-@Conditional(GoogleMailComponentAutoConfiguration.Condition.class)
+@Conditional({ConditionalOnCamelContextAndAutoConfigurationBeans.class,
+GoogleMailComponentAutoConfiguration.GroupConditions.class})
 @AutoConfigureAfter(CamelAutoConfiguration.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,
 GoogleMailComponentConfiguration.class})
-public class GoogleMailComponentAutoConfiguration extends AllNestedConditions {
+public class GoogleMailComponentAutoConfiguration {
 
 private static final Logger LOGGER = LoggerFactory
 .getLogger(GoogleMailComponentAutoConfiguration.class);
@@ -64,27 +64,14 @@ public class GoogleMailComponentAutoConfiguration extends 
AllNestedConditions {
 @Autowired
 private GoogleMailComponentConfiguration componentConfiguration;
 
-public GoogleMailComponentAutoConfiguration() {
-super(ConfigurationPhase.REGISTER_BEAN);
-}
-
-@ConditionalOnBean(CamelContext.class)
-public static class OnCamelContext {
-}
-
-@ConditionalOnBean(CamelAutoConfiguration.class)
-public static class OnCamelAutoConfiguration {
-}
-
-public static class Condition extends GroupCondition {
-public Condition() {
+static class GroupConditions extends GroupCondition {
+public GroupConditions() {
 super("camel.component", "camel.component.google-mail");
 }
 }
 
 @Lazy
 @Bean(name = "google-mail-component")
-@ConditionalOnClass(CamelContext.class)
 @ConditionalOnMissingBean(GoogleMailComponent.class)
 public GoogleMailComponent configureGoogleMailComponent() throws Exception 
{
 GoogleMailComponent component = new GoogleMailComponent();

http://git-wip-us.apache.org/repos/asf/camel/blob/cd54a966/platforms/spring-boot/components-starter/camel-google-pubsub-starter/src/main/java/org/apache/camel/component/google/pubsub/springboot/GooglePubsubComponentAutoConfiguration.java
--
diff --git 
a/platforms/spring-boot/components-starter/camel-google-pubsub-starter/src/main/java/org/apache/camel/component/google/pubsub/springboot/GooglePubsubComponentAutoConfiguration.java
 
b/platforms/spring-boot/components-starter/camel-google-pubsub-starter/src/main/java/org/apache/camel/component/google/pubsub/springboot/GooglePubsubComponentAutoConfiguration.java
index 6a844de..9467826 100644
--- 
a/platforms/spring-boot/components-starter/camel-google-pubsub-starter/src/main/java/org/apache/camel/component/google/pubsub/spring

[08/16] camel git commit: Regen spring-boot components-starter

2017-05-20 Thread lburgazzoli

http://git-wip-us.apache.org/repos/asf/camel/blob/cd54a966/platforms/spring-boot/components-starter/camel-hessian-starter/src/main/java/org/apache/camel/dataformat/hessian/springboot/HessianDataFormatAutoConfiguration.java
--
diff --git 
a/platforms/spring-boot/components-starter/camel-hessian-starter/src/main/java/org/apache/camel/dataformat/hessian/springboot/HessianDataFormatAutoConfiguration.java
 
b/platforms/spring-boot/components-starter/camel-hessian-starter/src/main/java/org/apache/camel/dataformat/hessian/springboot/HessianDataFormatAutoConfiguration.java
index db0d9b5..a409983 100644
--- 
a/platforms/spring-boot/components-starter/camel-hessian-starter/src/main/java/org/apache/camel/dataformat/hessian/springboot/HessianDataFormatAutoConfiguration.java
+++ 
b/platforms/spring-boot/components-starter/camel-hessian-starter/src/main/java/org/apache/camel/dataformat/hessian/springboot/HessianDataFormatAutoConfiguration.java
@@ -29,6 +29,7 @@ import org.apache.camel.spi.DataFormatCustomizer;
 import org.apache.camel.spi.DataFormatFactory;
 import org.apache.camel.spring.boot.CamelAutoConfiguration;
 import org.apache.camel.spring.boot.DataFormatConfigurationProperties;
+import 
org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.GroupCondition;
 import org.apache.camel.util.IntrospectionSupport;
 import org.apache.camel.util.ObjectHelper;
@@ -36,9 +37,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
-import org.springframework.boot.autoconfigure.condition.AllNestedConditions;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import 
org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import 
org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
@@ -50,11 +49,12 @@ import org.springframework.context.annotation.Configuration;
  */
 @Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo")
 @Configuration
-@Conditional(HessianDataFormatAutoConfiguration.Condition.class)
+@Conditional({ConditionalOnCamelContextAndAutoConfigurationBeans.class,
+HessianDataFormatAutoConfiguration.GroupConditions.class})
 @AutoConfigureAfter(name = 
"org.apache.camel.spring.boot.CamelAutoConfiguration")
 @EnableConfigurationProperties({DataFormatConfigurationProperties.class,
 HessianDataFormatConfiguration.class})
-public class HessianDataFormatAutoConfiguration extends AllNestedConditions {
+public class HessianDataFormatAutoConfiguration {
 
 private static final Logger LOGGER = LoggerFactory
 .getLogger(HessianDataFormatAutoConfiguration.class);
@@ -67,31 +67,18 @@ public class HessianDataFormatAutoConfiguration extends 
AllNestedConditions {
 @Autowired
 private HessianDataFormatConfiguration dataformatConfiguration;
 
-public HessianDataFormatAutoConfiguration() {
-super(ConfigurationPhase.REGISTER_BEAN);
-}
-
-@ConditionalOnBean(CamelContext.class)
-public static class OnCamelContext {
-}
-
-@ConditionalOnBean(CamelAutoConfiguration.class)
-public static class OnCamelAutoConfiguration {
-}
-
-@ConditionalOnBean(CamelAutoConfiguration.class)
-public static class Condition extends GroupCondition {
-public Condition() {
+static class GroupConditions extends GroupCondition {
+public GroupConditions() {
 super("camel.dataformat", "camel.dataformat.hessian");
 }
 }
 
 @Bean(name = "hessian-dataformat-factory")
-@ConditionalOnClass(CamelContext.class)
 @ConditionalOnMissingBean(HessianDataFormat.class)
 public DataFormatFactory configureHessianDataFormatFactory()
 throws Exception {
 return new DataFormatFactory() {
+@Override
 public DataFormat newInstance() {
 HessianDataFormat dataformat = new HessianDataFormat();
 if (CamelContextAware.class

http://git-wip-us.apache.org/repos/asf/camel/blob/cd54a966/platforms/spring-boot/components-starter/camel-hipchat-starter/src/main/java/org/apache/camel/component/hipchat/springboot/HipchatComponentAutoConfiguration.java
--
diff --git 
a/platforms/spring-boot/components-starter/camel-hipchat-starter/src/main/java/org/apache/camel/component/hipchat/springboot/HipchatComponentAutoConfiguration.java
 
b/platforms/spring-boot/components-starter/camel-hipchat-starter/src/main/java/org/apache/camel/component/hipchat/springboot/HipchatComponentAutoConfiguration.java
index 045eb7c..96cf954 100644
---

[07/16] camel git commit: Regen spring-boot components-starter

2017-05-20 Thread lburgazzoli

http://git-wip-us.apache.org/repos/asf/camel/blob/cd54a966/platforms/spring-boot/components-starter/camel-jaxb-starter/src/main/java/org/apache/camel/converter/jaxb/springboot/JaxbDataFormatAutoConfiguration.java
--
diff --git 
a/platforms/spring-boot/components-starter/camel-jaxb-starter/src/main/java/org/apache/camel/converter/jaxb/springboot/JaxbDataFormatAutoConfiguration.java
 
b/platforms/spring-boot/components-starter/camel-jaxb-starter/src/main/java/org/apache/camel/converter/jaxb/springboot/JaxbDataFormatAutoConfiguration.java
index bb5b528..0f7f2de 100644
--- 
a/platforms/spring-boot/components-starter/camel-jaxb-starter/src/main/java/org/apache/camel/converter/jaxb/springboot/JaxbDataFormatAutoConfiguration.java
+++ 
b/platforms/spring-boot/components-starter/camel-jaxb-starter/src/main/java/org/apache/camel/converter/jaxb/springboot/JaxbDataFormatAutoConfiguration.java
@@ -29,6 +29,7 @@ import org.apache.camel.spi.DataFormatCustomizer;
 import org.apache.camel.spi.DataFormatFactory;
 import org.apache.camel.spring.boot.CamelAutoConfiguration;
 import org.apache.camel.spring.boot.DataFormatConfigurationProperties;
+import 
org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.GroupCondition;
 import org.apache.camel.util.IntrospectionSupport;
 import org.apache.camel.util.ObjectHelper;
@@ -36,9 +37,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
-import org.springframework.boot.autoconfigure.condition.AllNestedConditions;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import 
org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import 
org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
@@ -50,11 +49,12 @@ import org.springframework.context.annotation.Configuration;
  */
 @Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo")
 @Configuration
-@Conditional(JaxbDataFormatAutoConfiguration.Condition.class)
+@Conditional({ConditionalOnCamelContextAndAutoConfigurationBeans.class,
+JaxbDataFormatAutoConfiguration.GroupConditions.class})
 @AutoConfigureAfter(name = 
"org.apache.camel.spring.boot.CamelAutoConfiguration")
 @EnableConfigurationProperties({DataFormatConfigurationProperties.class,
 JaxbDataFormatConfiguration.class})
-public class JaxbDataFormatAutoConfiguration extends AllNestedConditions {
+public class JaxbDataFormatAutoConfiguration {
 
 private static final Logger LOGGER = LoggerFactory
 .getLogger(JaxbDataFormatAutoConfiguration.class);
@@ -67,30 +67,17 @@ public class JaxbDataFormatAutoConfiguration extends 
AllNestedConditions {
 @Autowired
 private JaxbDataFormatConfiguration dataformatConfiguration;
 
-public JaxbDataFormatAutoConfiguration() {
-super(ConfigurationPhase.REGISTER_BEAN);
-}
-
-@ConditionalOnBean(CamelContext.class)
-public static class OnCamelContext {
-}
-
-@ConditionalOnBean(CamelAutoConfiguration.class)
-public static class OnCamelAutoConfiguration {
-}
-
-@ConditionalOnBean(CamelAutoConfiguration.class)
-public static class Condition extends GroupCondition {
-public Condition() {
+static class GroupConditions extends GroupCondition {
+public GroupConditions() {
 super("camel.dataformat", "camel.dataformat.jaxb");
 }
 }
 
 @Bean(name = "jaxb-dataformat-factory")
-@ConditionalOnClass(CamelContext.class)
 @ConditionalOnMissingBean(JaxbDataFormat.class)
 public DataFormatFactory configureJaxbDataFormatFactory() throws Exception 
{
 return new DataFormatFactory() {
+@Override
 public DataFormat newInstance() {
 JaxbDataFormat dataformat = new JaxbDataFormat();
 if (CamelContextAware.class

http://git-wip-us.apache.org/repos/asf/camel/blob/cd54a966/platforms/spring-boot/components-starter/camel-jbpm-starter/src/main/java/org/apache/camel/component/jbpm/springboot/JBPMComponentAutoConfiguration.java
--
diff --git 
a/platforms/spring-boot/components-starter/camel-jbpm-starter/src/main/java/org/apache/camel/component/jbpm/springboot/JBPMComponentAutoConfiguration.java
 
b/platforms/spring-boot/components-starter/camel-jbpm-starter/src/main/java/org/apache/camel/component/jbpm/springboot/JBPMComponentAutoConfiguration.java
index b9ae50d..6f29dda 100644
--- 
a/platforms/spring-boot/components-starter/camel-jbpm-starter/src/main/java/org/apache/camel/component/jbpm/springboot/JBPMComponentAu

[03/16] camel git commit: Regen spring-boot components-starter

2017-05-20 Thread lburgazzoli

http://git-wip-us.apache.org/repos/asf/camel/blob/cd54a966/platforms/spring-boot/components-starter/camel-saxon-starter/src/main/java/org/apache/camel/language/xquery/springboot/XQueryLanguageAutoConfiguration.java
--
diff --git 
a/platforms/spring-boot/components-starter/camel-saxon-starter/src/main/java/org/apache/camel/language/xquery/springboot/XQueryLanguageAutoConfiguration.java
 
b/platforms/spring-boot/components-starter/camel-saxon-starter/src/main/java/org/apache/camel/language/xquery/springboot/XQueryLanguageAutoConfiguration.java
index 64d1f67..cd18ed7 100644
--- 
a/platforms/spring-boot/components-starter/camel-saxon-starter/src/main/java/org/apache/camel/language/xquery/springboot/XQueryLanguageAutoConfiguration.java
+++ 
b/platforms/spring-boot/components-starter/camel-saxon-starter/src/main/java/org/apache/camel/language/xquery/springboot/XQueryLanguageAutoConfiguration.java
@@ -26,16 +26,16 @@ import org.apache.camel.language.xquery.XQueryLanguage;
 import org.apache.camel.spi.LanguageCustomizer;
 import org.apache.camel.spring.boot.CamelAutoConfiguration;
 import org.apache.camel.spring.boot.LanguageConfigurationProperties;
+import 
org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.GroupCondition;
 import org.apache.camel.util.IntrospectionSupport;
 import org.apache.camel.util.ObjectHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.config.ConfigurableBeanFactory;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
-import org.springframework.boot.autoconfigure.condition.AllNestedConditions;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import 
org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import 
org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
@@ -48,11 +48,12 @@ import org.springframework.context.annotation.Scope;
  */
 @Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo")
 @Configuration
-@Conditional(XQueryLanguageAutoConfiguration.Condition.class)
+@Conditional({ConditionalOnCamelContextAndAutoConfigurationBeans.class,
+XQueryLanguageAutoConfiguration.GroupConditions.class})
 @AutoConfigureAfter(CamelAutoConfiguration.class)
 @EnableConfigurationProperties({LanguageConfigurationProperties.class,
 XQueryLanguageConfiguration.class})
-public class XQueryLanguageAutoConfiguration extends AllNestedConditions {
+public class XQueryLanguageAutoConfiguration {
 
 private static final Logger LOGGER = LoggerFactory
 .getLogger(XQueryLanguageAutoConfiguration.class);
@@ -65,28 +66,14 @@ public class XQueryLanguageAutoConfiguration extends 
AllNestedConditions {
 @Autowired
 private XQueryLanguageConfiguration languageConfiguration;
 
-public XQueryLanguageAutoConfiguration() {
-super(ConfigurationPhase.REGISTER_BEAN);
-}
-
-@ConditionalOnBean(CamelContext.class)
-public static class OnCamelContext {
-}
-
-@ConditionalOnBean(CamelAutoConfiguration.class)
-public static class OnCamelAutoConfiguration {
-}
-
-@ConditionalOnBean(CamelAutoConfiguration.class)
-public static class Condition extends GroupCondition {
-public Condition() {
+static class GroupConditions extends GroupCondition {
+public GroupConditions() {
 super("camel.component", "camel.component.xquery");
 }
 }
 
 @Bean(name = "xquery-language")
-@Scope("prototype")
-@ConditionalOnClass(CamelContext.class)
+@Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
 @ConditionalOnMissingBean(XQueryLanguage.class)
 public XQueryLanguage configureXQueryLanguage() throws Exception {
 XQueryLanguage language = new XQueryLanguage();

http://git-wip-us.apache.org/repos/asf/camel/blob/cd54a966/platforms/spring-boot/components-starter/camel-schematron-starter/src/main/java/org/apache/camel/component/schematron/springboot/SchematronComponentAutoConfiguration.java
--
diff --git 
a/platforms/spring-boot/components-starter/camel-schematron-starter/src/main/java/org/apache/camel/component/schematron/springboot/SchematronComponentAutoConfiguration.java
 
b/platforms/spring-boot/components-starter/camel-schematron-starter/src/main/java/org/apache/camel/component/schematron/springboot/SchematronComponentAutoConfiguration.java
index 3a5b076..5b7831e 100644
--- 
a/platforms/spring-boot/components-starter/camel-schematron-starter/src/main/java/org/apache/camel/component/schematron/springboot/SchematronComponentAutoConfi

[15/16] camel git commit: Regen spring-boot components-starter

2017-05-20 Thread lburgazzoli

Regen spring-boot components-starter


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

Branch: refs/heads/master
Commit: cd54a9665de1f0dddfa343a4d2fbe260769880bf
Parents: 545f3f7
Author: lburgazzoli 
Authored: Sat May 20 18:37:03 2017 +0200
Committer: lburgazzoli 
Committed: Sat May 20 18:37:43 2017 +0200

--
 .../AhcComponentAutoConfiguration.java  | 25 +++--
 .../WsComponentAutoConfiguration.java   | 25 +++--
 .../AMQPComponentAutoConfiguration.java | 25 +++--
 .../ApnsComponentAutoConfiguration.java | 25 +++--
 .../AsteriskComponentAutoConfiguration.java | 25 +++--
 .../AtmosComponentAutoConfiguration.java| 25 +++--
 .../WebsocketComponentAutoConfiguration.java| 25 +++--
 .../AtomComponentAutoConfiguration.java | 25 +++--
 .../AvroComponentAutoConfiguration.java | 25 +++--
 .../AvroDataFormatAutoConfiguration.java| 27 +++---
 .../CwComponentAutoConfiguration.java   | 25 +++--
 .../DdbComponentAutoConfiguration.java  | 25 +++--
 .../DdbStreamComponentAutoConfiguration.java| 25 +++--
 .../EC2ComponentAutoConfiguration.java  | 25 +++--
 ...nesisFirehoseComponentAutoConfiguration.java | 27 +++---
 .../KinesisComponentAutoConfiguration.java  | 25 +++--
 .../S3ComponentAutoConfiguration.java   | 25 +++--
 .../SdbComponentAutoConfiguration.java  | 25 +++--
 .../SesComponentAutoConfiguration.java  | 25 +++--
 .../SnsComponentAutoConfiguration.java  | 25 +++--
 .../SqsComponentAutoConfiguration.java  | 25 +++--
 .../SWFComponentAutoConfiguration.java  | 25 +++--
 .../BlobServiceComponentAutoConfiguration.java  | 25 +++--
 .../QueueServiceComponentAutoConfiguration.java | 25 +++--
 .../BarcodeDataFormatAutoConfiguration.java | 27 +++---
 .../Base64DataFormatAutoConfiguration.java  | 27 +++---
 ...BeanValidatorComponentAutoConfiguration.java | 27 +++---
 .../BeanIODataFormatAutoConfiguration.java  | 27 +++---
 .../BeanstalkComponentAutoConfiguration.java| 25 +++--
 .../BindyCsvDataFormatAutoConfiguration.java| 27 +++---
 ...yFixedLengthDataFormatAutoConfiguration.java | 29 +++
 ...KeyValuePairDataFormatAutoConfiguration.java | 29 +++
 .../BonitaComponentAutoConfiguration.java   | 25 +++--
 .../BoonDataFormatAutoConfiguration.java| 27 +++---
 .../BoxComponentAutoConfiguration.java  | 25 +++--
 .../BraintreeComponentAutoConfiguration.java| 25 +++--
 .../CacheComponentAutoConfiguration.java| 25 +++--
 .../CassandraComponentAutoConfiguration.java| 25 +++--
 .../CastorDataFormatAutoConfiguration.java  | 27 +++---
 ...ronicleEngineComponentAutoConfiguration.java | 27 +++---
 .../ChunkComponentAutoConfiguration.java| 25 +++--
 .../CMComponentAutoConfiguration.java   | 25 +++--
 .../CMISComponentAutoConfiguration.java | 25 +++--
 .../CoAPComponentAutoConfiguration.java | 25 +++--
 .../CometdComponentAutoConfiguration.java   | 25 +++--
 .../ConsulComponentAutoConfiguration.java   | 25 +++--
 ...lifiedContextComponentAutoConfiguration.java | 27 +++---
 .../BeanComponentAutoConfiguration.java | 25 +++--
 .../ClassComponentAutoConfiguration.java| 25 +++--
 .../BindingNameComponentAutoConfiguration.java  | 25 +++--
 .../BrowseComponentAutoConfiguration.java   | 25 +++--
 .../ControlBusComponentAutoConfiguration.java   | 25 +++--
 .../DataFormatComponentAutoConfiguration.java   | 25 +++--
 .../DataSetComponentAutoConfiguration.java  | 25 +++--
 .../DirectComponentAutoConfiguration.java   | 25 +++--
 .../DirectVmComponentAutoConfiguration.java | 25 +++--
 .../FileComponentAutoConfiguration.java | 25 +++--
 .../LanguageComponentAutoConfiguration.java | 25 +++--
 .../LogComponentAutoConfiguration.java  | 25 +++--
 .../MockComponentAutoConfiguration.java | 25 +++--
 .../PropertiesComponentAutoConfiguration.java   | 25 +++--
 .../RefComponentAutoConfiguration.java  | 25 +++--
 .../RestApiComponentAutoConfiguration.java  | 25 +++--
 .../RestComponentAutoConfiguration.java | 25 +++--
 .../SchedulerComponentAutoConfiguration.java| 25 +++--
 .../SedaComponentAutoConfiguration.java | 25 +++--
 .../StubComponentAutoConfiguration.java | 25 +++--
 .../TestComponentAutoConfiguration.java | 25 +++--
 .../TimerComponentAutoConfiguration.java

[11/16] camel git commit: Regen spring-boot components-starter

2017-05-20 Thread lburgazzoli

http://git-wip-us.apache.org/repos/asf/camel/blob/cd54a966/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/simple/springboot/SimpleLanguageAutoConfiguration.java
--
diff --git 
a/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/simple/springboot/SimpleLanguageAutoConfiguration.java
 
b/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/simple/springboot/SimpleLanguageAutoConfiguration.java
index d0fbc8e..9f46faf 100644
--- 
a/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/simple/springboot/SimpleLanguageAutoConfiguration.java
+++ 
b/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/simple/springboot/SimpleLanguageAutoConfiguration.java
@@ -26,16 +26,16 @@ import org.apache.camel.language.simple.SimpleLanguage;
 import org.apache.camel.spi.LanguageCustomizer;
 import org.apache.camel.spring.boot.CamelAutoConfiguration;
 import org.apache.camel.spring.boot.LanguageConfigurationProperties;
+import 
org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.GroupCondition;
 import org.apache.camel.util.IntrospectionSupport;
 import org.apache.camel.util.ObjectHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.config.ConfigurableBeanFactory;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
-import org.springframework.boot.autoconfigure.condition.AllNestedConditions;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import 
org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import 
org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
@@ -48,11 +48,12 @@ import org.springframework.context.annotation.Scope;
  */
 @Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo")
 @Configuration
-@Conditional(SimpleLanguageAutoConfiguration.Condition.class)
+@Conditional({ConditionalOnCamelContextAndAutoConfigurationBeans.class,
+SimpleLanguageAutoConfiguration.GroupConditions.class})
 @AutoConfigureAfter(CamelAutoConfiguration.class)
 @EnableConfigurationProperties({LanguageConfigurationProperties.class,
 SimpleLanguageConfiguration.class})
-public class SimpleLanguageAutoConfiguration extends AllNestedConditions {
+public class SimpleLanguageAutoConfiguration {
 
 private static final Logger LOGGER = LoggerFactory
 .getLogger(SimpleLanguageAutoConfiguration.class);
@@ -65,28 +66,14 @@ public class SimpleLanguageAutoConfiguration extends 
AllNestedConditions {
 @Autowired
 private SimpleLanguageConfiguration languageConfiguration;
 
-public SimpleLanguageAutoConfiguration() {
-super(ConfigurationPhase.REGISTER_BEAN);
-}
-
-@ConditionalOnBean(CamelContext.class)
-public static class OnCamelContext {
-}
-
-@ConditionalOnBean(CamelAutoConfiguration.class)
-public static class OnCamelAutoConfiguration {
-}
-
-@ConditionalOnBean(CamelAutoConfiguration.class)
-public static class Condition extends GroupCondition {
-public Condition() {
+static class GroupConditions extends GroupCondition {
+public GroupConditions() {
 super("camel.component", "camel.component.simple");
 }
 }
 
 @Bean(name = "simple-language")
-@Scope("prototype")
-@ConditionalOnClass(CamelContext.class)
+@Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
 @ConditionalOnMissingBean(SimpleLanguage.class)
 public SimpleLanguage configureSimpleLanguage() throws Exception {
 SimpleLanguage language = new SimpleLanguage();

http://git-wip-us.apache.org/repos/asf/camel/blob/cd54a966/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/tokenizer/springboot/TokenizeLanguageAutoConfiguration.java
--
diff --git 
a/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/tokenizer/springboot/TokenizeLanguageAutoConfiguration.java
 
b/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/tokenizer/springboot/TokenizeLanguageAutoConfiguration.java
index 0a38257..bea928e 100644
--- 
a/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/language/tokenizer/springboot/TokenizeLanguageAutoConfiguration.java
+++ 
b/platforms/spring-boot/compon

[01/16] camel git commit: Regen spring-boot components-starter

2017-05-20 Thread lburgazzoli

Repository: camel
Updated Branches:
  refs/heads/master c3d7668ca -> cd54a9665


http://git-wip-us.apache.org/repos/asf/camel/blob/cd54a966/platforms/spring-boot/components-starter/camel-univocity-parsers-starter/src/main/java/org/apache/camel/dataformat/univocity/springboot/UniVocityFixedWidthDataFormatAutoConfiguration.java
--
diff --git 
a/platforms/spring-boot/components-starter/camel-univocity-parsers-starter/src/main/java/org/apache/camel/dataformat/univocity/springboot/UniVocityFixedWidthDataFormatAutoConfiguration.java
 
b/platforms/spring-boot/components-starter/camel-univocity-parsers-starter/src/main/java/org/apache/camel/dataformat/univocity/springboot/UniVocityFixedWidthDataFormatAutoConfiguration.java
index 9d66cd3..95c5064 100644
--- 
a/platforms/spring-boot/components-starter/camel-univocity-parsers-starter/src/main/java/org/apache/camel/dataformat/univocity/springboot/UniVocityFixedWidthDataFormatAutoConfiguration.java
+++ 
b/platforms/spring-boot/components-starter/camel-univocity-parsers-starter/src/main/java/org/apache/camel/dataformat/univocity/springboot/UniVocityFixedWidthDataFormatAutoConfiguration.java
@@ -29,6 +29,7 @@ import org.apache.camel.spi.DataFormatCustomizer;
 import org.apache.camel.spi.DataFormatFactory;
 import org.apache.camel.spring.boot.CamelAutoConfiguration;
 import org.apache.camel.spring.boot.DataFormatConfigurationProperties;
+import 
org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.GroupCondition;
 import org.apache.camel.util.IntrospectionSupport;
 import org.apache.camel.util.ObjectHelper;
@@ -36,9 +37,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
-import org.springframework.boot.autoconfigure.condition.AllNestedConditions;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import 
org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import 
org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
@@ -50,13 +49,12 @@ import org.springframework.context.annotation.Configuration;
  */
 @Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo")
 @Configuration
-@Conditional(UniVocityFixedWidthDataFormatAutoConfiguration.Condition.class)
+@Conditional({ConditionalOnCamelContextAndAutoConfigurationBeans.class,
+UniVocityFixedWidthDataFormatAutoConfiguration.GroupConditions.class})
 @AutoConfigureAfter(name = 
"org.apache.camel.spring.boot.CamelAutoConfiguration")
 @EnableConfigurationProperties({DataFormatConfigurationProperties.class,
 UniVocityFixedWidthDataFormatConfiguration.class})
-public class UniVocityFixedWidthDataFormatAutoConfiguration
-extends
-AllNestedConditions {
+public class UniVocityFixedWidthDataFormatAutoConfiguration {
 
 private static final Logger LOGGER = LoggerFactory
 .getLogger(UniVocityFixedWidthDataFormatAutoConfiguration.class);
@@ -69,31 +67,18 @@ public class UniVocityFixedWidthDataFormatAutoConfiguration
 @Autowired
 private UniVocityFixedWidthDataFormatConfiguration dataformatConfiguration;
 
-public UniVocityFixedWidthDataFormatAutoConfiguration() {
-super(ConfigurationPhase.REGISTER_BEAN);
-}
-
-@ConditionalOnBean(CamelContext.class)
-public static class OnCamelContext {
-}
-
-@ConditionalOnBean(CamelAutoConfiguration.class)
-public static class OnCamelAutoConfiguration {
-}
-
-@ConditionalOnBean(CamelAutoConfiguration.class)
-public static class Condition extends GroupCondition {
-public Condition() {
+static class GroupConditions extends GroupCondition {
+public GroupConditions() {
 super("camel.dataformat", "camel.dataformat.univocity-fixed");
 }
 }
 
 @Bean(name = "univocity-fixed-dataformat-factory")
-@ConditionalOnClass(CamelContext.class)
 @ConditionalOnMissingBean(UniVocityFixedWidthDataFormat.class)
 public DataFormatFactory configureUniVocityFixedWidthDataFormatFactory()
 throws Exception {
 return new DataFormatFactory() {
+@Override
 public DataFormat newInstance() {
 UniVocityFixedWidthDataFormat dataformat = new 
UniVocityFixedWidthDataFormat();
 if (CamelContextAware.class

http://git-wip-us.apache.org/repos/asf/camel/blob/cd54a966/platforms/spring-boot/components-starter/camel-univocity-parsers-starter/src/main/java/org/apache/camel/dataformat/univocity/springboot/UniVocityTsvDataFormatAutoConfiguration.java

[05/16] camel git commit: Regen spring-boot components-starter

2017-05-20 Thread lburgazzoli

http://git-wip-us.apache.org/repos/asf/camel/blob/cd54a966/platforms/spring-boot/components-starter/camel-mvel-starter/src/main/java/org/apache/camel/language/mvel/springboot/MvelLanguageAutoConfiguration.java
--
diff --git 
a/platforms/spring-boot/components-starter/camel-mvel-starter/src/main/java/org/apache/camel/language/mvel/springboot/MvelLanguageAutoConfiguration.java
 
b/platforms/spring-boot/components-starter/camel-mvel-starter/src/main/java/org/apache/camel/language/mvel/springboot/MvelLanguageAutoConfiguration.java
index e43763a..29124e8 100644
--- 
a/platforms/spring-boot/components-starter/camel-mvel-starter/src/main/java/org/apache/camel/language/mvel/springboot/MvelLanguageAutoConfiguration.java
+++ 
b/platforms/spring-boot/components-starter/camel-mvel-starter/src/main/java/org/apache/camel/language/mvel/springboot/MvelLanguageAutoConfiguration.java
@@ -26,16 +26,16 @@ import org.apache.camel.language.mvel.MvelLanguage;
 import org.apache.camel.spi.LanguageCustomizer;
 import org.apache.camel.spring.boot.CamelAutoConfiguration;
 import org.apache.camel.spring.boot.LanguageConfigurationProperties;
+import 
org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.GroupCondition;
 import org.apache.camel.util.IntrospectionSupport;
 import org.apache.camel.util.ObjectHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.config.ConfigurableBeanFactory;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
-import org.springframework.boot.autoconfigure.condition.AllNestedConditions;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import 
org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import 
org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
@@ -48,11 +48,12 @@ import org.springframework.context.annotation.Scope;
  */
 @Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo")
 @Configuration
-@Conditional(MvelLanguageAutoConfiguration.Condition.class)
+@Conditional({ConditionalOnCamelContextAndAutoConfigurationBeans.class,
+MvelLanguageAutoConfiguration.GroupConditions.class})
 @AutoConfigureAfter(CamelAutoConfiguration.class)
 @EnableConfigurationProperties({LanguageConfigurationProperties.class,
 MvelLanguageConfiguration.class})
-public class MvelLanguageAutoConfiguration extends AllNestedConditions {
+public class MvelLanguageAutoConfiguration {
 
 private static final Logger LOGGER = LoggerFactory
 .getLogger(MvelLanguageAutoConfiguration.class);
@@ -65,28 +66,14 @@ public class MvelLanguageAutoConfiguration extends 
AllNestedConditions {
 @Autowired
 private MvelLanguageConfiguration languageConfiguration;
 
-public MvelLanguageAutoConfiguration() {
-super(ConfigurationPhase.REGISTER_BEAN);
-}
-
-@ConditionalOnBean(CamelContext.class)
-public static class OnCamelContext {
-}
-
-@ConditionalOnBean(CamelAutoConfiguration.class)
-public static class OnCamelAutoConfiguration {
-}
-
-@ConditionalOnBean(CamelAutoConfiguration.class)
-public static class Condition extends GroupCondition {
-public Condition() {
+static class GroupConditions extends GroupCondition {
+public GroupConditions() {
 super("camel.component", "camel.component.mvel");
 }
 }
 
 @Bean(name = "mvel-language")
-@Scope("prototype")
-@ConditionalOnClass(CamelContext.class)
+@Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
 @ConditionalOnMissingBean(MvelLanguage.class)
 public MvelLanguage configureMvelLanguage() throws Exception {
 MvelLanguage language = new MvelLanguage();

http://git-wip-us.apache.org/repos/asf/camel/blob/cd54a966/platforms/spring-boot/components-starter/camel-mybatis-starter/src/main/java/org/apache/camel/component/mybatis/springboot/MyBatisComponentAutoConfiguration.java
--
diff --git 
a/platforms/spring-boot/components-starter/camel-mybatis-starter/src/main/java/org/apache/camel/component/mybatis/springboot/MyBatisComponentAutoConfiguration.java
 
b/platforms/spring-boot/components-starter/camel-mybatis-starter/src/main/java/org/apache/camel/component/mybatis/springboot/MyBatisComponentAutoConfiguration.java
index a01e0bd..5294480 100644
--- 
a/platforms/spring-boot/components-starter/camel-mybatis-starter/src/main/java/org/apache/camel/component/mybatis/springboot/MyBatisComponentAutoConfiguration.java
+++ 
b/platforms/spring-boot/components-starter/camel-mybatis-starter/src/main/java

[06/16] camel git commit: Regen spring-boot components-starter

2017-05-20 Thread lburgazzoli

http://git-wip-us.apache.org/repos/asf/camel/blob/cd54a966/platforms/spring-boot/components-starter/camel-kestrel-starter/src/main/java/org/apache/camel/component/kestrel/springboot/KestrelComponentAutoConfiguration.java
--
diff --git 
a/platforms/spring-boot/components-starter/camel-kestrel-starter/src/main/java/org/apache/camel/component/kestrel/springboot/KestrelComponentAutoConfiguration.java
 
b/platforms/spring-boot/components-starter/camel-kestrel-starter/src/main/java/org/apache/camel/component/kestrel/springboot/KestrelComponentAutoConfiguration.java
index a591369..84112b2 100644
--- 
a/platforms/spring-boot/components-starter/camel-kestrel-starter/src/main/java/org/apache/camel/component/kestrel/springboot/KestrelComponentAutoConfiguration.java
+++ 
b/platforms/spring-boot/components-starter/camel-kestrel-starter/src/main/java/org/apache/camel/component/kestrel/springboot/KestrelComponentAutoConfiguration.java
@@ -25,6 +25,7 @@ import org.apache.camel.component.kestrel.KestrelComponent;
 import org.apache.camel.spi.ComponentCustomizer;
 import org.apache.camel.spring.boot.CamelAutoConfiguration;
 import org.apache.camel.spring.boot.ComponentConfigurationProperties;
+import 
org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.GroupCondition;
 import org.apache.camel.util.IntrospectionSupport;
 import org.apache.camel.util.ObjectHelper;
@@ -32,9 +33,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
-import org.springframework.boot.autoconfigure.condition.AllNestedConditions;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import 
org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import 
org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
@@ -47,11 +46,12 @@ import org.springframework.context.annotation.Lazy;
  */
 @Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo")
 @Configuration
-@Conditional(KestrelComponentAutoConfiguration.Condition.class)
+@Conditional({ConditionalOnCamelContextAndAutoConfigurationBeans.class,
+KestrelComponentAutoConfiguration.GroupConditions.class})
 @AutoConfigureAfter(CamelAutoConfiguration.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,
 KestrelComponentConfiguration.class})
-public class KestrelComponentAutoConfiguration extends AllNestedConditions {
+public class KestrelComponentAutoConfiguration {
 
 private static final Logger LOGGER = LoggerFactory
 .getLogger(KestrelComponentAutoConfiguration.class);
@@ -64,27 +64,14 @@ public class KestrelComponentAutoConfiguration extends 
AllNestedConditions {
 @Autowired
 private KestrelComponentConfiguration componentConfiguration;
 
-public KestrelComponentAutoConfiguration() {
-super(ConfigurationPhase.REGISTER_BEAN);
-}
-
-@ConditionalOnBean(CamelContext.class)
-public static class OnCamelContext {
-}
-
-@ConditionalOnBean(CamelAutoConfiguration.class)
-public static class OnCamelAutoConfiguration {
-}
-
-public static class Condition extends GroupCondition {
-public Condition() {
+static class GroupConditions extends GroupCondition {
+public GroupConditions() {
 super("camel.component", "camel.component.kestrel");
 }
 }
 
 @Lazy
 @Bean(name = "kestrel-component")
-@ConditionalOnClass(CamelContext.class)
 @ConditionalOnMissingBean(KestrelComponent.class)
 public KestrelComponent configureKestrelComponent() throws Exception {
 KestrelComponent component = new KestrelComponent();

http://git-wip-us.apache.org/repos/asf/camel/blob/cd54a966/platforms/spring-boot/components-starter/camel-krati-starter/src/main/java/org/apache/camel/component/krati/springboot/KratiComponentAutoConfiguration.java
--
diff --git 
a/platforms/spring-boot/components-starter/camel-krati-starter/src/main/java/org/apache/camel/component/krati/springboot/KratiComponentAutoConfiguration.java
 
b/platforms/spring-boot/components-starter/camel-krati-starter/src/main/java/org/apache/camel/component/krati/springboot/KratiComponentAutoConfiguration.java
index b394541..703d8c7 100644
--- 
a/platforms/spring-boot/components-starter/camel-krati-starter/src/main/java/org/apache/camel/component/krati/springboot/KratiComponentAutoConfiguration.java
+++ 
b/platforms/spring-boot/components-starter/camel-krati-starter/src/main/java/org/apache/camel/component/krati/springboot/KratiComponentAutoConfiguration

[12/16] camel git commit: Regen spring-boot components-starter

2017-05-20 Thread lburgazzoli

http://git-wip-us.apache.org/repos/asf/camel/blob/cd54a966/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/properties/springboot/PropertiesComponentAutoConfiguration.java
--
diff --git 
a/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/properties/springboot/PropertiesComponentAutoConfiguration.java
 
b/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/properties/springboot/PropertiesComponentAutoConfiguration.java
index 11d8b9f..0867c37 100644
--- 
a/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/properties/springboot/PropertiesComponentAutoConfiguration.java
+++ 
b/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/properties/springboot/PropertiesComponentAutoConfiguration.java
@@ -25,6 +25,7 @@ import 
org.apache.camel.component.properties.PropertiesComponent;
 import org.apache.camel.spi.ComponentCustomizer;
 import org.apache.camel.spring.boot.CamelAutoConfiguration;
 import org.apache.camel.spring.boot.ComponentConfigurationProperties;
+import 
org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.GroupCondition;
 import org.apache.camel.util.IntrospectionSupport;
 import org.apache.camel.util.ObjectHelper;
@@ -32,9 +33,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
-import org.springframework.boot.autoconfigure.condition.AllNestedConditions;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import 
org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import 
org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
@@ -47,11 +46,12 @@ import org.springframework.context.annotation.Lazy;
  */
 @Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo")
 @Configuration
-@Conditional(PropertiesComponentAutoConfiguration.Condition.class)
+@Conditional({ConditionalOnCamelContextAndAutoConfigurationBeans.class,
+PropertiesComponentAutoConfiguration.GroupConditions.class})
 @AutoConfigureAfter(CamelAutoConfiguration.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,
 PropertiesComponentConfiguration.class})
-public class PropertiesComponentAutoConfiguration extends AllNestedConditions {
+public class PropertiesComponentAutoConfiguration {
 
 private static final Logger LOGGER = LoggerFactory
 .getLogger(PropertiesComponentAutoConfiguration.class);
@@ -64,27 +64,14 @@ public class PropertiesComponentAutoConfiguration extends 
AllNestedConditions {
 @Autowired
 private PropertiesComponentConfiguration componentConfiguration;
 
-public PropertiesComponentAutoConfiguration() {
-super(ConfigurationPhase.REGISTER_BEAN);
-}
-
-@ConditionalOnBean(CamelContext.class)
-public static class OnCamelContext {
-}
-
-@ConditionalOnBean(CamelAutoConfiguration.class)
-public static class OnCamelAutoConfiguration {
-}
-
-public static class Condition extends GroupCondition {
-public Condition() {
+static class GroupConditions extends GroupCondition {
+public GroupConditions() {
 super("camel.component", "camel.component.properties");
 }
 }
 
 @Lazy
 @Bean(name = "properties-component")
-@ConditionalOnClass(CamelContext.class)
 @ConditionalOnMissingBean(PropertiesComponent.class)
 public PropertiesComponent configurePropertiesComponent() throws Exception 
{
 PropertiesComponent component = new PropertiesComponent();

http://git-wip-us.apache.org/repos/asf/camel/blob/cd54a966/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/ref/springboot/RefComponentAutoConfiguration.java
--
diff --git 
a/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/ref/springboot/RefComponentAutoConfiguration.java
 
b/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/ref/springboot/RefComponentAutoConfiguration.java
index 4add425..8e1e763 100644
--- 
a/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/component/ref/springboot/RefComponentAutoConfiguration.java
+++ 
b/platforms/spring-boot/components-starter/camel-core-starter/src/main/java/org/apache/camel/componen

[16/16] camel git commit: Review the usage of AllNestedConditions for components-starter code auto generation

2017-05-20 Thread lburgazzoli

Review the usage of AllNestedConditions for components-starter code auto 
generation


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

Branch: refs/heads/master
Commit: 545f3f791c03f48906361e00197266f5ade7c768
Parents: c3d7668
Author: lburgazzoli 
Authored: Sat May 20 18:36:32 2017 +0200
Committer: lburgazzoli 
Committed: Sat May 20 18:37:43 2017 +0200

--
 ...OnCamelContextAndAutoConfigurationBeans.java |  36 ++
 .../SpringBootAutoConfigurationMojo.java| 119 +--
 2 files changed, 63 insertions(+), 92 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/545f3f79/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/util/ConditionalOnCamelContextAndAutoConfigurationBeans.java
--
diff --git 
a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/util/ConditionalOnCamelContextAndAutoConfigurationBeans.java
 
b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/util/ConditionalOnCamelContextAndAutoConfigurationBeans.java
new file mode 100644
index 000..c7ee1b0
--- /dev/null
+++ 
b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/util/ConditionalOnCamelContextAndAutoConfigurationBeans.java
@@ -0,0 +1,36 @@
+/**
+ * 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.spring.boot.util;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.spring.boot.CamelAutoConfiguration;
+import org.springframework.boot.autoconfigure.condition.AllNestedConditions;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
+
+public class ConditionalOnCamelContextAndAutoConfigurationBeans extends 
AllNestedConditions {
+public ConditionalOnCamelContextAndAutoConfigurationBeans() {
+super(ConfigurationPhase.REGISTER_BEAN);
+}
+
+@ConditionalOnBean(CamelContext.class)
+static class OnCamelContext {
+}
+
+@ConditionalOnBean(CamelAutoConfiguration.class)
+static class OnCamelAutoConfiguration {
+}
+}

http://git-wip-us.apache.org/repos/asf/camel/blob/545f3f79/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java
--
diff --git 
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java
 
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java
index da7ecb8..50c3b61 100644
--- 
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java
+++ 
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootAutoConfigurationMojo.java
@@ -69,8 +69,8 @@ import org.jboss.forge.roaster.model.source.PropertySource;
 import org.jboss.forge.roaster.model.util.Formatter;
 import org.jboss.forge.roaster.model.util.Strings;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.config.ConfigurableBeanFactory;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
-import org.springframework.boot.autoconfigure.condition.AllNestedConditions;
 import org.springframework.boot.autoconfigure.condition.ConditionMessage;
 import org.springframework.boot.autoconfigure.condition.ConditionOutcome;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
@@ -1180,17 +1180,17 @@ public class SpringBootAutoConfigurationMojo extends 
AbstractMojo {
 String name = model.getJavaType().substring(pos + 1);
 name = name.replace("Component", "ComponentAutoConfiguration");
 
+String configurationName = name.replace("Comp

[10/16] camel git commit: Regen spring-boot components-starter

2017-05-20 Thread lburgazzoli

http://git-wip-us.apache.org/repos/asf/camel/blob/cd54a966/platforms/spring-boot/components-starter/camel-ehcache-starter/src/main/java/org/apache/camel/component/ehcache/springboot/customizer/CacheManagerCustomizer.java
--
diff --git 
a/platforms/spring-boot/components-starter/camel-ehcache-starter/src/main/java/org/apache/camel/component/ehcache/springboot/customizer/CacheManagerCustomizer.java
 
b/platforms/spring-boot/components-starter/camel-ehcache-starter/src/main/java/org/apache/camel/component/ehcache/springboot/customizer/CacheManagerCustomizer.java
index 4942169..13cfe54 100644
--- 
a/platforms/spring-boot/components-starter/camel-ehcache-starter/src/main/java/org/apache/camel/component/ehcache/springboot/customizer/CacheManagerCustomizer.java
+++ 
b/platforms/spring-boot/components-starter/camel-ehcache-starter/src/main/java/org/apache/camel/component/ehcache/springboot/customizer/CacheManagerCustomizer.java
@@ -28,6 +28,7 @@ import 
org.springframework.boot.autoconfigure.condition.AllNestedConditions;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import 
org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Conditional;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.Ordered;
 import org.springframework.core.annotation.Order;
@@ -41,29 +42,24 @@ import org.springframework.core.annotation.Order;
  *
  * 1. globally using:
  *camel.component.customizer.enable = true/false
- *
  * 2. for component:
  *camel.component.ehcache.customizer.enabled = true/false
- *
  * 3. individually:
  *camel.component.ehcache.customizer.cache-manager.enabled = true/false
  */
 @Order(Ordered.LOWEST_PRECEDENCE)
 @Configuration
+@Conditional(CacheManagerCustomizer.NestedConditions.class)
 @ConditionalOnProperty(name = 
"camel.component.ehcache.customizer.cache-manager.enabled", matchIfMissing = 
true)
 @AutoConfigureAfter(CamelAutoConfiguration.class)
 @AutoConfigureBefore(EhcacheComponentAutoConfiguration.class)
 @EnableConfigurationProperties(CacheManagerCustomizerConfiguration.class)
-public class CacheManagerCustomizer extends AllNestedConditions implements 
ComponentCustomizer {
+public class CacheManagerCustomizer implements 
ComponentCustomizer {
 @Autowired
 private CacheManager cacheManager;
 @Autowired
 private CacheManagerCustomizerConfiguration configuration;
 
-public CacheManagerCustomizer() {
-super(ConfigurationPhase.REGISTER_BEAN);
-}
-
 @Override
 public void customize(EhcacheComponent component) {
 // Set the cache manager only if the customizer is configured to always
@@ -75,20 +71,27 @@ public class CacheManagerCustomizer extends 
AllNestedConditions implements Compo
 
 // 
*
 // By default ConditionalOnBean works using an OR operation so if you list
-// a number of classes, the condition succeeds if a single instance of the
-// classes is found.
+// a number of classes, the condition succeeds if a single instance of any
+// class is found.
 //
 // A workaround is to use AllNestedConditions and creates some dummy 
classes
-// annotated @ConditionalOnBean
+// annotated with @ConditionalOnBean
 //
 // This should be fixed in spring-boot 2.0 where ConditionalOnBean uses and
 // AND operation instead of the OR as it does today.
 // 
*
 
-@ConditionalOnBean(CacheManager.class)
-static class OnCacheManager {
-}
-@ConditionalOnBean(CamelAutoConfiguration.class)
-static class OnCamelAutoConfiguration {
+static class NestedConditions extends AllNestedConditions {
+public NestedConditions() {
+super(ConfigurationPhase.REGISTER_BEAN);
+}
+
+@ConditionalOnBean(CacheManager.class)
+static class OnCacheManager {
+}
+
+@ConditionalOnBean(CamelAutoConfiguration.class)
+static class OnCamelAutoConfiguration {
+}
 }
 }

http://git-wip-us.apache.org/repos/asf/camel/blob/cd54a966/platforms/spring-boot/components-starter/camel-ehcache-starter/src/test/java/org/apache/camel/component/ehcache/springboot/CacheManagerCustomizerWithoutCacheManagerTest.java
--
diff --git 
a/platforms/spring-boot/components-starter/camel-ehcache-starter/src/test/java/org/apache/camel/component/ehcache/springboot/CacheManagerCustomizerWithoutCacheManagerTest.java
 
b/platforms/spring-boot/components-starter/camel-ehcache-starter/src/test/java/org/apache/camel/component/ehcache/springboot/CacheManagerCustomizerWithoutCacheManagerT

[02/16] camel git commit: Regen spring-boot components-starter

2017-05-20 Thread lburgazzoli

http://git-wip-us.apache.org/repos/asf/camel/blob/cd54a966/platforms/spring-boot/components-starter/camel-spring-ldap-starter/src/main/java/org/apache/camel/component/springldap/springboot/SpringLdapComponentAutoConfiguration.java
--
diff --git 
a/platforms/spring-boot/components-starter/camel-spring-ldap-starter/src/main/java/org/apache/camel/component/springldap/springboot/SpringLdapComponentAutoConfiguration.java
 
b/platforms/spring-boot/components-starter/camel-spring-ldap-starter/src/main/java/org/apache/camel/component/springldap/springboot/SpringLdapComponentAutoConfiguration.java
index b0f6797..b38745e 100644
--- 
a/platforms/spring-boot/components-starter/camel-spring-ldap-starter/src/main/java/org/apache/camel/component/springldap/springboot/SpringLdapComponentAutoConfiguration.java
+++ 
b/platforms/spring-boot/components-starter/camel-spring-ldap-starter/src/main/java/org/apache/camel/component/springldap/springboot/SpringLdapComponentAutoConfiguration.java
@@ -25,6 +25,7 @@ import 
org.apache.camel.component.springldap.SpringLdapComponent;
 import org.apache.camel.spi.ComponentCustomizer;
 import org.apache.camel.spring.boot.CamelAutoConfiguration;
 import org.apache.camel.spring.boot.ComponentConfigurationProperties;
+import 
org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
 import org.apache.camel.spring.boot.util.GroupCondition;
 import org.apache.camel.util.IntrospectionSupport;
 import org.apache.camel.util.ObjectHelper;
@@ -32,9 +33,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
-import org.springframework.boot.autoconfigure.condition.AllNestedConditions;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import 
org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import 
org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
@@ -47,11 +46,12 @@ import org.springframework.context.annotation.Lazy;
  */
 @Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo")
 @Configuration
-@Conditional(SpringLdapComponentAutoConfiguration.Condition.class)
+@Conditional({ConditionalOnCamelContextAndAutoConfigurationBeans.class,
+SpringLdapComponentAutoConfiguration.GroupConditions.class})
 @AutoConfigureAfter(CamelAutoConfiguration.class)
 @EnableConfigurationProperties({ComponentConfigurationProperties.class,
 SpringLdapComponentConfiguration.class})
-public class SpringLdapComponentAutoConfiguration extends AllNestedConditions {
+public class SpringLdapComponentAutoConfiguration {
 
 private static final Logger LOGGER = LoggerFactory
 .getLogger(SpringLdapComponentAutoConfiguration.class);
@@ -64,27 +64,14 @@ public class SpringLdapComponentAutoConfiguration extends 
AllNestedConditions {
 @Autowired
 private SpringLdapComponentConfiguration componentConfiguration;
 
-public SpringLdapComponentAutoConfiguration() {
-super(ConfigurationPhase.REGISTER_BEAN);
-}
-
-@ConditionalOnBean(CamelContext.class)
-public static class OnCamelContext {
-}
-
-@ConditionalOnBean(CamelAutoConfiguration.class)
-public static class OnCamelAutoConfiguration {
-}
-
-public static class Condition extends GroupCondition {
-public Condition() {
+static class GroupConditions extends GroupCondition {
+public GroupConditions() {
 super("camel.component", "camel.component.spring-ldap");
 }
 }
 
 @Lazy
 @Bean(name = "spring-ldap-component")
-@ConditionalOnClass(CamelContext.class)
 @ConditionalOnMissingBean(SpringLdapComponent.class)
 public SpringLdapComponent configureSpringLdapComponent() throws Exception 
{
 SpringLdapComponent component = new SpringLdapComponent();

http://git-wip-us.apache.org/repos/asf/camel/blob/cd54a966/platforms/spring-boot/components-starter/camel-spring-redis-starter/src/main/java/org/apache/camel/component/redis/springboot/RedisComponentAutoConfiguration.java
--
diff --git 
a/platforms/spring-boot/components-starter/camel-spring-redis-starter/src/main/java/org/apache/camel/component/redis/springboot/RedisComponentAutoConfiguration.java
 
b/platforms/spring-boot/components-starter/camel-spring-redis-starter/src/main/java/org/apache/camel/component/redis/springboot/RedisComponentAutoConfiguration.java
index c189510..dfda106 100644
--- 
a/platforms/spring-boot/components-starter/camel-spring-redis-starter/src/main/java/org/apache/camel/component/redis/springboot/RedisComponentAutoConfiguration.java
+++ 
b/platforms/spri

camel git commit: Fix Checkstyle issues

2017-05-20 Thread gzurowski

Repository: camel
Updated Branches:
  refs/heads/camel-2.18.x 2d4f940b9 -> 091ed28d0


Fix Checkstyle issues

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/091ed28d
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/091ed28d
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/091ed28d

Branch: refs/heads/camel-2.18.x
Commit: 091ed28d0a496a02e6ca34ff1ab0b556a26274f5
Parents: 2d4f940
Author: Gregor Zurowski 
Authored: Sat May 20 17:08:51 2017 +0100
Committer: Gregor Zurowski 
Committed: Sat May 20 17:08:51 2017 +0100

--
 .../java/org/apache/camel/component/sql/stored/ParserTest.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/091ed28d/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ParserTest.java
--
diff --git 
a/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ParserTest.java
 
b/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ParserTest.java
index 98a17f6..9f47600 100644
--- 
a/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ParserTest.java
+++ 
b/components/camel-sql/src/test/java/org/apache/camel/component/sql/stored/ParserTest.java
@@ -112,7 +112,7 @@ public class ParserTest extends CamelTestSupport {
 pc.setLocation("classpath:jndi.properties");
 Exchange exchange = createExchangeWithBody(1);
 Template template = parser.parseTemplate("ADDNUMBERS2(-1342 
${properties:java.naming.factory.initial})");
-
assertEquals("org.apache.camel.util.jndi.CamelInitialContextFactory",((InputParameter)template.getParameterList().get(0)).getValueExtractor().eval(exchange,
 null));
+assertEquals("org.apache.camel.util.jndi.CamelInitialContextFactory", 
((InputParameter)template.getParameterList().get(0)).getValueExtractor().eval(exchange,
 null));
 }
 
 @Test
@@ -121,7 +121,7 @@ public class ParserTest extends CamelTestSupport {
 Exchange exchange = createExchangeWithBody(1);
 
 Map container = new HashMap();
-container.put("a:",1);
+container.put("a:", 1);
 assertEquals(1, ((InputParameter) 
template.getParameterList().get(0)).getValueExtractor().eval(exchange, 
container));
 }

svn commit: r1012563 - in /websites/production/camel/content: cache/main.pageCache camel-2200-release.html

2017-05-20 Thread buildbot

Author: buildbot
Date: Sat May 20 14:19:05 2017
New Revision: 1012563

Log:
Production update by buildbot for camel

Modified:
websites/production/camel/content/cache/main.pageCache
websites/production/camel/content/camel-2200-release.html

Modified: websites/production/camel/content/cache/main.pageCache
==
Binary files - no diff available.

Modified: websites/production/camel/content/camel-2200-release.html
==
--- websites/production/camel/content/camel-2200-release.html (original)
+++ websites/production/camel/content/camel-2200-release.html Sat May 20 
14:19:05 2017
@@ -91,7 +91,7 @@
  
 
 
-New and NoteworthyWelcome 
to the x.y.z release which approx XXX issues resolved (new features, 
improvements and bug fixes such as...)highlighted issue 
fixedhighlighted issue fixedFixed these 
issuesFixed a infinitive recursion in Camel's Error Handler when an onException was routing to 
another route using direct endpoint and this route would throw a new exception 
that would circle back to the same onException or at a later point, which will 
cause an endless recursion.Fixed a potential issue with masking 
password from URI using RAW(xxx) would reveal part of the password if the 
password contains a & character.The Restlet component is now internally using curly 
brackets for its uri patterns instead of regular parentheses so it works 
similar to the other REST component 
 and as Restlet framework itself doesFixed Hystrix EIP having wrong default for 
circuitBreakerForceClose when using camel-hystrix-starter with Spring Boot. The 
default should be false and not trueFixed Hystrix EIP when failing and running fallback not 
signaling to Hystrix itself so it can keep state of the failure and react 
accordingly to run in half-open mode as well.Fixed MDC logging loosing route id after 
calling a direct route from within a transacted routeNew Enterprise Integration 
PatternsNew Componentscamel-reactor - a reactor 
based back-end for camel's reactive streams componentNew DSLNew 
AnnotationsNew Data FormatsNew LanguagesNew 
ExamplesNew TutorialsAPI breakingKnown IssuesImportant 
changes to consider when upgradingMaven 3.3.3 or newer is required 
to build the projectcamel-infinispan - the result is not more set in 
the CamelInfinispanOperationResult header but in the in 
body, to change this behavior you can set the header CamelInfinispanOperationResultHeader with 
the name of the header that should contains the result or with the resultHeader uri 
optioncamel-infinispan - the uri option command has been 
deprecated and replaced by operation for 
consistencycamel-infinispan - 
the commands are now int the short form PUT, GET etc. old operation names 
like CamelInfinispanOperationPut, CamelInfinispanOperationGet etc have been 
deprecated.Getting the 
DistributionsBinary 
DistributionsDescriptionDownload LinkPGP Signature file of downloadWindows 
Distributionhttp://www.apache.org/dyn/closer.cgi/camel/apache-camel/x.y.x/apache-camel-x.y.x.zip";>apache-camel-x.y.x.ziphttp://www.apache.org/dist/camel/apache-camel/x.y.x/apache-camel-x.y.
 x.zip.asc">apache-camel-x.y.x.zip.ascUnix/Linux/Cygwin Distributionhttp://www.apache.org/dyn/closer.cgi/camel/apache-camel/x.y.x/apache-camel-x.y.x.tar.gz";>apache-camel-x.y.x.tar.gzhttp://www.apache.org/dist/camel/apache-camel/x.y.x/apache-camel-x.y.x.tar.gz.asc";>apache-camel-x.y.x.tar.gz.ascThe above URLs use 
redirectionThe above URLs use the Apache 
Mirror system to redirect you to a suitable mirror for your downl
 oad. Some users have experienced issues with some versions of browsers (e.g. 
some Safari browsers). If the download doesn't seem to work for you from the 
above URL then try using http://www.mozilla.com/en-US/firefox/"; 
rel="nofollow">FireFoxSource DistributionsDescriptionDownload LinkPGP Signature file of 
downloadSource (zip)http://www.apache.org/dyn/closer.cgi/camel/apache-camel/x.y.x/apache-camel-x.y.x-src.zip";>apache-camel-x.y.x-src.ziphttp://www.apache.org/dist/camel/apache-camel/x.y.x/apache-camel-x.y.x-src.zip.asc";>apache-camel-x.y.x-src.zip.ascGetting the Binaries 
using Maven 2To use this release in your maven project, the proper 
dependency configuration that you should use in your http://maven.apache.org/guides/introduction/introduction-to-the-pom.html";>Maven
 POM is:
+New and NoteworthyWelcome 
to the x.y.z release which approx XXX issues resolved (new features, 
improvements and bug fixes such as...)highlighted issue 
fixedhighlighted issue fixedFixed these 
issuesFixed a infinitive recursion in Camel's Error Handler when an onException was routing to 
another route using direct endpoint and this route would throw a new exception 
that would circle back to the same onException or at a later point, which will 
cause an endless recursion.Fixed a potential issue with masking 
password from URI using RAW(

camel git commit: Upgrade Artemis to 2.x

2017-05-20 Thread davsclaus

Repository: camel
Updated Branches:
  refs/heads/master 815978fc1 -> c3d7668ca


Upgrade Artemis to 2.x


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

Branch: refs/heads/master
Commit: c3d7668ca8fd68e22a98995484834f0033c947a8
Parents: 815978f
Author: Claus Ibsen 
Authored: Sat May 20 15:58:17 2017 +0200
Committer: Claus Ibsen 
Committed: Sat May 20 15:58:17 2017 +0200

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


http://git-wip-us.apache.org/repos/asf/camel/blob/c3d7668c/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 75ce6ce..6a0101d 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -41,7 +41,7 @@
 1.1.3
 
 5.14.5
-1.5.5
+2.1.0
 1.0.2.v20150114
 2.0.32
 1.7.0_6

[01/10] camel git commit: CAMEL-11235: Used the new override from getMethodInfo(...)

2017-05-20 Thread davsclaus

Repository: camel
Updated Branches:
  refs/heads/camel-2.19.x 6d820defc -> f96c58232
  refs/heads/master bb6d6b60e -> 815978fc1


CAMEL-11235: Used the new override from getMethodInfo(...)


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

Branch: refs/heads/master
Commit: 27288c8b1d2f320d7132d5cf2b6c5cd1e33b99ca
Parents: 62800b1
Author: aldettinger 
Authored: Sat May 20 13:13:15 2017 +0200
Committer: Claus Ibsen 
Committed: Sat May 20 14:27:01 2017 +0200

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


http://git-wip-us.apache.org/repos/asf/camel/blob/27288c8b/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java 
b/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
index f87e4a4..480fbc7 100644
--- a/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
+++ b/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
@@ -434,7 +434,7 @@ public class BeanInfo {
 if (answer == null) {
 // maybe the method overrides, and the method map keeps info of 
the source override we can use
 for (Method source : methodMap.keySet()) {
-if (ObjectHelper.isOverridingMethod(source, method, false)) {
+if (ObjectHelper.isOverridingMethod(getType(), source, method, 
false)) {
 answer = methodMap.get(source);
 break;
 }

[07/10] camel git commit: CAMEL-11235: Used the new override from getMethodInfo(...)

2017-05-20 Thread davsclaus

CAMEL-11235: Used the new override from getMethodInfo(...)


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

Branch: refs/heads/camel-2.19.x
Commit: aef52c315e5fcd8a9bb2d538606ac32a1372e2fc
Parents: 04c4de8
Author: aldettinger 
Authored: Sat May 20 13:13:15 2017 +0200
Committer: Claus Ibsen 
Committed: Sat May 20 15:53:56 2017 +0200

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


http://git-wip-us.apache.org/repos/asf/camel/blob/aef52c31/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java 
b/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
index f87e4a4..480fbc7 100644
--- a/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
+++ b/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
@@ -434,7 +434,7 @@ public class BeanInfo {
 if (answer == null) {
 // maybe the method overrides, and the method map keeps info of 
the source override we can use
 for (Method source : methodMap.keySet()) {
-if (ObjectHelper.isOverridingMethod(source, method, false)) {
+if (ObjectHelper.isOverridingMethod(getType(), source, method, 
false)) {
 answer = methodMap.get(source);
 break;
 }

[02/10] camel git commit: CAMEL-11235: Resolved an issue where a method inherited from a superclass overrides a superinterface method

2017-05-20 Thread davsclaus

CAMEL-11235: Resolved an issue where a method inherited from a superclass 
overrides a superinterface method


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

Branch: refs/heads/master
Commit: 62800b148780c60e7b5b4716f885bc6339103341
Parents: bb6d6b6
Author: aldettinger 
Authored: Sat May 20 12:18:57 2017 +0200
Committer: Claus Ibsen 
Committed: Sat May 20 14:27:01 2017 +0200

--
 .../apache/camel/component/bean/BeanInfo.java   | 46 ++--
 .../org/apache/camel/util/ObjectHelper.java | 20 -
 .../camel/component/bean/MyOtherFooBean.java| 17 
 .../org/apache/camel/util/ObjectHelperTest.java | 15 +++
 4 files changed, 65 insertions(+), 33 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/62800b14/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java 
b/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
index 1efe61c..f87e4a4 100644
--- a/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
+++ b/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
@@ -328,7 +328,7 @@ public class BeanInfo {
 methods.addAll(extraMethods);
 }
 
-Set overrides = new HashSet();
+Set overriddenMethods = new HashSet();
 
 // do not remove duplicates form class from the Java itself as they 
have some "duplicates" we need
 boolean javaClass = clazz.getName().startsWith("java.") || 
clazz.getName().startsWith("javax.");
@@ -343,38 +343,17 @@ public class BeanInfo {
 
 for (Method target : methods) {
 // skip ourselves
-if (ObjectHelper.isOverridingMethod(source, target, true)) 
{
+if (ObjectHelper.isOverridingMethod(getType(), source, 
target, true)) {
 continue;
 }
 // skip duplicates which may be assign compatible (favor 
keep first added method when duplicate)
-if (ObjectHelper.isOverridingMethod(source, target, 
false)) {
-overrides.add(target);
+if (ObjectHelper.isOverridingMethod(getType(), source, 
target, false)) {
+overriddenMethods.add(target);
 }
 }
 }
-methods.removeAll(overrides);
-overrides.clear();
-}
-
-// if we are a public class, then add non duplicate interface classes 
also
-if (Modifier.isPublic(clazz.getModifiers())) {
-// add additional interface methods
-List extraMethods = getInterfaceMethods(clazz);
-for (Method source : extraMethods) {
-for (Method target : methods) {
-if (ObjectHelper.isOverridingMethod(source, target, 
false)) {
-overrides.add(source);
-}
-}
-for (Method target : methodMap.keySet()) {
-if (ObjectHelper.isOverridingMethod(source, target, 
false)) {
-overrides.add(source);
-}
-}
-}
-// remove all the overrides methods
-extraMethods.removeAll(overrides);
-methods.addAll(extraMethods);
+methods.removeAll(overriddenMethods);
+overriddenMethods.clear();
 }
 
 // now introspect the methods and filter non valid methods
@@ -386,9 +365,12 @@ public class BeanInfo {
 }
 }
 
-Class superclass = clazz.getSuperclass();
-if (superclass != null && !superclass.equals(Object.class)) {
-introspect(superclass);
+Class superClass = clazz.getSuperclass();
+if (superClass != null && !superClass.equals(Object.class)) {
+introspect(superClass);
+}
+for (Class superInterface : clazz.getInterfaces()) {
+introspect(superInterface);
 }
 }
 
@@ -917,9 +899,9 @@ public class BeanInfo {
 Method alreadyRegisteredMethod = 
alreadyRegisteredMethodInfo.getMethod();
 Method proposedMethod = proposedMethodInfo.getMethod();
 
-if (ObjectHelper.isOverridingMethod(proposedMethod, 
alreadyRegisteredMethod, false)) {
+if (ObjectHelper.isOverridingMethod(getType(), proposedMethod, 
alreadyRegisteredMethod, false)) {
 return alreadyRegisteredMethodInfo;
-

[04/10] camel git commit: Upgrade artemis

2017-05-20 Thread davsclaus

Upgrade artemis


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

Branch: refs/heads/master
Commit: efa3e09ea77da296bdf79589b16674cc00491f1d
Parents: 87be7ea
Author: Claus Ibsen 
Authored: Sat May 20 15:42:57 2017 +0200
Committer: Claus Ibsen 
Committed: Sat May 20 15:42:57 2017 +0200

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


http://git-wip-us.apache.org/repos/asf/camel/blob/efa3e09e/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 4da5671..75ce6ce 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -41,7 +41,7 @@
 1.1.3
 
 5.14.5
-1.5.4
+1.5.5
 1.0.2.v20150114
 2.0.32
 1.7.0_6

[08/10] camel git commit: CAMEL-11235: Added unit test. This closes #1703

2017-05-20 Thread davsclaus

CAMEL-11235: Added unit test. This closes #1703


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

Branch: refs/heads/camel-2.19.x
Commit: 5f40bbb4b8a03ea588d70135cf93154c928964af
Parents: aef52c3
Author: Claus Ibsen 
Authored: Sat May 20 15:23:51 2017 +0200
Committer: Claus Ibsen 
Committed: Sat May 20 15:54:02 2017 +0200

--
 ...iguousMethodCallExceptionSimplifiedTest.java | 62 
 .../MethodNotFoundExceptionSimplifiedTest.java  | 58 ++
 2 files changed, 120 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/5f40bbb4/camel-core/src/test/java/org/apache/camel/component/bean/AmbiguousMethodCallExceptionSimplifiedTest.java
--
diff --git 
a/camel-core/src/test/java/org/apache/camel/component/bean/AmbiguousMethodCallExceptionSimplifiedTest.java
 
b/camel-core/src/test/java/org/apache/camel/component/bean/AmbiguousMethodCallExceptionSimplifiedTest.java
new file mode 100644
index 000..ca9d2e4
--- /dev/null
+++ 
b/camel-core/src/test/java/org/apache/camel/component/bean/AmbiguousMethodCallExceptionSimplifiedTest.java
@@ -0,0 +1,62 @@
+/**
+ * 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.bean;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.builder.ExchangeBuilder;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+
+public class AmbiguousMethodCallExceptionSimplifiedTest extends 
ContextTestSupport {
+
+public interface InterfaceSize {
+int size();
+}
+
+public abstract static class AbstractClassSize {
+public abstract int size();
+}
+
+public static class SuperClazz extends AbstractClassSize implements 
InterfaceSize {
+public int size() {
+return 1;
+}
+}
+
+public static class Clazz extends SuperClazz {
+}
+
+@Override
+protected RouteBuilder createRouteBuilder() {
+return new RouteBuilder() {
+@Override
+public void configure() throws Exception {
+from("direct:in").choice().when(simple("${headers.bean.size} 
!= 0")).to("mock:out");
+}
+};
+}
+
+public void testAmbiguousMethodCallException() throws Exception {
+MockEndpoint out = getMockEndpoint("mock:out");
+out.expectedMessageCount(1);
+
+ExchangeBuilder exchangeBuilder = new 
ExchangeBuilder(context).withHeader("bean", new Clazz());
+template.send("direct:in", exchangeBuilder.build());
+
+out.assertIsSatisfied();
+}
+}

http://git-wip-us.apache.org/repos/asf/camel/blob/5f40bbb4/camel-core/src/test/java/org/apache/camel/component/bean/MethodNotFoundExceptionSimplifiedTest.java
--
diff --git 
a/camel-core/src/test/java/org/apache/camel/component/bean/MethodNotFoundExceptionSimplifiedTest.java
 
b/camel-core/src/test/java/org/apache/camel/component/bean/MethodNotFoundExceptionSimplifiedTest.java
new file mode 100644
index 000..ff8b3f9
--- /dev/null
+++ 
b/camel-core/src/test/java/org/apache/camel/component/bean/MethodNotFoundExceptionSimplifiedTest.java
@@ -0,0 +1,58 @@
+/**
+ * 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

[09/10] camel git commit: Upgrade artemis

2017-05-20 Thread davsclaus

Upgrade artemis


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

Branch: refs/heads/camel-2.19.x
Commit: 68ba27f2c507a5f3890fa682aa3eb3b0f286e2cd
Parents: 5f40bbb
Author: Claus Ibsen 
Authored: Sat May 20 15:42:57 2017 +0200
Committer: Claus Ibsen 
Committed: Sat May 20 15:54:08 2017 +0200

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


http://git-wip-us.apache.org/repos/asf/camel/blob/68ba27f2/parent/pom.xml
--
diff --git a/parent/pom.xml b/parent/pom.xml
index 33fcaa2..1781a47 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -38,7 +38,7 @@
 1.1.3
 
 5.14.5
-1.5.4
+1.5.5
 1.0.2.v20150114
 2.0.32
 1.7.0_6

[05/10] camel git commit: Fixed test on osx

2017-05-20 Thread davsclaus

Fixed test on osx


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

Branch: refs/heads/master
Commit: 815978fc108139e173d3dfe613c590ae08c4ebcd
Parents: efa3e09
Author: Claus Ibsen 
Authored: Sat May 20 15:53:24 2017 +0200
Committer: Claus Ibsen 
Committed: Sat May 20 15:53:24 2017 +0200

--
 .../java/org/apache/camel/component/jetty/InterfacesTest.java  | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/815978fc/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/InterfacesTest.java
--
diff --git 
a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/InterfacesTest.java
 
b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/InterfacesTest.java
index d28af2f..a1ccb1d 100644
--- 
a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/InterfacesTest.java
+++ 
b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/InterfacesTest.java
@@ -44,7 +44,11 @@ public class InterfacesTest extends BaseJettyTest {
 Enumeration addresses =  interfaze.getInetAddresses();
 if (addresses.hasMoreElements()) {
 InetAddress nextAddress = addresses.nextElement();
-if (nextAddress.isLoopbackAddress() || 
!nextAddress.isReachable(2000)) {
+try {
+if (nextAddress.isLoopbackAddress() || 
!nextAddress.isReachable(2000)) {
+continue;
+}
+} catch (Exception e) {
 continue;
 }
 if (nextAddress instanceof Inet6Address) {

[03/10] camel git commit: CAMEL-11235: Added unit test. This closes #1703

2017-05-20 Thread davsclaus

CAMEL-11235: Added unit test. This closes #1703


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

Branch: refs/heads/master
Commit: 87be7ea1523a99a068b56a056551a2628f6fa38b
Parents: 27288c8
Author: Claus Ibsen 
Authored: Sat May 20 15:23:51 2017 +0200
Committer: Claus Ibsen 
Committed: Sat May 20 15:31:12 2017 +0200

--
 ...iguousMethodCallExceptionSimplifiedTest.java | 62 
 .../MethodNotFoundExceptionSimplifiedTest.java  | 58 ++
 2 files changed, 120 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/87be7ea1/camel-core/src/test/java/org/apache/camel/component/bean/AmbiguousMethodCallExceptionSimplifiedTest.java
--
diff --git 
a/camel-core/src/test/java/org/apache/camel/component/bean/AmbiguousMethodCallExceptionSimplifiedTest.java
 
b/camel-core/src/test/java/org/apache/camel/component/bean/AmbiguousMethodCallExceptionSimplifiedTest.java
new file mode 100644
index 000..ca9d2e4
--- /dev/null
+++ 
b/camel-core/src/test/java/org/apache/camel/component/bean/AmbiguousMethodCallExceptionSimplifiedTest.java
@@ -0,0 +1,62 @@
+/**
+ * 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.bean;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.builder.ExchangeBuilder;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+
+public class AmbiguousMethodCallExceptionSimplifiedTest extends 
ContextTestSupport {
+
+public interface InterfaceSize {
+int size();
+}
+
+public abstract static class AbstractClassSize {
+public abstract int size();
+}
+
+public static class SuperClazz extends AbstractClassSize implements 
InterfaceSize {
+public int size() {
+return 1;
+}
+}
+
+public static class Clazz extends SuperClazz {
+}
+
+@Override
+protected RouteBuilder createRouteBuilder() {
+return new RouteBuilder() {
+@Override
+public void configure() throws Exception {
+from("direct:in").choice().when(simple("${headers.bean.size} 
!= 0")).to("mock:out");
+}
+};
+}
+
+public void testAmbiguousMethodCallException() throws Exception {
+MockEndpoint out = getMockEndpoint("mock:out");
+out.expectedMessageCount(1);
+
+ExchangeBuilder exchangeBuilder = new 
ExchangeBuilder(context).withHeader("bean", new Clazz());
+template.send("direct:in", exchangeBuilder.build());
+
+out.assertIsSatisfied();
+}
+}

http://git-wip-us.apache.org/repos/asf/camel/blob/87be7ea1/camel-core/src/test/java/org/apache/camel/component/bean/MethodNotFoundExceptionSimplifiedTest.java
--
diff --git 
a/camel-core/src/test/java/org/apache/camel/component/bean/MethodNotFoundExceptionSimplifiedTest.java
 
b/camel-core/src/test/java/org/apache/camel/component/bean/MethodNotFoundExceptionSimplifiedTest.java
new file mode 100644
index 000..ff8b3f9
--- /dev/null
+++ 
b/camel-core/src/test/java/org/apache/camel/component/bean/MethodNotFoundExceptionSimplifiedTest.java
@@ -0,0 +1,58 @@
+/**
+ * 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

[06/10] camel git commit: CAMEL-11235: Resolved an issue where a method inherited from a superclass overrides a superinterface method

2017-05-20 Thread davsclaus

CAMEL-11235: Resolved an issue where a method inherited from a superclass 
overrides a superinterface method


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

Branch: refs/heads/camel-2.19.x
Commit: 04c4de84687579b1f26fb536c21b0ad90d1fbeb1
Parents: 6d820de
Author: aldettinger 
Authored: Sat May 20 12:18:57 2017 +0200
Committer: Claus Ibsen 
Committed: Sat May 20 15:53:49 2017 +0200

--
 .../apache/camel/component/bean/BeanInfo.java   | 46 ++--
 .../org/apache/camel/util/ObjectHelper.java | 20 -
 .../camel/component/bean/MyOtherFooBean.java| 17 
 .../org/apache/camel/util/ObjectHelperTest.java | 15 +++
 4 files changed, 65 insertions(+), 33 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/04c4de84/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
--
diff --git 
a/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java 
b/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
index 1efe61c..f87e4a4 100644
--- a/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
+++ b/camel-core/src/main/java/org/apache/camel/component/bean/BeanInfo.java
@@ -328,7 +328,7 @@ public class BeanInfo {
 methods.addAll(extraMethods);
 }
 
-Set overrides = new HashSet();
+Set overriddenMethods = new HashSet();
 
 // do not remove duplicates form class from the Java itself as they 
have some "duplicates" we need
 boolean javaClass = clazz.getName().startsWith("java.") || 
clazz.getName().startsWith("javax.");
@@ -343,38 +343,17 @@ public class BeanInfo {
 
 for (Method target : methods) {
 // skip ourselves
-if (ObjectHelper.isOverridingMethod(source, target, true)) 
{
+if (ObjectHelper.isOverridingMethod(getType(), source, 
target, true)) {
 continue;
 }
 // skip duplicates which may be assign compatible (favor 
keep first added method when duplicate)
-if (ObjectHelper.isOverridingMethod(source, target, 
false)) {
-overrides.add(target);
+if (ObjectHelper.isOverridingMethod(getType(), source, 
target, false)) {
+overriddenMethods.add(target);
 }
 }
 }
-methods.removeAll(overrides);
-overrides.clear();
-}
-
-// if we are a public class, then add non duplicate interface classes 
also
-if (Modifier.isPublic(clazz.getModifiers())) {
-// add additional interface methods
-List extraMethods = getInterfaceMethods(clazz);
-for (Method source : extraMethods) {
-for (Method target : methods) {
-if (ObjectHelper.isOverridingMethod(source, target, 
false)) {
-overrides.add(source);
-}
-}
-for (Method target : methodMap.keySet()) {
-if (ObjectHelper.isOverridingMethod(source, target, 
false)) {
-overrides.add(source);
-}
-}
-}
-// remove all the overrides methods
-extraMethods.removeAll(overrides);
-methods.addAll(extraMethods);
+methods.removeAll(overriddenMethods);
+overriddenMethods.clear();
 }
 
 // now introspect the methods and filter non valid methods
@@ -386,9 +365,12 @@ public class BeanInfo {
 }
 }
 
-Class superclass = clazz.getSuperclass();
-if (superclass != null && !superclass.equals(Object.class)) {
-introspect(superclass);
+Class superClass = clazz.getSuperclass();
+if (superClass != null && !superClass.equals(Object.class)) {
+introspect(superClass);
+}
+for (Class superInterface : clazz.getInterfaces()) {
+introspect(superInterface);
 }
 }
 
@@ -917,9 +899,9 @@ public class BeanInfo {
 Method alreadyRegisteredMethod = 
alreadyRegisteredMethodInfo.getMethod();
 Method proposedMethod = proposedMethodInfo.getMethod();
 
-if (ObjectHelper.isOverridingMethod(proposedMethod, 
alreadyRegisteredMethod, false)) {
+if (ObjectHelper.isOverridingMethod(getType(), proposedMethod, 
alreadyRegisteredMethod, false)) {
 return alreadyRegisteredMethodI

[10/10] camel git commit: Fixed test on osx

2017-05-20 Thread davsclaus

Fixed test on osx


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

Branch: refs/heads/camel-2.19.x
Commit: f96c5823254b8a2caf5ba716961b5d658f32de9b
Parents: 68ba27f
Author: Claus Ibsen 
Authored: Sat May 20 15:53:24 2017 +0200
Committer: Claus Ibsen 
Committed: Sat May 20 15:54:15 2017 +0200

--
 .../java/org/apache/camel/component/jetty/InterfacesTest.java  | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/f96c5823/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/InterfacesTest.java
--
diff --git 
a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/InterfacesTest.java
 
b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/InterfacesTest.java
index d28af2f..a1ccb1d 100644
--- 
a/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/InterfacesTest.java
+++ 
b/components/camel-jetty9/src/test/java/org/apache/camel/component/jetty/InterfacesTest.java
@@ -44,7 +44,11 @@ public class InterfacesTest extends BaseJettyTest {
 Enumeration addresses =  interfaze.getInetAddresses();
 if (addresses.hasMoreElements()) {
 InetAddress nextAddress = addresses.nextElement();
-if (nextAddress.isLoopbackAddress() || 
!nextAddress.isReachable(2000)) {
+try {
+if (nextAddress.isLoopbackAddress() || 
!nextAddress.isReachable(2000)) {
+continue;
+}
+} catch (Exception e) {
 continue;
 }
 if (nextAddress instanceof Inet6Address) {

[camel] Git Push Summary

2017-05-20 Thread davsclaus

Repository: camel
Updated Branches:
  refs/heads/CAMEL-11229 [deleted] eacb2

camel git commit: Fix Checkstyle issues

2017-05-20 Thread gzurowski

Repository: camel
Updated Branches:
  refs/heads/camel-2.18.x 68d721b65 -> 2d4f940b9


Fix Checkstyle issues

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/2d4f940b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/2d4f940b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/2d4f940b

Branch: refs/heads/camel-2.18.x
Commit: 2d4f940b949e1f30e7fb1f72d899334aef8989ca
Parents: 68d721b
Author: Gregor Zurowski 
Authored: Sat May 20 11:35:41 2017 +0100
Committer: Gregor Zurowski 
Committed: Sat May 20 11:35:41 2017 +0100

--
 .../OnExceptionGlobalScopedRecursionTest.java   | 12 ++--
 .../processor/onexception/OnExceptionRecursionTest.java |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/camel/blob/2d4f940b/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionGlobalScopedRecursionTest.java
--
diff --git 
a/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionGlobalScopedRecursionTest.java
 
b/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionGlobalScopedRecursionTest.java
index 417d4fa..37f6088 100644
--- 
a/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionGlobalScopedRecursionTest.java
+++ 
b/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionGlobalScopedRecursionTest.java
@@ -42,7 +42,7 @@ public class OnExceptionGlobalScopedRecursionTest extends 
ContextTestSupport {
 .to("mock:c")
 .log("onException")
 .throwException(new NullPointerException("A NPE error 
here"))
-.end();
+.end();
 
 from("direct:test")
 .to("mock:a")
@@ -78,7 +78,7 @@ public class OnExceptionGlobalScopedRecursionTest extends 
ContextTestSupport {
 .to("mock:c")
 .log("onException")
 .throwException(new NullPointerException("A NPE error 
here"))
-.end();
+.end();
 
 from("direct:test")
 .to("mock:a")
@@ -114,7 +114,7 @@ public class OnExceptionGlobalScopedRecursionTest extends 
ContextTestSupport {
 .to("mock:c")
 .log("onException")
 .to("direct:error")
-.end();
+.end();
 
 from("direct:test")
 .to("mock:a")
@@ -157,7 +157,7 @@ public class OnExceptionGlobalScopedRecursionTest extends 
ContextTestSupport {
 .to("mock:c")
 .log("onException")
 .to("direct:error")
-.end();
+.end();
 
 from("direct:test")
 .to("mock:a")
@@ -199,7 +199,7 @@ public class OnExceptionGlobalScopedRecursionTest extends 
ContextTestSupport {
 .to("mock:c")
 .log("onException")
 .to("direct:error")
-.end();
+.end();
 
 from("direct:test")
 .to("mock:a")
@@ -239,7 +239,7 @@ public class OnExceptionGlobalScopedRecursionTest extends 
ContextTestSupport {
 .to("mock:c")
 .log("onException")
 .to("direct:error")
-.end();
+.end();
 
 from("direct:test")
 .to("mock:a")

http://git-wip-us.apache.org/repos/asf/camel/blob/2d4f940b/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionRecursionTest.java
--
diff --git 
a/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionRecursionTest.java
 
b/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionRecursionTest.java
index bac6e40..d832296 100644
--- 
a/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionRecursionTest.java
+++ 
b/camel-core/src/test/java/org/apache/camel/processor/onexception/OnExceptionRecursionTest.java
@@ -68,7 +68,7 @@ public class OnExceptionRecursionTest extends 
ContextTestSupport {
 assertEquals("Bad state", ise.getMessage());
 }
 
- assertMockEndpointsSatisfied();
+assertMockEndpointsSatisfied();
 }
 
 public void testRecursionDirectNoErrorHandler() throws Exception {

42 matches

Mail list logo