[08/14] camel git commit: [maven-release-plugin] prepare release camel-2.18.5
http://git-wip-us.apache.org/repos/asf/camel/blob/c5f09077/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 4500be2..079467f 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.5-SNAPSHOT +2.18.5 camel-google-calendar-starter jar http://git-wip-us.apache.org/repos/asf/camel/blob/c5f09077/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 5b230b1..308e11e 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.5-SNAPSHOT +2.18.5 camel-google-drive-starter jar http://git-wip-us.apache.org/repos/asf/camel/blob/c5f09077/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 9220f3c..acc7ecf 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.5-SNAPSHOT +2.18.5 camel-google-mail-starter jar http://git-wip-us.apache.org/repos/asf/camel/blob/c5f09077/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 4816909..1019720 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.5-SNAPSHOT +2.18.5 camel-gora-starter jar http://git-wip-us.apache.org/repos/asf/camel/blob/c5f09077/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 6c709e6..e963c05 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.5-SNAPSHOT +2.18.5 camel-grape-starter jar http://git-wip-us.apache.org/repos/asf/camel/blob/c5f09077/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 213137e..079025c 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.5-SNAPSHOT +2.18.5 camel-groovy-starter jar http://git-wip-us.apache.org/repos/asf/camel/blob/c5f09077/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 ae4ecbb..c6486dc 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.5-SNAPSHOT +2.18.5 camel-gson-starter jar http://git-wip-us.apache.org/repos/asf/camel/blob/c5f09077/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 9d43c34..780f22f 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.5-SNAPSHOT +2.18.5 camel-guava-eventbus-starter jar http://git-wip-us.apache.org/repos/asf/camel/blob/c5f09077/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 8d75208..812bbaa 100644 --- a/components-starter
[12/14] camel git commit: [maven-release-plugin] prepare for next development iteration
http://git-wip-us.apache.org/repos/asf/camel/blob/e82da57e/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 5063ebe..c074803 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.5 +2.18.6-SNAPSHOT camel-spring-javaconfig-starter jar http://git-wip-us.apache.org/repos/asf/camel/blob/e82da57e/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 e5927a8..451af0f 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.5 +2.18.6-SNAPSHOT camel-spring-ldap-starter jar http://git-wip-us.apache.org/repos/asf/camel/blob/e82da57e/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 8d50897..933c634 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.5 +2.18.6-SNAPSHOT camel-spring-redis-starter jar http://git-wip-us.apache.org/repos/asf/camel/blob/e82da57e/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 5d42aaf..0e64aa8 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.5 +2.18.6-SNAPSHOT camel-spring-security-starter jar http://git-wip-us.apache.org/repos/asf/camel/blob/e82da57e/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 488d788..f6a0f2f 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.5 +2.18.6-SNAPSHOT camel-spring-starter jar http://git-wip-us.apache.org/repos/asf/camel/blob/e82da57e/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 a0ed1d9..be43fc1 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.5 +2.18.6-SNAPSHOT camel-spring-ws-starter jar http://git-wip-us.apache.org/repos/asf/camel/blob/e82da57e/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 52ca0d2..0383fe7 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.5 +2.18.6-SNAPSHOT camel-sql-starter jar http://git-wip-us.apache.org/repos/asf/camel/blob/e82da57e/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 122604d..65a3f85 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.5 +2.18.6-SNAPSHOT camel-ssh-starter jar http://git-wip-us.apache.org/repos/asf/camel/blob/e82da57e/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 6a2aac0..aa04321 1006
[10/14] camel git commit: [maven-release-plugin] prepare for next development iteration
http://git-wip-us.apache.org/repos/asf/camel/blob/e82da57e/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 c6274f0..9ae1626 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.5 +2.18.6-SNAPSHOT camel-example-cdi-rest-servlet http://git-wip-us.apache.org/repos/asf/camel/blob/e82da57e/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 c45bdd8..fc125e2 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.5 +2.18.6-SNAPSHOT camel-example-cdi-test http://git-wip-us.apache.org/repos/asf/camel/blob/e82da57e/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 ba2e212..581db0e 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.5 +2.18.6-SNAPSHOT camel-example-cdi-xml http://git-wip-us.apache.org/repos/asf/camel/blob/e82da57e/examples/camel-example-cdi/pom.xml -- diff --git a/examples/camel-example-cdi/pom.xml b/examples/camel-example-cdi/pom.xml index 8523bf4..f17e876 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.5 +2.18.6-SNAPSHOT camel-example-cdi http://git-wip-us.apache.org/repos/asf/camel/blob/e82da57e/examples/camel-example-console/pom.xml -- diff --git a/examples/camel-example-console/pom.xml b/examples/camel-example-console/pom.xml index b38788a..b1369f5 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.5 +2.18.6-SNAPSHOT camel-example-console http://git-wip-us.apache.org/repos/asf/camel/blob/e82da57e/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 ecef11a..ae626f9 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.5 +2.18.6-SNAPSHOT camel-example-cxf-blueprint http://git-wip-us.apache.org/repos/asf/camel/blob/e82da57e/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 c632ff9..e5db3a6 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.5 +2.18.6-SNAPSHOT camel-example-cxf-osgi http://git-wip-us.apache.org/repos/asf/camel/blob/e82da57e/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 a5347b7..4f7b19a 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.5 +2.18.6-SNAPSHOT camel-example-cxf-proxy http://git-wip-us.apache.org/repos/asf/camel/blob/e82da57e/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 6eeb082..1505571 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.5 +2.18.6-SNAPSHOT camel-example-cxf-tomcat http://git-wip-us.apache.org/repos/asf/camel/blob/e82da57e/examples/camel-example-cxf/pom.xml -- diff --git a/examples/camel-example-cxf/pom.xml b/examples/camel-example-cxf/pom.xml index 514f222..c929962 100644 --- a/examples/camel-example-cxf/pom.xml +++ b/examples/
[09/14] camel git commit: [maven-release-plugin] prepare release camel-2.18.5
[maven-release-plugin] prepare release camel-2.18.5 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c5f09077 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c5f09077 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c5f09077 Branch: refs/heads/camel-2.18.x Commit: c5f09077c0ed1ca570184854f6d13a44456bceff Parents: 9a1159c Author: Gregor Zurowski Authored: Thu Sep 21 08:16:45 2017 + Committer: Gregor Zurowski Committed: Thu Sep 21 08:16:45 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| 2 +-
[13/14] camel git commit: [maven-release-plugin] prepare for next development iteration
http://git-wip-us.apache.org/repos/asf/camel/blob/e82da57e/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 079467f..67ac80c 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.5 +2.18.6-SNAPSHOT camel-google-calendar-starter jar http://git-wip-us.apache.org/repos/asf/camel/blob/e82da57e/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 308e11e..d0cc958 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.5 +2.18.6-SNAPSHOT camel-google-drive-starter jar http://git-wip-us.apache.org/repos/asf/camel/blob/e82da57e/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 acc7ecf..6939fb6 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.5 +2.18.6-SNAPSHOT camel-google-mail-starter jar http://git-wip-us.apache.org/repos/asf/camel/blob/e82da57e/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 1019720..4afd22f 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.5 +2.18.6-SNAPSHOT camel-gora-starter jar http://git-wip-us.apache.org/repos/asf/camel/blob/e82da57e/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 e963c05..d2e4364 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.5 +2.18.6-SNAPSHOT camel-grape-starter jar http://git-wip-us.apache.org/repos/asf/camel/blob/e82da57e/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 079025c..44b79f6 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.5 +2.18.6-SNAPSHOT camel-groovy-starter jar http://git-wip-us.apache.org/repos/asf/camel/blob/e82da57e/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 c6486dc..19078df 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.5 +2.18.6-SNAPSHOT camel-gson-starter jar http://git-wip-us.apache.org/repos/asf/camel/blob/e82da57e/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 780f22f..720eea7 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.5 +2.18.6-SNAPSHOT camel-guava-eventbus-starter jar http://git-wip-us.apache.org/repos/asf/camel/blob/e82da57e/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 812bbaa..944bb00 100644 --- a/components-starter
[07/14] camel git commit: [maven-release-plugin] prepare release camel-2.18.5
http://git-wip-us.apache.org/repos/asf/camel/blob/c5f09077/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 d8f9e7d..5063ebe 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.5-SNAPSHOT +2.18.5 camel-spring-javaconfig-starter jar http://git-wip-us.apache.org/repos/asf/camel/blob/c5f09077/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 6728852..e5927a8 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.5-SNAPSHOT +2.18.5 camel-spring-ldap-starter jar http://git-wip-us.apache.org/repos/asf/camel/blob/c5f09077/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 9e6af5b..8d50897 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.5-SNAPSHOT +2.18.5 camel-spring-redis-starter jar http://git-wip-us.apache.org/repos/asf/camel/blob/c5f09077/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 2e760ee..5d42aaf 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.5-SNAPSHOT +2.18.5 camel-spring-security-starter jar http://git-wip-us.apache.org/repos/asf/camel/blob/c5f09077/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 6647d0b..488d788 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.5-SNAPSHOT +2.18.5 camel-spring-starter jar http://git-wip-us.apache.org/repos/asf/camel/blob/c5f09077/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 e414e16..a0ed1d9 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.5-SNAPSHOT +2.18.5 camel-spring-ws-starter jar http://git-wip-us.apache.org/repos/asf/camel/blob/c5f09077/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 fa2cbe5..52ca0d2 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.5-SNAPSHOT +2.18.5 camel-sql-starter jar http://git-wip-us.apache.org/repos/asf/camel/blob/c5f09077/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 04763d0..122604d 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.5-SNAPSHOT +2.18.5 camel-ssh-starter jar http://git-wip-us.apache.org/repos/asf/camel/blob/c5f09077/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 e9ffb50..6a2aac0 1006
[14/14] camel git commit: [maven-release-plugin] prepare for next development iteration
[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/e82da57e Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e82da57e Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e82da57e Branch: refs/heads/camel-2.18.x Commit: e82da57e9c9af03a18b76613c6da133c3669c403 Parents: c5f0907 Author: Gregor Zurowski Authored: Thu Sep 21 08:17:16 2017 + Committer: Gregor Zurowski Committed: Thu Sep 21 08:17:16 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
[11/14] camel git commit: [maven-release-plugin] prepare for next development iteration
http://git-wip-us.apache.org/repos/asf/camel/blob/e82da57e/components/camel-jira/pom.xml -- diff --git a/components/camel-jira/pom.xml b/components/camel-jira/pom.xml index 05286ca..ec4157b 100644 --- a/components/camel-jira/pom.xml +++ b/components/camel-jira/pom.xml @@ -16,7 +16,7 @@ org.apache.camel components -2.18.5 +2.18.6-SNAPSHOT camel-jira http://git-wip-us.apache.org/repos/asf/camel/blob/e82da57e/components/camel-jms/pom.xml -- diff --git a/components/camel-jms/pom.xml b/components/camel-jms/pom.xml index 9934462..169c7ee 100644 --- a/components/camel-jms/pom.xml +++ b/components/camel-jms/pom.xml @@ -21,7 +21,7 @@ org.apache.camel components -2.18.5 +2.18.6-SNAPSHOT camel-jms http://git-wip-us.apache.org/repos/asf/camel/blob/e82da57e/components/camel-jmx/pom.xml -- diff --git a/components/camel-jmx/pom.xml b/components/camel-jmx/pom.xml index 705f2b3..8d6743f 100644 --- a/components/camel-jmx/pom.xml +++ b/components/camel-jmx/pom.xml @@ -21,7 +21,7 @@ org.apache.camel components -2.18.5 +2.18.6-SNAPSHOT camel-jmx http://git-wip-us.apache.org/repos/asf/camel/blob/e82da57e/components/camel-johnzon/pom.xml -- diff --git a/components/camel-johnzon/pom.xml b/components/camel-johnzon/pom.xml index 7f24b6f..ab6f792 100644 --- a/components/camel-johnzon/pom.xml +++ b/components/camel-johnzon/pom.xml @@ -21,7 +21,7 @@ org.apache.camel components -2.18.5 +2.18.6-SNAPSHOT camel-johnzon http://git-wip-us.apache.org/repos/asf/camel/blob/e82da57e/components/camel-jolt/pom.xml -- diff --git a/components/camel-jolt/pom.xml b/components/camel-jolt/pom.xml index f3eb23b..793db7a 100644 --- a/components/camel-jolt/pom.xml +++ b/components/camel-jolt/pom.xml @@ -22,7 +22,7 @@ components org.apache.camel -2.18.5 +2.18.6-SNAPSHOT camel-jolt http://git-wip-us.apache.org/repos/asf/camel/blob/e82da57e/components/camel-josql/pom.xml -- diff --git a/components/camel-josql/pom.xml b/components/camel-josql/pom.xml index 83130c6..b23db75 100644 --- a/components/camel-josql/pom.xml +++ b/components/camel-josql/pom.xml @@ -21,7 +21,7 @@ org.apache.camel components -2.18.5 +2.18.6-SNAPSHOT camel-josql http://git-wip-us.apache.org/repos/asf/camel/blob/e82da57e/components/camel-jpa/pom.xml -- diff --git a/components/camel-jpa/pom.xml b/components/camel-jpa/pom.xml index 2b92d39..799b2ca 100644 --- a/components/camel-jpa/pom.xml +++ b/components/camel-jpa/pom.xml @@ -21,7 +21,7 @@ org.apache.camel components -2.18.5 +2.18.6-SNAPSHOT camel-jpa http://git-wip-us.apache.org/repos/asf/camel/blob/e82da57e/components/camel-jsch/pom.xml -- diff --git a/components/camel-jsch/pom.xml b/components/camel-jsch/pom.xml index 28c69da..ef873c6 100644 --- a/components/camel-jsch/pom.xml +++ b/components/camel-jsch/pom.xml @@ -23,7 +23,7 @@ org.apache.camel components -2.18.5 +2.18.6-SNAPSHOT camel-jsch http://git-wip-us.apache.org/repos/asf/camel/blob/e82da57e/components/camel-jsonpath/pom.xml -- diff --git a/components/camel-jsonpath/pom.xml b/components/camel-jsonpath/pom.xml index 1d8a8cd..219490e 100644 --- a/components/camel-jsonpath/pom.xml +++ b/components/camel-jsonpath/pom.xml @@ -22,7 +22,7 @@ org.apache.camel components -2.18.5 +2.18.6-SNAPSHOT camel-jsonpath http://git-wip-us.apache.org/repos/asf/camel/blob/e82da57e/components/camel-jt400/pom.xml -- diff --git a/components/camel-jt400/pom.xml b/components/camel-jt400/pom.xml index 476ac14..79f7cfe 100644 --- a/components/camel-jt400/pom.xml +++ b/components/camel-jt400/pom.xml @@ -21,7 +21,7 @@ org.apache.camel components -2.18.5 +2.18.6-SNAPSHOT camel-jt400 http://git-wip-us.apache.org/repos/asf/camel/blob/e82da57e/components/camel-juel/pom.xml -- diff --git a/components/camel-juel/pom.xml b/components/camel-juel/pom.xml index abcd1ae..a067a97 100644 --- a/components/camel-juel/pom.xml +++ b/components/camel-juel/pom.xml @@ -21,7 +21,7 @@ org.apache.camel
[01/14] camel git commit: CAMEL-10393: camel-properties: Add an option to disable using default value if a property does not exists
Repository: camel Updated Branches: refs/heads/camel-2.18.x 7d0dbdffb -> e82da57e9 CAMEL-10393: camel-properties: Add an option to disable using default value if a property does not exists Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/57da1afe Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/57da1afe Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/57da1afe Branch: refs/heads/camel-2.18.x Commit: 57da1afee72f3e7b1810eee4c50ff876cb7792ca Parents: 7d0dbdf Author: lburgazzoli Authored: Wed Oct 19 17:05:03 2016 +0200 Committer: Gregor Zurowski Committed: Thu Sep 21 08:09:48 2017 +0100 -- .../src/main/docs/properties-component.adoc | 3 +- ...mentedPropertyNameAwarePropertiesParser.java | 5 +- .../properties/DefaultPropertiesParser.java | 22 --- .../properties/PropertiesComponent.java | 19 +- .../PropertiesComponentDisableDefaultsTest.java | 68 .../PropertiesComponentConfiguration.java | 14 .../xml/AbstractCamelContextFactoryBean.java| 3 + .../xml/CamelPropertyPlaceholderDefinition.java | 13 .../BridgePropertyPlaceholderConfigurer.java| 4 +- .../blueprint/BlueprintDefaultValuesTest.java | 51 +++ .../camel/test/blueprint/default-values.xml | 46 + 11 files changed, 232 insertions(+), 16 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/57da1afe/camel-core/src/main/docs/properties-component.adoc -- diff --git a/camel-core/src/main/docs/properties-component.adoc b/camel-core/src/main/docs/properties-component.adoc index 1668af9..b55849b 100644 --- a/camel-core/src/main/docs/properties-component.adoc +++ b/camel-core/src/main/docs/properties-component.adoc @@ -20,7 +20,7 @@ Options ^^^ // component options: START -The Properties component supports 15 options which are listed below. +The Properties component supports 16 options which are listed below. @@ -37,6 +37,7 @@ The Properties component supports 15 options which are listed below. | propertyPrefix | String | Optional prefix prepended to property names before resolution. | propertySuffix | String | Optional suffix appended to property names before resolution. | fallbackToUnaugmentedProperty | boolean | If true first attempt resolution of property name augmented with propertyPrefix and propertySuffix before falling back the plain property name specified. If false only the augmented property name is searched. +| disableDefaultValueResolution | boolean | If true the component does not attempt to find a default for the key by looking after the colon separator. | ignoreMissingLocation | boolean | Whether to silently ignore if a location cannot be located such as a properties file not found. | prefixToken | String | Sets the value of the prefix token used to identify properties to replace. Setting a value of null restores the default token (link link DEFAULT_PREFIX_TOKEN). | suffixToken | String | Sets the value of the suffix token used to identify properties to replace. Setting a value of null restores the default token (link link DEFAULT_SUFFIX_TOKEN). http://git-wip-us.apache.org/repos/asf/camel/blob/57da1afe/camel-core/src/main/java/org/apache/camel/component/properties/AugmentedPropertyNameAwarePropertiesParser.java -- diff --git a/camel-core/src/main/java/org/apache/camel/component/properties/AugmentedPropertyNameAwarePropertiesParser.java b/camel-core/src/main/java/org/apache/camel/component/properties/AugmentedPropertyNameAwarePropertiesParser.java index 0f4d05d..dfe8df7 100644 --- a/camel-core/src/main/java/org/apache/camel/component/properties/AugmentedPropertyNameAwarePropertiesParser.java +++ b/camel-core/src/main/java/org/apache/camel/component/properties/AugmentedPropertyNameAwarePropertiesParser.java @@ -40,6 +40,9 @@ public interface AugmentedPropertyNameAwarePropertiesParser extends PropertiesPa * @param fallbackToUnaugmentedProperty flag indicating if the originally *parsed property name should by used for resolution if there is *no match to the augmented property name + * @param disableDefaultValueResolution flag indicating if the value after colon + * should be the default value to use it + * the property has not been resolved * * @return the parsed text with replaced placeholders * @@ -47,5 +50,5 @@ public interface AugmentedPropertyNameAwarePropertiesParser extends PropertiesPa * is not found */ String parseUri(String text, Pro
[03/14] camel git commit: Fix Checkstyle issue
Fix Checkstyle issue
Signed-off-by: Gregor Zurowski
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/49e32334
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/49e32334
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/49e32334
Branch: refs/heads/camel-2.18.x
Commit: 49e32334a8f28fa46d95ecf0574e10d7c9241620
Parents: b843e0d
Author: Gregor Zurowski
Authored: Sun Sep 17 10:45:07 2017 +0200
Committer: Gregor Zurowski
Committed: Thu Sep 21 08:09:59 2017 +0100
--
.../apache/camel/component/cxf/transport/CamelDestination.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/49e32334/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelDestination.java
--
diff --git
a/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelDestination.java
b/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelDestination.java
index 900ecbe..2b9ac06 100644
---
a/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelDestination.java
+++
b/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelDestination.java
@@ -280,8 +280,8 @@ public class CamelDestination extends AbstractDestination
implements Configurabl
OutputStream outputStream =
outMessage.getContent(OutputStream.class);
if (outputStream instanceof CachedOutputStream) {
camelExchange.getOut().setBody(((CachedOutputStream)outputStream).getInputStream());
-} else {
-camelExchange.getOut().setBody(outputStream);
+} else {
+camelExchange.getOut().setBody(outputStream);
}
LOG.debug("send the response message: {}", outputStream);
}
[02/14] camel git commit: CAMEL-10393: camel-properties: Add an option to disable using default value if a property does not exists
CAMEL-10393: camel-properties: Add an option to disable using default value if a property does not exists Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b843e0dd Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b843e0dd Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b843e0dd Branch: refs/heads/camel-2.18.x Commit: b843e0dda9ae79bb0347ab42d3275db401f49e02 Parents: 57da1af Author: lburgazzoli Authored: Thu Oct 20 01:02:30 2016 +0200 Committer: Gregor Zurowski Committed: Thu Sep 21 08:09:54 2017 +0100 -- camel-core/src/main/docs/properties-component.adoc| 2 +- .../AugmentedPropertyNameAwarePropertiesParser.java | 8 .../component/properties/DefaultPropertiesParser.java | 12 ++-- .../component/properties/PropertiesComponent.java | 12 ++-- .../PropertiesComponentDisableDefaultsTest.java | 2 +- .../springboot/PropertiesComponentConfiguration.java | 11 +-- .../core/xml/AbstractCamelContextFactoryBean.java | 4 ++-- .../core/xml/CamelPropertyPlaceholderDefinition.java | 14 +++--- .../spi/BridgePropertyPlaceholderConfigurer.java | 4 ++-- .../apache/camel/test/blueprint/default-values.xml| 2 +- 10 files changed, 35 insertions(+), 36 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/b843e0dd/camel-core/src/main/docs/properties-component.adoc -- diff --git a/camel-core/src/main/docs/properties-component.adoc b/camel-core/src/main/docs/properties-component.adoc index b55849b..14291ca 100644 --- a/camel-core/src/main/docs/properties-component.adoc +++ b/camel-core/src/main/docs/properties-component.adoc @@ -37,7 +37,7 @@ The Properties component supports 16 options which are listed below. | propertyPrefix | String | Optional prefix prepended to property names before resolution. | propertySuffix | String | Optional suffix appended to property names before resolution. | fallbackToUnaugmentedProperty | boolean | If true first attempt resolution of property name augmented with propertyPrefix and propertySuffix before falling back the plain property name specified. If false only the augmented property name is searched. -| disableDefaultValueResolution | boolean | If true the component does not attempt to find a default for the key by looking after the colon separator. +| defaultFallbackEnabled | boolean | If true the component does not attempt to find a default for the key by looking after the colon separator. | ignoreMissingLocation | boolean | Whether to silently ignore if a location cannot be located such as a properties file not found. | prefixToken | String | Sets the value of the prefix token used to identify properties to replace. Setting a value of null restores the default token (link link DEFAULT_PREFIX_TOKEN). | suffixToken | String | Sets the value of the suffix token used to identify properties to replace. Setting a value of null restores the default token (link link DEFAULT_SUFFIX_TOKEN). http://git-wip-us.apache.org/repos/asf/camel/blob/b843e0dd/camel-core/src/main/java/org/apache/camel/component/properties/AugmentedPropertyNameAwarePropertiesParser.java -- diff --git a/camel-core/src/main/java/org/apache/camel/component/properties/AugmentedPropertyNameAwarePropertiesParser.java b/camel-core/src/main/java/org/apache/camel/component/properties/AugmentedPropertyNameAwarePropertiesParser.java index dfe8df7..a244227 100644 --- a/camel-core/src/main/java/org/apache/camel/component/properties/AugmentedPropertyNameAwarePropertiesParser.java +++ b/camel-core/src/main/java/org/apache/camel/component/properties/AugmentedPropertyNameAwarePropertiesParser.java @@ -40,9 +40,9 @@ public interface AugmentedPropertyNameAwarePropertiesParser extends PropertiesPa * @param fallbackToUnaugmentedProperty flag indicating if the originally *parsed property name should by used for resolution if there is *no match to the augmented property name - * @param disableDefaultValueResolution flag indicating if the value after colon - * should be the default value to use it - * the property has not been resolved + * @param defaultFallbackEnabled flag indicating if the value after colon + * should be the default value to use it + * the property has not been resolved * * @return the parsed text with replaced placeholders * @@ -50,5 +50,5 @@ public interface AugmentedPropertyNameAwarePropertiesParser extends PropertiesPa
[05/14] camel git commit: [maven-release-plugin] prepare release camel-2.18.5
http://git-wip-us.apache.org/repos/asf/camel/blob/c5f09077/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 586ec05..c6274f0 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.5-SNAPSHOT +2.18.5 camel-example-cdi-rest-servlet http://git-wip-us.apache.org/repos/asf/camel/blob/c5f09077/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 9705315..c45bdd8 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.5-SNAPSHOT +2.18.5 camel-example-cdi-test http://git-wip-us.apache.org/repos/asf/camel/blob/c5f09077/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 031c056..ba2e212 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.5-SNAPSHOT +2.18.5 camel-example-cdi-xml http://git-wip-us.apache.org/repos/asf/camel/blob/c5f09077/examples/camel-example-cdi/pom.xml -- diff --git a/examples/camel-example-cdi/pom.xml b/examples/camel-example-cdi/pom.xml index 024c34e..8523bf4 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.5-SNAPSHOT +2.18.5 camel-example-cdi http://git-wip-us.apache.org/repos/asf/camel/blob/c5f09077/examples/camel-example-console/pom.xml -- diff --git a/examples/camel-example-console/pom.xml b/examples/camel-example-console/pom.xml index 602bf93..b38788a 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.5-SNAPSHOT +2.18.5 camel-example-console http://git-wip-us.apache.org/repos/asf/camel/blob/c5f09077/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 b0424383..ecef11a 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.5-SNAPSHOT +2.18.5 camel-example-cxf-blueprint http://git-wip-us.apache.org/repos/asf/camel/blob/c5f09077/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 e29ea5c..c632ff9 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.5-SNAPSHOT +2.18.5 camel-example-cxf-osgi http://git-wip-us.apache.org/repos/asf/camel/blob/c5f09077/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 c7cb383..a5347b7 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.5-SNAPSHOT +2.18.5 camel-example-cxf-proxy http://git-wip-us.apache.org/repos/asf/camel/blob/c5f09077/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 677fa54..6eeb082 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.5-SNAPSHOT +2.18.5 camel-example-cxf-tomcat http://git-wip-us.apache.org/repos/asf/camel/blob/c5f09077/examples/camel-example-cxf/pom.xml -- diff --git a/examples/camel-example-cxf/pom.xml b/examples/camel-example-cxf/pom.xml index cb3d190..514f222 100644 --- a/examples/camel-example-cxf/pom.xml +++ b/examples
[06/14] camel git commit: [maven-release-plugin] prepare release camel-2.18.5
http://git-wip-us.apache.org/repos/asf/camel/blob/c5f09077/components/camel-jira/pom.xml -- diff --git a/components/camel-jira/pom.xml b/components/camel-jira/pom.xml index 8c63d23..05286ca 100644 --- a/components/camel-jira/pom.xml +++ b/components/camel-jira/pom.xml @@ -16,7 +16,7 @@ org.apache.camel components -2.18.5-SNAPSHOT +2.18.5 camel-jira http://git-wip-us.apache.org/repos/asf/camel/blob/c5f09077/components/camel-jms/pom.xml -- diff --git a/components/camel-jms/pom.xml b/components/camel-jms/pom.xml index 851443d..9934462 100644 --- a/components/camel-jms/pom.xml +++ b/components/camel-jms/pom.xml @@ -21,7 +21,7 @@ org.apache.camel components -2.18.5-SNAPSHOT +2.18.5 camel-jms http://git-wip-us.apache.org/repos/asf/camel/blob/c5f09077/components/camel-jmx/pom.xml -- diff --git a/components/camel-jmx/pom.xml b/components/camel-jmx/pom.xml index 8323ffb..705f2b3 100644 --- a/components/camel-jmx/pom.xml +++ b/components/camel-jmx/pom.xml @@ -21,7 +21,7 @@ org.apache.camel components -2.18.5-SNAPSHOT +2.18.5 camel-jmx http://git-wip-us.apache.org/repos/asf/camel/blob/c5f09077/components/camel-johnzon/pom.xml -- diff --git a/components/camel-johnzon/pom.xml b/components/camel-johnzon/pom.xml index 47a70fc..7f24b6f 100644 --- a/components/camel-johnzon/pom.xml +++ b/components/camel-johnzon/pom.xml @@ -21,7 +21,7 @@ org.apache.camel components -2.18.5-SNAPSHOT +2.18.5 camel-johnzon http://git-wip-us.apache.org/repos/asf/camel/blob/c5f09077/components/camel-jolt/pom.xml -- diff --git a/components/camel-jolt/pom.xml b/components/camel-jolt/pom.xml index a8a6048..f3eb23b 100644 --- a/components/camel-jolt/pom.xml +++ b/components/camel-jolt/pom.xml @@ -22,7 +22,7 @@ components org.apache.camel -2.18.5-SNAPSHOT +2.18.5 camel-jolt http://git-wip-us.apache.org/repos/asf/camel/blob/c5f09077/components/camel-josql/pom.xml -- diff --git a/components/camel-josql/pom.xml b/components/camel-josql/pom.xml index c0360e3..83130c6 100644 --- a/components/camel-josql/pom.xml +++ b/components/camel-josql/pom.xml @@ -21,7 +21,7 @@ org.apache.camel components -2.18.5-SNAPSHOT +2.18.5 camel-josql http://git-wip-us.apache.org/repos/asf/camel/blob/c5f09077/components/camel-jpa/pom.xml -- diff --git a/components/camel-jpa/pom.xml b/components/camel-jpa/pom.xml index e5afe1e..2b92d39 100644 --- a/components/camel-jpa/pom.xml +++ b/components/camel-jpa/pom.xml @@ -21,7 +21,7 @@ org.apache.camel components -2.18.5-SNAPSHOT +2.18.5 camel-jpa http://git-wip-us.apache.org/repos/asf/camel/blob/c5f09077/components/camel-jsch/pom.xml -- diff --git a/components/camel-jsch/pom.xml b/components/camel-jsch/pom.xml index 6c926ba..28c69da 100644 --- a/components/camel-jsch/pom.xml +++ b/components/camel-jsch/pom.xml @@ -23,7 +23,7 @@ org.apache.camel components -2.18.5-SNAPSHOT +2.18.5 camel-jsch http://git-wip-us.apache.org/repos/asf/camel/blob/c5f09077/components/camel-jsonpath/pom.xml -- diff --git a/components/camel-jsonpath/pom.xml b/components/camel-jsonpath/pom.xml index 9129144..1d8a8cd 100644 --- a/components/camel-jsonpath/pom.xml +++ b/components/camel-jsonpath/pom.xml @@ -22,7 +22,7 @@ org.apache.camel components -2.18.5-SNAPSHOT +2.18.5 camel-jsonpath http://git-wip-us.apache.org/repos/asf/camel/blob/c5f09077/components/camel-jt400/pom.xml -- diff --git a/components/camel-jt400/pom.xml b/components/camel-jt400/pom.xml index 2d46905..476ac14 100644 --- a/components/camel-jt400/pom.xml +++ b/components/camel-jt400/pom.xml @@ -21,7 +21,7 @@ org.apache.camel components -2.18.5-SNAPSHOT +2.18.5 camel-jt400 http://git-wip-us.apache.org/repos/asf/camel/blob/c5f09077/components/camel-juel/pom.xml -- diff --git a/components/camel-juel/pom.xml b/components/camel-juel/pom.xml index 2c1e86a..abcd1ae 100644 --- a/components/camel-juel/pom.xml +++ b/components/camel-juel/pom.xml @@ -21,7 +21,7 @@ org.apache.camel
[04/14] camel git commit: Fix Checkstyle issue
Fix Checkstyle issue
Signed-off-by: Gregor Zurowski
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9a1159c5
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9a1159c5
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9a1159c5
Branch: refs/heads/camel-2.18.x
Commit: 9a1159c50f402e97a35c2c0c2910be59a5d3c2ad
Parents: 49e3233
Author: Gregor Zurowski
Authored: Sun Sep 17 12:25:20 2017 +0200
Committer: Gregor Zurowski
Committed: Thu Sep 21 08:10:05 2017 +0100
--
.../java/org/apache/camel/component/leveldb/LevelDBFile.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/9a1159c5/components/camel-leveldb/src/main/java/org/apache/camel/component/leveldb/LevelDBFile.java
--
diff --git
a/components/camel-leveldb/src/main/java/org/apache/camel/component/leveldb/LevelDBFile.java
b/components/camel-leveldb/src/main/java/org/apache/camel/component/leveldb/LevelDBFile.java
index b284256..5ba8019 100644
---
a/components/camel-leveldb/src/main/java/org/apache/camel/component/leveldb/LevelDBFile.java
+++
b/components/camel-leveldb/src/main/java/org/apache/camel/component/leveldb/LevelDBFile.java
@@ -180,8 +180,8 @@ public class LevelDBFile implements Service {
private DBFactory getFactory() {
String[] classNames = new String[] {
-"org.fusesource.leveldbjni.JniDBFactory",
-"org.iq80.leveldb.impl.Iq80DBFactory"
+"org.fusesource.leveldbjni.JniDBFactory",
+"org.iq80.leveldb.impl.Iq80DBFactory"
};
for (String cn : classNames) {
try {
[2/3] camel git commit: CAMEL-11776: Renamed the twitter-search connector to twitter-find
http://git-wip-us.apache.org/repos/asf/camel/blob/0b83a0eb/connectors/examples/twitter-search-connector/src/main/java/org/foo/search/springboot/TwitterSearchConnectorConfigurationCommon.java
--
diff --git
a/connectors/examples/twitter-search-connector/src/main/java/org/foo/search/springboot/TwitterSearchConnectorConfigurationCommon.java
b/connectors/examples/twitter-search-connector/src/main/java/org/foo/search/springboot/TwitterSearchConnectorConfigurationCommon.java
deleted file mode 100644
index c320a39..000
---
a/connectors/examples/twitter-search-connector/src/main/java/org/foo/search/springboot/TwitterSearchConnectorConfigurationCommon.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.foo.search.springboot;
-
-import javax.annotation.Generated;
-
-/**
- * Search for twitter
- *
- * Generated by camel-package-maven-plugin - do not edit this file!
- */
-@Generated("org.apache.camel.maven.connector.SpringBootAutoConfigurationMojo")
-public class TwitterSearchConnectorConfigurationCommon {
-
-/**
- * The access token
- */
-private String accessToken;
-/**
- * The access token secret
- */
-private String accessTokenSecret;
-/**
- * The consumer key
- */
-private String consumerKey;
-/**
- * The consumer secret
- */
-private String consumerSecret;
-/**
- * Filter out old tweets that has previously been polled. This state is
- * stored in memory only and based on last tweet id.
- */
-private boolean filterOld = true;
-/**
- * Can be used for search and streaming/filter. Multiple values can be
- * separated with comma.
- */
-private String keywords;
-/**
- * Milliseconds before the next poll.
- */
-private long delay = 5000L;
-/**
- * A prefix
- */
-private String prefix;
-
-public String getAccessToken() {
-return accessToken;
-}
-
-public void setAccessToken(String accessToken) {
-this.accessToken = accessToken;
-}
-
-public String getAccessTokenSecret() {
-return accessTokenSecret;
-}
-
-public void setAccessTokenSecret(String accessTokenSecret) {
-this.accessTokenSecret = accessTokenSecret;
-}
-
-public String getConsumerKey() {
-return consumerKey;
-}
-
-public void setConsumerKey(String consumerKey) {
-this.consumerKey = consumerKey;
-}
-
-public String getConsumerSecret() {
-return consumerSecret;
-}
-
-public void setConsumerSecret(String consumerSecret) {
-this.consumerSecret = consumerSecret;
-}
-
-public boolean isFilterOld() {
-return filterOld;
-}
-
-public void setFilterOld(boolean filterOld) {
-this.filterOld = filterOld;
-}
-
-public String getKeywords() {
-return keywords;
-}
-
-public void setKeywords(String keywords) {
-this.keywords = keywords;
-}
-
-public long getDelay() {
-return delay;
-}
-
-public void setDelay(long delay) {
-this.delay = delay;
-}
-
-public String getPrefix() {
-return prefix;
-}
-
-public void setPrefix(String prefix) {
-this.prefix = prefix;
-}
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/0b83a0eb/connectors/examples/twitter-search-connector/src/main/resources/META-INF/services/org/apache/camel/component/twitter-search
--
diff --git
a/connectors/examples/twitter-search-connector/src/main/resources/META-INF/services/org/apache/camel/component/twitter-search
b/connectors/examples/twitter-search-connector/src/main/resources/META-INF/services/org/apache/camel/component/twitter-search
deleted file mode 100644
index 34e94d4..000
---
a/connectors/examples/twitter-search-connector/src/main/resources/META-INF/services/org/apache/camel/component/twitter-search
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. S
[1/3] camel git commit: CAMEL-11776: Fixed doc and checkstyle
Repository: camel Updated Branches: refs/heads/master 0b3c19ce2 -> 280d9e948 CAMEL-11776: Fixed doc and checkstyle Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/280d9e94 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/280d9e94 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/280d9e94 Branch: refs/heads/master Commit: 280d9e9481361d212ee9ba4d9589ca7e2e750a09 Parents: 0b83a0e Author: aldettinger Authored: Thu Sep 21 15:36:09 2017 +0200 Committer: Claus Ibsen Committed: Fri Sep 22 08:19:03 2017 +0200 -- .../src/main/docs/connector-component.adoc | 44 ++-- .../springboot/TwitterFindConnectorTest.java| 16 +++ .../src/test/resources/application.properties | 17 .../src/test/resources/logback.xml | 4 ++ .../src/main/resources/application.properties | 32 +++--- 5 files changed, 75 insertions(+), 38 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/280d9e94/connectors/camel-connector/src/main/docs/connector-component.adoc -- diff --git a/connectors/camel-connector/src/main/docs/connector-component.adoc b/connectors/camel-connector/src/main/docs/connector-component.adoc index de55227..4b588a5 100644 --- a/connectors/camel-connector/src/main/docs/connector-component.adoc +++ b/connectors/camel-connector/src/main/docs/connector-component.adoc @@ -6,7 +6,7 @@ The connector component is an abstract component that is used as a building bloc ### What is a Camel connector? A Camel connector is a simplified setup of any existing Camel component. The idea is to be able to pre-configure - a connector to a specific use-case, such as _add contact to salesforce_, or _add calender entry_, + a connector to a specific use-case, such as _add contact to salesforce_, or _add calendar entry_, or _new leads from twitter_. The existing Camel components are generic and have many options. Therefore to use any of these components you @@ -42,7 +42,7 @@ You can also copy the existing examples from the `connectors` directory where th - `foo-connector` - A connector that is based on the Timer component from `camel-core`. - `bar-connector` - A connector that is based on the 3rd party `beverage-component`. - `wine-connector` - Another connector that is based on the 3rd party `beverage-component`. -- `twitter-search` - A connector based on twitter to search for keywords. +- `twitter-find` - A connector based on twitter to search for keywords. You can find an example using these connectors in the `foo-bar-wine-example` in the `connectors` directory. @@ -162,35 +162,35 @@ You will also need to add the `spring-boot-configuration-processor` in the Maven -An example on how to configure a component in spring boot can be taken from the twitter-search connector: +An example on how to configure a component in spring boot can be taken from the twitter-find connector: [source] -camel.connector.twitter-search.consumer-key = ... -camel.connector.twitter-search.consumer-secret = ... -camel.connector.twitter-search.access-token = ... -camel.connector.twitter-search.access-token-secret = ... -camel.connector.twitter-search.keywords = apache-camel +camel.connector.twitter-find.consumer-key = ... +camel.connector.twitter-find.consumer-secret = ... +camel.connector.twitter-find.access-token = ... +camel.connector.twitter-find.access-token-secret = ... +camel.connector.twitter-find.keywords = apache-camel You may need to instantiate multiple instance of the connector i.e. to use different logins and this is now possible through the 'configurations' parameters: [source] -camel.connector.twitter-search.configurations.tw-search1.consumer-key = ... -camel.connector.twitter-search.configurations.tw-search1.consumer-secret = ... -camel.connector.twitter-search.configurations.tw-search1.access-token = ... - camel.connector.twitter-search.configurations.tw-search1.access-token-secret = ... -camel.connector.twitter-search.configurations.tw-search1.keywords = apache-camel - -camel.connector.twitter-search.configurations.tw-search2.consumer-key = ... -camel.connector.twitter-search.configurations.tw-search2.consumer-secret = ... -camel.connector.twitter-search.configurations.tw-search2.access-token = ... - camel.connector.twitter-search.configurations.tw-search2.access-token-secret = ... -camel.connector.twitter-search.configurations.tw-search2.keywords = apache-karaf +camel.connector.twitter-find.configurations.tw-find1.consumer-key = ... +camel.connector.twitter-find.configurations.tw-find1.cons
[3/3] camel git commit: CAMEL-11776: Renamed the twitter-search connector to twitter-find
CAMEL-11776: Renamed the twitter-search connector to twitter-find
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/0b83a0eb
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/0b83a0eb
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/0b83a0eb
Branch: refs/heads/master
Commit: 0b83a0eb098f436805051d51c3aa244be75f9c0d
Parents: 0b3c19c
Author: aldettinger
Authored: Thu Sep 21 14:49:15 2017 +0200
Committer: Claus Ibsen
Committed: Fri Sep 22 08:19:03 2017 +0200
--
connectors/examples/pom.xml | 4 +-
.../examples/twitter-find-connector/pom.xml | 188 +
.../java/org/foo/find/TwitterFindComponent.java | 30 +++
.../TwitterFindConnectorAutoConfiguration.java | 148 ++
.../TwitterFindConnectorConfiguration.java | 38
...TwitterFindConnectorConfigurationCommon.java | 127
.../org/apache/camel/component/twitter-find | 18 ++
.../main/resources/META-INF/spring.factories| 19 ++
.../main/resources/camel-connector-schema.json | 33 +++
.../src/main/resources/camel-connector.json | 39
.../springboot/TwitterFindConnectorTest.java| 65 ++
.../src/test/resources/application.properties | 7 +
.../src/test/resources/logback.xml | 36
.../examples/twitter-find-example/README.md | 18 ++
.../examples/twitter-find-example/pom.xml | 112 ++
.../java/org/foo/TwitterFindApplication.java| 32 +++
.../java/org/foo/TwitterFindCustomizer.java | 45
.../foo/TwitterFindCustomizerProperties.java| 37
.../src/main/java/org/foo/TwitterFindRoute.java | 29 +++
.../src/main/resources/META-INF/LICENSE.txt | 203 +++
.../src/main/resources/META-INF/NOTICE.txt | 11 +
.../src/main/resources/application.properties | 31 +++
.../examples/twitter-search-connector/pom.xml | 188 -
.../org/foo/search/TwitterSearchComponent.java | 30 ---
...TwitterSearchConnectorAutoConfiguration.java | 148 --
.../TwitterSearchConnectorConfiguration.java| 38
...itterSearchConnectorConfigurationCommon.java | 127
.../org/apache/camel/component/twitter-search | 18 --
.../main/resources/META-INF/spring.factories| 19 --
.../main/resources/camel-connector-schema.json | 33 ---
.../src/main/resources/camel-connector.json | 39
.../springbot/TwitterSearchConnectorTest.java | 65 --
.../src/test/resources/application.properties | 7 -
.../src/test/resources/logback.xml | 36
.../examples/twitter-search-example/README.md | 18 --
.../examples/twitter-search-example/pom.xml | 112 --
.../java/org/foo/TwitterSearchApplication.java | 32 ---
.../java/org/foo/TwitterSearchCustomizer.java | 45
.../foo/TwitterSearchCustomizerProperties.java | 37
.../main/java/org/foo/TwitterSearchRoute.java | 29 ---
.../src/main/resources/META-INF/LICENSE.txt | 203 ---
.../src/main/resources/META-INF/NOTICE.txt | 11 -
.../src/main/resources/application.properties | 31 ---
43 files changed, 1268 insertions(+), 1268 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/0b83a0eb/connectors/examples/pom.xml
--
diff --git a/connectors/examples/pom.xml b/connectors/examples/pom.xml
index 8a4b10a..654381b 100644
--- a/connectors/examples/pom.xml
+++ b/connectors/examples/pom.xml
@@ -40,8 +40,8 @@
wine-connector
foo-bar-wine-example
twitter-mention-connector
-twitter-search-connector
-twitter-search-example
+twitter-find-connector
+twitter-find-example
twitter-salesforce-example
salesforce-upsert-contact-connector
petstore-connector
http://git-wip-us.apache.org/repos/asf/camel/blob/0b83a0eb/connectors/examples/twitter-find-connector/pom.xml
--
diff --git a/connectors/examples/twitter-find-connector/pom.xml
b/connectors/examples/twitter-find-connector/pom.xml
new file mode 100644
index 000..32ba369
--- /dev/null
+++ b/connectors/examples/twitter-find-connector/pom.xml
@@ -0,0 +1,188 @@
+
+
+http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
+
+ 4.0.0
+
+
+org.apache.camel
+connectors-examples
+2.20.0-SNAPSHOT
+..
+
+
+ org.foo
+ twitter-find-connector
+ Camel :: Connectors :: Examples :: Twitter Find Connector
+ Twitter Find Connector
+ jar
+
+
+
+
+
+org.apache.camel
+camel-parent
+${project.ver
camel git commit: [CAMEL-11798] Connector API assumes flat classpath (fix typo)
Repository: camel
Updated Branches:
refs/heads/master 79993fe2b -> 0b3c19ce2
[CAMEL-11798] Connector API assumes flat classpath (fix typo)
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/0b3c19ce
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/0b3c19ce
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/0b3c19ce
Branch: refs/heads/master
Commit: 0b3c19ce2499d7306b52fe14f4e3b161df42b771
Parents: 79993fe
Author: Thomas Diesler
Authored: Thu Sep 21 14:31:03 2017 +0200
Committer: Claus Ibsen
Committed: Fri Sep 22 08:17:50 2017 +0200
--
.../camel/component/connector/DefaultConnectorComponent.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/0b3c19ce/connectors/camel-connector/src/main/java/org/apache/camel/component/connector/DefaultConnectorComponent.java
--
diff --git
a/connectors/camel-connector/src/main/java/org/apache/camel/component/connector/DefaultConnectorComponent.java
b/connectors/camel-connector/src/main/java/org/apache/camel/component/connector/DefaultConnectorComponent.java
index 57afa69..88b7832 100644
---
a/connectors/camel-connector/src/main/java/org/apache/camel/component/connector/DefaultConnectorComponent.java
+++
b/connectors/camel-connector/src/main/java/org/apache/camel/component/connector/DefaultConnectorComponent.java
@@ -69,15 +69,15 @@ public abstract class DefaultConnectorComponent extends
DefaultComponent impleme
this(componentName, loadConnectorClass(className));
}
-protected DefaultConnectorComponent(String componentName, Class
className) {
-this.model = new ConnectorModel(componentName, className);
+protected DefaultConnectorComponent(String componentName, Class
componentClass) {
+this.model = new ConnectorModel(componentName, componentClass);
this.baseScheme = this.model.getBaseScheme();
this.componentName = componentName;
this.componentScheme = componentName + "-component";
this.options = new HashMap<>();
// add to catalog
-this.catalog.addComponent(componentName, className.getName());
+this.catalog.addComponent(componentName, componentClass.getName());
// It may be a custom component so we need to register this in the
camel catalog also
if (!catalog.findComponentNames().contains(baseScheme)) {
camel git commit: CAMEL-10225: Add option to xpath to enable thread safety as otherwise we can get weird issues when using camel-saxon etc. Thanks to David Bennison for providing unit test.
Repository: camel
Updated Branches:
refs/heads/master db22d8468 -> 79993fe2b
CAMEL-10225: Add option to xpath to enable thread safety as otherwise we can
get weird issues when using camel-saxon etc. Thanks to David Bennison for
providing unit test.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/79993fe2
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/79993fe2
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/79993fe2
Branch: refs/heads/master
Commit: 79993fe2b37f9e3803f120c2c128ac05c808adbf
Parents: db22d84
Author: Claus Ibsen
Authored: Thu Sep 21 17:13:08 2017 +0200
Committer: Claus Ibsen
Committed: Thu Sep 21 17:46:24 2017 +0200
--
camel-core/src/main/docs/xpath-language.adoc| 5 +-
.../apache/camel/builder/xml/XPathBuilder.java | 47
.../converter/jaxp/ThreadSafeNodeList.java | 78
.../camel/language/xpath/XPathLanguage.java | 12 +++
.../camel/model/language/XPathExpression.java | 30 +++-
.../springboot/XPathLanguageConfiguration.java | 20 +
6 files changed, 188 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/79993fe2/camel-core/src/main/docs/xpath-language.adoc
--
diff --git a/camel-core/src/main/docs/xpath-language.adoc
b/camel-core/src/main/docs/xpath-language.adoc
index 79a8a42..85207f8 100644
--- a/camel-core/src/main/docs/xpath-language.adoc
+++ b/camel-core/src/main/docs/xpath-language.adoc
@@ -38,7 +38,7 @@ from("queue:foo").
=== XPath Language options
// language options: START
-The XPath language supports 8 options which are listed below.
+The XPath language supports 9 options which are listed below.
@@ -46,12 +46,13 @@ The XPath language supports 8 options which are listed
below.
|===
| Name | Default | Java Type | Description
| documentType | | String | Name of class for document type The default value
is org.w3c.dom.Document
-| resultType | | String | Sets the class name of the result type (type from
output) The default result type is NodeSet
+| resultType | NODESET | String | Sets the class name of the result type (type
from output) The default result type is NodeSet
| saxon | false | Boolean | Whether to use Saxon.
| factoryRef | | String | References to a custom XPathFactory to lookup in
the registry
| objectModel | | String | The XPath object model to use
| logNamespaces | false | Boolean | Whether to log namespaces which can assist
during trouble shooting
| headerName | | String | Name of header to use as input instead of the
message body
+| threadSafety | false | Boolean | Whether to enable thread-safety for the
returned result of the xpath expression. This applies to when using NODESET as
the result type and the returned set has multiple elements. In this situation
there can be thread-safety issues if you process the NODESET concurrently such
as from a Camel Splitter EIP in parallel processing mode. This option prevents
concurrency issues by doing defensive copies of the nodes. It is recommended to
turn this option on if you are using camel-saxon or Saxon in your application.
Saxon has thread-safety issues which can be prevented by turning this option on.
| trim | true | Boolean | Whether to trim the value to remove leading and
trailing whitespaces and line breaks
|===
// language options: END
http://git-wip-us.apache.org/repos/asf/camel/blob/79993fe2/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java
--
diff --git
a/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java
b/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java
index dc7ffb3..da3279c 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/xml/XPathBuilder.java
@@ -50,6 +50,7 @@ import org.apache.camel.NoTypeConversionAvailableException;
import org.apache.camel.Predicate;
import org.apache.camel.RuntimeExpressionException;
import org.apache.camel.WrappedFile;
+import org.apache.camel.converter.jaxp.ThreadSafeNodeList;
import org.apache.camel.impl.DefaultExchange;
import org.apache.camel.spi.Language;
import org.apache.camel.spi.NamespaceAware;
@@ -96,6 +97,7 @@ public class XPathBuilder extends ServiceSupport implements
Expression, Predicat
private final ThreadLocal exchange = new ThreadLocal();
private final MessageVariableResolver variableResolver = new
MessageVariableResolver(exchange);
private final Map namespaces = new
ConcurrentHashMap();
+private boolean threadSafety;
private volatile XPathFactory xpathFactory;
private volatile Cla
[2/2] camel git commit: CAMEL-11786: Migrate docs to more correct ascii doc format
CAMEL-11786: Migrate docs to more correct ascii doc format
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/db22d846
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/db22d846
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/db22d846
Branch: refs/heads/master
Commit: db22d8468a950c85a51edb201dfc7870a6e03ab6
Parents: 76f6a37
Author: Claus Ibsen
Authored: Thu Sep 21 10:54:16 2017 +0200
Committer: Claus Ibsen
Committed: Thu Sep 21 11:25:39 2017 +0200
--
.../src/main/docs/eips/recipientList-eip.adoc | 289 -
.../src/main/docs/eips/resequence-eip.adoc | 101 +++---
camel-core/src/main/docs/eips/sample-eip.adoc | 21 +-
camel-core/src/main/docs/eips/script-eip.adoc | 29 +-
.../src/main/docs/eips/serviceCall-eip.adoc | 235 +++---
camel-core/src/main/docs/eips/sort-eip.adoc | 66 ++--
camel-core/src/main/docs/eips/split-eip.adoc| 311 ++-
camel-core/src/main/docs/eips/throttle-eip.adoc | 51 ++-
camel-core/src/main/docs/eips/validate-eip.adoc | 45 +--
9 files changed, 519 insertions(+), 629 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/db22d846/camel-core/src/main/docs/eips/recipientList-eip.adoc
--
diff --git a/camel-core/src/main/docs/eips/recipientList-eip.adoc
b/camel-core/src/main/docs/eips/recipientList-eip.adoc
index 01b7656..c2dac10 100644
--- a/camel-core/src/main/docs/eips/recipientList-eip.adoc
+++ b/camel-core/src/main/docs/eips/recipientList-eip.adoc
@@ -33,211 +33,172 @@ The Recipient List EIP supports 15 options which are
listed below:
// eip options: END
+TIP: You can use the RecipientList Annotation on a POJO to create a Dynamic
Recipient List. For more details see the Bean Integration.
+
=== Static Recipient List
The following example shows how to route a request from an input *queue:a*
endpoint to a static list of destinations
-#=== Using Annotations
-You can use the RecipientList Annotation on a POJO to create a Dynamic
Recipient List. For more details see the Bean Integration.
-
-#=== Using the Fluent Builders
-
[source,java]
--
-RouteBuilder builder = new RouteBuilder() {
-public void configure() {
-errorHandler(deadLetterChannel("mock:error"));
+
+from("jms:queue:a")
+.recipientList("direct:b,direct:c,direct:d");
+
-from("direct:a")
-.multicast().to("direct:b", "direct:c", "direct:d");
-}
-};
--
-
-#=== Using the Spring XML Extensions
+And in XML:
[source,xml]
--
-http://camel.apache.org/schema/spring";>
+
+http://camel.apache.org/schema/spring";>
-
-
-
-
-
-
+
+
+direct:b,direct:c,direct:d
+
--
+
=== Dynamic Recipient List
-Usually one of the main reasons for using the Recipient List pattern is that
the list of recipients is dynamic and calculated at runtime. The following
example demonstrates how to create a dynamic recipient list using an Expression
(which in this case extracts a named header value dynamically) to calculate the
list of endpoints which are either of type Endpoint or are converted to a
String and then resolved using the endpoint URIs.
-
-#=== Using the Fluent Builders
-
-[source,java]
--
-RouteBuilder builder = new RouteBuilder() {
-public void configure() {
-errorHandler(deadLetterChannel("mock:error"));
-
-from("direct:a")
-.recipientList(header("foo"));
-}
-};
--
-
-The above assumes that the header contains a list of endpoint URIs. The
following takes a single string header and tokenizes it
+Usually one of the main reasons for using the Recipient List pattern is that
the list of recipients is dynamic and
+calculated at runtime. The following example demonstrates how to create a
dynamic recipient list using an Expression
+(which in this case extracts a named header value dynamically) to calculate
the list of endpoints which are either
+of type Endpoint or are converted to a String and then resolved using the
endpoint URIs (separated by comma).
[source,java]
--
-from("direct:a").recipientList(
-header("recipientListHeader").tokenize(","));
--
+
+from("jms:queue:a")
+.recipientList(header("foo"));
+
-##=== Iteratable value
+=== Iteratable value
The dynamic list of recipients that are defined in the header must be iterable
such as:
* `java.util.Collection`
* `java.util.Iterator`
* arrays
* `org.w3c.dom.NodeList`
-* a single String with values separated by comma
+* a single S
[1/2] camel git commit: CAMEL-11786: Migrate docs to more correct ascii doc format
Repository: camel
Updated Branches:
refs/heads/master 76f6a3704 -> db22d8468
http://git-wip-us.apache.org/repos/asf/camel/blob/db22d846/camel-core/src/main/docs/eips/throttle-eip.adoc
--
diff --git a/camel-core/src/main/docs/eips/throttle-eip.adoc
b/camel-core/src/main/docs/eips/throttle-eip.adoc
index 7e026ca..b9d3d4c 100644
--- a/camel-core/src/main/docs/eips/throttle-eip.adoc
+++ b/camel-core/src/main/docs/eips/throttle-eip.adoc
@@ -1,4 +1,5 @@
== Throttle EIP
+
The Throttler Pattern allows you to ensure that a specific endpoint does not
get overloaded, or that we don't exceed an agreed SLA with some external
service.
=== Options
@@ -18,40 +19,30 @@ The Throttle EIP supports 5 options which are listed below:
|===
// eip options: END
-=== Examples
-#=== Using the Fluent Builders
+=== Samples
[source,java]
--
-from("seda:a").throttle(3).timePeriodMillis(1).to("log:result",
"mock:result");
--
+
+from("seda:a")
+ .throttle(3).timePeriodMillis(1)
+ .to("log:result", "mock:result");
+
So the above example will throttle messages all messages received on *seda:a*
before being sent to *mock:result* ensuring that a maximum of 3 messages are
sent in any 10 second window.
Note that since `timePeriodMillis` defaults to 1000 milliseconds, just setting
the `maximumRequestsPerPeriod` has the effect of setting the maximum number of
requests per second. So to throttle requests at 100 requests per second between
two endpoints, it would look more like this...
[source,java]
--
-from("seda:a").throttle(100).to("seda:b");
--
+
+from("seda:a")
+ .throttle(100)
+ .to("seda:b");
+
For further examples of this pattern in use you could look at the junit test
case.
-#=== Using the Spring XML Extensions
-##=== Camel 2.7.x or older
+And an example in XML
[source,xml]
--
-
-
-
-
-
-
--
-
-##=== Camel 2.8 onwards
-In Camel 2.8 onwards you must set the maximum period as an Expression as shown
below where we use a Constant expression:
-[source,xml]
--
+
@@ -61,14 +52,14 @@ In Camel 2.8 onwards you must set the maximum period as an
Expression as shown b
--
+
=== Dynamically changing maximum requests per period
*Available as of Camel 2.8*
Since we use an Expression you can adjust this value at runtime, for example
you can provide a header with the value. At runtime Camel evaluates the
expression and converts the result to a `java.lang.Long` type. In the example
below we use a header from the message to determine the maximum requests per
period. If the header is absent, then the Throttler uses the old value. So that
allows you to only provide a header if the value is to be changed:
[source,xml]
--
+
@@ -78,17 +69,15 @@ Since we use an Expression you can adjust this value at
runtime, for example you
--
+
=== Asynchronous delaying
-*Available as of Camel 2.4*
You can let the Throttler use non blocking asynchronous delaying, which means
Camel will use a scheduler to schedule a task to be executed in the future. The
task will then continue routing. This allows the caller thread to not block and
be able to service other messages, etc.
[source,java]
-
-from("seda:a").throttle(100).asyncDelayed().to("seda:b");
+from("seda:a")
+ .throttle(100).asyncDelayed()
+ .to("seda:b");
-
-
-=== Using This Pattern
-If you would like to use this EIP Pattern then please read the Getting
Started, you may also find the Architecture useful particularly the description
of Endpoint and URIs. Then you could try out some of the Examples first before
trying this pattern out.
http://git-wip-us.apache.org/repos/asf/camel/blob/db22d846/camel-core/src/main/docs/eips/validate-eip.adoc
--
diff --git a/camel-core/src/main/docs/eips/validate-eip.adoc
b/camel-core/src/main/docs/eips/validate-eip.adoc
index e962c9d..cd3cb2c 100644
--- a/camel-core/src/main/docs/eips/validate-eip.adoc
+++ b/camel-core/src/main/docs/eips/validate-eip.adoc
@@ -1,7 +1,11 @@
== Validate EIP
*Available as of Camel 2.3* +
-Validate uses an expression or predicates to validate the contents of a
message. It is useful for ensuring that messages are valid before attempting to
process them. +
-You can use the validate DSL with all kind of Predicates and Expressions.
Validate evaluates the Predicate/Expression and if it is false a
`PredicateValidationException` is thrown. If it is true message processing
continues.
+
+Validate uses an expression or predicates to validate the contents of a
message.
+It is useful for ensuring that messages are valid before attempt
[2/5] camel git commit: [maven-release-plugin] prepare for next development iteration
http://git-wip-us.apache.org/repos/asf/camel/blob/e82da57e/components/camel-jira/pom.xml -- diff --git a/components/camel-jira/pom.xml b/components/camel-jira/pom.xml index 05286ca..ec4157b 100644 --- a/components/camel-jira/pom.xml +++ b/components/camel-jira/pom.xml @@ -16,7 +16,7 @@ org.apache.camel components -2.18.5 +2.18.6-SNAPSHOT camel-jira http://git-wip-us.apache.org/repos/asf/camel/blob/e82da57e/components/camel-jms/pom.xml -- diff --git a/components/camel-jms/pom.xml b/components/camel-jms/pom.xml index 9934462..169c7ee 100644 --- a/components/camel-jms/pom.xml +++ b/components/camel-jms/pom.xml @@ -21,7 +21,7 @@ org.apache.camel components -2.18.5 +2.18.6-SNAPSHOT camel-jms http://git-wip-us.apache.org/repos/asf/camel/blob/e82da57e/components/camel-jmx/pom.xml -- diff --git a/components/camel-jmx/pom.xml b/components/camel-jmx/pom.xml index 705f2b3..8d6743f 100644 --- a/components/camel-jmx/pom.xml +++ b/components/camel-jmx/pom.xml @@ -21,7 +21,7 @@ org.apache.camel components -2.18.5 +2.18.6-SNAPSHOT camel-jmx http://git-wip-us.apache.org/repos/asf/camel/blob/e82da57e/components/camel-johnzon/pom.xml -- diff --git a/components/camel-johnzon/pom.xml b/components/camel-johnzon/pom.xml index 7f24b6f..ab6f792 100644 --- a/components/camel-johnzon/pom.xml +++ b/components/camel-johnzon/pom.xml @@ -21,7 +21,7 @@ org.apache.camel components -2.18.5 +2.18.6-SNAPSHOT camel-johnzon http://git-wip-us.apache.org/repos/asf/camel/blob/e82da57e/components/camel-jolt/pom.xml -- diff --git a/components/camel-jolt/pom.xml b/components/camel-jolt/pom.xml index f3eb23b..793db7a 100644 --- a/components/camel-jolt/pom.xml +++ b/components/camel-jolt/pom.xml @@ -22,7 +22,7 @@ components org.apache.camel -2.18.5 +2.18.6-SNAPSHOT camel-jolt http://git-wip-us.apache.org/repos/asf/camel/blob/e82da57e/components/camel-josql/pom.xml -- diff --git a/components/camel-josql/pom.xml b/components/camel-josql/pom.xml index 83130c6..b23db75 100644 --- a/components/camel-josql/pom.xml +++ b/components/camel-josql/pom.xml @@ -21,7 +21,7 @@ org.apache.camel components -2.18.5 +2.18.6-SNAPSHOT camel-josql http://git-wip-us.apache.org/repos/asf/camel/blob/e82da57e/components/camel-jpa/pom.xml -- diff --git a/components/camel-jpa/pom.xml b/components/camel-jpa/pom.xml index 2b92d39..799b2ca 100644 --- a/components/camel-jpa/pom.xml +++ b/components/camel-jpa/pom.xml @@ -21,7 +21,7 @@ org.apache.camel components -2.18.5 +2.18.6-SNAPSHOT camel-jpa http://git-wip-us.apache.org/repos/asf/camel/blob/e82da57e/components/camel-jsch/pom.xml -- diff --git a/components/camel-jsch/pom.xml b/components/camel-jsch/pom.xml index 28c69da..ef873c6 100644 --- a/components/camel-jsch/pom.xml +++ b/components/camel-jsch/pom.xml @@ -23,7 +23,7 @@ org.apache.camel components -2.18.5 +2.18.6-SNAPSHOT camel-jsch http://git-wip-us.apache.org/repos/asf/camel/blob/e82da57e/components/camel-jsonpath/pom.xml -- diff --git a/components/camel-jsonpath/pom.xml b/components/camel-jsonpath/pom.xml index 1d8a8cd..219490e 100644 --- a/components/camel-jsonpath/pom.xml +++ b/components/camel-jsonpath/pom.xml @@ -22,7 +22,7 @@ org.apache.camel components -2.18.5 +2.18.6-SNAPSHOT camel-jsonpath http://git-wip-us.apache.org/repos/asf/camel/blob/e82da57e/components/camel-jt400/pom.xml -- diff --git a/components/camel-jt400/pom.xml b/components/camel-jt400/pom.xml index 476ac14..79f7cfe 100644 --- a/components/camel-jt400/pom.xml +++ b/components/camel-jt400/pom.xml @@ -21,7 +21,7 @@ org.apache.camel components -2.18.5 +2.18.6-SNAPSHOT camel-jt400 http://git-wip-us.apache.org/repos/asf/camel/blob/e82da57e/components/camel-juel/pom.xml -- diff --git a/components/camel-juel/pom.xml b/components/camel-juel/pom.xml index abcd1ae..a067a97 100644 --- a/components/camel-juel/pom.xml +++ b/components/camel-juel/pom.xml @@ -21,7 +21,7 @@ org.apache.camel
[4/5] camel git commit: [maven-release-plugin] prepare for next development iteration
http://git-wip-us.apache.org/repos/asf/camel/blob/e82da57e/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 079467f..67ac80c 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.5 +2.18.6-SNAPSHOT camel-google-calendar-starter jar http://git-wip-us.apache.org/repos/asf/camel/blob/e82da57e/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 308e11e..d0cc958 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.5 +2.18.6-SNAPSHOT camel-google-drive-starter jar http://git-wip-us.apache.org/repos/asf/camel/blob/e82da57e/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 acc7ecf..6939fb6 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.5 +2.18.6-SNAPSHOT camel-google-mail-starter jar http://git-wip-us.apache.org/repos/asf/camel/blob/e82da57e/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 1019720..4afd22f 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.5 +2.18.6-SNAPSHOT camel-gora-starter jar http://git-wip-us.apache.org/repos/asf/camel/blob/e82da57e/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 e963c05..d2e4364 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.5 +2.18.6-SNAPSHOT camel-grape-starter jar http://git-wip-us.apache.org/repos/asf/camel/blob/e82da57e/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 079025c..44b79f6 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.5 +2.18.6-SNAPSHOT camel-groovy-starter jar http://git-wip-us.apache.org/repos/asf/camel/blob/e82da57e/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 c6486dc..19078df 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.5 +2.18.6-SNAPSHOT camel-gson-starter jar http://git-wip-us.apache.org/repos/asf/camel/blob/e82da57e/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 780f22f..720eea7 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.5 +2.18.6-SNAPSHOT camel-guava-eventbus-starter jar http://git-wip-us.apache.org/repos/asf/camel/blob/e82da57e/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 812bbaa..944bb00 100644 --- a/components-starter
[camel] Git Push Summary
Repository: camel Updated Tags: refs/tags/camel-2.18.5 [created] 1d0ec1897
[5/5] camel git commit: [maven-release-plugin] prepare for next development iteration
[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/e82da57e Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e82da57e Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e82da57e Branch: refs/heads/release/2.18.5 Commit: e82da57e9c9af03a18b76613c6da133c3669c403 Parents: c5f0907 Author: Gregor Zurowski Authored: Thu Sep 21 08:17:16 2017 + Committer: Gregor Zurowski Committed: Thu Sep 21 08:17:16 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 for next development iteration
Repository: camel Updated Branches: refs/heads/release/2.18.5 c5f09077c -> e82da57e9 http://git-wip-us.apache.org/repos/asf/camel/blob/e82da57e/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 c6274f0..9ae1626 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.5 +2.18.6-SNAPSHOT camel-example-cdi-rest-servlet http://git-wip-us.apache.org/repos/asf/camel/blob/e82da57e/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 c45bdd8..fc125e2 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.5 +2.18.6-SNAPSHOT camel-example-cdi-test http://git-wip-us.apache.org/repos/asf/camel/blob/e82da57e/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 ba2e212..581db0e 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.5 +2.18.6-SNAPSHOT camel-example-cdi-xml http://git-wip-us.apache.org/repos/asf/camel/blob/e82da57e/examples/camel-example-cdi/pom.xml -- diff --git a/examples/camel-example-cdi/pom.xml b/examples/camel-example-cdi/pom.xml index 8523bf4..f17e876 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.5 +2.18.6-SNAPSHOT camel-example-cdi http://git-wip-us.apache.org/repos/asf/camel/blob/e82da57e/examples/camel-example-console/pom.xml -- diff --git a/examples/camel-example-console/pom.xml b/examples/camel-example-console/pom.xml index b38788a..b1369f5 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.5 +2.18.6-SNAPSHOT camel-example-console http://git-wip-us.apache.org/repos/asf/camel/blob/e82da57e/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 ecef11a..ae626f9 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.5 +2.18.6-SNAPSHOT camel-example-cxf-blueprint http://git-wip-us.apache.org/repos/asf/camel/blob/e82da57e/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 c632ff9..e5db3a6 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.5 +2.18.6-SNAPSHOT camel-example-cxf-osgi http://git-wip-us.apache.org/repos/asf/camel/blob/e82da57e/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 a5347b7..4f7b19a 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.5 +2.18.6-SNAPSHOT camel-example-cxf-proxy http://git-wip-us.apache.org/repos/asf/camel/blob/e82da57e/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 6eeb082..1505571 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.5 +2.18.6-SNAPSHOT camel-example-cxf-tomcat http://git-wip-us.apache.org/repos/asf/camel/blob/e82da57e/examples/camel-example-cxf/pom.xml -- diff --git a/examples/camel-example-cxf/pom.xml b/examples/camel-example-cxf/pom.x
[5/5] camel git commit: [maven-release-plugin] prepare release camel-2.18.5
[maven-release-plugin] prepare release camel-2.18.5 Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c5f09077 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c5f09077 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c5f09077 Branch: refs/heads/release/2.18.5 Commit: c5f09077c0ed1ca570184854f6d13a44456bceff Parents: 9a1159c Author: Gregor Zurowski Authored: Thu Sep 21 08:16:45 2017 + Committer: Gregor Zurowski Committed: Thu Sep 21 08:16:45 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| 2 +
[3/5] camel git commit: [maven-release-plugin] prepare release camel-2.18.5
http://git-wip-us.apache.org/repos/asf/camel/blob/c5f09077/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 d8f9e7d..5063ebe 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.5-SNAPSHOT +2.18.5 camel-spring-javaconfig-starter jar http://git-wip-us.apache.org/repos/asf/camel/blob/c5f09077/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 6728852..e5927a8 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.5-SNAPSHOT +2.18.5 camel-spring-ldap-starter jar http://git-wip-us.apache.org/repos/asf/camel/blob/c5f09077/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 9e6af5b..8d50897 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.5-SNAPSHOT +2.18.5 camel-spring-redis-starter jar http://git-wip-us.apache.org/repos/asf/camel/blob/c5f09077/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 2e760ee..5d42aaf 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.5-SNAPSHOT +2.18.5 camel-spring-security-starter jar http://git-wip-us.apache.org/repos/asf/camel/blob/c5f09077/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 6647d0b..488d788 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.5-SNAPSHOT +2.18.5 camel-spring-starter jar http://git-wip-us.apache.org/repos/asf/camel/blob/c5f09077/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 e414e16..a0ed1d9 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.5-SNAPSHOT +2.18.5 camel-spring-ws-starter jar http://git-wip-us.apache.org/repos/asf/camel/blob/c5f09077/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 fa2cbe5..52ca0d2 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.5-SNAPSHOT +2.18.5 camel-sql-starter jar http://git-wip-us.apache.org/repos/asf/camel/blob/c5f09077/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 04763d0..122604d 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.5-SNAPSHOT +2.18.5 camel-ssh-starter jar http://git-wip-us.apache.org/repos/asf/camel/blob/c5f09077/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 e9ffb50..6a2aac0 1006
[1/5] camel git commit: [maven-release-plugin] prepare release camel-2.18.5
Repository: camel Updated Branches: refs/heads/release/2.18.5 9a1159c50 -> c5f09077c http://git-wip-us.apache.org/repos/asf/camel/blob/c5f09077/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 586ec05..c6274f0 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.5-SNAPSHOT +2.18.5 camel-example-cdi-rest-servlet http://git-wip-us.apache.org/repos/asf/camel/blob/c5f09077/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 9705315..c45bdd8 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.5-SNAPSHOT +2.18.5 camel-example-cdi-test http://git-wip-us.apache.org/repos/asf/camel/blob/c5f09077/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 031c056..ba2e212 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.5-SNAPSHOT +2.18.5 camel-example-cdi-xml http://git-wip-us.apache.org/repos/asf/camel/blob/c5f09077/examples/camel-example-cdi/pom.xml -- diff --git a/examples/camel-example-cdi/pom.xml b/examples/camel-example-cdi/pom.xml index 024c34e..8523bf4 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.5-SNAPSHOT +2.18.5 camel-example-cdi http://git-wip-us.apache.org/repos/asf/camel/blob/c5f09077/examples/camel-example-console/pom.xml -- diff --git a/examples/camel-example-console/pom.xml b/examples/camel-example-console/pom.xml index 602bf93..b38788a 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.5-SNAPSHOT +2.18.5 camel-example-console http://git-wip-us.apache.org/repos/asf/camel/blob/c5f09077/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 b0424383..ecef11a 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.5-SNAPSHOT +2.18.5 camel-example-cxf-blueprint http://git-wip-us.apache.org/repos/asf/camel/blob/c5f09077/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 e29ea5c..c632ff9 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.5-SNAPSHOT +2.18.5 camel-example-cxf-osgi http://git-wip-us.apache.org/repos/asf/camel/blob/c5f09077/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 c7cb383..a5347b7 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.5-SNAPSHOT +2.18.5 camel-example-cxf-proxy http://git-wip-us.apache.org/repos/asf/camel/blob/c5f09077/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 677fa54..6eeb082 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.5-SNAPSHOT +2.18.5 camel-example-cxf-tomcat http://git-wip-us.apache.org/repos/asf/camel/blob/c5f09077/examples/camel-example-cxf/pom.xml -- diff --git a/examples/camel-example-cxf/pom.xml b/examples/camel-example-cxf/pom.
[3/5] camel git commit: [maven-release-plugin] prepare for next development iteration
http://git-wip-us.apache.org/repos/asf/camel/blob/e82da57e/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 5063ebe..c074803 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.5 +2.18.6-SNAPSHOT camel-spring-javaconfig-starter jar http://git-wip-us.apache.org/repos/asf/camel/blob/e82da57e/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 e5927a8..451af0f 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.5 +2.18.6-SNAPSHOT camel-spring-ldap-starter jar http://git-wip-us.apache.org/repos/asf/camel/blob/e82da57e/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 8d50897..933c634 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.5 +2.18.6-SNAPSHOT camel-spring-redis-starter jar http://git-wip-us.apache.org/repos/asf/camel/blob/e82da57e/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 5d42aaf..0e64aa8 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.5 +2.18.6-SNAPSHOT camel-spring-security-starter jar http://git-wip-us.apache.org/repos/asf/camel/blob/e82da57e/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 488d788..f6a0f2f 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.5 +2.18.6-SNAPSHOT camel-spring-starter jar http://git-wip-us.apache.org/repos/asf/camel/blob/e82da57e/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 a0ed1d9..be43fc1 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.5 +2.18.6-SNAPSHOT camel-spring-ws-starter jar http://git-wip-us.apache.org/repos/asf/camel/blob/e82da57e/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 52ca0d2..0383fe7 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.5 +2.18.6-SNAPSHOT camel-sql-starter jar http://git-wip-us.apache.org/repos/asf/camel/blob/e82da57e/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 122604d..65a3f85 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.5 +2.18.6-SNAPSHOT camel-ssh-starter jar http://git-wip-us.apache.org/repos/asf/camel/blob/e82da57e/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 6a2aac0..aa04321 1006
[2/5] camel git commit: [maven-release-plugin] prepare release camel-2.18.5
http://git-wip-us.apache.org/repos/asf/camel/blob/c5f09077/components/camel-jira/pom.xml -- diff --git a/components/camel-jira/pom.xml b/components/camel-jira/pom.xml index 8c63d23..05286ca 100644 --- a/components/camel-jira/pom.xml +++ b/components/camel-jira/pom.xml @@ -16,7 +16,7 @@ org.apache.camel components -2.18.5-SNAPSHOT +2.18.5 camel-jira http://git-wip-us.apache.org/repos/asf/camel/blob/c5f09077/components/camel-jms/pom.xml -- diff --git a/components/camel-jms/pom.xml b/components/camel-jms/pom.xml index 851443d..9934462 100644 --- a/components/camel-jms/pom.xml +++ b/components/camel-jms/pom.xml @@ -21,7 +21,7 @@ org.apache.camel components -2.18.5-SNAPSHOT +2.18.5 camel-jms http://git-wip-us.apache.org/repos/asf/camel/blob/c5f09077/components/camel-jmx/pom.xml -- diff --git a/components/camel-jmx/pom.xml b/components/camel-jmx/pom.xml index 8323ffb..705f2b3 100644 --- a/components/camel-jmx/pom.xml +++ b/components/camel-jmx/pom.xml @@ -21,7 +21,7 @@ org.apache.camel components -2.18.5-SNAPSHOT +2.18.5 camel-jmx http://git-wip-us.apache.org/repos/asf/camel/blob/c5f09077/components/camel-johnzon/pom.xml -- diff --git a/components/camel-johnzon/pom.xml b/components/camel-johnzon/pom.xml index 47a70fc..7f24b6f 100644 --- a/components/camel-johnzon/pom.xml +++ b/components/camel-johnzon/pom.xml @@ -21,7 +21,7 @@ org.apache.camel components -2.18.5-SNAPSHOT +2.18.5 camel-johnzon http://git-wip-us.apache.org/repos/asf/camel/blob/c5f09077/components/camel-jolt/pom.xml -- diff --git a/components/camel-jolt/pom.xml b/components/camel-jolt/pom.xml index a8a6048..f3eb23b 100644 --- a/components/camel-jolt/pom.xml +++ b/components/camel-jolt/pom.xml @@ -22,7 +22,7 @@ components org.apache.camel -2.18.5-SNAPSHOT +2.18.5 camel-jolt http://git-wip-us.apache.org/repos/asf/camel/blob/c5f09077/components/camel-josql/pom.xml -- diff --git a/components/camel-josql/pom.xml b/components/camel-josql/pom.xml index c0360e3..83130c6 100644 --- a/components/camel-josql/pom.xml +++ b/components/camel-josql/pom.xml @@ -21,7 +21,7 @@ org.apache.camel components -2.18.5-SNAPSHOT +2.18.5 camel-josql http://git-wip-us.apache.org/repos/asf/camel/blob/c5f09077/components/camel-jpa/pom.xml -- diff --git a/components/camel-jpa/pom.xml b/components/camel-jpa/pom.xml index e5afe1e..2b92d39 100644 --- a/components/camel-jpa/pom.xml +++ b/components/camel-jpa/pom.xml @@ -21,7 +21,7 @@ org.apache.camel components -2.18.5-SNAPSHOT +2.18.5 camel-jpa http://git-wip-us.apache.org/repos/asf/camel/blob/c5f09077/components/camel-jsch/pom.xml -- diff --git a/components/camel-jsch/pom.xml b/components/camel-jsch/pom.xml index 6c926ba..28c69da 100644 --- a/components/camel-jsch/pom.xml +++ b/components/camel-jsch/pom.xml @@ -23,7 +23,7 @@ org.apache.camel components -2.18.5-SNAPSHOT +2.18.5 camel-jsch http://git-wip-us.apache.org/repos/asf/camel/blob/c5f09077/components/camel-jsonpath/pom.xml -- diff --git a/components/camel-jsonpath/pom.xml b/components/camel-jsonpath/pom.xml index 9129144..1d8a8cd 100644 --- a/components/camel-jsonpath/pom.xml +++ b/components/camel-jsonpath/pom.xml @@ -22,7 +22,7 @@ org.apache.camel components -2.18.5-SNAPSHOT +2.18.5 camel-jsonpath http://git-wip-us.apache.org/repos/asf/camel/blob/c5f09077/components/camel-jt400/pom.xml -- diff --git a/components/camel-jt400/pom.xml b/components/camel-jt400/pom.xml index 2d46905..476ac14 100644 --- a/components/camel-jt400/pom.xml +++ b/components/camel-jt400/pom.xml @@ -21,7 +21,7 @@ org.apache.camel components -2.18.5-SNAPSHOT +2.18.5 camel-jt400 http://git-wip-us.apache.org/repos/asf/camel/blob/c5f09077/components/camel-juel/pom.xml -- diff --git a/components/camel-juel/pom.xml b/components/camel-juel/pom.xml index 2c1e86a..abcd1ae 100644 --- a/components/camel-juel/pom.xml +++ b/components/camel-juel/pom.xml @@ -21,7 +21,7 @@ org.apache.camel
[4/5] camel git commit: [maven-release-plugin] prepare release camel-2.18.5
http://git-wip-us.apache.org/repos/asf/camel/blob/c5f09077/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 4500be2..079467f 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.5-SNAPSHOT +2.18.5 camel-google-calendar-starter jar http://git-wip-us.apache.org/repos/asf/camel/blob/c5f09077/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 5b230b1..308e11e 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.5-SNAPSHOT +2.18.5 camel-google-drive-starter jar http://git-wip-us.apache.org/repos/asf/camel/blob/c5f09077/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 9220f3c..acc7ecf 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.5-SNAPSHOT +2.18.5 camel-google-mail-starter jar http://git-wip-us.apache.org/repos/asf/camel/blob/c5f09077/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 4816909..1019720 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.5-SNAPSHOT +2.18.5 camel-gora-starter jar http://git-wip-us.apache.org/repos/asf/camel/blob/c5f09077/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 6c709e6..e963c05 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.5-SNAPSHOT +2.18.5 camel-grape-starter jar http://git-wip-us.apache.org/repos/asf/camel/blob/c5f09077/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 213137e..079025c 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.5-SNAPSHOT +2.18.5 camel-groovy-starter jar http://git-wip-us.apache.org/repos/asf/camel/blob/c5f09077/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 ae4ecbb..c6486dc 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.5-SNAPSHOT +2.18.5 camel-gson-starter jar http://git-wip-us.apache.org/repos/asf/camel/blob/c5f09077/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 9d43c34..780f22f 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.5-SNAPSHOT +2.18.5 camel-guava-eventbus-starter jar http://git-wip-us.apache.org/repos/asf/camel/blob/c5f09077/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 8d75208..812bbaa 100644 --- a/components-starter
[2/2] camel git commit: [CAMEL-11798] Connector API assumes flat classpath
[CAMEL-11798] Connector API assumes flat classpath
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b4c933b7
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b4c933b7
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b4c933b7
Branch: refs/heads/master
Commit: b4c933b7f958bb8378990292d14441a2bd1deea5
Parents: af68897
Author: Thomas Diesler
Authored: Thu Sep 21 08:22:36 2017 +0200
Committer: Claus Ibsen
Committed: Thu Sep 21 09:22:45 2017 +0200
--
.../camel/component/connector/ConnectorModel.java| 10 +-
.../connector/DefaultConnectorComponent.java | 15 ++-
2 files changed, 19 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/b4c933b7/connectors/camel-connector/src/main/java/org/apache/camel/component/connector/ConnectorModel.java
--
diff --git
a/connectors/camel-connector/src/main/java/org/apache/camel/component/connector/ConnectorModel.java
b/connectors/camel-connector/src/main/java/org/apache/camel/component/connector/ConnectorModel.java
index 112d4985..da7a928 100644
---
a/connectors/camel-connector/src/main/java/org/apache/camel/component/connector/ConnectorModel.java
+++
b/connectors/camel-connector/src/main/java/org/apache/camel/component/connector/ConnectorModel.java
@@ -65,10 +65,10 @@ final class ConnectorModel {
private List componentOptions;
private List connectorOptions;
-ConnectorModel(String componentName, String className) {
+ConnectorModel(String componentName, Class componentClass) {
this.componentName = componentName;
-this.className = className;
-this.lines = Suppliers.memorize(() -> findCamelConnectorJSonSchema());
+this.className = componentClass.getName();
+this.lines = Suppliers.memorize(() ->
findCamelConnectorJSonSchema(componentClass));
}
public String getComponentName() {
@@ -183,12 +183,12 @@ final class ConnectorModel {
// Helpers
// ***
-private List findCamelConnectorJSonSchema() {
+private List findCamelConnectorJSonSchema(Class componentClass)
{
LOGGER.debug("Finding camel-connector.json in classpath for connector:
{}", componentName);
Enumeration urls;
try {
-urls =
ConnectorModel.class.getClassLoader().getResources("camel-connector.json");
+urls =
componentClass.getClassLoader().getResources("camel-connector.json");
} catch (IOException e) {
throw new IllegalArgumentException("Cannot open
camel-connector.json in classpath for connector " + componentName);
}
http://git-wip-us.apache.org/repos/asf/camel/blob/b4c933b7/connectors/camel-connector/src/main/java/org/apache/camel/component/connector/DefaultConnectorComponent.java
--
diff --git
a/connectors/camel-connector/src/main/java/org/apache/camel/component/connector/DefaultConnectorComponent.java
b/connectors/camel-connector/src/main/java/org/apache/camel/component/connector/DefaultConnectorComponent.java
index 81e22ba..57afa69 100644
---
a/connectors/camel-connector/src/main/java/org/apache/camel/component/connector/DefaultConnectorComponent.java
+++
b/connectors/camel-connector/src/main/java/org/apache/camel/component/connector/DefaultConnectorComponent.java
@@ -66,6 +66,10 @@ public abstract class DefaultConnectorComponent extends
DefaultComponent impleme
private Processor afterConsumer;
protected DefaultConnectorComponent(String componentName, String
className) {
+this(componentName, loadConnectorClass(className));
+}
+
+protected DefaultConnectorComponent(String componentName, Class
className) {
this.model = new ConnectorModel(componentName, className);
this.baseScheme = this.model.getBaseScheme();
this.componentName = componentName;
@@ -73,7 +77,7 @@ public abstract class DefaultConnectorComponent extends
DefaultComponent impleme
this.options = new HashMap<>();
// add to catalog
-this.catalog.addComponent(componentName, className);
+this.catalog.addComponent(componentName, className.getName());
// It may be a custom component so we need to register this in the
camel catalog also
if (!catalog.findComponentNames().contains(baseScheme)) {
@@ -89,6 +93,15 @@ public abstract class DefaultConnectorComponent extends
DefaultComponent impleme
registerExtension(this::getComponentVerifierExtension);
}
+private static Class loadConnectorClass(String className) {
+try {
+ClassLoader classLoader =
DefaultConnectorComponent.class.g
[1/2] camel git commit: CAMEL-11797: Change MessageHelper to actually use the custom message history format for lines > 1
Repository: camel
Updated Branches:
refs/heads/camel-2.19.x 414eb298f -> 1e68bf73c
refs/heads/master b4c933b7f -> 76f6a3704
CAMEL-11797: Change MessageHelper to actually use the custom message history
format for lines > 1
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/76f6a370
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/76f6a370
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/76f6a370
Branch: refs/heads/master
Commit: 76f6a370463a2f90ddaabd1c66b3f7c436997dd4
Parents: b4c933b
Author: Roman Rodov
Authored: Thu Sep 21 17:22:56 2017 +1000
Committer: Claus Ibsen
Committed: Thu Sep 21 09:27:16 2017 +0200
--
.../src/main/java/org/apache/camel/util/MessageHelper.java| 7 +++
1 file changed, 3 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/76f6a370/camel-core/src/main/java/org/apache/camel/util/MessageHelper.java
--
diff --git a/camel-core/src/main/java/org/apache/camel/util/MessageHelper.java
b/camel-core/src/main/java/org/apache/camel/util/MessageHelper.java
index 050fecc..8631cca 100644
--- a/camel-core/src/main/java/org/apache/camel/util/MessageHelper.java
+++ b/camel-core/src/main/java/org/apache/camel/util/MessageHelper.java
@@ -566,9 +566,8 @@ public final class MessageHelper {
}
String goMessageHistoryOutput =
exchange.getContext().getGlobalOption(Exchange.MESSAGE_HISTORY_OUTPUT_FORMAT);
-sb.append(String.format(
-goMessageHistoryOutput == null ?
MESSAGE_HISTORY_OUTPUT : goMessageHistoryOutput,
-routeId, id, label, elapsed));
+goMessageHistoryOutput = goMessageHistoryOutput == null ?
MESSAGE_HISTORY_OUTPUT : goMessageHistoryOutput;
+sb.append(String.format(goMessageHistoryOutput, routeId, id, label,
elapsed));
sb.append("\n");
// and then each history
@@ -582,7 +581,7 @@ public final class MessageHelper {
label =
URISupport.sanitizeUri(StringHelper.limitLength(history.getNode().getLabel(),
100));
elapsed = history.getElapsed();
-sb.append(String.format(MESSAGE_HISTORY_OUTPUT, routeId, id,
label, elapsed));
+sb.append(String.format(goMessageHistoryOutput, routeId, id,
label, elapsed));
sb.append("\n");
}
[2/2] camel git commit: CAMEL-11797: Change MessageHelper to actually use the custom message history format for lines > 1
CAMEL-11797: Change MessageHelper to actually use the custom message history
format for lines > 1
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/1e68bf73
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/1e68bf73
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/1e68bf73
Branch: refs/heads/camel-2.19.x
Commit: 1e68bf73c3c0dfb6ac34b93b1c1e249d66dbb402
Parents: 414eb29
Author: Roman Rodov
Authored: Thu Sep 21 17:22:56 2017 +1000
Committer: Claus Ibsen
Committed: Thu Sep 21 09:28:21 2017 +0200
--
.../src/main/java/org/apache/camel/util/MessageHelper.java| 7 +++
1 file changed, 3 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/1e68bf73/camel-core/src/main/java/org/apache/camel/util/MessageHelper.java
--
diff --git a/camel-core/src/main/java/org/apache/camel/util/MessageHelper.java
b/camel-core/src/main/java/org/apache/camel/util/MessageHelper.java
index 4b34902..c19c13e 100644
--- a/camel-core/src/main/java/org/apache/camel/util/MessageHelper.java
+++ b/camel-core/src/main/java/org/apache/camel/util/MessageHelper.java
@@ -566,9 +566,8 @@ public final class MessageHelper {
}
String goMessageHistoryOutput =
exchange.getContext().getGlobalOption(Exchange.MESSAGE_HISTORY_OUTPUT_FORMAT);
-sb.append(String.format(
-goMessageHistoryOutput == null ?
MESSAGE_HISTORY_OUTPUT : goMessageHistoryOutput,
-routeId, id, label, elapsed));
+goMessageHistoryOutput = goMessageHistoryOutput == null ?
MESSAGE_HISTORY_OUTPUT : goMessageHistoryOutput;
+sb.append(String.format(goMessageHistoryOutput, routeId, id, label,
elapsed));
sb.append("\n");
// and then each history
@@ -582,7 +581,7 @@ public final class MessageHelper {
label =
URISupport.sanitizeUri(StringHelper.limitLength(history.getNode().getLabel(),
100));
elapsed = history.getElapsed();
-sb.append(String.format(MESSAGE_HISTORY_OUTPUT, routeId, id,
label, elapsed));
+sb.append(String.format(goMessageHistoryOutput, routeId, id,
label, elapsed));
sb.append("\n");
}
[4/4] camel git commit: Fix Checkstyle issue
Fix Checkstyle issue
Signed-off-by: Gregor Zurowski
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/9a1159c5
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/9a1159c5
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/9a1159c5
Branch: refs/heads/release/2.18.5
Commit: 9a1159c50f402e97a35c2c0c2910be59a5d3c2ad
Parents: 49e3233
Author: Gregor Zurowski
Authored: Sun Sep 17 12:25:20 2017 +0200
Committer: Gregor Zurowski
Committed: Thu Sep 21 08:10:05 2017 +0100
--
.../java/org/apache/camel/component/leveldb/LevelDBFile.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/9a1159c5/components/camel-leveldb/src/main/java/org/apache/camel/component/leveldb/LevelDBFile.java
--
diff --git
a/components/camel-leveldb/src/main/java/org/apache/camel/component/leveldb/LevelDBFile.java
b/components/camel-leveldb/src/main/java/org/apache/camel/component/leveldb/LevelDBFile.java
index b284256..5ba8019 100644
---
a/components/camel-leveldb/src/main/java/org/apache/camel/component/leveldb/LevelDBFile.java
+++
b/components/camel-leveldb/src/main/java/org/apache/camel/component/leveldb/LevelDBFile.java
@@ -180,8 +180,8 @@ public class LevelDBFile implements Service {
private DBFactory getFactory() {
String[] classNames = new String[] {
-"org.fusesource.leveldbjni.JniDBFactory",
-"org.iq80.leveldb.impl.Iq80DBFactory"
+"org.fusesource.leveldbjni.JniDBFactory",
+"org.iq80.leveldb.impl.Iq80DBFactory"
};
for (String cn : classNames) {
try {
[3/4] camel git commit: Fix Checkstyle issue
Fix Checkstyle issue
Signed-off-by: Gregor Zurowski
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/49e32334
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/49e32334
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/49e32334
Branch: refs/heads/release/2.18.5
Commit: 49e32334a8f28fa46d95ecf0574e10d7c9241620
Parents: b843e0d
Author: Gregor Zurowski
Authored: Sun Sep 17 10:45:07 2017 +0200
Committer: Gregor Zurowski
Committed: Thu Sep 21 08:09:59 2017 +0100
--
.../apache/camel/component/cxf/transport/CamelDestination.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/49e32334/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelDestination.java
--
diff --git
a/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelDestination.java
b/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelDestination.java
index 900ecbe..2b9ac06 100644
---
a/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelDestination.java
+++
b/components/camel-cxf-transport/src/main/java/org/apache/camel/component/cxf/transport/CamelDestination.java
@@ -280,8 +280,8 @@ public class CamelDestination extends AbstractDestination
implements Configurabl
OutputStream outputStream =
outMessage.getContent(OutputStream.class);
if (outputStream instanceof CachedOutputStream) {
camelExchange.getOut().setBody(((CachedOutputStream)outputStream).getInputStream());
-} else {
-camelExchange.getOut().setBody(outputStream);
+} else {
+camelExchange.getOut().setBody(outputStream);
}
LOG.debug("send the response message: {}", outputStream);
}
[2/4] camel git commit: CAMEL-10393: camel-properties: Add an option to disable using default value if a property does not exists
CAMEL-10393: camel-properties: Add an option to disable using default value if a property does not exists Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b843e0dd Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b843e0dd Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b843e0dd Branch: refs/heads/release/2.18.5 Commit: b843e0dda9ae79bb0347ab42d3275db401f49e02 Parents: 57da1af Author: lburgazzoli Authored: Thu Oct 20 01:02:30 2016 +0200 Committer: Gregor Zurowski Committed: Thu Sep 21 08:09:54 2017 +0100 -- camel-core/src/main/docs/properties-component.adoc| 2 +- .../AugmentedPropertyNameAwarePropertiesParser.java | 8 .../component/properties/DefaultPropertiesParser.java | 12 ++-- .../component/properties/PropertiesComponent.java | 12 ++-- .../PropertiesComponentDisableDefaultsTest.java | 2 +- .../springboot/PropertiesComponentConfiguration.java | 11 +-- .../core/xml/AbstractCamelContextFactoryBean.java | 4 ++-- .../core/xml/CamelPropertyPlaceholderDefinition.java | 14 +++--- .../spi/BridgePropertyPlaceholderConfigurer.java | 4 ++-- .../apache/camel/test/blueprint/default-values.xml| 2 +- 10 files changed, 35 insertions(+), 36 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/b843e0dd/camel-core/src/main/docs/properties-component.adoc -- diff --git a/camel-core/src/main/docs/properties-component.adoc b/camel-core/src/main/docs/properties-component.adoc index b55849b..14291ca 100644 --- a/camel-core/src/main/docs/properties-component.adoc +++ b/camel-core/src/main/docs/properties-component.adoc @@ -37,7 +37,7 @@ The Properties component supports 16 options which are listed below. | propertyPrefix | String | Optional prefix prepended to property names before resolution. | propertySuffix | String | Optional suffix appended to property names before resolution. | fallbackToUnaugmentedProperty | boolean | If true first attempt resolution of property name augmented with propertyPrefix and propertySuffix before falling back the plain property name specified. If false only the augmented property name is searched. -| disableDefaultValueResolution | boolean | If true the component does not attempt to find a default for the key by looking after the colon separator. +| defaultFallbackEnabled | boolean | If true the component does not attempt to find a default for the key by looking after the colon separator. | ignoreMissingLocation | boolean | Whether to silently ignore if a location cannot be located such as a properties file not found. | prefixToken | String | Sets the value of the prefix token used to identify properties to replace. Setting a value of null restores the default token (link link DEFAULT_PREFIX_TOKEN). | suffixToken | String | Sets the value of the suffix token used to identify properties to replace. Setting a value of null restores the default token (link link DEFAULT_SUFFIX_TOKEN). http://git-wip-us.apache.org/repos/asf/camel/blob/b843e0dd/camel-core/src/main/java/org/apache/camel/component/properties/AugmentedPropertyNameAwarePropertiesParser.java -- diff --git a/camel-core/src/main/java/org/apache/camel/component/properties/AugmentedPropertyNameAwarePropertiesParser.java b/camel-core/src/main/java/org/apache/camel/component/properties/AugmentedPropertyNameAwarePropertiesParser.java index dfe8df7..a244227 100644 --- a/camel-core/src/main/java/org/apache/camel/component/properties/AugmentedPropertyNameAwarePropertiesParser.java +++ b/camel-core/src/main/java/org/apache/camel/component/properties/AugmentedPropertyNameAwarePropertiesParser.java @@ -40,9 +40,9 @@ public interface AugmentedPropertyNameAwarePropertiesParser extends PropertiesPa * @param fallbackToUnaugmentedProperty flag indicating if the originally *parsed property name should by used for resolution if there is *no match to the augmented property name - * @param disableDefaultValueResolution flag indicating if the value after colon - * should be the default value to use it - * the property has not been resolved + * @param defaultFallbackEnabled flag indicating if the value after colon + * should be the default value to use it + * the property has not been resolved * * @return the parsed text with replaced placeholders * @@ -50,5 +50,5 @@ public interface AugmentedPropertyNameAwarePropertiesParser extends PropertiesPa
[1/4] camel git commit: CAMEL-10393: camel-properties: Add an option to disable using default value if a property does not exists
Repository: camel Updated Branches: refs/heads/release/2.18.5 [created] 9a1159c50 CAMEL-10393: camel-properties: Add an option to disable using default value if a property does not exists Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/57da1afe Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/57da1afe Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/57da1afe Branch: refs/heads/release/2.18.5 Commit: 57da1afee72f3e7b1810eee4c50ff876cb7792ca Parents: 7d0dbdf Author: lburgazzoli Authored: Wed Oct 19 17:05:03 2016 +0200 Committer: Gregor Zurowski Committed: Thu Sep 21 08:09:48 2017 +0100 -- .../src/main/docs/properties-component.adoc | 3 +- ...mentedPropertyNameAwarePropertiesParser.java | 5 +- .../properties/DefaultPropertiesParser.java | 22 --- .../properties/PropertiesComponent.java | 19 +- .../PropertiesComponentDisableDefaultsTest.java | 68 .../PropertiesComponentConfiguration.java | 14 .../xml/AbstractCamelContextFactoryBean.java| 3 + .../xml/CamelPropertyPlaceholderDefinition.java | 13 .../BridgePropertyPlaceholderConfigurer.java| 4 +- .../blueprint/BlueprintDefaultValuesTest.java | 51 +++ .../camel/test/blueprint/default-values.xml | 46 + 11 files changed, 232 insertions(+), 16 deletions(-) -- http://git-wip-us.apache.org/repos/asf/camel/blob/57da1afe/camel-core/src/main/docs/properties-component.adoc -- diff --git a/camel-core/src/main/docs/properties-component.adoc b/camel-core/src/main/docs/properties-component.adoc index 1668af9..b55849b 100644 --- a/camel-core/src/main/docs/properties-component.adoc +++ b/camel-core/src/main/docs/properties-component.adoc @@ -20,7 +20,7 @@ Options ^^^ // component options: START -The Properties component supports 15 options which are listed below. +The Properties component supports 16 options which are listed below. @@ -37,6 +37,7 @@ The Properties component supports 15 options which are listed below. | propertyPrefix | String | Optional prefix prepended to property names before resolution. | propertySuffix | String | Optional suffix appended to property names before resolution. | fallbackToUnaugmentedProperty | boolean | If true first attempt resolution of property name augmented with propertyPrefix and propertySuffix before falling back the plain property name specified. If false only the augmented property name is searched. +| disableDefaultValueResolution | boolean | If true the component does not attempt to find a default for the key by looking after the colon separator. | ignoreMissingLocation | boolean | Whether to silently ignore if a location cannot be located such as a properties file not found. | prefixToken | String | Sets the value of the prefix token used to identify properties to replace. Setting a value of null restores the default token (link link DEFAULT_PREFIX_TOKEN). | suffixToken | String | Sets the value of the suffix token used to identify properties to replace. Setting a value of null restores the default token (link link DEFAULT_SUFFIX_TOKEN). http://git-wip-us.apache.org/repos/asf/camel/blob/57da1afe/camel-core/src/main/java/org/apache/camel/component/properties/AugmentedPropertyNameAwarePropertiesParser.java -- diff --git a/camel-core/src/main/java/org/apache/camel/component/properties/AugmentedPropertyNameAwarePropertiesParser.java b/camel-core/src/main/java/org/apache/camel/component/properties/AugmentedPropertyNameAwarePropertiesParser.java index 0f4d05d..dfe8df7 100644 --- a/camel-core/src/main/java/org/apache/camel/component/properties/AugmentedPropertyNameAwarePropertiesParser.java +++ b/camel-core/src/main/java/org/apache/camel/component/properties/AugmentedPropertyNameAwarePropertiesParser.java @@ -40,6 +40,9 @@ public interface AugmentedPropertyNameAwarePropertiesParser extends PropertiesPa * @param fallbackToUnaugmentedProperty flag indicating if the originally *parsed property name should by used for resolution if there is *no match to the augmented property name + * @param disableDefaultValueResolution flag indicating if the value after colon + * should be the default value to use it + * the property has not been resolved * * @return the parsed text with replaced placeholders * @@ -47,5 +50,5 @@ public interface AugmentedPropertyNameAwarePropertiesParser extends PropertiesPa * is not found */ String parseUri(String text, Pr
[1/2] camel git commit: [CAMEL-11798] Connector API assumes flat classpath
Repository: camel
Updated Branches:
refs/heads/camel-2.19.x 2a7cba96b -> 414eb298f
refs/heads/master af6889705 -> b4c933b7f
[CAMEL-11798] Connector API assumes flat classpath
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/414eb298
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/414eb298
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/414eb298
Branch: refs/heads/camel-2.19.x
Commit: 414eb298f21ce3cf5e643a57854e7c8735b4b240
Parents: 2a7cba9
Author: Thomas Diesler
Authored: Thu Sep 21 08:22:36 2017 +0200
Committer: Thomas Diesler
Committed: Thu Sep 21 08:22:36 2017 +0200
--
.../camel/component/connector/ConnectorModel.java | 10 +-
.../connector/DefaultConnectorComponent.java | 17 +++--
2 files changed, 20 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/camel/blob/414eb298/connectors/camel-connector/src/main/java/org/apache/camel/component/connector/ConnectorModel.java
--
diff --git
a/connectors/camel-connector/src/main/java/org/apache/camel/component/connector/ConnectorModel.java
b/connectors/camel-connector/src/main/java/org/apache/camel/component/connector/ConnectorModel.java
index 2165d41..d5ff687 100644
---
a/connectors/camel-connector/src/main/java/org/apache/camel/component/connector/ConnectorModel.java
+++
b/connectors/camel-connector/src/main/java/org/apache/camel/component/connector/ConnectorModel.java
@@ -62,10 +62,10 @@ final class ConnectorModel {
private Map defaultComponentOptions;
private Map defaultEndpointOptions;
-ConnectorModel(String componentName, String className) {
+ConnectorModel(String componentName, Class componentClass) {
this.componentName = componentName;
-this.className = className;
-this.lines = Suppliers.memorize(() -> findCamelConnectorJSonSchema());
+this.className = componentClass.getName();
+this.lines = Suppliers.memorize(() ->
findCamelConnectorJSonSchema(componentClass));
}
public String getComponentName() {
@@ -156,12 +156,12 @@ final class ConnectorModel {
// Helpers
// ***
-private List findCamelConnectorJSonSchema() {
+private List findCamelConnectorJSonSchema(Class componentClass)
{
LOGGER.debug("Finding camel-connector.json in classpath for connector:
{}", componentName);
Enumeration urls;
try {
-urls =
ConnectorModel.class.getClassLoader().getResources("camel-connector.json");
+urls =
componentClass.getClassLoader().getResources("camel-connector.json");
} catch (IOException e) {
throw new IllegalArgumentException("Cannot open
camel-connector.json in classpath for connector " + componentName);
}
http://git-wip-us.apache.org/repos/asf/camel/blob/414eb298/connectors/camel-connector/src/main/java/org/apache/camel/component/connector/DefaultConnectorComponent.java
--
diff --git
a/connectors/camel-connector/src/main/java/org/apache/camel/component/connector/DefaultConnectorComponent.java
b/connectors/camel-connector/src/main/java/org/apache/camel/component/connector/DefaultConnectorComponent.java
index 192ebf1..30074f1 100644
---
a/connectors/camel-connector/src/main/java/org/apache/camel/component/connector/DefaultConnectorComponent.java
+++
b/connectors/camel-connector/src/main/java/org/apache/camel/component/connector/DefaultConnectorComponent.java
@@ -57,11 +57,15 @@ public abstract class DefaultConnectorComponent extends
DefaultComponent impleme
private Processor afterConsumer;
protected DefaultConnectorComponent(String componentName, String
className) {
+this(componentName, loadConnectorComponent(className));
+}
+
+protected DefaultConnectorComponent(String componentName, Class
componentClass) {
this.componentName = componentName;
-this.model = new ConnectorModel(componentName, className);
+this.model = new ConnectorModel(componentName, componentClass);
// add to catalog
-this.catalog.addComponent(componentName, className);
+this.catalog.addComponent(componentName, componentClass.getName());
}
@Override
@@ -426,5 +430,14 @@ public abstract class DefaultConnectorComponent extends
DefaultComponent impleme
}
return null;
}
+
+private static Class loadConnectorComponent(String className) {
+try {
+ClassLoader classLoader =
DefaultConnectorComponent.class.getClassLoader();
+return classLoader.loadClass(className);
+} catch (ClassNotFoundException ex) {
+
[camel] Git Push Summary
Repository: camel Updated Branches: refs/heads/release/2.18.5 [deleted] a1d16f1ef
