[camel] branch master updated: CAMEL-10671 Fixed the CI build by introducing the maven dependencies into Ceylon module

2018-05-03 Thread ningjiang 
This is an automated email from the ASF dual-hosted git repository.

ningjiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/master by this push:
 new 03e57c3  CAMEL-10671 Fixed the CI build by introducing the maven 
dependencies into Ceylon module
03e57c3 is described below

commit 03e57c355f5ddeb48af51e9e066dcfd60c2bd62f
Author: Willem Jiang 
AuthorDate: Fri May 4 13:37:12 2018 +0800

CAMEL-10671 Fixed the CI build by introducing the maven dependencies into 
Ceylon module
---
 examples/camel-example-ceylon/pom.xml | 22 ++
 1 file changed, 22 insertions(+)

diff --git a/examples/camel-example-ceylon/pom.xml 
b/examples/camel-example-ceylon/pom.xml
index 4ec21f1..4f9bbcf 100644
--- a/examples/camel-example-ceylon/pom.xml
+++ b/examples/camel-example-ceylon/pom.xml
@@ -111,6 +111,28 @@
 
 
   
+dependency
+
+  import-dependency
+
+
+  
+
+  
+  
+org.apache.camel
+camel-core
+  
+  
+org.apache.camel
+camel-jetty
+  
+
+  
+
+  
+  
+compile
 
   compile
 

-- 
To stop receiving notification emails like this one, please contact
ningji...@apache.org.

[camel] branch master updated: Update camel-fhir Karaf feature

2018-05-03 Thread acosentino 
This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/master by this push:
 new 6ed659a  Update camel-fhir Karaf feature
6ed659a is described below

commit 6ed659a76e7f4133dd9105fdcc46b63aa2719648
Author: jpoth 
AuthorDate: Tue Apr 17 15:30:20 2018 +0200

Update camel-fhir Karaf feature
---
 parent/pom.xml  |  1 -
 .../karaf/features/src/main/resources/features.xml  | 17 -
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index ead9649..638bc72 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -288,7 +288,6 @@
 2.0.0.0
 2.3
 3.3.0
-23.0
 1.11
 1.6
 1.22
diff --git a/platforms/karaf/features/src/main/resources/features.xml 
b/platforms/karaf/features/src/main/resources/features.xml
index 2299c97..416997c 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -22,6 +22,7 @@
   
mvn:org.apache.jclouds.karaf/jclouds-karaf/${jclouds-version}/xml/features
   
mvn:org.ops4j.pax.cdi/pax-cdi-features/${pax-cdi-version}/xml/features
   
mvn:org.hibernate.validator/hibernate-validator-osgi-karaf-features/${hibernate-validator-version}/xml/features
+  
mvn:ca.uhn.hapi.fhir.karaf/hapi-fhir/${hapi-fhir-version}/xml/features
 
   
 mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.activation-api-1.1/${servicemix-specs-version}
@@ -671,19 +672,9 @@
   
   
 camel-core
-mvn:com.google.code.gson/gson/${gson-version}
-mvn:org.apache.commons/commons-lang3/${commons-lang3-version}
-mvn:commons-codec/commons-codec/${commons-codec-version}
-mvn:commons-io/commons-io/${commons-io-version}
-mvn:com.google.guava/guava/${guava-fhir-version}
-mvn:org.apache.httpcomponents/httpcore-osgi/${httpcore4-version}
-mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient4-version}
-mvn:ca.uhn.hapi/hapi-osgi-base/${hapi-version}
-
wrap:mvn:ca.uhn.hapi.fhir/hapi-fhir-client/${hapi-fhir-version}
-
wrap:mvn:ca.uhn.hapi.fhir/hapi-fhir-base/${hapi-fhir-version}$DynamicImport-Package=*
-
wrap:mvn:ca.uhn.hapi.fhir/hapi-fhir-structures-dstu3/${hapi-fhir-version}
-
wrap:mvn:ca.uhn.hapi.fhir/hapi-fhir-utilities/${hapi-fhir-version}
-
wrap:mvn:ca.uhn.hapi.fhir/hapi-fhir-structures-dstu2/${hapi-fhir-version}
+hapi-fhir
+hapi-fhir-dstu2
+hapi-fhir-dstu3
 mvn:org.apache.camel/camel-fhir/${project.version}
   
   

-- 
To stop receiving notification emails like this one, please contact
acosent...@apache.org.

[camel] branch master updated: CAMEL-12383 - changes regarding SB 2.0 upgrade remove non-customizable management.security.enabled property

2018-05-03 Thread onders 
This is an automated email from the ASF dual-hosted git repository.

onders pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/master by this push:
 new 4b8749e  CAMEL-12383 - changes regarding SB 2.0 upgrade remove 
non-customizable management.security.enabled property
4b8749e is described below

commit 4b8749eb4086bce20fee256faac70ef3699b5875
Author: Sezgin 
AuthorDate: Thu May 3 13:44:29 2018 +0300

CAMEL-12383 - changes regarding SB 2.0 upgrade
remove non-customizable management.security.enabled property
---
 .../archetype-resources/src/main/resources/application.properties   | 2 --
 components/camel-spring-boot/src/test/resources/application.properties  | 2 +-
 .../camel-example-rabbitmq/src/main/resources/application.properties| 2 --
 .../cluster-node/src/main/resources/application.properties  | 2 +-
 .../application/src/main/resources/application.properties   | 2 --
 .../src/main/resources/application.properties   | 2 +-
 .../src/main/resources/application.properties   | 2 --
 .../src/main/resources/application.properties   | 2 --
 8 files changed, 3 insertions(+), 13 deletions(-)

diff --git 
a/archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/src/main/resources/application.properties
 
b/archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/src/main/resources/application.properties
index 24b20c1..2c1eb8d 100644
--- 
a/archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/src/main/resources/application.properties
+++ 
b/archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/src/main/resources/application.properties
@@ -34,8 +34,6 @@ timer.period = 2000
 # expose actuator endpoint via HTTP
 management.endpoints.web.exposure.include=info,health,camelroutes
 
-# all access to actuator endpoints without security
-management.security.enabled = false
 # turn on actuator health check
 management.endpoint.health.enabled = true
 
diff --git 
a/components/camel-spring-boot/src/test/resources/application.properties 
b/components/camel-spring-boot/src/test/resources/application.properties
index 518bcd1..4271cf9 100644
--- a/components/camel-spring-boot/src/test/resources/application.properties
+++ b/components/camel-spring-boot/src/test/resources/application.properties
@@ -15,7 +15,7 @@
 ## limitations under the License.
 ## ---
 
-spring.main.banner_mode=off
+spring.main.banner-mode=off
 
 from=direct:test
 to=mock:test
diff --git 
a/examples/camel-example-rabbitmq/src/main/resources/application.properties 
b/examples/camel-example-rabbitmq/src/main/resources/application.properties
index cd4dc76..613e5f8 100644
--- a/examples/camel-example-rabbitmq/src/main/resources/application.properties
+++ b/examples/camel-example-rabbitmq/src/main/resources/application.properties
@@ -28,8 +28,6 @@ camel.springboot.name = SampleCamel
 # properties used in the Camel route and beans
 # 
 
-# all access to actuator endpoints without security
-management.security.enabled = false
 # turn on actuator health check
 management.endpoint.health.enabled = true
 
diff --git 
a/examples/camel-example-spring-boot-clustered-route-controller/cluster-node/src/main/resources/application.properties
 
b/examples/camel-example-spring-boot-clustered-route-controller/cluster-node/src/main/resources/application.properties
index 52314b2..fbaf9c1 100644
--- 
a/examples/camel-example-spring-boot-clustered-route-controller/cluster-node/src/main/resources/application.properties
+++ 
b/examples/camel-example-spring-boot-clustered-route-controller/cluster-node/src/main/resources/application.properties
@@ -28,7 +28,7 @@ management.endpoints.enabled-by-default = false
 management.endpoints.jmx.enabled = false
 management.endpoint.health.enabled = true
 
-management.port = -1
+management.server.port = -1
 
 node.id = ${random.uuid}
 
diff --git 
a/examples/camel-example-spring-boot-health-checks/application/src/main/resources/application.properties
 
b/examples/camel-example-spring-boot-health-checks/application/src/main/resources/application.properties
index ae3be62..e22e0d2b 100644
--- 
a/examples/camel-example-spring-boot-health-checks/application/src/main/resources/application.properties
+++ 
b/examples/camel-example-spring-boot-health-checks/application/src/main/resources/application.properties
@@ -28,8 +28,6 @@ management.endpoint.mappings.enabled = true
 management.endpoint.health.enabled = true
 management.endpoint.camelhealthchecks.enabled = true
 
-management.security.enabled = false
-
 camel.springboot.name = SampleHealthChecks

[camel] branch master updated: Updated the enterprise integration pattern document

2018-05-03 Thread ningjiang 
This is an automated email from the ASF dual-hosted git repository.

ningjiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/master by this push:
 new 89c4b65  Updated the enterprise integration pattern document
89c4b65 is described below

commit 89c4b650788dc8551fb680407b2842ff0b95f0d5
Author: Willem Jiang 
AuthorDate: Thu May 3 16:39:29 2018 +0800

Updated the enterprise integration pattern document
---
 docs/user-manual/en/enterprise-integration-patterns.adoc | 12 
 1 file changed, 12 insertions(+)

diff --git a/docs/user-manual/en/enterprise-integration-patterns.adoc 
b/docs/user-manual/en/enterprise-integration-patterns.adoc
index cd8cc80..037707c 100644
--- a/docs/user-manual/en/enterprise-integration-patterns.adoc
+++ b/docs/user-manual/en/enterprise-integration-patterns.adoc
@@ -184,6 +184,18 @@ in a given period to avoid downstream route does not get 
overloaded?
 number of endpoints?
 
 
|image:http://cwiki.apache.org/confluence/download/attachments/49204/clear.png[image]
+|Hystrix |How can I stop to call an external service if the service is broken?
+
+|image:http://cwiki.apache.org/confluence/download/attachments/49204/clear.png[image]
+|Service Call |How can I call a remote service in a distributed system
+where the service is looked up from a service registry of some sorts?
+
+|image:http://cwiki.apache.org/confluence/download/attachments/49204/clear.png[image]
+|Saga |How can I define a series of related actions in a Camel route
+that should be either completed successfully (all of them) or 
not-executed/compensated?
+
+
+|image:http://cwiki.apache.org/confluence/download/attachments/49204/clear.png[image]
 |Multicast |How can I route a message to a number
 of endpoints at the same time?
 

-- 
To stop receiving notification emails like this one, please contact
ningji...@apache.org.

[camel] 02/02: Upgrade Chronicle queue to version 4.6.106

2018-05-03 Thread acosentino 
This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit ae14927e2f809be80e0f162f17a1ff087014701f
Author: Andrea Cosentino 
AuthorDate: Thu May 3 14:55:12 2018 +0200

Upgrade Chronicle queue to version 4.6.106
---
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index 1b65dc2..ead9649 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -124,7 +124,7 @@
 1.13.27
 2.4.17
 1.12.2
-4.6.105
+4.6.106
 1.12.3
 1.12.4
 3.3.1

-- 
To stop receiving notification emails like this one, please contact
acosent...@apache.org.

[camel] 01/02: Upgrade Chronicle Bytes to version 1.12.11

2018-05-03 Thread acosentino 
This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 294f528a4a40a6a35177caa8228a86359b375030
Author: Andrea Cosentino 
AuthorDate: Thu May 3 14:54:35 2018 +0200

Upgrade Chronicle Bytes to version 1.12.11
---
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index f1c0045..1b65dc2 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -119,7 +119,7 @@
 1.2
 3.2.6_1
 3.2.6
-1.12.10
+1.12.11
 1.12.5
 1.13.27
 2.4.17

-- 
To stop receiving notification emails like this one, please contact
acosent...@apache.org.

[camel] branch master updated (df59578 -> ae14927)

2018-05-03 Thread acosentino 
This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.


from df59578  Upgrade Mongo Java Driver to version 3.7.0
 new 294f528  Upgrade Chronicle Bytes to version 1.12.11
 new ae14927  Upgrade Chronicle queue to version 4.6.106

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 parent/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
acosent...@apache.org.

[camel] branch master updated: Upgrade Mongo Java Driver to version 3.7.0

2018-05-03 Thread acosentino 
This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/master by this push:
 new df59578  Upgrade Mongo Java Driver to version 3.7.0
df59578 is described below

commit df59578c0bcaf86b517c5b68b551fe9f6bc827db
Author: Andrea Cosentino 
AuthorDate: Thu May 3 14:33:20 2018 +0200

Upgrade Mongo Java Driver to version 3.7.0
---
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index 83cb92c..f1c0045 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -504,7 +504,7 @@
 1.9
 0.0.17
 2.17.0
-3.6.3
+3.7.0
 1.5.0
 1.14
 2013.6.1

-- 
To stop receiving notification emails like this one, please contact
acosent...@apache.org.

[camel] 01/04: Add url parameter to configure the queueUrl of an SqsEndpoint

2018-05-03 Thread acosentino 
This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 173009ab892008272f8a28cefec0109ebb867995
Author: Dani Rey 
AuthorDate: Wed May 2 16:33:50 2018 +0200

Add url parameter to configure the queueUrl of an SqsEndpoint
---
 .../camel-aws/src/main/docs/aws-sqs-component.adoc |  3 +-
 .../camel/component/aws/sqs/SqsConfiguration.java  | 13 +++
 .../camel/component/aws/sqs/SqsEndpoint.java   | 44 +++---
 3 files changed, 38 insertions(+), 22 deletions(-)

diff --git a/components/camel-aws/src/main/docs/aws-sqs-component.adoc 
b/components/camel-aws/src/main/docs/aws-sqs-component.adoc
index 5af3f9f..72bc438 100644
--- a/components/camel-aws/src/main/docs/aws-sqs-component.adoc
+++ b/components/camel-aws/src/main/docs/aws-sqs-component.adoc
@@ -68,7 +68,7 @@ with the following path and query parameters:
 |===
 
 
- Query Parameters (46 parameters):
+ Query Parameters (47 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -78,6 +78,7 @@ with the following path and query parameters:
 | *amazonSQSClient* (common) | To use the AmazonSQS as client |  | AmazonSQS
 | *headerFilterStrategy* (common) | To use a custom HeaderFilterStrategy to 
map headers to/from Camel. |  | HeaderFilterStrategy
 | *queueOwnerAWSAccountId* (common) | Specify the queue owner aws account id 
when you need to connect the queue with different account owner. |  | String
+| *queueUrl* (common) | To define the queueUrl explicitly. All other 
parameters which would influence the queueUrl are ignored. |  | String
 | *region* (common) | Specify the queue region which could be used with 
queueOwnerAWSAccountId to build the service URL. |  | String
 | *attributeNames* (consumer) | A list of attribute names to receive when 
consuming. Multiple names can be separated by comma. |  | String
 | *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the 
Camel routing Error Handler, which mean any exceptions occurred while the 
consumer is trying to pickup incoming messages, or the likes, will now be 
processed as a message and handled by the routing Error Handler. By default the 
consumer will use the org.apache.camel.spi.ExceptionHandler to deal with 
exceptions, that will be logged at WARN or ERROR level and ignored. | false | 
boolean
diff --git 
a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsConfiguration.java
 
b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsConfiguration.java
index d052976..daa098b 100644
--- 
a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsConfiguration.java
+++ 
b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsConfiguration.java
@@ -63,6 +63,8 @@ public class SqsConfiguration implements Cloneable {
 private boolean extendMessageVisibility;
 @UriParam(label = "consumer", defaultValue = "1")
 private int concurrentConsumers = 1;
+   @UriParam
+private String queueUrl;
 
 // producer properties
 @UriParam(label = "producer")
@@ -345,6 +347,17 @@ public class SqsConfiguration implements Cloneable {
 public void setConcurrentConsumers(int concurrentConsumers) {
 this.concurrentConsumers = concurrentConsumers;
 }
+   
+   /**
+ *  To define the queueUrl explicitly. All other parameters, which would 
influence the queueUrl, are ignored.
+ */
+public String getQueueUrl() {
+return queueUrl;
+}
+
+public void setQueueUrl(String queueUrl) {
+this.queueUrl = queueUrl;
+}
 
 /**
  * To define a proxy host when instantiating the SQS client
diff --git 
a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsEndpoint.java
 
b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsEndpoint.java
index 1ab049b..91daa2c 100644
--- 
a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsEndpoint.java
+++ 
b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsEndpoint.java
@@ -121,28 +121,30 @@ public class SqsEndpoint extends ScheduledPollEndpoint 
implements HeaderFilterSt
 headerFilterStrategy = new SqsHeaderFilterStrategy();
 }
 
-// If both region and Account ID is provided the queue URL can be 
built manually.
-// This allows accessing queues where you don't have permission to 
list queues or query queues
-if (configuration.getRegion() != null && 
configuration.getQueueOwnerAWSAccountId() != null) {
-String host = configuration.getAmazonAWSHost();
-host = FileUtil.stripTrailingSeparator(host);
-queueUrl = "https://sqs.; + configuration.getRegion() + "." + host 
+ "/"
-+  configuration.getQueueOwnerAWSAccountId() + "/" + 
configuration.getQueueName();
-

[camel] 02/04: Fix for findings from code review: - re-added use of configuration.getAmazonAWSHost when building queueUrl - replaced tabs with spaces - use aws-sqs-component.adoc as generated by build

2018-05-03 Thread acosentino 
This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 6bb9f5559145bfc1f9db6718192e86c2a09a4e07
Author: Dani Rey 
AuthorDate: Thu May 3 09:26:09 2018 +0200

Fix for findings from code review:
 - re-added use of configuration.getAmazonAWSHost when building queueUrl
 - replaced tabs with spaces
 - use aws-sqs-component.adoc as generated by build
---
 components/camel-aws/src/main/docs/aws-sqs-component.adoc   | 2 +-
 .../java/org/apache/camel/component/aws/sqs/SqsConfiguration.java   | 4 ++--
 .../main/java/org/apache/camel/component/aws/sqs/SqsEndpoint.java   | 6 --
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/components/camel-aws/src/main/docs/aws-sqs-component.adoc 
b/components/camel-aws/src/main/docs/aws-sqs-component.adoc
index 72bc438..0550d1d 100644
--- a/components/camel-aws/src/main/docs/aws-sqs-component.adoc
+++ b/components/camel-aws/src/main/docs/aws-sqs-component.adoc
@@ -78,7 +78,7 @@ with the following path and query parameters:
 | *amazonSQSClient* (common) | To use the AmazonSQS as client |  | AmazonSQS
 | *headerFilterStrategy* (common) | To use a custom HeaderFilterStrategy to 
map headers to/from Camel. |  | HeaderFilterStrategy
 | *queueOwnerAWSAccountId* (common) | Specify the queue owner aws account id 
when you need to connect the queue with different account owner. |  | String
-| *queueUrl* (common) | To define the queueUrl explicitly. All other 
parameters which would influence the queueUrl are ignored. |  | String
+| *queueUrl* (common) | To define the queueUrl explicitly. All other 
parameters, which would influence the queueUrl, are ignored. |  | String
 | *region* (common) | Specify the queue region which could be used with 
queueOwnerAWSAccountId to build the service URL. |  | String
 | *attributeNames* (consumer) | A list of attribute names to receive when 
consuming. Multiple names can be separated by comma. |  | String
 | *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the 
Camel routing Error Handler, which mean any exceptions occurred while the 
consumer is trying to pickup incoming messages, or the likes, will now be 
processed as a message and handled by the routing Error Handler. By default the 
consumer will use the org.apache.camel.spi.ExceptionHandler to deal with 
exceptions, that will be logged at WARN or ERROR level and ignored. | false | 
boolean
diff --git 
a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsConfiguration.java
 
b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsConfiguration.java
index daa098b..481e1a6 100644
--- 
a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsConfiguration.java
+++ 
b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsConfiguration.java
@@ -63,7 +63,7 @@ public class SqsConfiguration implements Cloneable {
 private boolean extendMessageVisibility;
 @UriParam(label = "consumer", defaultValue = "1")
 private int concurrentConsumers = 1;
-   @UriParam
+@UriParam
 private String queueUrl;
 
 // producer properties
@@ -348,7 +348,7 @@ public class SqsConfiguration implements Cloneable {
 this.concurrentConsumers = concurrentConsumers;
 }

-   /**
+/**
  *  To define the queueUrl explicitly. All other parameters, which would 
influence the queueUrl, are ignored.
  */
 public String getQueueUrl() {
diff --git 
a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsEndpoint.java
 
b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsEndpoint.java
index 91daa2c..7f3ab4d 100644
--- 
a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsEndpoint.java
+++ 
b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsEndpoint.java
@@ -127,7 +127,9 @@ public class SqsEndpoint extends ScheduledPollEndpoint 
implements HeaderFilterSt
 // If both region and Account ID is provided the queue URL can be 
built manually.
 // This allows accessing queues where you don't have permission to 
list queues or query queues
 if (configuration.getRegion() != null && 
configuration.getQueueOwnerAWSAccountId() != null) {
-queueUrl = "https://sqs.; + configuration.getRegion() + 
".amazonaws.com/"
+String host = configuration.getAmazonAWSHost();
+host = FileUtil.stripTrailingSeparator(host);
+queueUrl = "https://sqs.; + configuration.getRegion() + host + 
"/"
 + configuration.getQueueOwnerAWSAccountId() + "/" + 
configuration.getQueueName();
 } else if (configuration.getQueueOwnerAWSAccountId() != null) {
 GetQueueUrlRequest getQueueUrlRequest = new

[camel] 03/04: Fixing findings from review: - label the queueUrl parameter as advanced - improve documentation of queueUrl parameter, clarify that it is intended for testing purposes - add a UnitTest

2018-05-03 Thread acosentino 
This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit b22cae32854e94a3c8f5673cab02984008466c89
Author: Dani Rey 
AuthorDate: Thu May 3 11:11:15 2018 +0200

Fixing findings from review:
 - label the queueUrl parameter as advanced
 - improve documentation of queueUrl parameter, clarify that it is
 intended for testing purposes
 - add a UnitTest for the queueUrl parameter
---
 .../camel-aws/src/main/docs/aws-sqs-component.adoc |  2 +-
 .../camel/component/aws/sqs/SqsConfiguration.java  |  3 +-
 .../aws/sqs/SqsEndpointExplicitQueueUrlTest.java   | 50 ++
 3 files changed, 53 insertions(+), 2 deletions(-)

diff --git a/components/camel-aws/src/main/docs/aws-sqs-component.adoc 
b/components/camel-aws/src/main/docs/aws-sqs-component.adoc
index 0550d1d..0c5af41 100644
--- a/components/camel-aws/src/main/docs/aws-sqs-component.adoc
+++ b/components/camel-aws/src/main/docs/aws-sqs-component.adoc
@@ -78,7 +78,6 @@ with the following path and query parameters:
 | *amazonSQSClient* (common) | To use the AmazonSQS as client |  | AmazonSQS
 | *headerFilterStrategy* (common) | To use a custom HeaderFilterStrategy to 
map headers to/from Camel. |  | HeaderFilterStrategy
 | *queueOwnerAWSAccountId* (common) | Specify the queue owner aws account id 
when you need to connect the queue with different account owner. |  | String
-| *queueUrl* (common) | To define the queueUrl explicitly. All other 
parameters, which would influence the queueUrl, are ignored. |  | String
 | *region* (common) | Specify the queue region which could be used with 
queueOwnerAWSAccountId to build the service URL. |  | String
 | *attributeNames* (consumer) | A list of attribute names to receive when 
consuming. Multiple names can be separated by comma. |  | String
 | *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the 
Camel routing Error Handler, which mean any exceptions occurred while the 
consumer is trying to pickup incoming messages, or the likes, will now be 
processed as a message and handled by the routing Error Handler. By default the 
consumer will use the org.apache.camel.spi.ExceptionHandler to deal with 
exceptions, that will be logged at WARN or ERROR level and ignored. | false | 
boolean
@@ -98,6 +97,7 @@ with the following path and query parameters:
 | *delaySeconds* (producer) | Delay sending messages for a number of seconds. 
|  | Integer
 | *messageDeduplicationId Strategy* (producer) | Only for FIFO queues. 
Strategy for setting the messageDeduplicationId on the message. Can be one of 
the following options: useExchangeId, useContentBasedDeduplication. For the 
useContentBasedDeduplication option, no messageDeduplicationId will be set on 
the message. | useExchangeId | MessageDeduplicationId Strategy
 | *messageGroupIdStrategy* (producer) | Only for FIFO queues. Strategy for 
setting the messageGroupId on the message. Can be one of the following options: 
useConstant, useExchangeId, usePropertyValue. For the usePropertyValue option, 
the value of property CamelAwsMessageGroupId will be used. |  | 
MessageGroupIdStrategy
+| *queueUrl* (advanced) | To define the queueUrl explicitly. All other 
parameters, which would influence the queueUrl, are ignored. This parameter is 
intended to be used, to connect to a mock implementation of SQS, for testing 
purposes. |  | String
 | *synchronous* (advanced) | Sets whether synchronous processing should be 
strictly used, or Camel is allowed to use asynchronous processing (if 
supported). | false | boolean
 | *backoffErrorThreshold* (scheduler) | The number of subsequent error polls 
(failed due some error) that should happen before the backoffMultipler should 
kick-in. |  | int
 | *backoffIdleThreshold* (scheduler) | The number of subsequent idle polls 
that should happen before the backoffMultipler should kick-in. |  | int
diff --git 
a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsConfiguration.java
 
b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsConfiguration.java
index 481e1a6..4d9839d 100644
--- 
a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsConfiguration.java
+++ 
b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsConfiguration.java
@@ -63,7 +63,7 @@ public class SqsConfiguration implements Cloneable {
 private boolean extendMessageVisibility;
 @UriParam(label = "consumer", defaultValue = "1")
 private int concurrentConsumers = 1;
-@UriParam
+@UriParam(label = "advanced")
 private String queueUrl;
 
 // producer properties
@@ -350,6 +350,7 @@ public class SqsConfiguration implements Cloneable {

 /**
  *  To define the queueUrl explicitly. All other parameters, which would 
influence the queueUrl, are ignored.
+ *  This

[camel] branch master updated (fe2fb4e -> 07e3d06)

2018-05-03 Thread acosentino 
This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.


from fe2fb4e  Fhir component requires Guava 23.0 for his Karaf Feature
 new 173009a  Add url parameter to configure the queueUrl of an SqsEndpoint
 new 6bb9f55  Fix for findings from code review:  - re-added use of 
configuration.getAmazonAWSHost when building queueUrl  - replaced tabs with 
spaces  - use aws-sqs-component.adoc as generated by build
 new b22cae3  Fixing findings from review:  - label the queueUrl parameter 
as advanced  - improve documentation of queueUrl parameter, clarify that it is  
intended for testing purposes  - add a UnitTest for the queueUrl parameter
 new 07e3d06  Fixed CS and regen

The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../camel-aws/src/main/docs/aws-sqs-component.adoc |  3 +-
 .../camel/component/aws/sqs/SqsConfiguration.java  | 14 +++
 .../camel/component/aws/sqs/SqsEndpoint.java   | 44 --
 .../SqsEndpointExplicitQueueUrlTest.java}  | 40 ++--
 .../sqs/springboot/SqsComponentConfiguration.java  |  9 +
 5 files changed, 69 insertions(+), 41 deletions(-)
 copy 
components/camel-aws/src/test/java/org/apache/camel/component/aws/{sdb/DeleteDomainCommandTest.java
 => sqs/SqsEndpointExplicitQueueUrlTest.java} (52%)

-- 
To stop receiving notification emails like this one, please contact
acosent...@apache.org.

[camel] 04/04: Fixed CS and regen

2018-05-03 Thread acosentino 
This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 07e3d064bd495bcab50250e583938d937be0b24d
Author: Andrea Cosentino 
AuthorDate: Thu May 3 13:25:45 2018 +0200

Fixed CS and regen
---
 .../org/apache/camel/component/aws/sqs/SqsConfiguration.java | 2 +-
 .../camel/component/aws/sqs/SqsEndpointExplicitQueueUrlTest.java | 4 ++--
 .../component/aws/sqs/springboot/SqsComponentConfiguration.java  | 9 +
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git 
a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsConfiguration.java
 
b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsConfiguration.java
index 4d9839d..6c02929 100644
--- 
a/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsConfiguration.java
+++ 
b/components/camel-aws/src/main/java/org/apache/camel/component/aws/sqs/SqsConfiguration.java
@@ -347,7 +347,7 @@ public class SqsConfiguration implements Cloneable {
 public void setConcurrentConsumers(int concurrentConsumers) {
 this.concurrentConsumers = concurrentConsumers;
 }
-   
+
 /**
  *  To define the queueUrl explicitly. All other parameters, which would 
influence the queueUrl, are ignored.
  *  This parameter is intended to be used, to connect to a mock 
implementation of SQS, for testing purposes.
diff --git 
a/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/SqsEndpointExplicitQueueUrlTest.java
 
b/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/SqsEndpointExplicitQueueUrlTest.java
index 7674360..61a314e 100644
--- 
a/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/SqsEndpointExplicitQueueUrlTest.java
+++ 
b/components/camel-aws/src/test/java/org/apache/camel/component/aws/sqs/SqsEndpointExplicitQueueUrlTest.java
@@ -18,10 +18,10 @@ package org.apache.camel.component.aws.sqs;
 
 import com.amazonaws.services.sqs.AmazonSQSClient;
 import org.apache.camel.impl.DefaultCamelContext;
-import org.mockito.Mockito;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
+import org.mockito.Mockito;
 
 
 public class SqsEndpointExplicitQueueUrlTest extends Assert {
@@ -47,4 +47,4 @@ public class SqsEndpointExplicitQueueUrlTest extends Assert {
 
 assertEquals(endpoint.getQueueUrl(), QUEUE_URL);
 }
-}
\ No newline at end of file
+}
diff --git 
a/platforms/spring-boot/components-starter/camel-aws-starter/src/main/java/org/apache/camel/component/aws/sqs/springboot/SqsComponentConfiguration.java
 
b/platforms/spring-boot/components-starter/camel-aws-starter/src/main/java/org/apache/camel/component/aws/sqs/springboot/SqsComponentConfiguration.java
index 1db47e5..37cc16e 100644
--- 
a/platforms/spring-boot/components-starter/camel-aws-starter/src/main/java/org/apache/camel/component/aws/sqs/springboot/SqsComponentConfiguration.java
+++ 
b/platforms/spring-boot/components-starter/camel-aws-starter/src/main/java/org/apache/camel/component/aws/sqs/springboot/SqsComponentConfiguration.java
@@ -208,6 +208,7 @@ public class SqsComponentConfiguration
  */
 private String region;
 private Integer concurrentConsumers = 1;
+private String queueUrl;
 private String proxyHost;
 private Integer proxyPort;
 
@@ -388,6 +389,14 @@ public class SqsComponentConfiguration
 this.concurrentConsumers = concurrentConsumers;
 }
 
+public String getQueueUrl() {
+return queueUrl;
+}
+
+public void setQueueUrl(String queueUrl) {
+this.queueUrl = queueUrl;
+}
+
 public String getProxyHost() {
 return proxyHost;
 }

-- 
To stop receiving notification emails like this one, please contact
acosent...@apache.org.

[camel] branch master updated (e0a7134 -> fe2fb4e)

2018-05-03 Thread acosentino 
This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.


from e0a7134  Upgrade RxJava to version 2.1.13
 new ad741ba  Upgrade Gson to version 2.8.4
 new fe2fb4e  Fhir component requires Guava 23.0 for his Karaf Feature

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 parent/pom.xml   | 3 ++-
 platforms/karaf/features/src/main/resources/features.xml | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
acosent...@apache.org.

[camel] 02/02: Fhir component requires Guava 23.0 for his Karaf Feature

2018-05-03 Thread acosentino 
This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit fe2fb4e77f18f879daaa6eb37a6da8d522522650
Author: Andrea Cosentino 
AuthorDate: Thu May 3 11:53:51 2018 +0200

Fhir component requires Guava 23.0 for his Karaf Feature
---
 parent/pom.xml   | 1 +
 platforms/karaf/features/src/main/resources/features.xml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index 74168bb..83cb92c 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -288,6 +288,7 @@
 2.0.0.0
 2.3
 3.3.0
+23.0
 1.11
 1.6
 1.22
diff --git a/platforms/karaf/features/src/main/resources/features.xml 
b/platforms/karaf/features/src/main/resources/features.xml
index f7c2238..2299c97 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -675,7 +675,7 @@
 mvn:org.apache.commons/commons-lang3/${commons-lang3-version}
 mvn:commons-codec/commons-codec/${commons-codec-version}
 mvn:commons-io/commons-io/${commons-io-version}
-mvn:com.google.guava/guava/${google-guava-version}
+mvn:com.google.guava/guava/${guava-fhir-version}
 mvn:org.apache.httpcomponents/httpcore-osgi/${httpcore4-version}
 mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient4-version}
 mvn:ca.uhn.hapi/hapi-osgi-base/${hapi-version}

-- 
To stop receiving notification emails like this one, please contact
acosent...@apache.org.

[camel] 01/02: Upgrade Gson to version 2.8.4

2018-05-03 Thread acosentino 
This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git

commit ad741ba0acee0bc727d7cc59e1353f7640987b34
Author: Andrea Cosentino 
AuthorDate: Thu May 3 11:51:55 2018 +0200

Upgrade Gson to version 2.8.4
---
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index 6149761..74168bb 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -276,7 +276,7 @@
 
2.0.7.Final
 1.10.1_1
 2.1.3
-2.8.2
+2.8.4
 4.0
 3.0
 3.0_1

-- 
To stop receiving notification emails like this one, please contact
acosent...@apache.org.

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

2018-05-03 Thread buildbot 
Author: buildbot
Date: Thu May  3 08:19:03 2018
New Revision: 1029342

Log:
Production update by buildbot for camel

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

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

Modified: websites/production/camel/content/camel-2220-release.html
==
--- websites/production/camel/content/camel-2220-release.html (original)
+++ websites/production/camel/content/camel-2220-release.html Thu May  3 
08:19:03 2018
@@ -94,7 +94,7 @@
 
 
 
-New and NoteworthyWelcome 
to the 2.22.0 release which approx XXX issues resolved (new features, 
improvements and bug fixes such as...)This release supports only 
Spring Boot 2. Spring Boot v1 is no longer 
supported.Camel has upgraded from 
Spring Boot v1 to v2 and therefore v1 is no longer 
supported.Upgraded to Spring Framework 5. Camel should work with 
Spring 4.3.x as well, but going forward Spring 5.x will be the minimum Spring 
version in future releases.Upgraded to Karaf 4.2. You may run 
Camel on Karaf 4.1 but we only officially support Karaf 4.2 in this 
release.Optimised using toD DSL to reuse endpoints and prod
 ucers for components where its possible. For example HTTP based components 
will now reuse producer (http clients) with dynamic uris sending to the same 
host. See more details in the https://github.com/apache/camel/blob/master/camel-core/src/main/docs/eips/toD-eip.adoc;
 rel="nofollow">toD documentation.TheFile2 consumer with read-lock 
idempotent/idempotent-changed can now be configured to delay the release tasks 
to expand the window when a file is regarded as in-process, which is usable in 
active/active cluster settings with a shared idempotent repository to ensure 
other nodes dont too quickly see a processed file as a file they can process 
(only needed if you have readLockRemoveOnCommit=true).Allow to plugin 
a custom request/reply correlation id manager implementation onNetty4 producer in request/reply 
mode.TheTwitter component now uses extended mode by 
default to support tweets  140 charactersAnd these important 
fixes:Fixed a CXF continuation timeout issue with 
camel-cxfconsumer could cause the consumer to return a response with data 
instead of triggering a timeout to the calling SOAP client.Fixed 
camel-cxf consumerdoesn't release UoW 
when using robust oneway operationFixed usingAdviceWith and using weave methods 
ononExceptionetc. not 
working.FixedSplitter in parallel processing and streaming mode may 
block, while iterating message body when the iterator throws exception in first 
invoked next() method call.FixedKafka consumer to not auto commit if autoCommitEnable=fals
 e.Fixed file consumer was using markerFile as read-lock by default, 
which should have been none.Fixed using manual commit 
withKafka to provide the current 
record offset and not the previous (and -1 for first)New Enterprise Integration 
PatternsNew Componentscamel-mybatis - Now has a 
mybatis-bean component that supports using MyBatis annotations on POJO beans to 
specify the SQL queries and mappings.camel-web3j -The web3j 
component uses the Web3j client API and allows you to add/read nodes to/from a 
web3j compliant content repositories.New DSLNew AnnotationsNew Data FormatsNew LanguagesNew 
ExamplesNew TutorialsAPI 
breakingTheRestProducerFactory has an API change where the 
RestConfiguration is provided as parameter as well.Known IssuesImportant 
changes to consider when upgradingCamel has upgraded from Spring 
Boot v1 to v2 and therefore v1 is no longer supported. Migrating from SB1 to 
SB2 may require changes, see the Spring Boot v1 to v2 migration documentation 
for details.Upgraded to Spring Framework v5 as default. Support for 
Spring Framework v4.3 is deprecated
  and not recommended to be used.Upgraded to Karaf 4.2. You may run 
Camel on Karaf 4.1 but we only officially support Karaf 4.2 in this 
release.The camel-jms Maven pom.xml file now exclude 
spring-messaging dependency as this JAR is not used.Unit testing Camel 
with Spring Boot and extending the base 
classesCamelTestSupport 
orCamelSpringTestSupport is now throwing an exception as 
this has never been intended/support. Instead use the CamelSpringBootRunner 
JUnit runner, and do not extend a base class.The file consumer has 
changed to use readLock=none as default instead of readLock=markerFile. 
Documentation already indicated that readLock=none was the 
default.Getting the 
DistributionsBinary 
DistributionsDescriptionDownload LinkPGP Signature file of 
downloadWindows

[camel] branch master updated: Upgrade RxJava to version 2.1.13

2018-05-03 Thread acosentino 
This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/master by this push:
 new e0a7134  Upgrade RxJava to version 2.1.13
e0a7134 is described below

commit e0a7134ee84edeacb9a8c8d2c2674d0ac289310c
Author: Andrea Cosentino 
AuthorDate: Thu May 3 10:13:49 2018 +0200

Upgrade RxJava to version 2.1.13
---
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index 1213ad5..6149761 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -597,7 +597,7 @@
 1.0_3
 1.0
 1.3.8
-2.1.12
+2.1.13
 1.3.2_2
 9.8.0-10_1
 9.8.0-10

-- 
To stop receiving notification emails like this one, please contact
acosent...@apache.org.

[camel] branch master updated: CAMEL-12442:rest-dsl - Rest producer should use RestConfiguration (#2314)

2018-05-03 Thread davsclaus 
This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/master by this push:
 new 505117a  CAMEL-12442:rest-dsl - Rest producer should use 
RestConfiguration (#2314)
505117a is described below

commit 505117adb445e2cc0c99bc1b2511d3ceb08591cc
Author: ramu11 
AuthorDate: Thu May 3 13:14:34 2018 +0530

CAMEL-12442:rest-dsl - Rest producer should use RestConfiguration (#2314)
---
 .../apache/camel/component/http/HttpComponent.java | 20 ++
 .../camel/component/http4/HttpComponent.java   | 19 ++
 .../component/netty4/http/NettyHttpComponent.java  | 20 ++
 .../RestNettyProducerThrowExceptionErrorTest.java  | 72 ++
 .../camel/component/restlet/RestletComponent.java  | 23 ++-
 .../RestletProducerThrowExceptionErrorTest.java| 69 +
 .../component/undertow/UndertowComponent.java  | 20 ++
 ...estUndertowProducerThrowExceptionErrorTest.java | 71 +
 8 files changed, 313 insertions(+), 1 deletion(-)

diff --git 
a/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java
 
b/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java
index d0e93e2..39107cf 100644
--- 
a/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java
+++ 
b/components/camel-http/src/main/java/org/apache/camel/component/http/HttpComponent.java
@@ -312,6 +312,26 @@ public class HttpComponent extends HttpCommonComponent 
implements RestProducerFa
 if (!ObjectHelper.isEmpty(uriTemplate)) {
 url += "/" + uriTemplate;
 }
+
+RestConfiguration config = configuration;
+if (config == null) {
+config = camelContext.getRestConfiguration("http", true);
+}
+
+Map map = new HashMap<>();
+// build query string, and append any endpoint configuration properties
+if (config.getComponent() == null || 
config.getComponent().equals("http")) {
+// setup endpoint options
+if (config.getEndpointProperties() != null && 
!config.getEndpointProperties().isEmpty()) {
+map.putAll(config.getEndpointProperties());
+}
+}
+
+// get the endpoint
+String query = URISupport.createQueryString(map);
+if (!query.isEmpty()) {
+url = url + "?" + query;
+}
 
 HttpEndpoint endpoint = camelContext.getEndpoint(url, 
HttpEndpoint.class);
 if (parameters != null && !parameters.isEmpty()) {
diff --git 
a/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java
 
b/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java
index 95bcb66..7444681 100644
--- 
a/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java
+++ 
b/components/camel-http4/src/main/java/org/apache/camel/component/http4/HttpComponent.java
@@ -433,7 +433,26 @@ public class HttpComponent extends HttpCommonComponent 
implements RestProducerFa
 if (!ObjectHelper.isEmpty(uriTemplate)) {
 url += "/" + uriTemplate;
 }
+
+RestConfiguration config = configuration;
+if (config == null) {
+config = camelContext.getRestConfiguration("http4", true);
+}
 
+Map map = new HashMap<>();
+// build query string, and append any endpoint configuration properties
+if (config.getComponent() == null || 
config.getComponent().equals("http4")) {
+// setup endpoint options
+if (config.getEndpointProperties() != null && 
!config.getEndpointProperties().isEmpty()) {
+map.putAll(config.getEndpointProperties());
+}
+}
+
+// get the endpoint
+String query = URISupport.createQueryString(map);
+if (!query.isEmpty()) {
+url = url + "?" + query;
+}
 HttpEndpoint endpoint = camelContext.getEndpoint(url, 
HttpEndpoint.class);
 if (parameters != null && !parameters.isEmpty()) {
 setProperties(camelContext, endpoint, parameters);
diff --git 
a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpComponent.java
 
b/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpComponent.java
index 28db0ab..bcac251 100644
--- 
a/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpComponent.java
+++ 
b/components/camel-netty4-http/src/main/java/org/apache/camel/component/netty4/http/NettyHttpComponent.java
@@ -430,6 +430,26 @@ public class NettyHttpComponent extends NettyComponent 
implements HeaderFilterSt
 if

[camel] branch master updated: Regen

2018-05-03 Thread davsclaus 
This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/master by this push:
 new 0c3ba85  Regen
0c3ba85 is described below

commit 0c3ba85de21f1ac60d0c66c79ff2d72c75454402
Author: Claus Ibsen 
AuthorDate: Thu May 3 09:33:58 2018 +0200

Regen
---
 components/readme.adoc | 5 +
 docs/user-manual/en/SUMMARY.md | 1 -
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/components/readme.adoc b/components/readme.adoc
index 63c41d0..4683b03 100644
--- a/components/readme.adoc
+++ b/components/readme.adoc
@@ -2,7 +2,7 @@ Components
 ^^
 
 // components: START
-Number of Components: 294 in 201 JAR artifacts (20 deprecated)
+Number of Components: 293 in 200 JAR artifacts (20 deprecated)
 
 [width="100%",cols="4,1,5",options="header"]
 |===
@@ -236,9 +236,6 @@ Number of Components: 294 in 201 JAR artifacts (20 
deprecated)
 | 
link:camel-elasticsearch-rest/src/main/docs/elasticsearch-rest-component.adoc[Elastichsearch
 Rest] (camel-elasticsearch-rest) +
 `elasticsearch-rest:clusterName` | 2.21 | The elasticsearch component is used 
for interfacing with ElasticSearch server using REST API.
 
-| 
link:camel-elasticsearch5-rest/src/main/docs/elasticsearch5-rest-component.adoc[Elastichsearch5
 Rest] (camel-elasticsearch5-rest) +
-`elasticsearch5-rest:clusterName` | 2.21 | The elasticsearch component is used 
for interfacing with ElasticSearch server using 5.x REST API.
-
 | 
link:camel-elasticsearch/src/main/docs/elasticsearch-component.adoc[Elasticsearch]
 (camel-elasticsearch) +
 `elasticsearch:clusterName` | 2.11 | *deprecated* The elasticsearch component 
is used for interfacing with ElasticSearch server.
 
diff --git a/docs/user-manual/en/SUMMARY.md b/docs/user-manual/en/SUMMARY.md
index 92a77a1..e961fd6 100644
--- a/docs/user-manual/en/SUMMARY.md
+++ b/docs/user-manual/en/SUMMARY.md
@@ -192,7 +192,6 @@
* [Ehcache](ehcache-component.adoc)
* [EJB](ejb-component.adoc)
* [Elastichsearch Rest](elasticsearch-rest-component.adoc)
-   * [Elastichsearch5 Rest](elasticsearch5-rest-component.adoc)
* [Elasticsearch](elasticsearch-component.adoc)
* [Elasticsearch5](elasticsearch5-component.adoc)
* [ElSQL](elsql-component.adoc)

-- 
To stop receiving notification emails like this one, please contact
davscl...@apache.org.

[camel] branch master updated: Added first skeleton of AS2 component docs

2018-05-03 Thread acosentino 
This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/master by this push:
 new b318ed0  Added first skeleton of AS2 component docs
b318ed0 is described below

commit b318ed09897de505dc311f415ed2270167c39143
Author: Andrea Cosentino 
AuthorDate: Thu May 3 08:38:08 2018 +0200

Added first skeleton of AS2 component docs
---
 .../src/main/docs/as2-component.adoc   | 64 ++
 1 file changed, 64 insertions(+)

diff --git 
a/components/camel-as2/camel-as2-component/src/main/docs/as2-component.adoc 
b/components/camel-as2/camel-as2-component/src/main/docs/as2-component.adoc
new file mode 100644
index 000..a391ca2
--- /dev/null
+++ b/components/camel-as2/camel-as2-component/src/main/docs/as2-component.adoc
@@ -0,0 +1,64 @@
+[[as2-component]]
+== AS2 Component
+
+*Available as of Camel version *
+
+[source,xml]
+
+
+org.apache.camel
+camel-as2
+x.x.x
+
+
+
+
+### URI Options
+
+
+// component options: START
+The AS2 component supports 2 options which are listed below.
+
+
+
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *configuration* (common) | To use the shared configuration |  | 
AS2Configuration
+| *resolveProperty Placeholders* (advanced) | Whether the component should 
resolve property placeholders on itself when starting. Only properties which 
are of String type can use property placeholders. | true | boolean
+|===
+// component options: END
+
+
+// endpoint options: START
+The AS2 endpoint is configured using URI syntax:
+
+
+as2:name
+
+
+with the following path and query parameters:
+
+ Path Parameters (1 parameters):
+
+
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *name* | *Required* Some description of this option, and what it does |  | 
String
+|===
+
+
+ Query Parameters (5 parameters):
+
+
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *inBody* (common) | Sets the name of a parameter to be passed in the 
exchange In Body |  | String
+| *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the 
Camel routing Error Handler, which mean any exceptions occurred while the 
consumer is trying to pickup incoming messages, or the likes, will now be 
processed as a message and handled by the routing Error Handler. By default the 
consumer will use the org.apache.camel.spi.ExceptionHandler to deal with 
exceptions, that will be logged at WARN or ERROR level and ignored. | false | 
boolean
+| *exceptionHandler* (consumer) | To let the consumer use a custom 
ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this 
options is not in use. By default the consumer will deal with exceptions, that 
will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
+| *exchangePattern* (consumer) | Sets the exchange pattern when the consumer 
creates an exchange. |  | ExchangePattern
+| *synchronous* (advanced) | Sets whether synchronous processing should be 
strictly used, or Camel is allowed to use asynchronous processing (if 
supported). | false | boolean
+|===
+// endpoint options: END

-- 
To stop receiving notification emails like this one, please contact
acosent...@apache.org.

[camel] branch master updated: Upgrade Braintree to version 2.80.0

2018-05-03 Thread acosentino 
This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/master by this push:
 new 3227cb4  Upgrade Braintree to version 2.80.0
3227cb4 is described below

commit 3227cb40101fa99b1aefcee0c84c969422008df7
Author: Andrea Cosentino 
AuthorDate: Thu May 3 08:32:22 2018 +0200

Upgrade Braintree to version 2.80.0
---
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index be43893..1213ad5 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -98,7 +98,7 @@
 1.57
 3.2.1
 2.10.0
-2.77.0
+2.80.0
 4.13.4
 1.10
 0.9.5.2

-- 
To stop receiving notification emails like this one, please contact
acosent...@apache.org.