From f2608355c891ff4aabe49c2c3665bb13083c3f8a Mon Sep 17 00:00:00 2001
From: Andrea Cosentino <ancosen@gmail.com>
Date: Mon, 12 Nov 2018 14:16:16 +0100
Subject: [PATCH 001/125] CAMEL-12925 - Camel-Slack: Consumer must be able to
 use a different server than the default one

---
 .../camel-slack/src/main/docs/slack-component.adoc  |  3 ++-
 .../slack/SlackComponentVerifierExtension.java      |  2 +-
 .../apache/camel/component/slack/SlackConsumer.java |  4 ++--
 .../apache/camel/component/slack/SlackEndpoint.java | 13 +++++++++++++
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/components/camel-slack/src/main/docs/slack-component.adoc b/components/camel-slack/src/main/docs/slack-component.adoc
index a7c5699686628..329fd2d2b1425 100644
--- a/components/camel-slack/src/main/docs/slack-component.adoc
+++ b/components/camel-slack/src/main/docs/slack-component.adoc
@@ -77,7 +77,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (25 parameters):
+==== Query Parameters (26 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -86,6 +86,7 @@ with the following path and query parameters:
 | *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
 | *maxResults* (consumer) | The Max Result for the poll | 10 | String
 | *sendEmptyMessageWhenIdle* (consumer) | If the polling consumer did not poll any files, you can enable this option to send an empty message (no body) instead. | false | boolean
+| *serverUrl* (consumer) | The Server URL of the Slack instance | https://slack.com | String
 | *token* (consumer) | The token to use |  | String
 | *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option 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
diff --git a/components/camel-slack/src/main/java/org/apache/camel/component/slack/SlackComponentVerifierExtension.java b/components/camel-slack/src/main/java/org/apache/camel/component/slack/SlackComponentVerifierExtension.java
index 7eb6650dee287..143c532fb2e50 100644
--- a/components/camel-slack/src/main/java/org/apache/camel/component/slack/SlackComponentVerifierExtension.java
+++ b/components/camel-slack/src/main/java/org/apache/camel/component/slack/SlackComponentVerifierExtension.java
@@ -111,7 +111,7 @@ private void verifyCredentials(ResultBuilder builder, Map<String, Object> parame
 
             try {
                 HttpClient client = HttpClientBuilder.create().useSystemProperties().build();
-                HttpPost httpPost = new HttpPost("https://slack.com/api/channels.list");
+                HttpPost httpPost = new HttpPost(parameters.get("serverUrl") + "/api/channels.list");
 
                 List<BasicNameValuePair> params = new ArrayList<BasicNameValuePair>();
                 params.add(new BasicNameValuePair("token", token));
diff --git a/components/camel-slack/src/main/java/org/apache/camel/component/slack/SlackConsumer.java b/components/camel-slack/src/main/java/org/apache/camel/component/slack/SlackConsumer.java
index 5c665d5f7bfc5..c9835be4b17f2 100644
--- a/components/camel-slack/src/main/java/org/apache/camel/component/slack/SlackConsumer.java
+++ b/components/camel-slack/src/main/java/org/apache/camel/component/slack/SlackConsumer.java
@@ -62,7 +62,7 @@ protected int poll() throws Exception {
         Queue<Exchange> exchanges;
 
         HttpClient client = HttpClientBuilder.create().useSystemProperties().build();
-        HttpPost httpPost = new HttpPost("https://slack.com/api/channels.history");
+        HttpPost httpPost = new HttpPost(slackEndpoint.getServerUrl() + "/api/channels.history");
         List<BasicNameValuePair> params = new ArrayList<BasicNameValuePair>();
         params.add(new BasicNameValuePair("channel", channelId));
         if (ObjectHelper.isNotEmpty(timestamp)) {
@@ -130,7 +130,7 @@ public void done(boolean doneSync) {
 
     private String getChannelId(String channel) throws IOException, ParseException {
         HttpClient client = HttpClientBuilder.create().useSystemProperties().build();
-        HttpPost httpPost = new HttpPost("https://slack.com/api/channels.list");
+        HttpPost httpPost = new HttpPost(slackEndpoint.getServerUrl() + "/api/channels.list");
 
         List<BasicNameValuePair> params = new ArrayList<BasicNameValuePair>();
         params.add(new BasicNameValuePair("token", slackEndpoint.getToken()));
diff --git a/components/camel-slack/src/main/java/org/apache/camel/component/slack/SlackEndpoint.java b/components/camel-slack/src/main/java/org/apache/camel/component/slack/SlackEndpoint.java
index 57b7e4ce0a081..1e75df0ccb7d0 100644
--- a/components/camel-slack/src/main/java/org/apache/camel/component/slack/SlackEndpoint.java
+++ b/components/camel-slack/src/main/java/org/apache/camel/component/slack/SlackEndpoint.java
@@ -54,6 +54,8 @@ public class SlackEndpoint extends ScheduledPollEndpoint {
     private String token;
     @UriParam(label = "consumer", defaultValue = "10")
     private String maxResults = "10";
+    @UriParam(label = "consumer", defaultValue = "https://slack.com")
+    private String serverUrl = "https://slack.com";
 
     /**
      * Constructor for SlackEndpoint
@@ -169,6 +171,17 @@ public void setMaxResults(String maxResult) {
         this.maxResults = maxResult;
     }
 
+    public String getServerUrl() {
+        return serverUrl;
+    }
+    
+    /**
+     * The Server URL of the Slack instance
+     */
+    public void setServerUrl(String serverUrl) {
+        this.serverUrl = serverUrl;
+    }
+
     public Exchange createExchange(JSONObject object) {
         return createExchange(getExchangePattern(), object);
     }

From a8d7d2d64ba37627a932b18c653cddee864b877c Mon Sep 17 00:00:00 2001
From: Andrea Cosentino <ancosen@gmail.com>
Date: Mon, 12 Nov 2018 14:17:04 +0100
Subject: [PATCH 002/125] Camel-slack: Removed unused import

---
 .../java/org/apache/camel/component/slack/SlackEndpoint.java     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/components/camel-slack/src/main/java/org/apache/camel/component/slack/SlackEndpoint.java b/components/camel-slack/src/main/java/org/apache/camel/component/slack/SlackEndpoint.java
index 1e75df0ccb7d0..25cb8c20f658f 100644
--- a/components/camel-slack/src/main/java/org/apache/camel/component/slack/SlackEndpoint.java
+++ b/components/camel-slack/src/main/java/org/apache/camel/component/slack/SlackEndpoint.java
@@ -24,7 +24,6 @@
 import org.apache.camel.Producer;
 import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.component.slack.helper.SlackMessage;
-import org.apache.camel.impl.DefaultEndpoint;
 import org.apache.camel.impl.ScheduledPollEndpoint;
 import org.apache.camel.spi.Metadata;
 import org.apache.camel.spi.UriEndpoint;

From 9e268156698743e3692e0023e77544f29e221864 Mon Sep 17 00:00:00 2001
From: Andrea Tarocchi <andrea.tarocchi@gmail.com>
Date: Mon, 12 Nov 2018 15:58:11 +0100
Subject: [PATCH 003/125] renamed apiProperties to apiProperty in
 camel-core/src/main/docs/rest-dsl.adoc fix CAMEL-12929 (#2608)

---
 camel-core/src/main/docs/rest-dsl.adoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/camel-core/src/main/docs/rest-dsl.adoc b/camel-core/src/main/docs/rest-dsl.adoc
index 570cdc003e33c..b5e4fce3604ca 100644
--- a/camel-core/src/main/docs/rest-dsl.adoc
+++ b/camel-core/src/main/docs/rest-dsl.adoc
@@ -585,7 +585,7 @@ whether the Content-Type and Accept headers from
                         A key without a prefix is a common key for all situations.
 
                         From Camel 2.17: the options value can use the # notation to refer to a bean to lookup in the Registry
-|apiProperties | -|Sets additional options on api level.
+|apiProperty | -|Sets additional options on api level.
 |corsHeaders | -|Allows to configure custom CORS headers.
 |===
 

From e21ef60d01abed84b290e760c17c25f89d53172c Mon Sep 17 00:00:00 2001
From: aldettinger <aldettinger@gmail.com>
Date: Mon, 12 Nov 2018 20:19:56 +0100
Subject: [PATCH 004/125] Explicited the servlet-api dependency version brought
 by spring-boot-starter-undertow so that its no more overridden by
 camel-parent

---
 examples/camel-example-rest-producer/pom.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/examples/camel-example-rest-producer/pom.xml b/examples/camel-example-rest-producer/pom.xml
index d3a88e71d1d28..d7c2d99f0378f 100644
--- a/examples/camel-example-rest-producer/pom.xml
+++ b/examples/camel-example-rest-producer/pom.xml
@@ -58,6 +58,11 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
+      <dependency>
+        <groupId>javax.servlet</groupId>
+        <artifactId>javax.servlet-api</artifactId>
+        <version>4.0.1</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 

From de7785ede195fb9453d2125aa0cdcf5e11e20e3c Mon Sep 17 00:00:00 2001
From: Pascal Schumacher <pascalschumacher@gmx.net>
Date: Mon, 12 Nov 2018 20:39:44 +0100
Subject: [PATCH 005/125] Update Groovy to version 2.5.4

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

diff --git a/pom.xml b/pom.xml
index 5ce708ee40f51..fe6cf76e750f2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,7 +63,7 @@
     <errorprone-version>2.5</errorprone-version>
     <mycila-license-version>3.0</mycila-license-version>
     <gmavenplus-plugin-version>1.6.2</gmavenplus-plugin-version>
-    <groovy-version>2.5.3</groovy-version>
+    <groovy-version>2.5.4</groovy-version>
   </properties>
 
   <mailingLists>

From 5c5259caf4a222301afe0cf525cb322a527a6d8d Mon Sep 17 00:00:00 2001
From: Pascal Schumacher <pascalschumacher@gmx.net>
Date: Mon, 12 Nov 2018 21:46:28 +0100
Subject: [PATCH 006/125] Parent POM: Remove unused
 backport-util-concurrent-version property

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

diff --git a/parent/pom.xml b/parent/pom.xml
index 80d1b1f8a1638..f6f9d5ae6a623 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -88,7 +88,6 @@
     <azure-storage-java-sdk-version>8.0.0</azure-storage-java-sdk-version>
     <azure-storage-java-sdk-bundle-version>8.0.0_1</azure-storage-java-sdk-bundle-version>
     <azure-guava-version>20.0</azure-guava-version>
-    <backport-util-concurrent-version>3.1</backport-util-concurrent-version>
     <bcel-bundle-version>5.2_4</bcel-bundle-version>
     <beanio-version>2.1.0</beanio-version>
     <beanstalkd-client-version>1.4.6</beanstalkd-client-version>

From d0e08a8d4c7dc1440f52130e86ba52a2ace943cc Mon Sep 17 00:00:00 2001
From: Pascal Schumacher <pascalschumacher@gmx.net>
Date: Mon, 12 Nov 2018 21:50:55 +0100
Subject: [PATCH 007/125] Parent POM: Remove unused commons-digester-1x-version
 property

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

diff --git a/parent/pom.xml b/parent/pom.xml
index f6f9d5ae6a623..79fd41be4787a 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -145,7 +145,6 @@
     <commons-daemon-version>1.0.15</commons-daemon-version>
     <commons-dbcp-version>1.4</commons-dbcp-version>
     <commons-dbcp2-version>2.5.0</commons-dbcp2-version>
-    <commons-digester-1x-version>1.8.1</commons-digester-1x-version>
     <commons-digester-version>2.1</commons-digester-version>
     <commons-exec-version>1.3</commons-exec-version>
     <commons-httpclient-bundle-version>3.1_7</commons-httpclient-bundle-version>

From 5e34af225e7cebf4ffa92d938e41d0eb46833475 Mon Sep 17 00:00:00 2001
From: Pascal Schumacher <pascalschumacher@gmx.net>
Date: Mon, 12 Nov 2018 22:13:06 +0100
Subject: [PATCH 008/125] Parent POM: Remove pdfbox18-version property and
 dependency management of jempbox, because jempbox is not used by pdfbox 2

---
 parent/pom.xml                                              | 6 ------
 .../spring-boot-dm/camel-spring-boot-dependencies/pom.xml   | 5 -----
 2 files changed, 11 deletions(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index 79fd41be4787a..6d7a82bfe884b 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -560,7 +560,6 @@
     <pax-exam-version>4.12.0</pax-exam-version>
     <pax-tiny-bundle-version>1.3.2</pax-tiny-bundle-version>
     <pax-logging-version>1.8.6</pax-logging-version>
-    <pdfbox18-version>1.8.16</pdfbox18-version>
     <pdfbox-version>2.0.12</pdfbox-version>
     <pgjdbc-ng-driver-version>0.7.1</pgjdbc-ng-driver-version>
     <protobuf-version>3.5.1</protobuf-version>
@@ -4910,11 +4909,6 @@
 
 
       <!-- pdfbox -->
-      <dependency>
-        <groupId>org.apache.pdfbox</groupId>
-        <artifactId>jempbox</artifactId>
-        <version>${pdfbox18-version}</version><!-- because of Tika -->
-      </dependency>
       <dependency>
         <groupId>org.apache.pdfbox</groupId>
         <artifactId>fontbox</artifactId>
diff --git a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
index 0b3b6ce322655..2d1d0f0b92744 100644
--- a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
+++ b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
@@ -3349,11 +3349,6 @@
         <artifactId>fontbox</artifactId>
         <version>2.0.12</version>
       </dependency>
-      <dependency>
-        <groupId>org.apache.pdfbox</groupId>
-        <artifactId>jempbox</artifactId>
-        <version>1.8.16</version>
-      </dependency>
       <dependency>
         <groupId>org.apache.pdfbox</groupId>
         <artifactId>pdfbox</artifactId>

From 1ece67412d19215d7fb8fe9675ccd75c65b1d45d Mon Sep 17 00:00:00 2001
From: Maciej Swiderski <swiderski.maciej@gmail.com>
Date: Wed, 7 Nov 2018 14:33:49 +0100
Subject: [PATCH 009/125] CAMEL-12931 - Upgrade jBPM component to use 7 series
 with consumer capability to react to produced events by jBPM

---
 components/camel-jbpm/pom.xml                 |  71 ++--
 .../src/main/docs/jbpm-component.adoc         | 175 ++++++++--
 .../jbpm/JBPMCamelConsumerAware.java          |  29 ++
 .../camel/component/jbpm/JBPMComponent.java   |   6 +-
 .../component/jbpm/JBPMConfiguration.java     |  73 +++-
 .../camel/component/jbpm/JBPMConstants.java   |  11 +-
 .../camel/component/jbpm/JBPMConsumer.java    | 208 ++++++++++++
 .../camel/component/jbpm/JBPMEndpoint.java    |  44 +--
 .../camel/component/jbpm/JBPMProducer.java    | 291 +++++++++-------
 .../jbpm/emitters/CamelEventEmitter.java      |  75 ++++
 .../ServiceRegistryBoundEventEmitter.java     |  62 ++++
 .../listeners/CamelCaseEventListener.java     | 286 ++++++++++++++++
 .../listeners/CamelProcessEventListener.java  | 138 ++++++++
 .../listeners/CamelTaskEventListener.java     | 321 ++++++++++++++++++
 .../jbpm/server/CamelKieServerExtension.java  | 225 ++++++++++++
 ...kie.server.services.api.KieServerExtension |   1 +
 .../jbpm/JBPMComponentIntegrationTest.java    |  65 +++-
 parent/pom.xml                                |   2 +-
 .../features/src/main/resources/features.xml  |  50 ++-
 19 files changed, 1883 insertions(+), 250 deletions(-)
 create mode 100644 components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMCamelConsumerAware.java
 create mode 100644 components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMConsumer.java
 create mode 100644 components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/emitters/CamelEventEmitter.java
 create mode 100644 components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/emitters/ServiceRegistryBoundEventEmitter.java
 create mode 100644 components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/listeners/CamelCaseEventListener.java
 create mode 100644 components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/listeners/CamelProcessEventListener.java
 create mode 100644 components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/listeners/CamelTaskEventListener.java
 create mode 100644 components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/server/CamelKieServerExtension.java
 create mode 100644 components/camel-jbpm/src/main/resources/META-INF/services/org.kie.server.services.api.KieServerExtension

diff --git a/components/camel-jbpm/pom.xml b/components/camel-jbpm/pom.xml
index 6c197d48b9570..2a5a161e5dbdd 100644
--- a/components/camel-jbpm/pom.xml
+++ b/components/camel-jbpm/pom.xml
@@ -43,32 +43,55 @@
             <artifactId>camel-core</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.kie.remote</groupId>
-            <artifactId>kie-remote-client</artifactId>
+            <groupId>org.kie.server</groupId>
+            <artifactId>kie-server-client</artifactId>
             <version>${jbpm-version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.hornetq</groupId>
-                    <artifactId>hornetq-core-client</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.hornetq</groupId>
-                    <artifactId>hornetq-jms-client</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.jboss.spec.javax.jms</groupId>
-                    <artifactId>jboss-jms-api_1.1_spec</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.jboss.spec.javax.xml.ws</groupId>
-                    <artifactId>jboss-jaxws-api_2.2_spec</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.jboss.logging</groupId>
-                    <artifactId>jboss-logging</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
+        
+        <!-- jBPM consumer -->
+        <dependency>
+            <groupId>org.kie</groupId>
+            <artifactId>kie-api</artifactId>
+            <version>${jbpm-version}</version>
+            <scope>provided</scope>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.kie</groupId>
+            <artifactId>kie-internal</artifactId>
+            <version>${jbpm-version}</version>
+            <scope>provided</scope>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.jbpm</groupId>
+            <artifactId>jbpm-services-api</artifactId>
+            <version>${jbpm-version}</version>
+            <scope>provided</scope>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.jbpm</groupId>
+            <artifactId>jbpm-case-mgmt-api</artifactId>
+            <version>${jbpm-version}</version>
+            <scope>provided</scope>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.kie.server</groupId>
+            <artifactId>kie-server-services-common</artifactId>
+            <version>${jbpm-version}</version>
+            <scope>provided</scope>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.jbpm</groupId>
+            <artifactId>jbpm-persistence-api</artifactId>
+            <version>${jbpm-version}</version>
+            <scope>provided</scope>
+            <optional>true</optional>
+        </dependency>
+        
         <dependency>
             <groupId>org.jboss.logging</groupId>
             <artifactId>jboss-logging</artifactId>
diff --git a/components/camel-jbpm/src/main/docs/jbpm-component.adoc b/components/camel-jbpm/src/main/docs/jbpm-component.adoc
index 70e7796cdde89..46928d21565f4 100644
--- a/components/camel-jbpm/src/main/docs/jbpm-component.adoc
+++ b/components/camel-jbpm/src/main/docs/jbpm-component.adoc
@@ -4,9 +4,9 @@
 *Available as of Camel version 2.6*
 
 The *jbpm* component provides integration with Business Process
-Management (BPM) Suit http://www.jbpm.org/[jBPM]. It uses
-kie-remote-client API to interact with jBPM instance over REST. The
-component supports only producer.
+Management http://www.jbpm.org/[jBPM]. It uses
+kie-server-client API to interact with jBPM instance over REST. The
+component supports both producer and consumer.
 
 Maven users will need to add the following dependency to their `pom.xml`
 for this component:
@@ -20,6 +20,111 @@ for this component:
 </dependency>
 ------------------------------------------------------------------------------------
 
+## Consumer
+
+jBPM Consumer allows to attach routes to 
+
+* ProcessEventListeners
+* TaskEventListners
+* CaseEventListeners
+
+### URI format
+
+[source,java]
+---------------------------------------------
+jbpm::events:type:[classifier][?options]
+---------------------------------------------
+
+==== Path Parameters (3 parameters):
+
+
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *events* | Classifier for the consumer to know which type of data it should attach to |  | URL
+| *type* | Type of event listener - supports: process, task, case |  | String
+| *classifier* | Used to distinguish routes for same event type|  | String
+|===
+
+Each route would then receive events when they are being produced by jBPM engine.
+
+Routes can be defined either in global way - on application level or deployed 
+together with business assets projects also knows as KJARs.
+
+Consumers are configured via KieServerExtension that is a pluggable interface to enhance
+jBPM with additional capabilities. It reacts to different life cycle phases of the KIE Server
+and by that is able to configure individual endpoints properly.
+
+### KJAR routes
+
+Create file named `camel-routes.xml` in the root folder of your KJAR (src/main/resources) so it will be automatically 
+discovered and Camel Context for given KJAR will be created.
+
+### Global routes
+
+Create file name `global-camel-routes` in the root of the class path of KIE Server. It will be automatically found and registered
+on every KJAR deployed to KIE Server.
+
+
+Example camel-routes.xml file that can be placed in the KJAR
+
+[source, xml]
+----
+<routes xmlns="http://camel.apache.org/schema/spring">
+    
+    <route id="processes">
+        <from uri="jbpm:events:process:test"/>
+        <filter>
+          <simple>${in.header.EventType} == 'beforeProcessStarted'</simple>
+          <to uri="log:kjar.processes?level=INFO&amp;showBody=true&amp;showHeaders=true"/>
+        </filter>
+    </route>
+    
+    <route id="tasks">
+        <from uri="jbpm:events:task:test"/>
+        <filter>
+          <simple>${in.header.EventType} starts with 'before'</simple>
+          <to uri="log:kjar.tasks?level=INFO&amp;showBody=true&amp;showHeaders=true"/>
+        </filter>
+    </route>
+</routes>
+----
+
+
+### Use of jBPM Component in KIE Server
+
+To make use of camel-jbpm component in a KIE Server it is as simple as just adding two jars into KIE Server application
+
+* camel-core
+* camel-jbpm
+
+then start KIE Server and you will see once booted following information in logs
+
+[source, plain]
+----
+Camel KIE Server extension has been successfully registered as server extension
+....
+
+Route: tasks started and consuming from: jbpm://events:task:test?deploymentId=form-rendering_1.0.0
+Total 2 routes, of which 2 are started
+Apache Camel 2.23.0-SNAPSHOT (CamelContext: KIE Server Camel context for container evaluation_1.0.0) started in 0.378 seconds
+o.k.server.services.impl.KieServerImpl   : Container evaluation_1.0.0 (for release id evaluation:evaluation:1.0.0) successfully started
+----
+
+To make use of jBPM Consumer jBPM deployment descriptor must also define camel specific event listeners of following types
+
+* `new org.apache.camel.component.jbpm.listeners.CamelProcessEventListener()`
+* `new org.apache.camel.component.jbpm.listeners.CamelTaskEventListener()`
+* `new org.apache.camel.component.jbpm.listeners.CamelCaseEventListener()`
+
+These must be set in either server level of kjar deployment descriptor (use MVEL as resolver type) - see jbpm docs for more details about
+deployment descriptors.
+
+## Producer
+
+Producer is dedicated to interact with jBPM via kie-server-client that uses exposed REST api of 
+jBPM (KIE Server).
+
 ### URI format
 
 [source,java]
@@ -47,40 +152,46 @@ jbpm:connectionURL
 
 with the following path and query parameters:
 
-==== Path Parameters (1 parameters):
+==== Path Parameters (2 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
 | *connectionURL* | *Required* The URL to the jBPM server. |  | URL
+| *eventListenerType* | Sets the event listener type to attach to |  | String
 |===
 
 
-==== Query Parameters (25 parameters):
+==== Query Parameters (30 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
-| *attachmentId* (producer) | attachId to use when retrieving attachments |  | Long
-| *contentId* (producer) | contentId to use when retrieving attachments |  | Long
-| *deploymentId* (producer) | *Required* The id of the deployment |  | String
-| *event* (producer) | the data associated with this event when signalEvent operation is performed |  | Object
-| *eventType* (producer) | the type of event to use when signalEvent operation is performed |  | String
-| *identifier* (producer) | identifier the global identifier |  | String
-| *language* (producer) | The language to use when filtering user tasks |  | String
-| *maxNumber* (producer) | the maximum number of rules that should be fired |  | Integer
+| *attachmentId* (common) | attachId to use when retrieving attachments |  | Long
+| *contentId* (common) | contentId to use when retrieving attachments |  | Long
+| *deploymentId* (common) | *Required* The id of the deployment |  | String
+| *emitterSendItems* (common) | Sets if event produced by emitter should be sent as single items or complete collection |  | Boolean
+| *event* (common) | the data associated with this event when signalEvent operation is performed |  | Object
+| *eventType* (common) | the type of event to use when signalEvent operation is performed |  | String
+| *identifier* (common) | identifier the global identifier |  | String
+| *maxNumber* (common) | the maximum number of rules that should be fired |  | Integer
+| *page* (common) | The page to use when retrieving user tasks |  | Integer
+| *pageSize* (common) | The page size to use when retrieving user tasks |  | Integer
+| *processId* (common) | the id of the process that should be acted upon |  | String
+| *processInstanceId* (common) | the id of the process instance |  | Long
+| *targetUserId* (common) | The targetUserId used when delegating a task |  | String
+| *task* (common) | The task instance to use with task operations |  | Task
+| *taskId* (common) | the id of the task |  | Long
+| *timeout* (common) | A timeout value |  | Integer
+| *userId* (common) | userId to use with task operations |  | String
+| *value* (common) | the value to assign to the global identifier |  | Object
+| *workItemId* (common) | the id of the work item |  | Long
+| *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 option 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
 | *operation* (producer) | The operation to perform | startProcess | String
-| *processId* (producer) | the id of the process that should be acted upon |  | String
-| *processInstanceId* (producer) | the id of the process instance |  | Long
-| *targetUserId* (producer) | The targetUserId used when delegating a task |  | String
-| *task* (producer) | The task instance to use with task operations |  | Task
-| *taskId* (producer) | the id of the task |  | Long
-| *timeout* (producer) | A timeout value |  | Integer
-| *userId* (producer) | userId to use with task operations |  | String
-| *value* (producer) | the value to assign to the global identifier |  | Object
-| *workItemId* (producer) | the id of the work item |  | Long
 | *entities* (advanced) | The potentialOwners when nominateTask operation is performed |  | List
 | *extraJaxbClasses* (advanced) | To load additional classes when working with XML |  | Class[]
 | *parameters* (advanced) | the variables that should be set for various operations |  | Map
@@ -153,23 +264,29 @@ org.infinispan.notifications.cachelistener.event.Event.Type
 
 |CamelJBPMContentId |0 |Long |contentId to use when retrieving attachments
 
-|CamelJBPMEntityList |null |List<OrganizationalEntity> |The potentialOwners when nominateTask operation is performed
+|CamelJBPMEntityList |null |List<String> |The potentialOwners when nominateTask operation is performed
 
-|CamelJBPMStatusList |null |List<Status> |The list of status to use when filtering tasks
+|CamelJBPMStatusList |null |List<String> |The list of status to use when filtering tasks
 |=======================================================================
 
 ### Example
 
 Below is an example route that starts a business process with id
-project1.integration-test and deploymentId
-org.kie.example:project1:1.0.0-SNAPSHOT
+evaluation. To run this example you need jBPM to run locally, easiest is to use single zip 
+distribution - downloaded from jbpm.org. Next, start it and import Evaluation sample project, build and deploy.
+Once done this test can be ran out of the box.
 
 [source,java]
 ----------------------------------------------------------------------------------------------
+Map<String, Object> params = new HashMap<>();
+params.put("employee", "wbadmin");
+params.put("reason", "Camel asks for it");
+
 from("direct:start")
-        .setHeader(JBPMConstants.PROCESS_ID, constant("project1.integration-test"))
-        .to("jbpm:http://localhost:8080/business-central?userName=bpmsAdmin&password=pa$word1"
- + "&deploymentId=org.kie.example:project1:1.0.0-SNAPSHOT");
+        .setHeader(JBPMConstants.PROCESS_ID, constant("evaluation"))
+        .setHeader((JBPMConstants.PARAMETERS, params))
+        .to("jbpm:http://localhost:8080/kie-server/services/rest/server?userName=wbadmin&password=wbadmin
+        &deploymentId=evaluation");
 ----------------------------------------------------------------------------------------------
 
 ### See Also
diff --git a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMCamelConsumerAware.java b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMCamelConsumerAware.java
new file mode 100644
index 0000000000000..85b4df2a626ec
--- /dev/null
+++ b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMCamelConsumerAware.java
@@ -0,0 +1,29 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.camel.component.jbpm;
+
+/**
+ * Indicates that class implementing this interface should receive (at some point)
+ * JBPMConsumer instance that is required to operate.
+ */
+public interface JBPMCamelConsumerAware {
+
+    void addConsumer(JBPMConsumer consumer);
+    
+    void removeConsumer(JBPMConsumer consumer);
+}
diff --git a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMComponent.java b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMComponent.java
index f562234ed4740..ed03b515f170b 100644
--- a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMComponent.java
+++ b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMComponent.java
@@ -26,7 +26,11 @@ public class JBPMComponent extends DefaultComponent {
 
     protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
         JBPMConfiguration configuration = new JBPMConfiguration();
-        configuration.setConnectionURL(new URL(remaining));
+        if (remaining.startsWith("events")) {
+            configuration.setEventListenerType(remaining.split(":")[1]);
+        } else {        
+            configuration.setConnectionURL(new URL(remaining));
+        }
         setProperties(configuration, parameters);
         return new JBPMEndpoint(uri, this, configuration);
     }
diff --git a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMConfiguration.java b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMConfiguration.java
index c4a30c7069039..9633aaa765ee6 100644
--- a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMConfiguration.java
+++ b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMConfiguration.java
@@ -17,6 +17,7 @@
 package org.apache.camel.component.jbpm;
 
 import java.net.URL;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
@@ -24,8 +25,6 @@
 import org.apache.camel.spi.UriParam;
 import org.apache.camel.spi.UriParams;
 import org.apache.camel.spi.UriPath;
-import org.kie.api.task.model.OrganizationalEntity;
-import org.kie.api.task.model.Status;
 import org.kie.api.task.model.Task;
 
 @UriParams
@@ -58,7 +57,9 @@ public class JBPMConfiguration {
     @UriParam
     private String userId;
     @UriParam
-    private String language;
+    private Integer page = 0;
+    @UriParam
+    private Integer pageSize = 10;
     @UriParam
     private String targetUserId;
     @UriParam
@@ -68,9 +69,9 @@ public class JBPMConfiguration {
     @UriParam
     private Task task;
     @UriParam(label = "advanced")
-    private List<OrganizationalEntity> entities;
+    private List<String> entities;
     @UriParam(label = "filter")
-    private List<Status> statuses;
+    private List<String> statuses;
     @UriParam(label = "security", secret = true)
     private String userName;
     @UriParam(label = "security", secret = true)
@@ -81,6 +82,11 @@ public class JBPMConfiguration {
     private Map<String, Object> parameters;
     @UriParam(label = "advanced")
     private Class[] extraJaxbClasses;
+    @UriParam
+    private Boolean emitterSendItems;
+    
+    @UriPath
+    private String eventListenerType;
 
     public String getOperation() {
         return operation;
@@ -225,15 +231,26 @@ public void setTask(Task task) {
         this.task = task;
     }
 
-    public String getLanguage() {
-        return language;
+    public Integer getPage() {
+        return page;
+    }
+
+    /**
+     * The page to use when retrieving user tasks
+     */
+    public void setPage(Integer page) {
+        this.page = page;
+    }
+    
+    public Integer getPageSize() {
+        return pageSize;
     }
 
     /**
-     * The language to use when filtering user tasks
+     * The page size to use when retrieving user tasks
      */
-    public void setLanguage(String language) {
-        this.language = language;
+    public void setPageSize(Integer pageSize) {
+        this.pageSize = pageSize;
     }
 
     public String getTargetUserId() {
@@ -269,25 +286,25 @@ public void setContentId(Long contentId) {
         this.contentId = contentId;
     }
 
-    public List<OrganizationalEntity> getEntities() {
+    public List<String> getEntities() {
         return entities;
     }
 
     /**
      * The potentialOwners when nominateTask operation is performed
      */
-    public void setEntities(List<OrganizationalEntity> entities) {
+    public void setEntities(List<String> entities) {
         this.entities = entities;
     }
 
-    public List<Status> getStatuses() {
+    public List<String> getStatuses() {
         return statuses;
     }
 
     /**
      * The list of status to use when filtering tasks
      */
-    public void setStatuses(List<Status> statuses) {
+    public void setStatuses(List<String> statuses) {
         this.statuses = statuses;
     }
 
@@ -356,4 +373,32 @@ public Class[] getExtraJaxbClasses() {
     public void setExtraJaxbClasses(Class[] extraJaxbClasses) {
         this.extraJaxbClasses = extraJaxbClasses;
     }
+
+    
+    public String getEventListenerType() {
+        return eventListenerType;
+    }
+
+    /**
+     * Sets the event listener type to attach to
+     */
+    public void setEventListenerType(String eventListenerType) {
+        this.eventListenerType = eventListenerType;
+    }
+    
+    public Boolean getEmitterSendItems() {
+        return emitterSendItems;
+    }
+
+    /**
+     * Sets if event produced by emitter should be sent as single items or complete collection
+     */
+    public void setEmitterSendItems(Boolean emiterSendItems) {
+        this.emitterSendItems = emiterSendItems;
+    }
+
+    @Override
+    public String toString() {
+        return "JBPMConfiguration [connectionURL=" + connectionURL + ", operation=" + operation + ", deploymentId=" + deploymentId + ", processInstanceId=" + processInstanceId + ", value=" + value + ", processId=" + processId + ", eventType=" + eventType + ", event=" + event + ", maxNumber=" + maxNumber + ", identifier=" + identifier + ", workItemId=" + workItemId + ", taskId=" + taskId + ", userId=" + userId + ", page=" + page + ", pageSize=" + pageSize + ", targetUserId=" + targetUserId + ", attachmentId=" + attachmentId + ", contentId=" + contentId + ", task=" + task + ", entities=" + entities + ", statuses=" + statuses + ", userName=" + userName + ", password=" + password + ", timeout=" + timeout + ", parameters=" + parameters + ", extraJaxbClasses=" + Arrays.toString(extraJaxbClasses) + ", eventListenerType=" + eventListenerType + "]";
+    }
 }
diff --git a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMConstants.java b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMConstants.java
index 6b00d02598a99..8341cfd619c81 100644
--- a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMConstants.java
+++ b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMConstants.java
@@ -30,10 +30,17 @@ public interface JBPMConstants {
     String TASK_ID = "CamelJBPMTaskId";
     String TASK = "CamelJBPMTask";
     String USER_ID = "CamelJBPMUserId";
-    String TARGET_USER_ID = "CamelJBPMTargetUserId";
-    String LANGUAGE = "CamelJBPMLanguage";
+    String TARGET_USER_ID = "CamelJBPMTargetUserId";    
     String ATTACHMENT_ID = "CamelJBPMAttachmentId";
     String CONTENT_ID = "CamelJBPMContentId";
     String ENTITY_LIST = "CamelJBPMEntityList";
     String STATUS_LIST = "CamelJBPMStatusList";
+    String RESULT_PAGE = "CamelJBPMResultPage";
+    String RESULT_PAGE_SIZE = "CamelJBPMResultPageSize";
+    
+    
+    String JBPM_PROCESS_EVENT_LISTENER = "process";
+    String JBPM_TASK_EVENT_LISTENER = "task";
+    String JBPM_CASE_EVENT_LISTENER = "case";
+    String JBPM_EVENT_EMITTER = "emitter";
 }
diff --git a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMConsumer.java b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMConsumer.java
new file mode 100644
index 0000000000000..6c5c6f9064755
--- /dev/null
+++ b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMConsumer.java
@@ -0,0 +1,208 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.camel.component.jbpm;
+
+import org.apache.camel.AsyncCallback;
+import org.apache.camel.Endpoint;
+import org.apache.camel.Exchange;
+import org.apache.camel.ExchangePattern;
+import org.apache.camel.Processor;
+import org.apache.camel.component.jbpm.emitters.CamelEventEmitter;
+import org.apache.camel.component.jbpm.listeners.CamelCaseEventListener;
+import org.apache.camel.component.jbpm.listeners.CamelProcessEventListener;
+import org.apache.camel.component.jbpm.listeners.CamelTaskEventListener;
+import org.apache.camel.impl.DefaultConsumer;
+import org.jbpm.services.api.DeploymentEvent;
+import org.jbpm.services.api.DeploymentEventListener;
+import org.jbpm.services.api.DeploymentService;
+import org.jbpm.services.api.ListenerSupport;
+import org.jbpm.services.api.model.DeployedUnit;
+import org.jbpm.services.api.service.ServiceRegistry;
+import org.kie.internal.runtime.manager.CacheManager;
+import org.kie.internal.runtime.manager.InternalRuntimeManager;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+public class JBPMConsumer extends DefaultConsumer implements DeploymentEventListener {
+    
+    private static final transient Logger LOGGER = LoggerFactory.getLogger(JBPMConsumer.class);
+   
+    private JBPMEndpoint endpoint;
+    private JBPMConfiguration configuration;
+    
+    public JBPMConsumer(Endpoint endpoint, Processor processor) {
+        super(endpoint, processor);
+        
+        this.endpoint = (JBPMEndpoint) endpoint;
+        this.configuration = ((JBPMEndpoint) getEndpoint()).getConfiguration();
+    }
+
+    @Override
+    protected void doStart() throws Exception {
+        super.doStart();
+        
+        DeploymentService deploymentService = (DeploymentService) ServiceRegistry.get().service(ServiceRegistry.DEPLOYMENT_SERVICE);        
+        
+        if (configuration.getDeploymentId() != null) {
+            InternalRuntimeManager manager = (InternalRuntimeManager) deploymentService.getRuntimeManager(configuration.getDeploymentId());
+            configure(manager, this);
+            
+            LOGGER.debug("JBPM Camel Consumer configured and started for deployment id {}", configuration.getDeploymentId());
+        } else {
+            
+            ((ListenerSupport) deploymentService).addListener(this);
+            
+            for (DeployedUnit deployed : deploymentService.getDeployedUnits()) {
+                InternalRuntimeManager manager = (InternalRuntimeManager) deployed.getRuntimeManager();
+                configure(manager, this); 
+            }
+            
+            LOGGER.debug("JBPM Camel Consumer configured and started on all available deployments");
+        }
+        
+        
+    }
+
+    @Override
+    protected void doStop() throws Exception {
+        super.doStop();
+        DeploymentService deploymentService = (DeploymentService) ServiceRegistry.get().service(ServiceRegistry.DEPLOYMENT_SERVICE);        
+        if (configuration.getDeploymentId() != null) {
+            LOGGER.debug("JBPM Camel Consumer unconfigured and stopped for deployment id {}", configuration.getDeploymentId());
+        } else {
+            ((ListenerSupport) deploymentService).removeListener(this);
+            
+            LOGGER.debug("JBPM Camel Consumer unconfigured and stopped on all available deployments");
+        }
+        
+        if (JBPMConstants.JBPM_EVENT_EMITTER.equals(configuration.getEventListenerType())) {
+            ServiceRegistry.get().remove("CamelEventEmitter");
+        }
+        
+    }
+
+    public void sendMessage(String eventType, Object body) {
+        Exchange exchange = getEndpoint().createExchange(ExchangePattern.InOnly);
+        exchange.getIn().setHeader("EventType", eventType);
+        
+        exchange.getIn().setBody(body);
+
+        if (!endpoint.isSynchronous()) {
+            getAsyncProcessor().process(exchange, new AsyncCallback() {
+                @Override
+                public void done(boolean doneSync) {
+                    // handle any thrown exception
+                    if (exchange.getException() != null) {
+                        getExceptionHandler().handleException("Error processing exchange", exchange, exchange.getException());
+                    }
+                }
+            });
+        } else {
+            try {
+                getProcessor().process(exchange);
+            } catch (Exception e) {
+                exchange.setException(e);
+            }
+
+            // handle any thrown exception
+            if (exchange.getException() != null) {
+                getExceptionHandler().handleException("Error processing exchange", exchange, exchange.getException());
+            }
+        }
+    }
+    
+    @Override
+    public void onDeploy(DeploymentEvent event) {
+        InternalRuntimeManager manager = (InternalRuntimeManager) event.getDeployedUnit().getRuntimeManager();
+        configure(manager, this);       
+
+    }
+
+    @Override
+    public void onUnDeploy(DeploymentEvent event) {  
+        // no-op
+    }
+
+    @Override
+    public void onActivate(DeploymentEvent event) {
+        // no-op
+        
+    }
+
+    @Override
+    public void onDeactivate(DeploymentEvent event) {
+        // no-op
+        
+    }
+
+    
+    protected void configure(InternalRuntimeManager manager, JBPMConsumer consumer) {
+        String eventListenerType = configuration.getEventListenerType();
+        if (eventListenerType == null) {
+            return;
+        }
+        
+       
+        configureConsumer(eventListenerType, manager, consumer);
+        
+    }
+    
+    protected void configureConsumer(String eventListenerType, InternalRuntimeManager manager, JBPMConsumer consumer) {
+        LOGGER.debug("Configuring Camel JBPM Consumer for {} on runtime manager {}", eventListenerType, manager);
+       
+        CacheManager cacheManager = manager.getCacheManager();
+        JBPMCamelConsumerAware consumerAware = null;
+        if (JBPMConstants.JBPM_PROCESS_EVENT_LISTENER.equals(eventListenerType)) {
+            consumerAware = (JBPMCamelConsumerAware) cacheManager.get("new org.apache.camel.component.jbpm.listeners.CamelProcessEventListener()");
+            if (consumerAware == null) {
+                consumerAware = new CamelProcessEventListener();
+                cacheManager.add("new org.apache.camel.component.jbpm.listeners.CamelProcessEventListener()", consumerAware);
+            }
+            LOGGER.debug("Configuring JBPMConsumer on process event listener {}", consumerAware);
+        } else if (JBPMConstants.JBPM_TASK_EVENT_LISTENER.equals(eventListenerType)) {
+            consumerAware = (JBPMCamelConsumerAware) cacheManager.get("new org.apache.camel.component.jbpm.listeners.CamelTaskEventListener()");
+            if (consumerAware == null) {
+                consumerAware = new CamelTaskEventListener();
+                cacheManager.add("new org.apache.camel.component.jbpm.listeners.CamelTaskEventListener()", consumerAware);
+            }
+            LOGGER.debug("Configuring JBPMConsumer on task event listener {}", consumerAware);
+        } else if (JBPMConstants.JBPM_CASE_EVENT_LISTENER.equals(eventListenerType)) {
+            consumerAware = (JBPMCamelConsumerAware) cacheManager.get("new org.apache.camel.component.jbpm.listeners.CamelCaseEventListener()");
+            if (consumerAware == null) {
+                consumerAware = new CamelCaseEventListener();
+                cacheManager.add("new org.apache.camel.component.jbpm.listeners.CamelCaseEventListener()", consumerAware);
+            }
+            LOGGER.debug("Configuring JBPMConsumer on case event listener {}", consumerAware);
+        } else if (JBPMConstants.JBPM_EVENT_EMITTER.equals(eventListenerType)) {
+            LOGGER.debug("Configuring JBPMConsumer for event emitter");
+            ServiceRegistry.get().register("CamelEventEmitter", new CamelEventEmitter(this, configuration.getEmitterSendItems()));
+            
+            return;
+        }        
+  
+        LOGGER.debug("Adding consumer {} on {}", consumer, consumerAware);
+        consumerAware.addConsumer(consumer);    
+        
+    }
+
+    @Override
+    public String toString() {
+        return "JBPMConsumer [endpoint=" + endpoint + ", configuration=" + configuration + "]";
+    }
+}
diff --git a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMEndpoint.java b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMEndpoint.java
index 1a5d5e5e0d615..eb0472f94c6c2 100644
--- a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMEndpoint.java
+++ b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMEndpoint.java
@@ -18,6 +18,9 @@
 
 import java.net.MalformedURLException;
 import java.net.URISyntaxException;
+import java.util.Arrays;
+import java.util.LinkedHashSet;
+import java.util.List;
 
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
@@ -25,16 +28,16 @@
 import org.apache.camel.impl.DefaultEndpoint;
 import org.apache.camel.spi.UriEndpoint;
 import org.apache.camel.spi.UriParam;
-import org.kie.api.runtime.manager.RuntimeEngine;
-import org.kie.remote.client.api.RemoteRestRuntimeEngineBuilder;
-import org.kie.services.client.api.RemoteRuntimeEngineFactory;
+import org.kie.server.client.KieServicesClient;
+import org.kie.server.client.KieServicesConfiguration;
+import org.kie.server.client.KieServicesFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
  * The jbpm component provides integration with jBPM (Business Process Management).
  */
-@UriEndpoint(firstVersion = "2.6.0", scheme = "jbpm", title = "JBPM", syntax = "jbpm:connectionURL", producerOnly = true, label = "process")
+@UriEndpoint(firstVersion = "2.6.0", scheme = "jbpm", title = "JBPM", syntax = "jbpm:connectionURL", label = "process")
 public class JBPMEndpoint extends DefaultEndpoint {
     private static final transient Logger LOGGER = LoggerFactory.getLogger(JBPMEndpoint.class);
 
@@ -47,35 +50,24 @@ public JBPMEndpoint(String uri, JBPMComponent component, JBPMConfiguration confi
     }
 
     public Producer createProducer() throws Exception {
-        RemoteRestRuntimeEngineBuilder engineBuilder = RemoteRuntimeEngineFactory.newRestBuilder();
-        if (configuration.getUserName() != null) {
-            engineBuilder.addUserName(configuration.getUserName());
-        }
-        if (configuration.getPassword() != null) {
-            engineBuilder.addPassword(configuration.getPassword());
-        }
-        if (configuration.getDeploymentId() != null) {
-            engineBuilder.addDeploymentId(configuration.getDeploymentId());
-        }
-        if (configuration.getConnectionURL() != null) {
-            engineBuilder.addUrl(configuration.getConnectionURL());
-        }
-        if (configuration.getProcessInstanceId() != null) {
-            engineBuilder.addProcessInstanceId(configuration.getProcessInstanceId());
-        }
+        KieServicesConfiguration kieConfiguration = KieServicesFactory.newRestConfiguration(configuration.getConnectionURL().toExternalForm(), configuration.getUserName(), configuration.getPassword());
+  
         if (configuration.getTimeout() != null) {
-            engineBuilder.addTimeout(configuration.getTimeout());
+            kieConfiguration.setTimeout(configuration.getTimeout());
         }
         if (configuration.getExtraJaxbClasses() != null) {
-            engineBuilder.addExtraJaxbClasses(configuration.getExtraJaxbClasses());
+            List<Class<?>> classes = Arrays.asList(configuration.getExtraJaxbClasses());
+            kieConfiguration.addExtraClasses(new LinkedHashSet<>(classes));
         }
-        RuntimeEngine runtimeEngine = engineBuilder.build();
-
-        return new JBPMProducer(this, runtimeEngine);
+        
+        KieServicesClient kieServerClient = KieServicesFactory.newKieServicesClient(kieConfiguration);        
+        LOGGER.debug("JBPM Producer created with KieServerClient configured for {}", configuration.getConnectionURL());
+        return new JBPMProducer(this, kieServerClient);
     }
 
     public Consumer createConsumer(Processor processor) throws Exception {
-        throw new UnsupportedOperationException("Consumer not supported for " + getClass().getSimpleName() + " endpoint");
+        LOGGER.debug("JBPM Consumer created and configured for deployment {}", configuration.getDeploymentId());
+        return new JBPMConsumer(this, processor);
     }
 
     public boolean isSingleton() {
diff --git a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMProducer.java b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMProducer.java
index 8fc9fc4fdb4f8..c9f218b3e940b 100644
--- a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMProducer.java
+++ b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMProducer.java
@@ -16,7 +16,9 @@
  */
 package org.apache.camel.component.jbpm;
 
+import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
@@ -24,55 +26,54 @@
 import org.apache.camel.Message;
 import org.apache.camel.impl.DefaultProducer;
 import org.apache.camel.util.ExchangeHelper;
-import org.kie.api.runtime.KieSession;
-import org.kie.api.runtime.manager.RuntimeEngine;
-import org.kie.api.runtime.process.ProcessInstance;
-import org.kie.api.task.TaskService;
-import org.kie.api.task.model.Attachment;
-import org.kie.api.task.model.Content;
-import org.kie.api.task.model.OrganizationalEntity;
-import org.kie.api.task.model.Status;
+import org.kie.api.KieServices;
+import org.kie.api.command.BatchExecutionCommand;
+import org.kie.api.command.Command;
+import org.kie.api.command.KieCommands;
+import org.kie.api.runtime.ExecutionResults;
 import org.kie.api.task.model.Task;
-import org.kie.api.task.model.TaskSummary;
+import org.kie.server.api.model.ServiceResponse;
+import org.kie.server.api.model.instance.ProcessInstance;
+import org.kie.server.api.model.instance.TaskAttachment;
+import org.kie.server.api.model.instance.TaskInstance;
+import org.kie.server.api.model.instance.TaskSummary;
+import org.kie.server.client.KieServicesClient;
+import org.kie.server.client.ProcessServicesClient;
+import org.kie.server.client.QueryServicesClient;
+import org.kie.server.client.RuleServicesClient;
+import org.kie.server.client.UserTaskServicesClient;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class JBPMProducer extends DefaultProducer {
     private static final transient Logger LOGGER = LoggerFactory.getLogger(JBPMProducer.class);
-    private KieSession kieSession;
-    private TaskService taskService;
+
+    private static KieCommands commandsFactory = KieServices.get().getCommands();
+    
     private JBPMConfiguration configuration;
-    private RuntimeEngine runtimeEngine;
+    private KieServicesClient kieServicesClient;
+    
 
-    public JBPMProducer(JBPMEndpoint endpoint, RuntimeEngine runtimeEngine) {
+    public JBPMProducer(JBPMEndpoint endpoint, KieServicesClient kieServicesClient) {
         super(endpoint);
         this.configuration = endpoint.getConfiguration();
-        this.runtimeEngine = runtimeEngine;
+        this.kieServicesClient = kieServicesClient;        
     }
 
     @Override
     protected void doStart() throws Exception {
         LOGGER.trace("starting producer");
-        kieSession = runtimeEngine.getKieSession();
-        taskService = runtimeEngine.getTaskService();
         super.doStart();
         LOGGER.trace("started producer");
     }
 
     @Override
     protected void doStop() throws Exception {
-        super.doStop();
-        if (kieSession != null) {
-            kieSession = null;
-        }
-
-        if (taskService != null) {
-            taskService = null;
-        }
+        super.doStop();        
     }
 
     public void process(Exchange exchange) throws Exception {
-        getOperation(exchange).execute(kieSession, taskService, configuration, exchange);
+        getOperation(exchange).execute(kieServicesClient, configuration, exchange);
     }
 
     Operation getOperation(Exchange exchange) {
@@ -92,35 +93,40 @@ enum Operation {
         //PROCESS OPERATIONS
         startProcess {
             @Override
-            void execute(KieSession kieSession, TaskService taskService, JBPMConfiguration configuration, Exchange exchange) {
-                ProcessInstance processInstance = kieSession.startProcess(getProcessId(configuration, exchange), getParameters(configuration, exchange));
+            void execute(KieServicesClient kieServicesClient, JBPMConfiguration configuration, Exchange exchange) {
+                ProcessServicesClient processClient = kieServicesClient.getServicesClient(ProcessServicesClient.class);
+                Long processInstance = processClient.startProcess(configuration.getDeploymentId(), getProcessId(configuration, exchange), getParameters(configuration, exchange));
                 setResult(exchange, processInstance);
             }
         }, abortProcessInstance {
             @Override
-            void execute(KieSession kieSession, TaskService taskService, JBPMConfiguration configuration, Exchange exchange) {
-                kieSession.abortProcessInstance(safe(getProcessInstanceId(configuration, exchange)));
+            void execute(KieServicesClient kieServicesClient, JBPMConfiguration configuration, Exchange exchange) {
+                ProcessServicesClient processClient = kieServicesClient.getServicesClient(ProcessServicesClient.class);
+                processClient.abortProcessInstance(configuration.getDeploymentId(), safe(getProcessInstanceId(configuration, exchange)));
             }
         }, signalEvent {
             @Override
-            void execute(KieSession kieSession, TaskService taskService, JBPMConfiguration configuration, Exchange exchange) {
+            void execute(KieServicesClient kieServicesClient, JBPMConfiguration configuration, Exchange exchange) {
+                ProcessServicesClient processClient = kieServicesClient.getServicesClient(ProcessServicesClient.class);
                 Long processInstanceId = getProcessInstanceId(configuration, exchange);
                 if (processInstanceId != null) {
-                    kieSession.signalEvent(getEventType(configuration, exchange), getEvent(configuration, exchange), processInstanceId);
+                    processClient.signalProcessInstance(configuration.getDeploymentId(), processInstanceId, getEventType(configuration, exchange), getEvent(configuration, exchange));
                 } else {
-                    kieSession.signalEvent(getEventType(configuration, exchange), getEvent(configuration, exchange));
+                    processClient.signal(configuration.getDeploymentId(), getEventType(configuration, exchange), getEvent(configuration, exchange));
                 }
             }
         }, getProcessInstance {
             @Override
-            void execute(KieSession kieSession, TaskService taskService, JBPMConfiguration configuration, Exchange exchange) {
-                ProcessInstance processInstance = kieSession.getProcessInstance(safe(getProcessInstanceId(configuration, exchange)));
+            void execute(KieServicesClient kieServicesClient, JBPMConfiguration configuration, Exchange exchange) {
+                ProcessServicesClient processClient = kieServicesClient.getServicesClient(ProcessServicesClient.class);
+                ProcessInstance processInstance = processClient.getProcessInstance(configuration.getDeploymentId(), safe(getProcessInstanceId(configuration, exchange)));
                 setResult(exchange, processInstance);
             }
         }, getProcessInstances {
             @Override
-            void execute(KieSession kieSession, TaskService taskService, JBPMConfiguration configuration, Exchange exchange) {
-                Collection<ProcessInstance> processInstances = kieSession.getProcessInstances();
+            void execute(KieServicesClient kieServicesClient, JBPMConfiguration configuration, Exchange exchange) {
+                QueryServicesClient queryClient = kieServicesClient.getServicesClient(QueryServicesClient.class);
+                Collection<ProcessInstance> processInstances = queryClient.findProcessInstances(getPage(configuration, exchange), getPageSize(configuration, exchange));
                 setResult(exchange, processInstances);
             }
         },
@@ -128,198 +134,217 @@ void execute(KieSession kieSession, TaskService taskService, JBPMConfiguration c
         //RULE OPERATIONS
         fireAllRules {
             @Override
-            void execute(KieSession kieSession, TaskService taskService, JBPMConfiguration configuration, Exchange exchange) {
+            void execute(KieServicesClient kieServicesClient, JBPMConfiguration configuration, Exchange exchange) {
+                RuleServicesClient ruleClient = kieServicesClient.getServicesClient(RuleServicesClient.class);
+                List<Command<?>> commands = new ArrayList<Command<?>>();
+                BatchExecutionCommand executionCommand = commandsFactory.newBatchExecution(commands);
+                
                 Integer max = getMaxNumber(configuration, exchange);
-                int rulesFired;
                 if (max != null) {
-                    rulesFired = kieSession.fireAllRules(max);
+                    commands.add(commandsFactory.newFireAllRules(max));
                 } else {
-                    rulesFired = kieSession.fireAllRules();
+                    commands.add(commandsFactory.newFireAllRules());
                 }
-                setResult(exchange, rulesFired);
-            }
-        }, getFactCount {
-            @Override
-            void execute(KieSession kieSession, TaskService taskService, JBPMConfiguration configuration, Exchange exchange) {
-                long factCount = kieSession.getFactCount();
-                setResult(exchange, factCount);
+                ServiceResponse<ExecutionResults> reply = ruleClient.executeCommandsWithResults(configuration.getDeploymentId(), executionCommand);                
+                setResult(exchange, reply.getResult());
             }
         }, getGlobal {
             @Override
-            void execute(KieSession kieSession, TaskService taskService, JBPMConfiguration configuration, Exchange exchange) {
-                Object global = kieSession.getGlobal(getIdentifier(configuration, exchange));
-                setResult(exchange, global);
+            void execute(KieServicesClient kieServicesClient, JBPMConfiguration configuration, Exchange exchange) {
+                RuleServicesClient ruleClient = kieServicesClient.getServicesClient(RuleServicesClient.class);
+                List<Command<?>> commands = new ArrayList<Command<?>>();
+                BatchExecutionCommand executionCommand = commandsFactory.newBatchExecution(commands);
+                String identifier = getIdentifier(configuration, exchange);
+                commands.add(commandsFactory.newGetGlobal(identifier, identifier));
+
+                ServiceResponse<ExecutionResults> reply = ruleClient.executeCommandsWithResults(configuration.getDeploymentId(), executionCommand);  
+                setResult(exchange, reply.getResult().getValue(identifier));
             }
         }, setGlobal {
             @Override
-            void execute(KieSession kieSession, TaskService taskService, JBPMConfiguration configuration, Exchange exchange) {
-                kieSession.setGlobal(getIdentifier(configuration, exchange), getValue(configuration, exchange));
+            void execute(KieServicesClient kieServicesClient, JBPMConfiguration configuration, Exchange exchange) {
+                RuleServicesClient ruleClient = kieServicesClient.getServicesClient(RuleServicesClient.class);
+                List<Command<?>> commands = new ArrayList<Command<?>>();
+                BatchExecutionCommand executionCommand = commandsFactory.newBatchExecution(commands);
+
+                commands.add(commandsFactory.newSetGlobal(getIdentifier(configuration, exchange), getValue(configuration, exchange)));
+
+                ruleClient.executeCommandsWithResults(configuration.getDeploymentId(), executionCommand);                
             }
         },
 
         //WORK ITEM OPERATIONS
         abortWorkItem {
             @Override
-            void execute(KieSession kieSession, TaskService taskService, JBPMConfiguration configuration, Exchange exchange) {
-                kieSession.getWorkItemManager().abortWorkItem(safe(getWorkItemId(configuration, exchange)));
+            void execute(KieServicesClient kieServicesClient, JBPMConfiguration configuration, Exchange exchange) {
+                ProcessServicesClient processClient = kieServicesClient.getServicesClient(ProcessServicesClient.class);
+                processClient.abortWorkItem(configuration.getDeploymentId(), safe(getProcessInstanceId(configuration, exchange)), safe(getWorkItemId(configuration, exchange)));
             }
         }, completeWorkItem {
             @Override
-            void execute(KieSession kieSession, TaskService taskService, JBPMConfiguration configuration, Exchange exchange) {
-                kieSession.getWorkItemManager().completeWorkItem(safe(getWorkItemId(configuration, exchange)), getParameters(configuration, exchange));
+            void execute(KieServicesClient kieServicesClient, JBPMConfiguration configuration, Exchange exchange) {
+                ProcessServicesClient processClient = kieServicesClient.getServicesClient(ProcessServicesClient.class);
+                processClient.completeWorkItem(configuration.getDeploymentId(), safe(getProcessInstanceId(configuration, exchange)), safe(getWorkItemId(configuration, exchange)), getParameters(configuration, exchange));
             }
         },
 
         //TASK OPERATIONS
         activateTask {
             @Override
-            void execute(KieSession kieSession, TaskService taskService, JBPMConfiguration configuration, Exchange exchange) {
-                taskService.activate(safe(getTaskId(configuration, exchange)), getUserId(configuration, exchange));
-            }
-        }, addTask {
-            @Override
-            void execute(KieSession kieSession, TaskService taskService, JBPMConfiguration configuration, Exchange exchange) {
-                long taskId = taskService.addTask(getTask(configuration, exchange), getParameters(configuration, exchange));
-                setResult(exchange, taskId);
-            }
-        }, claimNextAvailableTask {
-            @Override
-            void execute(KieSession kieSession, TaskService taskService, JBPMConfiguration configuration, Exchange exchange) {
-                taskService.claimNextAvailable(getUserId(configuration, exchange), getLanguage(configuration, exchange));
+            void execute(KieServicesClient kieServicesClient, JBPMConfiguration configuration, Exchange exchange) {
+                UserTaskServicesClient taskClient = kieServicesClient.getServicesClient(UserTaskServicesClient.class);
+                taskClient.activateTask(configuration.getDeploymentId(), safe(getTaskId(configuration, exchange)), getUserId(configuration, exchange));
             }
         }, claimTask {
             @Override
-            void execute(KieSession kieSession, TaskService taskService, JBPMConfiguration configuration, Exchange exchange) {
-                taskService.claim(safe(getTaskId(configuration, exchange)), getUserId(configuration, exchange));
+            void execute(KieServicesClient kieServicesClient, JBPMConfiguration configuration, Exchange exchange) {
+                UserTaskServicesClient taskClient = kieServicesClient.getServicesClient(UserTaskServicesClient.class);
+                taskClient.claimTask(configuration.getDeploymentId(), safe(getTaskId(configuration, exchange)), getUserId(configuration, exchange));
             }
         }, completeTask {
             @Override
-            void execute(KieSession kieSession, TaskService taskService, JBPMConfiguration configuration, Exchange exchange) {
-                taskService.complete(safe(getTaskId(configuration, exchange)), getUserId(configuration, exchange), getParameters(configuration, exchange));
+            void execute(KieServicesClient kieServicesClient, JBPMConfiguration configuration, Exchange exchange) {
+                UserTaskServicesClient taskClient = kieServicesClient.getServicesClient(UserTaskServicesClient.class);
+                taskClient.completeAutoProgress(configuration.getDeploymentId(), safe(getTaskId(configuration, exchange)), getUserId(configuration, exchange), getParameters(configuration, exchange));
             }
         }, delegateTask {
             @Override
-            void execute(KieSession kieSession, TaskService taskService, JBPMConfiguration configuration, Exchange exchange) {
-                taskService.delegate(safe(getTaskId(configuration, exchange)), getUserId(configuration, exchange), getTargetUserId(configuration, exchange));
+            void execute(KieServicesClient kieServicesClient, JBPMConfiguration configuration, Exchange exchange) {
+                UserTaskServicesClient taskClient = kieServicesClient.getServicesClient(UserTaskServicesClient.class);
+                taskClient.delegateTask(configuration.getDeploymentId(), safe(getTaskId(configuration, exchange)), getUserId(configuration, exchange), getTargetUserId(configuration, exchange));
             }
         }, exitTask {
             @Override
-            void execute(KieSession kieSession, TaskService taskService, JBPMConfiguration configuration, Exchange exchange) {
-                taskService.exit(safe(getTaskId(configuration, exchange)), getUserId(configuration, exchange));
+            void execute(KieServicesClient kieServicesClient, JBPMConfiguration configuration, Exchange exchange) {
+                UserTaskServicesClient taskClient = kieServicesClient.getServicesClient(UserTaskServicesClient.class);
+                taskClient.exitTask(configuration.getDeploymentId(), safe(getTaskId(configuration, exchange)), getUserId(configuration, exchange));
             }
         }, failTask {
             @Override
-            void execute(KieSession kieSession, TaskService taskService, JBPMConfiguration configuration, Exchange exchange) {
-                taskService.fail(safe(getTaskId(configuration, exchange)), getUserId(configuration, exchange), getParameters(configuration, exchange));
+            void execute(KieServicesClient kieServicesClient, JBPMConfiguration configuration, Exchange exchange) {
+                UserTaskServicesClient taskClient = kieServicesClient.getServicesClient(UserTaskServicesClient.class);
+                taskClient.failTask(configuration.getDeploymentId(), safe(getTaskId(configuration, exchange)), getUserId(configuration, exchange), getParameters(configuration, exchange));
             }
         }, getAttachment {
             @Override
-            void execute(KieSession kieSession, TaskService taskService, JBPMConfiguration configuration, Exchange exchange) {
-                Attachment attachment = taskService.getAttachmentById(safe(getAttachmentId(configuration, exchange)));
+            void execute(KieServicesClient kieServicesClient, JBPMConfiguration configuration, Exchange exchange) {
+                UserTaskServicesClient taskClient = kieServicesClient.getServicesClient(UserTaskServicesClient.class);
+                TaskAttachment attachment = taskClient.getTaskAttachmentById(configuration.getDeploymentId(), safe(getTaskId(configuration, exchange)), safe(getAttachmentId(configuration, exchange)));
                 setResult(exchange, attachment);
             }
-        }, getContent {
-            @Override
-            void execute(KieSession kieSession, TaskService taskService, JBPMConfiguration configuration, Exchange exchange) {
-                Content content = taskService.getContentById(safe(getContentId(configuration, exchange)));
-                setResult(exchange, content);
-            }
         }, getTasksAssignedAsBusinessAdministrator {
             @Override
-            void execute(KieSession kieSession, TaskService taskService, JBPMConfiguration configuration, Exchange exchange) {
-                List<TaskSummary> taskSummaries = taskService.getTasksAssignedAsBusinessAdministrator(getUserId(configuration, exchange), getLanguage(configuration, exchange));
+            void execute(KieServicesClient kieServicesClient, JBPMConfiguration configuration, Exchange exchange) {
+                UserTaskServicesClient taskClient = kieServicesClient.getServicesClient(UserTaskServicesClient.class);
+                List<TaskSummary> taskSummaries = taskClient.findTasksAssignedAsBusinessAdministrator(getUserId(configuration, exchange), getPage(configuration, exchange), getPageSize(configuration, exchange));
                 setResult(exchange, taskSummaries);
             }
         }, getTasksAssignedAsPotentialOwnerByStatus {
             @Override
-            void execute(KieSession kieSession, TaskService taskService, JBPMConfiguration configuration, Exchange exchange) {
-                taskService.getTasksAssignedAsPotentialOwnerByStatus(getUserId(configuration, exchange), getStatuses(configuration, exchange), getLanguage(configuration, exchange));
+            void execute(KieServicesClient kieServicesClient, JBPMConfiguration configuration, Exchange exchange) {
+                UserTaskServicesClient taskClient = kieServicesClient.getServicesClient(UserTaskServicesClient.class);
+                List<TaskSummary> taskSummaries = taskClient.findTasksAssignedAsPotentialOwner(getUserId(configuration, exchange), getStatuses(configuration, exchange), getPage(configuration, exchange), getPageSize(configuration, exchange));
+                setResult(exchange, taskSummaries);
             }
         }, getTaskByWorkItem {
             @Override
-            void execute(KieSession kieSession, TaskService taskService, JBPMConfiguration configuration, Exchange exchange) {
-                Task task = taskService.getTaskByWorkItemId(safe(getWorkItemId(configuration, exchange)));
+            void execute(KieServicesClient kieServicesClient, JBPMConfiguration configuration, Exchange exchange) {
+                UserTaskServicesClient taskClient = kieServicesClient.getServicesClient(UserTaskServicesClient.class);
+                TaskInstance task = taskClient.findTaskByWorkItemId(safe(getWorkItemId(configuration, exchange)));
                 setResult(exchange, task);
             }
         }, getTaskBy {
             @Override
-            void execute(KieSession kieSession, TaskService taskService, JBPMConfiguration configuration, Exchange exchange) {
-                Task task = taskService.getTaskById(safe(getTaskId(configuration, exchange)));
+            void execute(KieServicesClient kieServicesClient, JBPMConfiguration configuration, Exchange exchange) {
+                UserTaskServicesClient taskClient = kieServicesClient.getServicesClient(UserTaskServicesClient.class);
+                TaskInstance task = taskClient.findTaskById(safe(getTaskId(configuration, exchange)));
                 setResult(exchange, task);
             }
         }, getTaskContent {
             @Override
-            void execute(KieSession kieSession, TaskService taskService, JBPMConfiguration configuration, Exchange exchange) {
-                Map<String, Object> taskContent = taskService.getTaskContent(safe(getTaskId(configuration, exchange)));
-                setResult(exchange, taskContent);
+            void execute(KieServicesClient kieServicesClient, JBPMConfiguration configuration, Exchange exchange) {
+                UserTaskServicesClient taskClient = kieServicesClient.getServicesClient(UserTaskServicesClient.class);
+                Map<String, Object> content = taskClient.getTaskOutputContentByTaskId(configuration.getDeploymentId(), safe(getTaskId(configuration, exchange)));
+                setResult(exchange, content);
             }
         }, getTasksByProcessInstance {
             @Override
-            void execute(KieSession kieSession, TaskService taskService, JBPMConfiguration configuration, Exchange exchange) {
-                List<Long> processInstanceIds = taskService.getTasksByProcessInstanceId(safe(getProcessInstanceId(configuration, exchange)));
+            void execute(KieServicesClient kieServicesClient, JBPMConfiguration configuration, Exchange exchange) {
+                UserTaskServicesClient taskClient = kieServicesClient.getServicesClient(UserTaskServicesClient.class);
+                List<TaskSummary> processInstanceIds = taskClient.findTasksByStatusByProcessInstanceId(safe(getProcessInstanceId(configuration, exchange)), Collections.emptyList(),
+                        getPage(configuration, exchange), getPageSize(configuration, exchange));
                 setResult(exchange, processInstanceIds);
             }
         }, getTasksByStatusByProcessInstance {
             @Override
-            void execute(KieSession kieSession, TaskService taskService, JBPMConfiguration configuration, Exchange exchange) {
-                List<TaskSummary> taskSummaryList = taskService.getTasksByStatusByProcessInstanceId(
+            void execute(KieServicesClient kieServicesClient, JBPMConfiguration configuration, Exchange exchange) {
+                UserTaskServicesClient taskClient = kieServicesClient.getServicesClient(UserTaskServicesClient.class);
+                List<TaskSummary> taskSummaryList = taskClient.findTasksByStatusByProcessInstanceId(
                         safe(getProcessInstanceId(configuration, exchange)), getStatuses(configuration, exchange),
-                        getLanguage(configuration, exchange));
+                        getPage(configuration, exchange), getPageSize(configuration, exchange));
                 setResult(exchange, taskSummaryList);
             }
         }, getTasksOwned {
             @Override
-            void execute(KieSession kieSession, TaskService taskService, JBPMConfiguration configuration, Exchange exchange) {
-                List<TaskSummary> summaryList = taskService.getTasksOwned(getUserId(configuration, exchange), getLanguage(configuration, exchange));
+            void execute(KieServicesClient kieServicesClient, JBPMConfiguration configuration, Exchange exchange) {
+                UserTaskServicesClient taskClient = kieServicesClient.getServicesClient(UserTaskServicesClient.class);
+                List<TaskSummary> summaryList = taskClient.findTasksOwned(getUserId(configuration, exchange), getPage(configuration, exchange), getPageSize(configuration, exchange));
                 setResult(exchange, summaryList);
             }
         }, nominateTask {
             @Override
-            void execute(KieSession kieSession, TaskService taskService, JBPMConfiguration configuration, Exchange exchange) {
-                taskService.nominate(safe(getTaskId(configuration, exchange)), getUserId(configuration, exchange), getEntities(configuration, exchange));
+            void execute(KieServicesClient kieServicesClient, JBPMConfiguration configuration, Exchange exchange) {
+                UserTaskServicesClient taskClient = kieServicesClient.getServicesClient(UserTaskServicesClient.class);
+                taskClient.nominateTask(configuration.getDeploymentId(), safe(getTaskId(configuration, exchange)), getUserId(configuration, exchange), getEntities(configuration, exchange));
             }
         }, releaseTask {
             @Override
-            void execute(KieSession kieSession, TaskService taskService, JBPMConfiguration configuration, Exchange exchange) {
-                taskService.release(safe(getTaskId(configuration, exchange)), getUserId(configuration, exchange));
+            void execute(KieServicesClient kieServicesClient, JBPMConfiguration configuration, Exchange exchange) {
+                UserTaskServicesClient taskClient = kieServicesClient.getServicesClient(UserTaskServicesClient.class);
+                taskClient.releaseTask(configuration.getDeploymentId(), safe(getTaskId(configuration, exchange)), getUserId(configuration, exchange));
             }
         }, resumeTask {
             @Override
-            void execute(KieSession kieSession, TaskService taskService, JBPMConfiguration configuration, Exchange exchange) {
-                taskService.resume(safe(getTaskId(configuration, exchange)), getUserId(configuration, exchange));
+            void execute(KieServicesClient kieServicesClient, JBPMConfiguration configuration, Exchange exchange) {
+                UserTaskServicesClient taskClient = kieServicesClient.getServicesClient(UserTaskServicesClient.class);
+                taskClient.resumeTask(configuration.getDeploymentId(), safe(getTaskId(configuration, exchange)), getUserId(configuration, exchange));
             }
         }, skipTask {
             @Override
-            void execute(KieSession kieSession, TaskService taskService, JBPMConfiguration configuration, Exchange exchange) {
-                taskService.skip(safe(getTaskId(configuration, exchange)), getUserId(configuration, exchange));
+            void execute(KieServicesClient kieServicesClient, JBPMConfiguration configuration, Exchange exchange) {
+                UserTaskServicesClient taskClient = kieServicesClient.getServicesClient(UserTaskServicesClient.class);
+                taskClient.skipTask(configuration.getDeploymentId(), safe(getTaskId(configuration, exchange)), getUserId(configuration, exchange));
             }
         }, startTask {
             @Override
-            void execute(KieSession kieSession, TaskService taskService, JBPMConfiguration configuration, Exchange exchange) {
-                taskService.start(safe(getTaskId(configuration, exchange)), getUserId(configuration, exchange));
+            void execute(KieServicesClient kieServicesClient, JBPMConfiguration configuration, Exchange exchange) {
+                UserTaskServicesClient taskClient = kieServicesClient.getServicesClient(UserTaskServicesClient.class);
+                taskClient.startTask(configuration.getDeploymentId(), safe(getTaskId(configuration, exchange)), getUserId(configuration, exchange));
             }
         }, stopTask {
             @Override
-            void execute(KieSession kieSession, TaskService taskService, JBPMConfiguration configuration, Exchange exchange) {
-                taskService.stop(safe(getTaskId(configuration, exchange)), getUserId(configuration, exchange));
+            void execute(KieServicesClient kieServicesClient, JBPMConfiguration configuration, Exchange exchange) {
+                UserTaskServicesClient taskClient = kieServicesClient.getServicesClient(UserTaskServicesClient.class);
+                taskClient.stopTask(configuration.getDeploymentId(), safe(getTaskId(configuration, exchange)), getUserId(configuration, exchange));
             }
         }, suspendTask {
             @Override
-            void execute(KieSession kieSession, TaskService taskService, JBPMConfiguration configuration, Exchange exchange) {
-                taskService.suspend(safe(getTaskId(configuration, exchange)), getUserId(configuration, exchange));
+            void execute(KieServicesClient kieServicesClient, JBPMConfiguration configuration, Exchange exchange) {
+                UserTaskServicesClient taskClient = kieServicesClient.getServicesClient(UserTaskServicesClient.class);
+                taskClient.suspendTask(configuration.getDeploymentId(), safe(getTaskId(configuration, exchange)), getUserId(configuration, exchange));
             }
         };
 
-        List<Status> getStatuses(JBPMConfiguration configuration, Exchange exchange) {
-            List<Status> statusList = exchange.getIn().getHeader(JBPMConstants.STATUS_LIST, List.class);
+        List<String> getStatuses(JBPMConfiguration configuration, Exchange exchange) {
+            List<String> statusList = exchange.getIn().getHeader(JBPMConstants.STATUS_LIST, List.class);
             if (statusList == null) {
                 statusList = configuration.getStatuses();
             }
             return statusList;
         }
 
-        List<OrganizationalEntity> getEntities(JBPMConfiguration configuration, Exchange exchange) {
-            List<OrganizationalEntity> entityList = exchange.getIn().getHeader(JBPMConstants.ENTITY_LIST, List.class);
+        List<String> getEntities(JBPMConfiguration configuration, Exchange exchange) {
+            List<String> entityList = exchange.getIn().getHeader(JBPMConstants.ENTITY_LIST, List.class);
             if (entityList == null) {
                 entityList = configuration.getEntities();
             }
@@ -350,12 +375,20 @@ String getTargetUserId(JBPMConfiguration configuration, Exchange exchange) {
             return userId;
         }
 
-        String getLanguage(JBPMConfiguration configuration, Exchange exchange) {
-            String language = exchange.getIn().getHeader(JBPMConstants.LANGUAGE, String.class);
-            if (language == null) {
-                language = configuration.getLanguage();
+        Integer getPage(JBPMConfiguration configuration, Exchange exchange) {
+            Integer page = exchange.getIn().getHeader(JBPMConstants.RESULT_PAGE, Integer.class);
+            if (page == null) {
+                page = configuration.getPage();
+            }
+            return page;
+        }
+        
+        Integer getPageSize(JBPMConfiguration configuration, Exchange exchange) {
+            Integer pageSize = exchange.getIn().getHeader(JBPMConstants.RESULT_PAGE_SIZE, Integer.class);
+            if (pageSize == null) {
+                pageSize = configuration.getPageSize();
             }
-            return language;
+            return pageSize;
         }
 
         Task getTask(JBPMConfiguration configuration, Exchange exchange) {
@@ -466,7 +499,7 @@ void setResult(Exchange exchange, Object result) {
             getResultMessage(exchange).setBody(result);
         }
 
-        abstract void execute(KieSession kieSession, TaskService taskService, JBPMConfiguration configuration, Exchange exchange);
+        abstract void execute(KieServicesClient kieServicesClient, JBPMConfiguration configuration, Exchange exchange);
     }
 }
 
diff --git a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/emitters/CamelEventEmitter.java b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/emitters/CamelEventEmitter.java
new file mode 100644
index 0000000000000..0886466f0f81d
--- /dev/null
+++ b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/emitters/CamelEventEmitter.java
@@ -0,0 +1,75 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.camel.component.jbpm.emitters;
+
+import java.util.Collection;
+
+import org.apache.camel.component.jbpm.JBPMConsumer;
+import org.jbpm.persistence.api.integration.EventCollection;
+import org.jbpm.persistence.api.integration.EventEmitter;
+import org.jbpm.persistence.api.integration.InstanceView;
+import org.jbpm.persistence.api.integration.base.BaseEventCollection;
+
+public class CamelEventEmitter implements EventEmitter {
+    
+    private JBPMConsumer consumer;
+    private boolean sendItems;
+    
+    public CamelEventEmitter(JBPMConsumer consumer, boolean sendItems) {
+        this.consumer = consumer; 
+        this.sendItems = sendItems;
+    }
+
+    @Override
+    public void deliver(Collection<InstanceView<?>> data) {
+        // no-op
+        
+    }
+
+    @Override
+    public void apply(Collection<InstanceView<?>> data) {
+        if (consumer == null || data.isEmpty()) {
+            return;
+        }
+        
+        if (sendItems) {
+            
+            data.forEach(item -> consumer.sendMessage("Emitter", item));
+        } else {
+        
+            consumer.sendMessage("Emitter", data);
+        }
+    }
+
+    @Override
+    public void drop(Collection<InstanceView<?>> data) {
+        // no-op
+        
+    }
+
+    @Override
+    public EventCollection newCollection() {
+        return new BaseEventCollection();
+    }
+
+    @Override
+    public void close() {
+
+    }
+
+}
diff --git a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/emitters/ServiceRegistryBoundEventEmitter.java b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/emitters/ServiceRegistryBoundEventEmitter.java
new file mode 100644
index 0000000000000..c531aa783d711
--- /dev/null
+++ b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/emitters/ServiceRegistryBoundEventEmitter.java
@@ -0,0 +1,62 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.camel.component.jbpm.emitters;
+
+import java.util.Collection;
+
+import org.jbpm.persistence.api.integration.EventCollection;
+import org.jbpm.persistence.api.integration.EventEmitter;
+import org.jbpm.persistence.api.integration.InstanceView;
+import org.jbpm.services.api.service.ServiceRegistry;
+
+public class ServiceRegistryBoundEventEmitter implements EventEmitter {
+    
+    private EventEmitter delegate;
+    
+    public ServiceRegistryBoundEventEmitter() {
+        this.delegate = (EventEmitter) ServiceRegistry.get().service("CamelEventEmitter");
+    }
+
+    @Override
+    public void deliver(Collection<InstanceView<?>> data) {
+        delegate.deliver(data);
+        
+    }
+
+    @Override
+    public void apply(Collection<InstanceView<?>> data) {
+        delegate.apply(data);
+    }
+
+    @Override
+    public void drop(Collection<InstanceView<?>> data) {
+        delegate.drop(data);
+        
+    }
+
+    @Override
+    public EventCollection newCollection() {
+        return delegate.newCollection();
+    }
+
+    @Override
+    public void close() {
+ 
+    }
+
+}
diff --git a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/listeners/CamelCaseEventListener.java b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/listeners/CamelCaseEventListener.java
new file mode 100644
index 0000000000000..4906b5b9b87f6
--- /dev/null
+++ b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/listeners/CamelCaseEventListener.java
@@ -0,0 +1,286 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.camel.component.jbpm.listeners;
+
+import java.util.LinkedHashSet;
+import java.util.Set;
+
+import org.apache.camel.component.jbpm.JBPMCamelConsumerAware;
+import org.apache.camel.component.jbpm.JBPMConsumer;
+import org.jbpm.casemgmt.api.event.CaseCancelEvent;
+import org.jbpm.casemgmt.api.event.CaseCloseEvent;
+import org.jbpm.casemgmt.api.event.CaseCommentEvent;
+import org.jbpm.casemgmt.api.event.CaseDataEvent;
+import org.jbpm.casemgmt.api.event.CaseDestroyEvent;
+import org.jbpm.casemgmt.api.event.CaseDynamicSubprocessEvent;
+import org.jbpm.casemgmt.api.event.CaseDynamicTaskEvent;
+import org.jbpm.casemgmt.api.event.CaseEventListener;
+import org.jbpm.casemgmt.api.event.CaseReopenEvent;
+import org.jbpm.casemgmt.api.event.CaseRoleAssignmentEvent;
+import org.jbpm.casemgmt.api.event.CaseStartEvent;
+import org.kie.internal.runtime.Cacheable;
+
+
+public class CamelCaseEventListener implements CaseEventListener, Cacheable, JBPMCamelConsumerAware {    
+    
+    private Set<JBPMConsumer> consumers = new LinkedHashSet<>();
+    
+    @Override
+    public void beforeCaseStarted(CaseStartEvent event) {
+        if (consumers.isEmpty()) {
+            return;
+        }
+        sendMessage("beforeCaseStarted", event);
+    }
+
+    @Override
+    public void afterCaseStarted(CaseStartEvent event) {
+        if (consumers.isEmpty()) {
+            return;
+        }
+        sendMessage("afterCaseStarted", event);
+    }
+
+    @Override
+    public void beforeCaseClosed(CaseCloseEvent event) {
+        if (consumers.isEmpty()) {
+            return;
+        }
+        sendMessage("beforeCaseClosed", event);
+    }
+
+    @Override
+    public void afterCaseClosed(CaseCloseEvent event) {
+        if (consumers.isEmpty()) {
+            return;
+        }
+        sendMessage("afterCaseClosed", event);
+    }
+
+    @Override
+    public void beforeCaseCancelled(CaseCancelEvent event) {
+        if (consumers.isEmpty()) {
+            return;
+        }
+        sendMessage("beforeCaseCancelled", event);
+    }
+
+    @Override
+    public void afterCaseCancelled(CaseCancelEvent event) {
+        if (consumers.isEmpty()) {
+            return;
+        }
+        sendMessage("afterCaseCancelled", event);
+    }
+
+    @Override
+    public void beforeCaseDestroyed(CaseDestroyEvent event) {
+        if (consumers.isEmpty()) {
+            return;
+        }
+        sendMessage("beforeCaseDestroyed", event);
+    }
+
+    @Override
+    public void afterCaseDestroyed(CaseDestroyEvent event) {
+        if (consumers.isEmpty()) {
+            return;
+        }
+        sendMessage("afterCaseDestroyed", event);
+    }
+
+    @Override
+    public void beforeCaseReopen(CaseReopenEvent event) {
+        if (consumers.isEmpty()) {
+            return;
+        }
+        sendMessage("beforeCaseReopen", event);
+    }
+
+    @Override
+    public void afterCaseReopen(CaseReopenEvent event) {
+        if (consumers.isEmpty()) {
+            return;
+        }
+        sendMessage("afterCaseReopen", event);
+    }
+
+    @Override
+    public void beforeCaseCommentAdded(CaseCommentEvent event) {
+        if (consumers.isEmpty()) {
+            return;
+        }
+        sendMessage("beforeCaseCommentAdded", event);
+    }
+
+    @Override
+    public void afterCaseCommentAdded(CaseCommentEvent event) {
+        if (consumers.isEmpty()) {
+            return;
+        }
+        sendMessage("afterCaseCommentAdded", event);
+    }
+
+    @Override
+    public void beforeCaseCommentUpdated(CaseCommentEvent event) {
+        if (consumers.isEmpty()) {
+            return;
+        }
+        sendMessage("beforeCaseCommentUpdated", event);
+    }
+
+    @Override
+    public void afterCaseCommentUpdated(CaseCommentEvent event) {
+        if (consumers.isEmpty()) {
+            return;
+        }
+        sendMessage("afterCaseCommentUpdated", event);
+    }
+
+    @Override
+    public void beforeCaseCommentRemoved(CaseCommentEvent event) {
+        if (consumers.isEmpty()) {
+            return;
+        }
+        sendMessage("beforeCaseCommentRemoved", event);
+    }
+
+    @Override
+    public void afterCaseCommentRemoved(CaseCommentEvent event) {
+        if (consumers.isEmpty()) {
+            return;
+        }
+        sendMessage("afterCaseCommentRemoved", event);
+    }
+
+    @Override
+    public void beforeCaseRoleAssignmentAdded(CaseRoleAssignmentEvent event) {
+        if (consumers.isEmpty()) {
+            return;
+        }
+        sendMessage("beforeCaseRoleAssignmentAdded", event);
+    }
+
+    @Override
+    public void afterCaseRoleAssignmentAdded(CaseRoleAssignmentEvent event) {
+        if (consumers.isEmpty()) {
+            return;
+        }
+        sendMessage("afterCaseRoleAssignmentAdded", event);
+    }
+
+    @Override
+    public void beforeCaseRoleAssignmentRemoved(CaseRoleAssignmentEvent event) {
+        if (consumers.isEmpty()) {
+            return;
+        }
+        sendMessage("beforeCaseRoleAssignmentRemoved", event);
+    }
+
+    @Override
+    public void afterCaseRoleAssignmentRemoved(CaseRoleAssignmentEvent event) {
+        if (consumers.isEmpty()) {
+            return;
+        }
+        sendMessage("afterCaseRoleAssignmentRemoved", event);
+    }
+
+    @Override
+    public void beforeCaseDataAdded(CaseDataEvent event) {
+        if (consumers.isEmpty()) {
+            return;
+        }
+        sendMessage("beforeCaseDataAdded", event);
+    }
+
+    @Override
+    public void afterCaseDataAdded(CaseDataEvent event) {
+        if (consumers.isEmpty()) {
+            return;
+        }
+        sendMessage("afterCaseDataAdded", event);
+    }
+
+    @Override
+    public void beforeCaseDataRemoved(CaseDataEvent event) {
+        if (consumers.isEmpty()) {
+            return;
+        }
+        sendMessage("beforeCaseDataRemoved", event);
+    }
+
+    @Override
+    public void afterCaseDataRemoved(CaseDataEvent event) {
+        if (consumers.isEmpty()) {
+            return;
+        }
+        sendMessage("afterCaseDataRemoved", event);
+    }
+
+    @Override
+    public void beforeDynamicTaskAdded(CaseDynamicTaskEvent event) {
+        if (consumers.isEmpty()) {
+            return;
+        }
+        sendMessage("beforeDynamicTaskAdded", event);
+    }
+
+    @Override
+    public void afterDynamicTaskAdded(CaseDynamicTaskEvent event) {
+        if (consumers.isEmpty()) {
+            return;
+        }
+        sendMessage("afterDynamicTaskAdded", event);
+    }
+
+    @Override
+    public void beforeDynamicProcessAdded(CaseDynamicSubprocessEvent event) {
+        if (consumers.isEmpty()) {
+            return;
+        }
+        sendMessage("beforeDynamicProcessAdded", event);
+    }
+
+    @Override
+    public void afterDynamicProcessAdded(CaseDynamicSubprocessEvent event) {
+        if (consumers.isEmpty()) {
+            return;
+        }
+        sendMessage("afterDynamicProcessAdded", event);
+    }
+
+    @Override
+    public void close() {
+
+    }
+
+    @Override
+    public void addConsumer(JBPMConsumer consumer) {
+        this.consumers.add(consumer);
+    }
+
+    @Override
+    public void removeConsumer(JBPMConsumer consumer) {
+        this.consumers.remove(consumer);
+    }
+    
+    protected void sendMessage(String eventType, Object event) {
+        this.consumers.stream().filter(c -> c.getStatus().isStarted()).forEach(c -> c.sendMessage(eventType, event));
+    }
+
+}
diff --git a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/listeners/CamelProcessEventListener.java b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/listeners/CamelProcessEventListener.java
new file mode 100644
index 0000000000000..2e6ff08af69ae
--- /dev/null
+++ b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/listeners/CamelProcessEventListener.java
@@ -0,0 +1,138 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.camel.component.jbpm.listeners;
+
+import java.util.LinkedHashSet;
+import java.util.Set;
+
+import org.apache.camel.component.jbpm.JBPMCamelConsumerAware;
+import org.apache.camel.component.jbpm.JBPMConsumer;
+import org.kie.api.event.process.ProcessCompletedEvent;
+import org.kie.api.event.process.ProcessEventListener;
+import org.kie.api.event.process.ProcessNodeLeftEvent;
+import org.kie.api.event.process.ProcessNodeTriggeredEvent;
+import org.kie.api.event.process.ProcessStartedEvent;
+import org.kie.api.event.process.ProcessVariableChangedEvent;
+import org.kie.internal.runtime.Cacheable;
+
+
+public class CamelProcessEventListener implements ProcessEventListener, Cacheable, JBPMCamelConsumerAware {
+
+    private Set<JBPMConsumer> consumers = new LinkedHashSet<>();
+
+    @Override
+    public void beforeProcessStarted(ProcessStartedEvent event) {
+        if (consumers.isEmpty()) {
+            return;
+        }
+
+        sendMessage("beforeProcessStarted", event);
+    }
+
+    @Override
+    public void afterProcessStarted(ProcessStartedEvent event) {
+        if (consumers.isEmpty()) {
+            return;
+        }
+        
+        sendMessage("afterProcessStarted", event);
+    }
+
+    @Override
+    public void beforeProcessCompleted(ProcessCompletedEvent event) {
+        if (consumers.isEmpty()) {
+            return;
+        }
+        sendMessage("beforeProcessCompleted", event);
+    }
+
+    @Override
+    public void afterProcessCompleted(ProcessCompletedEvent event) {
+        if (consumers.isEmpty()) {
+            return;
+        }
+        sendMessage("afterProcessCompleted", event);
+    }
+
+    @Override
+    public void beforeNodeTriggered(ProcessNodeTriggeredEvent event) {
+        if (consumers.isEmpty()) {
+            return;
+        }
+        sendMessage("beforeNodeTriggered", event);
+    }
+
+    @Override
+    public void afterNodeTriggered(ProcessNodeTriggeredEvent event) {
+        if (consumers.isEmpty()) {
+            return;
+        }
+        sendMessage("afterNodeTriggered", event);
+    }
+
+    @Override
+    public void beforeNodeLeft(ProcessNodeLeftEvent event) {
+        if (consumers.isEmpty()) {
+            return;
+        }
+        sendMessage("beforeNodeLeft", event);
+    }
+
+    @Override
+    public void afterNodeLeft(ProcessNodeLeftEvent event) {
+        if (consumers.isEmpty()) {
+            return;
+        }
+        sendMessage("afterNodeLeft", event);
+    }
+
+    @Override
+    public void beforeVariableChanged(ProcessVariableChangedEvent event) {
+        if (consumers.isEmpty()) {
+            return;
+        }
+        sendMessage("beforeVariableChanged", event);
+    }
+
+    @Override
+    public void afterVariableChanged(ProcessVariableChangedEvent event) {
+        if (consumers.isEmpty()) {
+            return;
+        }
+        sendMessage("afterVariableChanged", event);
+    }
+
+    @Override
+    public void close() {
+
+    }
+
+    @Override
+    public void addConsumer(JBPMConsumer consumer) {
+        this.consumers.add(consumer);
+    }
+
+    @Override
+    public void removeConsumer(JBPMConsumer consumer) {
+        this.consumers.remove(consumer);
+    }
+    
+    protected void sendMessage(String eventType, Object event) {
+        this.consumers.stream().filter(c -> c.getStatus().isStarted()).forEach(c -> c.sendMessage(eventType, event));
+    }
+}
diff --git a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/listeners/CamelTaskEventListener.java b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/listeners/CamelTaskEventListener.java
new file mode 100644
index 0000000000000..67a93b7d2e5d1
--- /dev/null
+++ b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/listeners/CamelTaskEventListener.java
@@ -0,0 +1,321 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.camel.component.jbpm.listeners;
+
+import java.util.LinkedHashSet;
+import java.util.Set;
+
+import org.apache.camel.component.jbpm.JBPMCamelConsumerAware;
+import org.apache.camel.component.jbpm.JBPMConsumer;
+import org.kie.api.task.TaskEvent;
+import org.kie.api.task.TaskLifeCycleEventListener;
+import org.kie.internal.runtime.Cacheable;
+
+
+public class CamelTaskEventListener implements Cacheable, TaskLifeCycleEventListener, JBPMCamelConsumerAware {
+
+    private Set<JBPMConsumer> consumers = new LinkedHashSet<>();
+    
+    @Override
+    public void beforeTaskActivatedEvent(TaskEvent event) {
+        if (consumers.isEmpty()) {
+            return;
+        }
+        sendMessage("beforeTaskActivatedEvent", event);
+    }
+
+    @Override
+    public void beforeTaskClaimedEvent(TaskEvent event) {
+        if (consumers.isEmpty()) {
+            return;
+        }
+        sendMessage("beforeTaskClaimedEvent", event);
+    }
+
+    @Override
+    public void beforeTaskSkippedEvent(TaskEvent event) {
+        if (consumers.isEmpty()) {
+            return;
+        }
+        sendMessage("beforeTaskSkippedEvent", event);
+    }
+
+    @Override
+    public void beforeTaskStartedEvent(TaskEvent event) {
+        if (consumers.isEmpty()) {
+            return;
+        }
+        sendMessage("beforeTaskStartedEvent", event);
+
+    }
+
+    @Override
+    public void beforeTaskStoppedEvent(TaskEvent event) {
+        if (consumers.isEmpty()) {
+            return;
+        }
+        sendMessage("beforeTaskStoppedEvent", event);
+
+    }
+
+    @Override
+    public void beforeTaskCompletedEvent(TaskEvent event) {
+        if (consumers.isEmpty()) {
+            return;
+        }
+        sendMessage("beforeTaskCompletedEvent", event);
+
+    }
+
+    @Override
+    public void beforeTaskFailedEvent(TaskEvent event) {
+        if (consumers.isEmpty()) {
+            return;
+        }
+        sendMessage("beforeTaskFailedEvent", event);
+
+    }
+
+    @Override
+    public void beforeTaskAddedEvent(TaskEvent event) {
+        if (consumers.isEmpty()) {
+            return;
+        }
+        sendMessage("beforeTaskAddedEvent", event);
+
+    }
+
+    @Override
+    public void beforeTaskExitedEvent(TaskEvent event) {
+        if (consumers.isEmpty()) {
+            return;
+        }
+        sendMessage("beforeTaskExitedEvent", event);
+
+    }
+
+    @Override
+    public void beforeTaskReleasedEvent(TaskEvent event) {
+        if (consumers.isEmpty()) {
+            return;
+        }
+        sendMessage("beforeTaskReleasedEvent", event);
+
+    }
+
+    @Override
+    public void beforeTaskResumedEvent(TaskEvent event) {
+        if (consumers.isEmpty()) {
+            return;
+        }
+        sendMessage("beforeTaskResumedEvent", event);
+
+    }
+
+    @Override
+    public void beforeTaskSuspendedEvent(TaskEvent event) {
+        if (consumers.isEmpty()) {
+            return;
+        }
+        sendMessage("beforeTaskSuspendedEvent", event);
+
+    }
+
+    @Override
+    public void beforeTaskForwardedEvent(TaskEvent event) {
+        if (consumers.isEmpty()) {
+            return;
+        }
+        sendMessage("beforeTaskForwardedEvent", event);
+
+    }
+
+    @Override
+    public void beforeTaskDelegatedEvent(TaskEvent event) {
+        if (consumers.isEmpty()) {
+            return;
+        }
+        sendMessage("beforeTaskDelegatedEvent", event);
+
+    }
+
+    @Override
+    public void beforeTaskNominatedEvent(TaskEvent event) {
+        if (consumers.isEmpty()) {
+            return;
+        }
+        sendMessage("beforeTaskNominatedEvent", event);
+
+    }
+
+    @Override
+    public void afterTaskActivatedEvent(TaskEvent event) {
+        if (consumers.isEmpty()) {
+            return;
+        }
+        sendMessage("afterTaskActivatedEvent", event);
+
+    }
+
+    @Override
+    public void afterTaskClaimedEvent(TaskEvent event) {
+        if (consumers.isEmpty()) {
+            return;
+        }
+        sendMessage("afterTaskClaimedEvent", event);
+
+    }
+
+    @Override
+    public void afterTaskSkippedEvent(TaskEvent event) {
+        if (consumers.isEmpty()) {
+            return;
+        }
+        sendMessage("afterTaskSkippedEvent", event);
+
+    }
+
+    @Override
+    public void afterTaskStartedEvent(TaskEvent event) {
+        if (consumers.isEmpty()) {
+            return;
+        }
+        sendMessage("afterTaskStartedEvent", event);
+
+    }
+
+    @Override
+    public void afterTaskStoppedEvent(TaskEvent event) {
+        if (consumers.isEmpty()) {
+            return;
+        }
+        sendMessage("afterTaskStoppedEvent", event);
+
+    }
+
+    @Override
+    public void afterTaskCompletedEvent(TaskEvent event) {
+        if (consumers.isEmpty()) {
+            return;
+        }
+        sendMessage("afterTaskCompletedEvent", event);
+
+    }
+
+    @Override
+    public void afterTaskFailedEvent(TaskEvent event) {
+        if (consumers.isEmpty()) {
+            return;
+        }
+        sendMessage("afterTaskFailedEvent", event);
+
+    }
+
+    @Override
+    public void afterTaskAddedEvent(TaskEvent event) {
+        if (consumers.isEmpty()) {
+            return;
+        }
+        sendMessage("afterTaskAddedEvent", event);
+
+    }
+
+    @Override
+    public void afterTaskExitedEvent(TaskEvent event) {
+        if (consumers.isEmpty()) {
+            return;
+        }
+        sendMessage("afterTaskExitedEvent", event);
+
+    }
+
+    @Override
+    public void afterTaskReleasedEvent(TaskEvent event) {
+        if (consumers.isEmpty()) {
+            return;
+        }
+        sendMessage("afterTaskReleasedEvent", event);
+
+    }
+
+    @Override
+    public void afterTaskResumedEvent(TaskEvent event) {
+        if (consumers.isEmpty()) {
+            return;
+        }
+        sendMessage("afterTaskResumedEvent", event);
+
+    }
+
+    @Override
+    public void afterTaskSuspendedEvent(TaskEvent event) {
+        if (consumers.isEmpty()) {
+            return;
+        }
+        sendMessage("afterTaskSuspendedEvent", event);
+
+    }
+
+    @Override
+    public void afterTaskForwardedEvent(TaskEvent event) {
+        if (consumers.isEmpty()) {
+            return;
+        }
+        sendMessage("afterTaskForwardedEvent", event);
+
+    }
+
+    @Override
+    public void afterTaskDelegatedEvent(TaskEvent event) {
+        if (consumers.isEmpty()) {
+            return;
+        }
+        sendMessage("afterTaskDelegatedEvent", event);
+
+    }
+
+    @Override
+    public void afterTaskNominatedEvent(TaskEvent event) {
+        if (consumers.isEmpty()) {
+            return;
+        }
+        sendMessage("afterTaskNominatedEvent", event);
+
+    }
+
+    @Override
+    public void close() {        
+
+    }
+
+    @Override
+    public void addConsumer(JBPMConsumer consumer) {
+        this.consumers.add(consumer);        
+    }
+
+    @Override
+    public void removeConsumer(JBPMConsumer consumer) {
+        this.consumers.remove(consumer);
+    }
+    
+    protected void sendMessage(String eventType, Object event) {
+        this.consumers.stream().filter(c -> c.getStatus().isStarted()).forEach(c -> c.sendMessage(eventType, event));
+    }
+
+
+}
diff --git a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/server/CamelKieServerExtension.java b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/server/CamelKieServerExtension.java
new file mode 100644
index 0000000000000..3a8a0ea9bb0d6
--- /dev/null
+++ b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/server/CamelKieServerExtension.java
@@ -0,0 +1,225 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.camel.component.jbpm.server;
+
+import java.io.InputStream;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.camel.impl.DefaultCamelContext;
+import org.apache.camel.model.FromDefinition;
+import org.apache.camel.model.RouteDefinition;
+import org.apache.camel.model.RoutesDefinition;
+import org.jbpm.services.api.service.ServiceRegistry;
+import org.kie.server.services.api.KieContainerInstance;
+import org.kie.server.services.api.KieServerExtension;
+import org.kie.server.services.api.KieServerRegistry;
+import org.kie.server.services.api.SupportedTransports;
+import org.kie.server.services.impl.KieServerImpl;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+public class CamelKieServerExtension implements KieServerExtension {
+    public static final String EXTENSION_NAME = "Camel";
+
+    private static final Logger logger = LoggerFactory.getLogger(CamelKieServerExtension.class);
+
+    private static final Boolean disabled = Boolean.parseBoolean(System.getProperty("org.camel.server.ext.disabled", "false"));
+
+    protected DefaultCamelContext camel;
+    
+    protected boolean managedCamel;
+
+    protected Map<String, DefaultCamelContext> camelContexts = new HashMap<>();
+    
+    public CamelKieServerExtension() {
+        this.managedCamel = true;
+    }
+    
+    public CamelKieServerExtension(DefaultCamelContext camel) {
+        this.camel = camel;
+        this.managedCamel = false;
+    }
+    
+    @Override
+    public boolean isInitialized() {
+        return camel != null;
+    }
+
+    @Override
+    public boolean isActive() {
+        return disabled == false;
+    }
+
+    @Override
+    public void init(KieServerImpl kieServer, KieServerRegistry registry) {
+        if (this.managedCamel && this.camel == null) {
+            this.camel = new DefaultCamelContext();
+            this.camel.setName("KIE Server Camel context");
+            
+            try (InputStream is = this.getClass().getResourceAsStream("/global-camel-routes.xml")) {
+                if (is != null) {
+                                        
+                    RoutesDefinition routes = camel.loadRoutesDefinition(is);                                  
+                    camel.addRouteDefinitions(routes.getRoutes());            
+                }
+            } catch (Exception e) {
+                logger.error("Error while adding Camel context for KIE Server", e);
+            }
+        }
+        
+        ServiceRegistry.get().register("GlobalCamelService", this.camel);
+    }
+
+    @Override
+    public void destroy(KieServerImpl kieServer, KieServerRegistry registry) {
+        ServiceRegistry.get().remove("GlobalCamelService");
+        
+        if (this.managedCamel && this.camel != null) {
+            try {
+                this.camel.stop();
+            } catch (Exception e) {
+                logger.error("Failed at stopping KIE Server extension {}", EXTENSION_NAME);
+            }
+        }
+    }
+
+    @Override
+    public void createContainer(String id, KieContainerInstance kieContainerInstance, Map<String, Object> parameters) {
+        
+        ClassLoader classloader = kieContainerInstance.getKieContainer().getClassLoader();
+        try (InputStream is = classloader.getResourceAsStream("camel-routes.xml")) {
+            if (is != null) {
+                
+                DefaultCamelContext context = new DefaultCamelContext();
+                context.setName("KIE Server Camel context for container " + kieContainerInstance.getContainerId());                            
+                
+                RoutesDefinition routes = context.loadRoutesDefinition(is);              
+                annotateKJarRoutes(routes, id);
+                context.addRouteDefinitions(routes.getRoutes());
+                context.start();
+                camelContexts.put(id, context);
+                
+                ServiceRegistry.get().register(id + "_CamelService", this.camel);
+               
+            }
+        } catch (Exception e) {
+            logger.error("Error while adding Camel context for {}", kieContainerInstance.getContainerId(), e);
+        }
+    }
+
+    @Override
+    public void updateContainer(String id, KieContainerInstance kieContainerInstance, Map<String, Object> parameters) {
+        disposeContainer(id, kieContainerInstance, parameters);
+        createContainer(id, kieContainerInstance, parameters);
+    }
+
+    @Override
+    public boolean isUpdateContainerAllowed(String id, KieContainerInstance kieContainerInstance, Map<String, Object> parameters) {
+        return true;
+    }
+
+    @Override
+    public void disposeContainer(String id, KieContainerInstance kieContainerInstance, Map<String, Object> parameters) {
+        DefaultCamelContext context = camelContexts.get(id);
+        
+        if (context != null) {
+            
+            ServiceRegistry.get().remove(id + "_CamelService");
+            try {
+                context.stop();
+            } catch (Exception e) {
+                logger.error("Error while removing Camel context for container {}", id, e);
+            }
+        }
+    }
+
+    @Override
+    public List<Object> getAppComponents(SupportedTransports type) {
+        return Collections.emptyList();
+    }
+
+    @Override
+    public <T> T getAppComponents(Class<T> serviceType) {
+        return null;
+    }
+
+    @Override
+    public String getImplementedCapability() {
+        return "Integration";
+    }
+
+    @Override
+    public List<Object> getServices() {
+        return Collections.emptyList();
+    }
+
+    @Override
+    public String getExtensionName() {
+        return EXTENSION_NAME;
+    }
+
+    @Override
+    public Integer getStartOrder() {
+        return 50;
+    }
+    
+    @Override
+    public void serverStarted() {
+        if (this.managedCamel && this.camel != null && !this.camel.isStarted()) {
+            try {
+                this.camel.start();
+            } catch (Exception e) {
+                logger.error("Failed at start Camel context", e);
+            }
+        }
+    }
+    
+    @Override
+    public String toString() {
+        return EXTENSION_NAME + " KIE Server extension";
+    }
+
+    protected void annotateKJarRoutes(RoutesDefinition routes, String deploymentId) {
+        for (RouteDefinition route : routes.getRoutes()) {
+            
+            for (FromDefinition from : route.getInputs()) {
+                
+                if (from.getUri().startsWith("jbpm:events") && !from.getUri().contains("deploymentId")) {
+                    StringBuilder uri = new StringBuilder(from.getUri());
+                    
+                    String[] split = from.getUri().split("\\?");
+                    if (split.length == 1) {
+                        // no query given
+                        uri.append("?");
+                    } else {
+                        // already query params exist
+                        uri.append("&");
+                    }
+                    uri.append("deploymentId=").append(deploymentId);
+                    from.setUri(uri.toString());
+                }
+                
+                System.out.println(from.getUri());
+            }
+        }
+    }
+}
diff --git a/components/camel-jbpm/src/main/resources/META-INF/services/org.kie.server.services.api.KieServerExtension b/components/camel-jbpm/src/main/resources/META-INF/services/org.kie.server.services.api.KieServerExtension
new file mode 100644
index 0000000000000..a3aed9f0f76d2
--- /dev/null
+++ b/components/camel-jbpm/src/main/resources/META-INF/services/org.kie.server.services.api.KieServerExtension
@@ -0,0 +1 @@
+org.apache.camel.component.jbpm.server.CamelKieServerExtension
\ No newline at end of file
diff --git a/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/JBPMComponentIntegrationTest.java b/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/JBPMComponentIntegrationTest.java
index 987b0a6b91206..18e1055a94d13 100644
--- a/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/JBPMComponentIntegrationTest.java
+++ b/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/JBPMComponentIntegrationTest.java
@@ -17,21 +17,74 @@
 
 package org.apache.camel.component.jbpm;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.jbpm.JBPMProducer.Operation;
 import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.Ignore;
 import org.junit.Test;
+import org.kie.server.api.model.instance.TaskSummary;
 
-@Ignore("This is an integration test that needs BPMS running on the local machine")
+/**
+ * To run this example you need jBPM to run locally, easiest is to use single zip 
+ * distribution - download from jbpm.org
+ * 
+ * Next, start it and import Evaluation sample project, build and deploy.
+ * Once done this test can be ran out of the box.
+ */
+@Ignore("This is an integration test that needs jBPM running on the local machine")
 public class JBPMComponentIntegrationTest extends CamelTestSupport {
 
+    @SuppressWarnings("unchecked")
     @Test
     public void interactsOverRest() throws Exception {
         getMockEndpoint("mock:result").expectedMessageCount(1);
-        template.sendBodyAndHeader("direct:start", null, JBPMConstants.PROCESS_ID, "project1.integration-test");
+        
+        // let's start process instance for evaluation process
+        Map<String, Object> params = new HashMap<>();
+        params.put("employee", "wbadmin");
+        params.put("reason", "Camel asks for it");
+        
+        Map<String, Object> headers = new HashMap<>();
+        headers.put(JBPMConstants.PROCESS_ID, "evaluation");
+        headers.put(JBPMConstants.PARAMETERS, params);
+        
+        template.sendBodyAndHeaders("direct:start", null, headers);
+        assertMockEndpointsSatisfied();
+        Long processInstanceId = (Long) getMockEndpoint("mock:result").getExchanges().get(0).getIn().getBody();
+        assertNotNull(processInstanceId);
+        
+        // now let's collect user tasks
+        headers = new HashMap<>();        
+        headers.put(JBPMConstants.OPERATION, JBPMConstants.OPERATION + Operation.getTasksOwned);
+        
+        template.sendBodyAndHeaders("direct:start", null, headers);
+        getMockEndpoint("mock:result").expectedMessageCount(2);
+        assertMockEndpointsSatisfied();
+        
+        List<TaskSummary> tasks = (List<TaskSummary>) getMockEndpoint("mock:result").getExchanges().get(1).getIn().getBody();
+        assertEquals(1, tasks.size());
+        
+        // let's complete first user task
+        headers = new HashMap<>();
+        headers.put(JBPMConstants.TASK_ID, tasks.get(0).getId());
+        headers.put(JBPMConstants.OPERATION, JBPMConstants.OPERATION + Operation.completeTask);
+        
+        template.sendBodyAndHeaders("direct:start", null, headers);
+        getMockEndpoint("mock:result").expectedMessageCount(3);
+        assertMockEndpointsSatisfied();
+        
+        // lastly let's abort process instance we just created
+        headers = new HashMap<>();
+        headers.put(JBPMConstants.PROCESS_INSTANCE_ID, processInstanceId);
+        headers.put(JBPMConstants.OPERATION, JBPMConstants.OPERATION + Operation.abortProcessInstance);
+        
+        template.sendBodyAndHeaders("direct:start", null, headers);
+        getMockEndpoint("mock:result").expectedMessageCount(4);
         assertMockEndpointsSatisfied();
-
-        assertNotNull(getMockEndpoint("mock:result").getExchanges().get(0).getIn().getBody());
     }
 
     @Override
@@ -40,8 +93,8 @@ protected RouteBuilder createRouteBuilder() throws Exception {
             @Override
             public void configure() {
                 from("direct:start")
-                        .to("jbpm:http://localhost:8080/business-central?userName=bpmsAdmin&password=pa$word1"
-                            + "&deploymentId=org.kie.example:project1:1.0.0-SNAPSHOT")
+                        .to("jbpm:http://localhost:8080/kie-server/services/rest/server?userName=wbadmin&password=wbadmin"
+                            + "&deploymentId=evaluation")
                         .to("mock:result");
             }
         };
diff --git a/parent/pom.xml b/parent/pom.xml
index 6d7a82bfe884b..69253d4b1f660 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -360,7 +360,7 @@
     <javax.ws.rs-api-version>2.0.1</javax.ws.rs-api-version>
     <jaxb-bundle-version>2.2.11_1</jaxb-bundle-version>
     <jaxen-version>1.1.6</jaxen-version>
-    <jbpm-version>6.5.0.Final</jbpm-version>
+    <jbpm-version>7.14.0.Final</jbpm-version>
     <jboss-javaee-6-version>1.0.0.Final</jboss-javaee-6-version>
     <jboss-logging-version>3.3.2.Final</jboss-logging-version>
     <jboss-marshalling-version>1.4.10.Final</jboss-marshalling-version>
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index 51a998811d1c6..0b6cb7d746a42 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1149,27 +1149,41 @@
     <details>The camel-jbpm feature can only run on a SUN JVM. You need to add the package com.sun.tools.xjc to the java platform packages in the etc/jre.properties file.</details>
     <feature version='${project.version}'>camel-core</feature>
     <feature>transaction</feature>
-    <bundle dependency='true'>mvn:org.openengsb.wrapped/com.google.protobuf/2.4.1.w1</bundle>
-    <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.javax-inject/${javax-inject-bundle-version}</bundle>
-    <bundle dependency='true'>mvn:org.codehaus.jackson/jackson-jaxrs/${jackson-version}</bundle>
-    <bundle dependency='true'>mvn:org.codehaus.jackson/jackson-core-asl/${jackson-version}</bundle>
-    <bundle dependency='true'>mvn:org.codehaus.jackson/jackson-mapper-asl/${jackson-version}</bundle>
-    <bundle dependency='true'>mvn:org.codehaus.jackson/jackson-xc/${jackson-version}</bundle>
-    <bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-jms_1.1_spec/${geronimo-jms-spec-version}</bundle>
-    <bundle dependency='true'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-2.2/${servicemix-specs-version}</bundle>
+    <feature version='${cxf-version-range}'>cxf-jaxrs</feature>
+    <bundle dependency='true'>mvn:org.kie.server/kie-server-api/${jbpm-version}</bundle>
+    <bundle dependency='true'>mvn:org.kie.server/kie-server-common/${jbpm-version}</bundle>
+    <bundle dependency='true'>mvn:org.kie.server/kie-server-client/${jbpm-version}</bundle>
+    <bundle dependency='true'>mvn:org.kie.soup/kie-soup-maven-support/${jbpm-version}</bundle>
+    <bundle dependency='true'>mvn:org.kie.soup/kie-soup-project-datamodel-api/${jbpm-version}</bundle>
+    <bundle dependency='true'>mvn:org.kie.soup/kie-soup-project-datamodel-commons/${jbpm-version}</bundle>
+    <bundle dependency='true'>mvn:org.kie.soup/kie-soup-commons/${jbpm-version}</bundle>
+    <bundle dependency='true'>mvn:org.kie/kie-api/${jbpm-version}</bundle>
+    <bundle dependency='true'>mvn:org.kie/kie-internal/${jbpm-version}</bundle>    
     <bundle dependency='true'>mvn:org.drools/drools-core/${jbpm-version}</bundle>
     <bundle dependency='true'>mvn:org.drools/drools-compiler/${jbpm-version}</bundle>
-    <bundle dependency='true'>wrap:mvn:org.kie/kie-internal/${jbpm-version}</bundle>
-    <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xstream-java8/${xstream-bundle-version}</bundle>
+    <bundle dependency='true'>mvn:org.mvel/mvel2/${mvel-version}</bundle>    
+    <bundle dependency='true'>mvn:org.kie/kie-dmn-model/${jbpm-version}</bundle>
+    <bundle dependency='true'>mvn:org.kie/kie-dmn-api/${jbpm-version}</bundle>   
+    <bundle dependency='true'>mvn:org.optaplanner/optaplanner-core/${jbpm-version}</bundle>
+    <bundle dependency='true'>mvn:org.optaplanner/optaplanner-persistence-common/${jbpm-version}</bundle>  
+    <bundle dependency='true'>mvn:org.optaplanner/optaplanner-persistence-jaxb/${jbpm-version}</bundle>
+    <bundle dependency='true'>mvn:org.optaplanner/optaplanner-persistence-jackson/${jbpm-version}</bundle>
+    <bundle dependency='true'>mvn:org.optaplanner/optaplanner-persistence-xstream/${jbpm-version}</bundle>  
+    <bundle dependency='true'>mvn:com.google.protobuf/protobuf-java/${protobuf-version}</bundle>
+    <bundle dependency='true'>mvn:com.google.guava/guava/${google-guava-version}</bundle>
+    <bundle dependency='true'>mvn:org.apache.commons/commons-math3/${commons-math3-version}</bundle>
+    <bundle dependency='true'>mvn:org.apache.commons/commons-lang3/${commons-lang3-version}</bundle>
     <bundle dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle>
-    <bundle dependency='true'>mvn:org.mvel/mvel2/${mvel-version}</bundle>
-    <bundle dependency='true'>wrap:mvn:org.kie/kie-api/${jbpm-version}</bundle>
-    <bundle dependency='true'>wrap:mvn:org.kie.remote/kie-remote-common/${jbpm-version}</bundle>
-    <bundle dependency='true'>wrap:mvn:org.kie.remote.ws/kie-remote-ws-common/${jbpm-version}</bundle>
-    <bundle dependency='true'>wrap:mvn:org.kie.remote/kie-remote-jaxb/${jbpm-version}</bundle>
-    <bundle dependency='true'>wrap:mvn:org.kie.remote/kie-services-client/6.1.0.Final</bundle>
-    <bundle dependency='true'>wrap:mvn:org.kie.remote/kie-remote-client/${jbpm-version}</bundle>
-    <bundle>mvn:org.apache.camel/camel-jbpm/${project.version}</bundle>
+    <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson2-version}</bundle>
+    <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle>
+    <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-version}</bundle>
+    <bundle dependency='true'>mvn:com.fasterxml.jackson.module/jackson-module-jaxb-annotations/${jackson2-version}</bundle>    
+    <bundle dependency='true'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-2.2/${servicemix-specs-version}</bundle>
+    <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xstream-java8/${xstream-bundle-version}</bundle>
+    <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xpp3/${xpp3-bundle-version}</bundle>    
+    <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.reflections/${reflections-bundle-version}</bundle>
+    <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-xjc/${jaxb-bundle-version}</bundle>    
+    <bundle>mvn:org.apache.camel/camel-jbpm/${project.version}</bundle> 
   </feature>
   <feature name='camel-jcache' version='${project.version}' resolver='(obr)' start-level='50'>
     <feature version='${project.version}'>camel-core</feature>

From 85954bfb0ec7e2c26f5cc467d9b7c60195e8f4c6 Mon Sep 17 00:00:00 2001
From: Andrea Cosentino <ancosen@gmail.com>
Date: Tue, 13 Nov 2018 08:30:52 +0100
Subject: [PATCH 010/125] Upgrade Atmosphere Websocket to version 2.5.2

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

diff --git a/parent/pom.xml b/parent/pom.xml
index 69253d4b1f660..57088ff60699f 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -69,7 +69,7 @@
     <asterisk-java-version>1.0.0-final</asterisk-java-version>
     <asterisk-java-bundle-version>1.0.0-final_1</asterisk-java-bundle-version>
     <atmos-client-version>2.2.2</atmos-client-version>
-    <atmosphere-version>2.5.1</atmosphere-version>
+    <atmosphere-version>2.5.2</atmosphere-version>
     <atmosphere-version-range>[2.5,3.0)</atmosphere-version-range>
     <atomix-version>1.0.8</atomix-version>
     <atomix-catalyst-version>1.2.1</atomix-catalyst-version>

From 3fc0486ba9b4b9000434c9b73ed29a8728b3b7b5 Mon Sep 17 00:00:00 2001
From: Andrea Cosentino <ancosen@gmail.com>
Date: Tue, 13 Nov 2018 12:22:26 +0100
Subject: [PATCH 011/125] Upgrade Joda Time to version 2.10.1

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

diff --git a/parent/pom.xml b/parent/pom.xml
index 57088ff60699f..4ac47da29e262 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -396,7 +396,7 @@
     <jira-rest-client-api-version>2.0.0-m30</jira-rest-client-api-version>
     <jmh-version>1.21</jmh-version>
     <jodatime-bundle-version>1.6.2</jodatime-bundle-version>
-    <jodatime2-bundle-version>2.10</jodatime2-bundle-version>
+    <jodatime2-bundle-version>2.10.1</jodatime2-bundle-version>
     <jolokia-version>1.6.0</jolokia-version>
     <jolt-version>0.1.1</jolt-version>
     <jolt-bundle-version>0.1.1_1</jolt-bundle-version>

From ef48e4b46950249e760d7f139a7b6b4d0b141bcc Mon Sep 17 00:00:00 2001
From: Maciej Swiderski <swiderski.maciej@gmail.com>
Date: Tue, 13 Nov 2018 10:28:34 +0100
Subject: [PATCH 012/125] upgrade versions of optaplanner and kie as they are
 from same release cycle

---
 parent/pom.xml                                        |  6 +++---
 .../karaf/features/src/main/resources/features.xml    | 11 +++++++++--
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index 4ac47da29e262..983ecc6d2ec13 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -184,7 +184,7 @@
     <docker-java-bundle-version>3.0.14_1</docker-java-bundle-version>
     <dom4j-bundle-version>1.6.1_5</dom4j-bundle-version>
     <dozer-version>6.4.1</dozer-version>
-    <drools-version>7.3.0.Final</drools-version>
+    <drools-version>7.14.0.Final</drools-version>
     <dropbox-version>3.0.10</dropbox-version>
     <eclipse-equinox-common-version>3.3.0-v20070426</eclipse-equinox-common-version>
     <egit-github-core-version>2.1.5</egit-github-core-version>
@@ -441,7 +441,7 @@
     <kafka-bundle-version>2.0.0_1</kafka-bundle-version>
     <karaf2-version>2.4.4</karaf2-version>
     <karaf4-version>4.2.1</karaf4-version>
-    <kie-version>7.3.0.Final</kie-version>
+    <kie-version>7.14.0.Final</kie-version>
     <krati-version>0.4.9</krati-version>
     <kubernetes-client-version>4.1.0</kubernetes-client-version>
     <kubernetes-model-version>4.1.0</kubernetes-model-version>
@@ -549,7 +549,7 @@
     <opentracing-version>0.31.0</opentracing-version>
     <opentracing-tracerresolver-version>0.1.4</opentracing-tracerresolver-version>
     <ops4j-base-version>1.5.0</ops4j-base-version>
-    <optaplanner-version>7.3.0.Final</optaplanner-version>
+    <optaplanner-version>7.14.0.Final</optaplanner-version>
     <oro-bundle-version>2.0.8_6</oro-bundle-version>
     <os-maven-plugin-version>1.6.0</os-maven-plugin-version>
     <oscache-bundle-version>2.4_5</oscache-bundle-version>
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index 0b6cb7d746a42..2e07d63199fc8 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1731,7 +1731,14 @@
     <bundle dependency='true'>mvn:commons-io/commons-io/${commons-io-version}</bundle>
     <bundle dependency='true'>mvn:commons-collections/commons-collections/${commons-collections-version}</bundle>
     <bundle dependency='true'>mvn:org.optaplanner/optaplanner-core/${optaplanner-version}</bundle>
-    <bundle dependency='true'>mvn:org.uberfire/uberfire-maven-support/${uberfire-maven-support-version}</bundle>
+    <bundle dependency='true'>mvn:org.optaplanner/optaplanner-persistence-common/${optaplanner-version}</bundle>  
+    <bundle dependency='true'>mvn:org.optaplanner/optaplanner-persistence-jaxb/${optaplanner-version}</bundle>
+    <bundle dependency='true'>mvn:org.optaplanner/optaplanner-persistence-jackson/${optaplanner-version}</bundle>
+    <bundle dependency='true'>mvn:org.optaplanner/optaplanner-persistence-xstream/${optaplanner-version}</bundle> 
+    <bundle dependency='true'>mvn:org.kie.soup/kie-soup-maven-support/${kie-version}</bundle>
+    <bundle dependency='true'>mvn:org.kie.soup/kie-soup-project-datamodel-api/${kie-version}</bundle>
+    <bundle dependency='true'>mvn:org.kie.soup/kie-soup-project-datamodel-commons/${kie-version}</bundle>
+    <bundle dependency='true'>mvn:org.kie.soup/kie-soup-commons/${kie-version}</bundle>
     <bundle dependency='true'>mvn:org.kie/kie-api/${kie-version}</bundle>
     <bundle dependency='true'>mvn:org.kie/kie-internal/${kie-version}</bundle>
     <bundle dependency='true'>mvn:org.drools/drools-core/${drools-version}</bundle>
@@ -1743,7 +1750,7 @@
     <bundle dependency='true'>mvn:com.google.protobuf/protobuf-java/${protobuf-version}</bundle>
     <bundle dependency='true'>mvn:com.google.guava/guava/${google-guava-version}</bundle>
     <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.javax-inject/${javax-inject-bundle-version}</bundle>
-    <bundle>mvn:org.apache.camel/camel-optaplanner/${project.version}</bundle>
+    <bundle>mvn:org.apache.camel/camel-optaplanner/${project.version}</bundle>    
   </feature>
   <feature name='camel-openstack' version='${project.version}' resolver='(obr)' start-level='50'>
     <feature version='${project.version}'>camel-core</feature>

From c9923bc5f1719164f75de51103ad3352c5cfd250 Mon Sep 17 00:00:00 2001
From: Andrea Cosentino <ancosen@gmail.com>
Date: Tue, 13 Nov 2018 15:00:45 +0100
Subject: [PATCH 013/125] Added link in Summary about REST DSL

---
 docs/user-manual/en/SUMMARY.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/user-manual/en/SUMMARY.md b/docs/user-manual/en/SUMMARY.md
index 9abdaca7dca51..bb7c40748a3a0 100644
--- a/docs/user-manual/en/SUMMARY.md
+++ b/docs/user-manual/en/SUMMARY.md
@@ -128,7 +128,7 @@
 * [Java DSL](java-dsl.adoc)
 * [Spring DSL](spring.adoc)
 * [Blueprint DSL](using-osgi-blueprint-with-camel.adoc)
-* Rest DSL
+* [Rest DSL](../../../camel-core/src/main/docs/rest-dsl.adoc)
 * [Groovy DSL](groovy-dsl.adoc)
 * [Scala DSL](scala-dsl.adoc)
 * [Annotation DSL](bean-integration.adoc)

From 355e6553896c9cdf3d67102aabe4cae121297a50 Mon Sep 17 00:00:00 2001
From: Andrea Cosentino <ancosen@gmail.com>
Date: Tue, 13 Nov 2018 15:27:45 +0100
Subject: [PATCH 014/125] Added languages.adoc to Summary

---
 docs/user-manual/en/SUMMARY.md     | 2 +-
 docs/user-manual/en/languages.adoc | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/docs/user-manual/en/SUMMARY.md b/docs/user-manual/en/SUMMARY.md
index bb7c40748a3a0..628f5592b5da8 100644
--- a/docs/user-manual/en/SUMMARY.md
+++ b/docs/user-manual/en/SUMMARY.md
@@ -102,7 +102,7 @@
 * [Injector](injector.adoc)
 * [Intercept](intercept.adoc)
 * [Inversion of Control with Smart Defaults](inversion-of-control-with-smart-defaults.adoc)
-* Languages
+* [Languages](languages.adoc)
 * [Lifecycle](lifecycle.adoc)
 * [OnCompletion](oncompletion.adoc)
 * Pluggable Class Resolvers
diff --git a/docs/user-manual/en/languages.adoc b/docs/user-manual/en/languages.adoc
index 453e4aedfa959..34a718844a5ac 100644
--- a/docs/user-manual/en/languages.adoc
+++ b/docs/user-manual/en/languages.adoc
@@ -8,9 +8,8 @@ link:expression.adoc[Expression] or link:predicate.adoc[Predicate]
 within either the link:dsl.adoc[Routing Domain Specific Language] or the
 link:xml-configuration.adoc[XML Configuration].
 
-[NOTE]
-====
-**Combining Predicates**
+==== Note
+*Combining Predicates**
 
 When creating predicates (expressions that evaluate to `true` or
 `false`), you can combine several predicates -- regardless of the

From 9da8cbb6eaac01c505653b48a2b1c914b7066230 Mon Sep 17 00:00:00 2001
From: aldettinger <aldettinger@gmail.com>
Date: Tue, 13 Nov 2018 22:19:42 +0100
Subject: [PATCH 015/125] Fixed typos

---
 .../component/file/GenericFileOperations.java      |  2 +-
 .../src/main/java/org/apache/camel/spi/Policy.java |  2 +-
 .../camel/impl/ComponentConfigurationTest.java     |  2 +-
 .../camel-cxf/src/main/docs/cxf-component.adoc     |  4 ++--
 .../camel/component/cxf/CxfProducerTest.java       |  2 +-
 .../src/test/resources/hdfs-default.xml            |  4 ++--
 .../camel-hdfs2/src/test/resources/hdfs-test.xml   |  4 ++--
 .../internal/client/DefaultCompositeApiClient.java |  4 ++--
 .../component/salesforce/LoginConfigHelper.java    |  2 +-
 .../api/dto/approval/ApprovalRequestTest.java      |  6 +++---
 .../camel-scala/src/main/docs/scala-eip.adoc       |  2 +-
 .../iso_schematron_skeleton_for_saxon.xsl          |  2 +-
 .../apache/camel/component/smpp/SmppSplitter.java  |  8 ++++----
 ...upervisingRouteControllerAutoConfiguration.java |  2 +-
 .../addressing/ProducerParamsPrecedenceTest.java   |  2 +-
 .../src/test/resources/urlrewrite.xml              |  2 +-
 .../xmlsecurity/api/XAdESSignatureProperties.java  | 14 +++++++-------
 .../xmlsecurity/XAdESSignaturePropertiesTest.java  | 14 +++++++-------
 docs/user-manual/en/scala-dsl-eip.adoc             |  2 +-
 docs/user-manual/en/servicepool.adoc               |  2 +-
 .../example/micrometer/ScrapeRouteBuilder.java     |  2 +-
 .../camel/itest/greeter/JmsToCxfInOutTest.java     |  2 +-
 22 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/camel-core/src/main/java/org/apache/camel/component/file/GenericFileOperations.java b/camel-core/src/main/java/org/apache/camel/component/file/GenericFileOperations.java
index 9d1b3c8c8511b..aaeb3df1ab922 100644
--- a/camel-core/src/main/java/org/apache/camel/component/file/GenericFileOperations.java
+++ b/camel-core/src/main/java/org/apache/camel/component/file/GenericFileOperations.java
@@ -62,7 +62,7 @@ public interface GenericFileOperations<T> {
      * folder already exists.
      *
      * @param directory the directory path to build as a relative string name
-     * @param absolute wether the directory is an absolute or relative path
+     * @param absolute whether the directory is an absolute or relative path
      * @return true if build or already exists, false if not possible (could be lack of permissions)
      * @throws GenericFileOperationFailedException can be thrown
      */
diff --git a/camel-core/src/main/java/org/apache/camel/spi/Policy.java b/camel-core/src/main/java/org/apache/camel/spi/Policy.java
index aa806f6aaa69a..b5f91d94cc95d 100644
--- a/camel-core/src/main/java/org/apache/camel/spi/Policy.java
+++ b/camel-core/src/main/java/org/apache/camel/spi/Policy.java
@@ -41,7 +41,7 @@ public interface Policy {
      * Hook invoked before the wrap.
      * <p/>
      * This allows you to do any custom logic before the processor is wrapped. For example to
-     * manipulate the {@link org.apache.camel.model.ProcessorDefinition definiton}
+     * manipulate the {@link org.apache.camel.model.ProcessorDefinition definition}
      *
      * @param routeContext   the route context
      * @param definition     the processor definition
diff --git a/camel-core/src/test/java/org/apache/camel/impl/ComponentConfigurationTest.java b/camel-core/src/test/java/org/apache/camel/impl/ComponentConfigurationTest.java
index 4d1a80b314784..b3da6da26ee8b 100644
--- a/camel-core/src/test/java/org/apache/camel/impl/ComponentConfigurationTest.java
+++ b/camel-core/src/test/java/org/apache/camel/impl/ComponentConfigurationTest.java
@@ -278,7 +278,7 @@ public void testIntrospectSedaEndpointParameters() throws Exception {
 
     /**
      * Shows we can introspect the parameters of a DefaultComponent (i.e. a non {@link UriEndpointComponent})
-     * though we only get to introspect the parameter values from teh current configuration
+     * though we only get to introspect the parameter values from the current configuration
      */
     @Test
     public void testIntrospectDefaultComponentParameters() throws Exception {
diff --git a/components/camel-cxf/src/main/docs/cxf-component.adoc b/components/camel-cxf/src/main/docs/cxf-component.adoc
index df9ea783f9506..bb006a5ef622f 100644
--- a/components/camel-cxf/src/main/docs/cxf-component.adoc
+++ b/components/camel-cxf/src/main/docs/cxf-component.adoc
@@ -812,7 +812,7 @@ response context with the following code:
          // Get the response context form outMessage
          Map<String, Object> responseContext = CastUtils.cast((Map)out.getHeader(Client.RESPONSE_CONTEXT));
          assertNotNull(responseContext);
-         assertEquals("Get the wrong wsdl opertion name", "{http://apache.org/hello_world_soap_http}greetMe",
+         assertEquals("Get the wrong wsdl operation name", "{http://apache.org/hello_world_soap_http}greetMe",
                       responseContext.get("javax.xml.ws.wsdl.operation").toString());
 -------------------------------------------------------------------------------------------------------------
 
@@ -824,7 +824,7 @@ Attachment is not tested.  Since attachments are marshalled and
 unmarshalled into POJOs, users typically do not need to deal with the
 attachment themself.  Attachments are propagated to Camel message's
 attachments if the MTOM is not enabled, since Camel 2.12.3.  So, it is
-possible to retreive attachments by Camel Message API
+possible to retrieve attachments by Camel Message API
 
 [source,java]
 --------------------------------------------
diff --git a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerTest.java b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerTest.java
index 7b0a4f1241a2c..6df44421c9bd4 100644
--- a/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerTest.java
+++ b/components/camel-cxf/src/test/java/org/apache/camel/component/cxf/CxfProducerTest.java
@@ -155,7 +155,7 @@ public void testInvokingJaxWsServerWithParams() throws Exception {
         LOG.info("Received output text: " + result);
         Map<String, Object> responseContext = CastUtils.cast((Map<?, ?>)out.getHeader(Client.RESPONSE_CONTEXT));
         assertNotNull(responseContext);
-        assertEquals("Get the wrong wsdl opertion name", "{http://apache.org/hello_world_soap_http}greetMe", responseContext.get("javax.xml.ws.wsdl.operation").toString());
+        assertEquals("Get the wrong wsdl operation name", "{http://apache.org/hello_world_soap_http}greetMe", responseContext.get("javax.xml.ws.wsdl.operation").toString());
         assertEquals("reply body on Camel", "Hello " + TEST_MESSAGE, result);
         
         // check the other camel header copying
diff --git a/components/camel-hdfs2/src/test/resources/hdfs-default.xml b/components/camel-hdfs2/src/test/resources/hdfs-default.xml
index 4143e0844d950..53af074450d96 100644
--- a/components/camel-hdfs2/src/test/resources/hdfs-default.xml
+++ b/components/camel-hdfs2/src/test/resources/hdfs-default.xml
@@ -690,8 +690,8 @@
   <value>${dfs.namenode.checkpoint.dir}</value>
   <description>Determines where on the local filesystem the DFS secondary
       name node should store the temporary edits to merge.
-      If this is a comma-delimited list of directoires then teh edits is
-      replicated in all of the directoires for redundancy.
+      If this is a comma-delimited list of directories then the edits is
+      replicated in all of the directories for redundancy.
       Default value is same as dfs.namenode.checkpoint.dir
   </description>
 </property>
diff --git a/components/camel-hdfs2/src/test/resources/hdfs-test.xml b/components/camel-hdfs2/src/test/resources/hdfs-test.xml
index 5462dbeaf966c..931556ea8a0bc 100644
--- a/components/camel-hdfs2/src/test/resources/hdfs-test.xml
+++ b/components/camel-hdfs2/src/test/resources/hdfs-test.xml
@@ -690,8 +690,8 @@
   <value>${dfs.namenode.checkpoint.dir}</value>
   <description>Determines where on the local filesystem the DFS secondary
       name node should store the temporary edits to merge.
-      If this is a comma-delimited list of directoires then teh edits is
-      replicated in all of the directoires for redundancy.
+      If this is a comma-delimited list of directories then the edits is
+      replicated in all of the directories for redundancy.
       Default value is same as dfs.namenode.checkpoint.dir
   </description>
 </property>
diff --git a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultCompositeApiClient.java b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultCompositeApiClient.java
index 1777f0ca8c7ae..f95c8e53692e5 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultCompositeApiClient.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/main/java/org/apache/camel/component/salesforce/internal/client/DefaultCompositeApiClient.java
@@ -74,7 +74,7 @@ public class DefaultCompositeApiClient extends AbstractClientBase implements Com
 
     private final Map<Class<?>, ObjectReader> readers = new HashMap<>();
 
-    private final Map<Class<?>, ObjectWriter> writters = new HashMap<>();
+    private final Map<Class<?>, ObjectWriter> writers = new HashMap<>();
 
     private final XStream xStreamCompositeBatch;
 
@@ -183,7 +183,7 @@ ObjectReader jsonReaderFor(final Class<?> type) {
     ObjectWriter jsonWriterFor(final Object obj) {
         final Class<?> type = obj.getClass();
 
-        return Optional.ofNullable(writters.get(type)).orElseGet(() -> mapper.writerFor(type));
+        return Optional.ofNullable(writers.get(type)).orElseGet(() -> mapper.writerFor(type));
     }
 
     ContentProvider serialize(final XStream xstream, final Object body, final Class<?>... additionalTypes)
diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/LoginConfigHelper.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/LoginConfigHelper.java
index fa3be30cc4fa5..f19658d560d0d 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/LoginConfigHelper.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/LoginConfigHelper.java
@@ -112,7 +112,7 @@ void validate(final SalesforceLoginConfig loginConfig) {
             System.out.println("| salesforce.keystore.password | SALESFORCE_KEYSTORE_PASSWORD | JWT    |");
             System.out.println("| salesforce.login.url         | SALESFORCE_LOGIN_URL         | ALL    |");
             System.out.println();
-            System.out.println("* ALL - required allways");
+            System.out.println("* ALL - required always");
             System.out.println("* UP  - when using username and password authentication");
             System.out.println("* RT  - when using refresh token flow");
             System.out.println("* JWT - when using JWT flow");
diff --git a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/api/dto/approval/ApprovalRequestTest.java b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/api/dto/approval/ApprovalRequestTest.java
index ddc7d7bb21e66..b264645287134 100644
--- a/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/api/dto/approval/ApprovalRequestTest.java
+++ b/components/camel-salesforce/camel-salesforce-component/src/test/java/org/apache/camel/component/salesforce/api/dto/approval/ApprovalRequestTest.java
@@ -67,9 +67,9 @@ public void shouldApplyValuesFromTemplate() {
         assertThat("Combined approval request should be a new instance", combined,
             both(not(sameInstance(request))).and(not(sameInstance(template))));
 
-        assertEquals("Action type should not be overwriten", request.getActionType(), combined.getActionType());
-        assertEquals("Comment should not be overwriten", request.getComments(), combined.getComments());
-        assertEquals("Context id should not be overwriten", request.getContextId(), combined.getContextId());
+        assertEquals("Action type should not be overwritten", request.getActionType(), combined.getActionType());
+        assertEquals("Comment should not be overwritten", request.getComments(), combined.getComments());
+        assertEquals("Context id should not be overwritten", request.getContextId(), combined.getContextId());
         assertEquals("Next approver id should be taken from template", template.getNextApproverIds(),
             combined.getNextApproverIds());
     }
diff --git a/components/camel-scala/src/main/docs/scala-eip.adoc b/components/camel-scala/src/main/docs/scala-eip.adoc
index 1922ea527d8d5..ce363b922e43d 100644
--- a/components/camel-scala/src/main/docs/scala-eip.adoc
+++ b/components/camel-scala/src/main/docs/scala-eip.adoc
@@ -118,7 +118,7 @@ Delayer
 +++++++
 
 Unlike a throttler, which only slows down messages if the rate exceeds a
-treshold, a delayer delays every messages with a fixed amount of time.
+threshold, a delayer delays every messages with a fixed amount of time.
 An example: to delay every message going from `seda:a` to `mock:a` with
 1 second, you write...
 
diff --git a/components/camel-schematron/src/main/resources/iso-schematron-xslt2/iso_schematron_skeleton_for_saxon.xsl b/components/camel-schematron/src/main/resources/iso-schematron-xslt2/iso_schematron_skeleton_for_saxon.xsl
index 3142878363977..6dbbe5b042963 100644
--- a/components/camel-schematron/src/main/resources/iso-schematron-xslt2/iso_schematron_skeleton_for_saxon.xsl
+++ b/components/camel-schematron/src/main/resources/iso-schematron-xslt2/iso_schematron_skeleton_for_saxon.xsl
@@ -2207,7 +2207,7 @@ which require a preprocess.
 		message text is taken from the strings below. We use XHTML, to provide
 		the namespace. 
 		
-		If the $langCode is somethign else, then the XSLT engine will try to
+		If the $langCode is something else, then the XSLT engine will try to
 		find a file called  sch-messages-$langCode.xhtml in the same directory
 		as this stylesheet. Expect a fatal error if the file does not exist.
 		
diff --git a/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppSplitter.java b/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppSplitter.java
index 3c79eee4ed50a..89bce93f34793 100644
--- a/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppSplitter.java
+++ b/components/camel-smpp/src/main/java/org/apache/camel/component/smpp/SmppSplitter.java
@@ -49,9 +49,9 @@ public class SmppSplitter {
     /**
      * The value that identifier length of the SAR fragment.
      * <p/>
-     * {@code 0x00} value must be used if the legnth of the reference number is
+     * {@code 0x00} value must be used if the length of the reference number is
      * 1 byte.<br/>
-     * {@code 0x08} value must be used if the legnth of the reference number is
+     * {@code 0x08} value must be used if the length of the reference number is
      * 2 bytes.
      */
     protected static final byte UDHIE_IDENTIFIER_SAR = 0x00;
@@ -59,9 +59,9 @@ public class SmppSplitter {
     /**
      * The length of the SAR fragment.
      * <p/>
-     * {@code 0x03} value must be used if the legnth of the reference number is
+     * {@code 0x03} value must be used if the length of the reference number is
      * 1 byte.<br/>
-     * {@code 0x04} value must be used if the legnth of the reference number is
+     * {@code 0x04} value must be used if the length of the reference number is
      * 2 bytes.
      */
     protected static final byte UDHIE_SAR_LENGTH = 0x03;
diff --git a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/SupervisingRouteControllerAutoConfiguration.java b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/SupervisingRouteControllerAutoConfiguration.java
index 0ac9994aa9ba7..9d5682030084e 100644
--- a/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/SupervisingRouteControllerAutoConfiguration.java
+++ b/components/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/SupervisingRouteControllerAutoConfiguration.java
@@ -71,7 +71,7 @@ public RouteController routeController() {
                 // Mark this route as excluded from supervisor
                 controller.addFilter(new SupervisingRouteControllerFilters.BlackList(entry.getKey()));
             } else {
-                // configure teh route
+                // configure the route
                 controller.setBackOff(entry.getKey(), configureBackOff(defaultBackOff, cfg.getBackOff()));
             }
         }
diff --git a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/addressing/ProducerParamsPrecedenceTest.java b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/addressing/ProducerParamsPrecedenceTest.java
index 7e9136978d4b8..8d3df0c1e8c2b 100644
--- a/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/addressing/ProducerParamsPrecedenceTest.java
+++ b/components/camel-spring-ws/src/test/java/org/apache/camel/component/spring/ws/addressing/ProducerParamsPrecedenceTest.java
@@ -149,7 +149,7 @@ public void testFaultToPrecedence() throws Exception {
         Assertions.assertThat(wsaProperties).isNotNull();
         Assertions.assertThat(wsaProperties.getFaultTo().getAddress()).isEqualTo(new URI("http://faultPrecedence.to"));
         // /we set in sample data all precendence fields for simplier tests
-        // otherwise it woudl be here annonymous
+        // otherwise it would be here anonymous
         Assertions.assertThat(wsaProperties.getReplyTo().getAddress()).isEqualTo(new URI("http://replyPrecedence.to"));
 
     }
diff --git a/components/camel-urlrewrite/src/test/resources/urlrewrite.xml b/components/camel-urlrewrite/src/test/resources/urlrewrite.xml
index 5c07d1d2e3384..1bfb4a47727fd 100644
--- a/components/camel-urlrewrite/src/test/resources/urlrewrite.xml
+++ b/components/camel-urlrewrite/src/test/resources/urlrewrite.xml
@@ -44,7 +44,7 @@
       the url /rewrite-status will be rewritten to /test/status/.
 
       The above rule and this outbound-rule means that end users should never see the
-      url /rewrite-status only /test/status/ both in thier location bar and in hyperlinks
+      url /rewrite-status only /test/status/ both in their location bar and in hyperlinks
       in your pages.
     </note>
     <from>/rewrite-status</from>
diff --git a/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/api/XAdESSignatureProperties.java b/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/api/XAdESSignatureProperties.java
index a83b39ed62ec5..594dbdb5903b8 100644
--- a/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/api/XAdESSignatureProperties.java
+++ b/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/api/XAdESSignatureProperties.java
@@ -721,7 +721,7 @@ protected void addCommitmentTypeIndication(Element signedDataObjectProperties, D
         if (!qualifiers.isEmpty()) {
             Element qualifiersEl = createElement("CommitmentTypeQualifiers", doc, input);
             commitmentTypeIndication.appendChild(qualifiersEl);
-            String errorMessage = "The XAdES confguration is invalid. The list of the commitment type qualifiers contains the invalid entry '%s'. An entry must either be a text or an XML fragment "
+            String errorMessage = "The XAdES configuration is invalid. The list of the commitment type qualifiers contains the invalid entry '%s'. An entry must either be a text or an XML fragment "
                     + "with the root element '%s' with the namespace '%s'.";
             for (String qualifier : getCommitmentTypeQualifiers()) {
                 Element qualifierEl = createChildFromXmlFragmentOrText(doc, input, "CommitmentTypeQualifier", errorMessage, qualifier);
@@ -868,7 +868,7 @@ protected void addSignerRole(Document doc, Element signedSignatureProperties, In
             LOG.debug("Adding claimed roles");
             Element claimedRolesEl = createElement("ClaimedRoles", doc, input);
             signerRole.appendChild(claimedRolesEl);
-            String errorMessage = "The XAdES confguration is invalid. The list of the claimed roles contains the invalid entry '%s'."
+            String errorMessage = "The XAdES configuration is invalid. The list of the claimed roles contains the invalid entry '%s'."
                     + " An entry must either be a text or an XML fragment with the root element '%s' with the namespace '%s'.";
             for (String claimedRole : claimedRoles) {
                 Element claimedRoleEl = createChildFromXmlFragmentOrText(doc, input, "ClaimedRole", errorMessage, claimedRole);
@@ -916,7 +916,7 @@ protected void addSignaturePolicyIdentifier(Document doc, Element signedProperti
             Element identifier = createElement("Identifier", doc, input);
             sigPolicyId.appendChild(identifier);
             if (getSigPolicyId() == null || getSigPolicyId().isEmpty()) {
-                throw new XmlSignatureException("The XAdES-EPES confguration is invalid. The signature policy identifier is missing.");
+                throw new XmlSignatureException("The XAdES-EPES configuration is invalid. The signature policy identifier is missing.");
             }
             identifier.setTextContent(getSigPolicyId());
             if (getSigPolicyIdQualifier() != null && !getSigPolicyIdQualifier().isEmpty()) {
@@ -942,14 +942,14 @@ protected void addSignaturePolicyIdentifier(Document doc, Element signedProperti
             id.appendChild(sigPolicyHash);
             if (getSignaturePolicyDigestAlgorithm() == null || getSignaturePolicyDigestAlgorithm().isEmpty()) {
                 throw new XmlSignatureException(
-                        "The XAdES-EPES confguration is invalid. The digest algorithm for the signature policy is missing.");
+                        "The XAdES-EPES configuration is invalid. The digest algorithm for the signature policy is missing.");
             }
             Element digestMethod = createDigSigElement("DigestMethod", doc, input.getPrefixForXmlSignatureNamespace());
             sigPolicyHash.appendChild(digestMethod);
             setAttribute(digestMethod, "Algorithm", getSignaturePolicyDigestAlgorithm());
             if (getSignaturePolicyDigestValue() == null || getSignaturePolicyDigestValue().isEmpty()) {
                 throw new XmlSignatureException(
-                        "The XAdES-EPES confguration is invalid. The digest value for the signature policy is missing.");
+                        "The XAdES-EPES configuration is invalid. The digest value for the signature policy is missing.");
             }
             Element digestValue = createDigSigElement("DigestValue", doc, input.getPrefixForXmlSignatureNamespace());
             sigPolicyHash.appendChild(digestValue);
@@ -959,7 +959,7 @@ protected void addSignaturePolicyIdentifier(Document doc, Element signedProperti
             if (!qualifiers.isEmpty()) {
                 Element qualifiersEl = createElement("SigPolicyQualifiers", doc, input);
                 id.appendChild(qualifiersEl);
-                String errorMessage = "The XAdES confguration is invalid. The list of the signatue policy qualifiers contains the invalid entry '%s'."
+                String errorMessage = "The XAdES configuration is invalid. The list of the signatue policy qualifiers contains the invalid entry '%s'."
                         + " An entry must either be a text or an XML fragment with the root element '%s' with the namespace '%s'.";
                 for (String elementOrText : getSigPolicyQualifiers()) {
                     Element child = createChildFromXmlFragmentOrText(doc, input, "SigPolicyQualifier", errorMessage, elementOrText);
@@ -992,7 +992,7 @@ protected Element createChildFromXmlFragmentOrText(Document doc, Input input, St
                 if (!ns.equals(child.getNamespaceURI())) {
                     throw new XmlSignatureException(
                             String.format(
-                                    "The XAdES confguration is invalid. The root element '%s' of the provided XML fragment '%s' has the invalid namespace '%s'. The correct namespace is '%s'.",
+                                    "The XAdES configuration is invalid. The root element '%s' of the provided XML fragment '%s' has the invalid namespace '%s'. The correct namespace is '%s'.",
                                     child.getLocalName(), elementOrText, child.getNamespaceURI(), ns));
                 }
             } catch (SAXException e) {
diff --git a/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/XAdESSignaturePropertiesTest.java b/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/XAdESSignaturePropertiesTest.java
index c4eceb489d063..7ba603b54bafd 100644
--- a/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/XAdESSignaturePropertiesTest.java
+++ b/components/camel-xmlsecurity/src/test/java/org/apache/camel/component/xmlsecurity/XAdESSignaturePropertiesTest.java
@@ -505,7 +505,7 @@ private void testExceptionSigPolicyIdMissing(String value) throws InterruptedExc
         sendBody("direct:enveloping", payload, Collections.<String, Object> emptyMap());
         assertMockEndpointsSatisfied();
         checkThrownException(mock, XmlSignatureException.class,
-                "The XAdES-EPES confguration is invalid. The signature policy identifier is missing.", null);
+                "The XAdES-EPES configuration is invalid. The signature policy identifier is missing.", null);
     }
 
     @Test
@@ -527,7 +527,7 @@ private void testExceptionSigPolicyDigestMissing(String value) throws Interrupte
         sendBody("direct:enveloping", payload, Collections.<String, Object> emptyMap());
         assertMockEndpointsSatisfied();
         checkThrownException(mock, XmlSignatureException.class,
-                "The XAdES-EPES confguration is invalid. The digest value for the signature policy is missing.", null);
+                "The XAdES-EPES configuration is invalid. The digest value for the signature policy is missing.", null);
     }
 
     @Test
@@ -549,7 +549,7 @@ private void testExceptionSigPolicyDigestAlgoMissing(String value) throws Interr
         sendBody("direct:enveloping", payload, Collections.<String, Object> emptyMap());
         assertMockEndpointsSatisfied();
         checkThrownException(mock, XmlSignatureException.class,
-                "The XAdES-EPES confguration is invalid. The digest algorithm for the signature policy is missing.", null);
+                "The XAdES-EPES configuration is invalid. The digest algorithm for the signature policy is missing.", null);
     }
 
     @Test
@@ -564,7 +564,7 @@ public void invalidXmlFragmentForClaimedRole() throws Exception {
         checkThrownException(
                 mock,
                 XmlSignatureException.class,
-                "The XAdES confguration is invalid. The list of the claimed roles contains the invalid entry '<ClaimedRole>wrong XML fragment<ClaimedRole>'. An entry must either be a text or"
+                "The XAdES configuration is invalid. The list of the claimed roles contains the invalid entry '<ClaimedRole>wrong XML fragment<ClaimedRole>'. An entry must either be a text or"
                         + " an XML fragment with the root element 'ClaimedRole' with the namespace 'http://uri.etsi.org/01903/v1.3.2#'.",
                 null);
     }
@@ -581,7 +581,7 @@ public void invalidXmlFragmentForCommitmentTypeQualifier() throws Exception {
         checkThrownException(
                 mock,
                 XmlSignatureException.class,
-                "The XAdES confguration is invalid. The list of the commitment type qualifiers contains the invalid entry '<CommitmentTypeQualifier>wrong XML fragment<CommitmentTypeQualifier>'."
+                "The XAdES configuration is invalid. The list of the commitment type qualifiers contains the invalid entry '<CommitmentTypeQualifier>wrong XML fragment<CommitmentTypeQualifier>'."
                         + " An entry must either be a text or an XML fragment with the root element 'CommitmentTypeQualifier' with the namespace 'http://uri.etsi.org/01903/v1.3.2#'.",
                 null);
     }
@@ -598,7 +598,7 @@ public void invalidXmlFragmentForSigPolicyQualifier() throws Exception {
         checkThrownException(
                 mock,
                 XmlSignatureException.class,
-                "The XAdES confguration is invalid. The list of the signatue policy qualifiers contains the invalid entry '<SigPolicyQualifier>wrong XML fragment<SigPolicyQualifier>'."
+                "The XAdES configuration is invalid. The list of the signatue policy qualifiers contains the invalid entry '<SigPolicyQualifier>wrong XML fragment<SigPolicyQualifier>'."
                         + " An entry must either be a text or an XML fragment with the root element 'SigPolicyQualifier' with the namespace 'http://uri.etsi.org/01903/v1.3.2#'.",
                 null);
     }
@@ -616,7 +616,7 @@ public void invalidNamespaceForTheRootElementInXmlFragmentForSigPolicyQualifier(
         checkThrownException(
                 mock,
                 XmlSignatureException.class,
-                "The XAdES confguration is invalid. The root element 'SigPolicyQualifier' of the provided XML fragment "
+                "The XAdES configuration is invalid. The root element 'SigPolicyQualifier' of the provided XML fragment "
                         + "'<SigPolicyQualifier xmlns=\"http://invalid.com\">XML fragment with wrong namespace for root element</SigPolicyQualifier>' has the invalid namespace 'http://invalid.com'."
                         + " The correct namespace is 'http://uri.etsi.org/01903/v1.3.2#'.", null);
     }
diff --git a/docs/user-manual/en/scala-dsl-eip.adoc b/docs/user-manual/en/scala-dsl-eip.adoc
index 2c5201661a9d5..c6297dd73f5ad 100644
--- a/docs/user-manual/en/scala-dsl-eip.adoc
+++ b/docs/user-manual/en/scala-dsl-eip.adoc
@@ -174,7 +174,7 @@ Delayer
 +++++++
 
 Unlike a throttler, which only slows down messages if the rate exceeds a
-treshold, a delayer delays every messages with a fixed amount of time.
+threshold, a delayer delays every messages with a fixed amount of time.
 An example: to delay every message going from `seda:a` to `mock:a` with
 1 second, you write...
 
diff --git a/docs/user-manual/en/servicepool.adoc b/docs/user-manual/en/servicepool.adoc
index 675c053e866e5..a9b36e2dac708 100644
--- a/docs/user-manual/en/servicepool.adoc
+++ b/docs/user-manual/en/servicepool.adoc
@@ -48,7 +48,7 @@ Then set your custom pooling on the `CamelContext` with the
 
 The producer service pool identify a producer as being pool capable if
 the producer implements the marker interface
-`org.apache.camel.SerivcePoolAware`. +
+`org.apache.camel.ServicePoolAware`. +
  As the producer will be pooled and thus long lived, your producer
 should be able to automatic safely recover lost connection. Usually you
 implement logic that re connects if needed.
diff --git a/examples/camel-example-micrometer/src/main/java/org/apache/camel/example/micrometer/ScrapeRouteBuilder.java b/examples/camel-example-micrometer/src/main/java/org/apache/camel/example/micrometer/ScrapeRouteBuilder.java
index 2fd3eb41cd306..c4a53ab0eec8b 100644
--- a/examples/camel-example-micrometer/src/main/java/org/apache/camel/example/micrometer/ScrapeRouteBuilder.java
+++ b/examples/camel-example-micrometer/src/main/java/org/apache/camel/example/micrometer/ScrapeRouteBuilder.java
@@ -23,7 +23,7 @@
 import org.springframework.stereotype.Component;
 
 /**
- * Route Builder that exposes teh endpoint used by Prometheus to scrape
+ * Route Builder that exposes the endpoint used by Prometheus to scrape
  * monitoring data from the Camel application. When running in a Spring
  * Boot 2.x environment, this is not required as Spring Boot already exposes
  * this endpoint by default.
diff --git a/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/JmsToCxfInOutTest.java b/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/JmsToCxfInOutTest.java
index 6ae765d8d2924..c2666a934f807 100644
--- a/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/JmsToCxfInOutTest.java
+++ b/tests/camel-itest/src/test/java/org/apache/camel/itest/greeter/JmsToCxfInOutTest.java
@@ -47,7 +47,7 @@ public void testJmsToCxfInOut() throws Exception {
         String out = template.requestBodyAndHeader("jms:queue:bridge.cxf", "Willem", CxfConstants.OPERATION_NAME, "greetMe", String.class);
         assertEquals("Hello Willem", out);
 
-        // call for the other opertion
+        // call for the other operation
         out = template.requestBodyAndHeader("jms:queue:bridge.cxf", new Object[0], CxfConstants.OPERATION_NAME, "sayHi", String.class);
         assertEquals("Bonjour", out);
     }

From 80e12e7b03aabf823d4ef6e943b772890f2c65e8 Mon Sep 17 00:00:00 2001
From: onders <onders@apache.org>
Date: Wed, 14 Nov 2018 04:11:23 +0300
Subject: [PATCH 016/125] CAMEL-12933 override populateHeaders  considering
 backward compatibility

---
 .../org/apache/camel/component/file/remote/RemoteFile.java   | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFile.java b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFile.java
index cd1d18eb3408a..e29c248488977 100644
--- a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFile.java
+++ b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/RemoteFile.java
@@ -42,6 +42,11 @@ public void populateHeaders(GenericFileMessage<T> message) {
             message.setHeader("CamelFileHost", getHostname());
         }
     }
+    
+    @Override
+    public void populateHeaders(GenericFileMessage<T> message, boolean isProbeContentTypeFromEndpoint) {
+        populateHeaders(message);
+    }
 
     public String getHostname() {
         return hostname;

From 8ddfee77ff06ec3efbac10547d764b438f564260 Mon Sep 17 00:00:00 2001
From: Vilmos Nagy <vilmos.nagy@outlook.com>
Date: Wed, 14 Nov 2018 10:51:09 +0100
Subject: [PATCH 017/125] Schematron component supports class
 `javax.xml.transform.Source`

---
 .../schematron/SchematronProducer.java        | 27 +++++++++---
 .../processor/SchematronProcessor.java        | 12 +++++-
 .../schematron/SchematronProducerTest.java    | 41 +++++++++++++++++++
 3 files changed, 72 insertions(+), 8 deletions(-)

diff --git a/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/SchematronProducer.java b/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/SchematronProducer.java
index debd27a2c8199..bef9c50805a7a 100644
--- a/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/SchematronProducer.java
+++ b/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/SchematronProducer.java
@@ -16,17 +16,19 @@
  */
 package org.apache.camel.component.schematron;
 
-import java.util.HashMap;
-import java.util.Map;
-
 import org.apache.camel.Exchange;
 import org.apache.camel.component.schematron.constant.Constants;
 import org.apache.camel.component.schematron.exception.SchematronValidationException;
+import org.apache.camel.component.schematron.processor.SchematronProcessor;
 import org.apache.camel.component.schematron.processor.SchematronProcessorFactory;
 import org.apache.camel.impl.DefaultProducer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import javax.xml.transform.Source;
+import java.util.HashMap;
+import java.util.Map;
+
 /**
  * The Schematron producer.
  */
@@ -50,9 +52,22 @@ public SchematronProducer(final SchematronEndpoint endpoint) {
      * @throws Exception
      */
     public void process(Exchange exchange) throws Exception {
-        String payload = exchange.getIn().getBody(String.class);
-        logger.debug("Applying schematron validation on payload: {}", payload);
-        String report = SchematronProcessorFactory.newScehamtronEngine(endpoint.getRules()).validate(payload);
+        final SchematronProcessor schematronProcessor = SchematronProcessorFactory.newScehamtronEngine(endpoint.getRules());
+        final Object payload = exchange.getIn().getBody();
+        final String report;
+
+        if (payload instanceof Source) {
+            logger.debug("Applying schematron validation on payload: {}", payload);
+            report = schematronProcessor.validate((Source) payload);
+        } else if (payload instanceof String) {
+            logger.debug("Applying schematron validation on payload: {}", payload);
+            report = schematronProcessor.validate((String) payload);
+        } else {
+            String stringPayload = exchange.getIn().getBody(String.class);
+            logger.debug("Applying schematron validation on payload: {}", stringPayload);
+            report = schematronProcessor.validate(stringPayload);
+        }
+
         logger.debug("Schematron validation report \n {}", report);
         String status = getValidationStatus(report);
         logger.info("Schematron validation status : {}", status);
diff --git a/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/processor/SchematronProcessor.java b/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/processor/SchematronProcessor.java
index 574e26c8dbf16..af1e7b65a0160 100644
--- a/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/processor/SchematronProcessor.java
+++ b/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/processor/SchematronProcessor.java
@@ -52,7 +52,6 @@ public class SchematronProcessor {
      * @param templates
      */
     public SchematronProcessor(XMLReader reader, Templates templates) {
-
         this.reader = reader;
         this.templates = templates;
     }
@@ -64,9 +63,18 @@ public SchematronProcessor(XMLReader reader, Templates templates) {
      * @return
      */
     public String validate(final String xml) {
+        final Source source = new SAXSource(reader, new InputSource(IOUtils.toInputStream(xml)));
+        return validate(source);
+    }
 
+    /**
+     * Validates the given XML for given Rules.
+     *
+     * @param source
+     * @return
+     */
+    public String validate(Source source) {
         try {
-            final Source source = new SAXSource(reader, new InputSource(IOUtils.toInputStream(xml)));
             final StringWriter writer = new StringWriter();
             templates.newTransformer().transform(source, new StreamResult(writer));
             return writer.toString();
diff --git a/components/camel-schematron/src/test/java/org/apache/camel/component/schematron/SchematronProducerTest.java b/components/camel-schematron/src/test/java/org/apache/camel/component/schematron/SchematronProducerTest.java
index e78bc00b0037c..ebf2594c6816a 100644
--- a/components/camel-schematron/src/test/java/org/apache/camel/component/schematron/SchematronProducerTest.java
+++ b/components/camel-schematron/src/test/java/org/apache/camel/component/schematron/SchematronProducerTest.java
@@ -15,8 +15,12 @@
  * limitations under the License.
  */
 package org.apache.camel.component.schematron;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
 import javax.xml.transform.Templates;
 import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.sax.SAXSource;
 
 import net.sf.saxon.TransformerFactoryImpl;
 import org.apache.camel.Exchange;
@@ -26,8 +30,12 @@
 import org.apache.camel.component.schematron.processor.TemplatesFactory;
 import org.apache.camel.impl.DefaultExchange;
 import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.commons.io.IOUtils;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+import org.xml.sax.XMLReader;
 
 /**
  * Schematron Producer Unit Test.
@@ -73,4 +81,37 @@ public void testProcessInValidXML() throws Exception {
 
     }
 
+    @Test
+    public void testProcessValidXMLAsSource() throws Exception {
+        Exchange exc = new DefaultExchange(context, ExchangePattern.InOut);
+        exc.getIn().setBody(new SAXSource(getXMLReader(), new InputSource(ClassLoader.getSystemResourceAsStream("xml/article-1.xml"))));
+
+        // process xml payload
+        producer.process(exc);
+
+        // assert
+        assertTrue(exc.getOut().getHeader(Constants.VALIDATION_STATUS).equals(Constants.SUCCESS));
+    }
+
+    @Test
+    public void testProcessInValidXMLAsSource() throws Exception {
+        Exchange exc = new DefaultExchange(context, ExchangePattern.InOut);
+        exc.getIn().setBody(new SAXSource(getXMLReader(), new InputSource(ClassLoader.getSystemResourceAsStream("xml/article-2.xml"))));
+
+        // process xml payload
+        producer.process(exc);
+
+        // assert
+        assertTrue(exc.getOut().getHeader(Constants.VALIDATION_STATUS).equals(Constants.FAILED));
+
+    }
+
+    private static XMLReader getXMLReader() throws ParserConfigurationException, SAXException {
+        final SAXParserFactory fac = SAXParserFactory.newInstance();
+        fac.setValidating(false);
+        final SAXParser parser = fac.newSAXParser();
+        XMLReader reader = parser.getXMLReader();
+        return reader;
+    }
+
 }

From aa1bd3e25e1ba41d5ba9af17c5b6238c0566c42d Mon Sep 17 00:00:00 2001
From: Andrea Tarocchi <atarocch@redhat.com>
Date: Wed, 14 Nov 2018 16:12:20 +0100
Subject: [PATCH 018/125] CAMEL-12926: fixed null pointer exceptions accessing
 swagger url in blueprint projects

---
 .../main/java/org/apache/camel/swagger/RestSwaggerSupport.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerSupport.java b/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerSupport.java
index dbbcb905e6215..b549634f1f961 100644
--- a/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerSupport.java
+++ b/components/camel-swagger-java/src/main/java/org/apache/camel/swagger/RestSwaggerSupport.java
@@ -18,6 +18,7 @@
 
 import java.lang.management.ManagementFactory;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -210,7 +211,7 @@ public void renderResourceListing(RestApiResponseAdapter response, BeanConfig sw
 
         List<RestDefinition> rests = getRestDefinitions(contextId);
         if (rests != null) {
-            final Map<String, Object> apiProperties = configuration.getApiProperties();
+            final Map<String, Object> apiProperties = configuration.getApiProperties() != null ? configuration.getApiProperties() : new HashMap<>();
             if (json) {
                 response.setHeader(Exchange.CONTENT_TYPE, (String) apiProperties.getOrDefault("api.specification.contentType.json", "application/json"));
 

From 5d8ac7506ede74720f8675fe16891db0691cf466 Mon Sep 17 00:00:00 2001
From: Andrea Cosentino <ancosen@gmail.com>
Date: Thu, 15 Nov 2018 09:46:50 +0100
Subject: [PATCH 019/125] CAMEL-12932 - Camel-AHC-WS: Consumer parameters are
 not set

---
 .../java/org/apache/camel/component/ahc/ws/WsEndpoint.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/components/camel-ahc-ws/src/main/java/org/apache/camel/component/ahc/ws/WsEndpoint.java b/components/camel-ahc-ws/src/main/java/org/apache/camel/component/ahc/ws/WsEndpoint.java
index c34b6aea1ee9b..876e051f5f4fe 100644
--- a/components/camel-ahc-ws/src/main/java/org/apache/camel/component/ahc/ws/WsEndpoint.java
+++ b/components/camel-ahc-ws/src/main/java/org/apache/camel/component/ahc/ws/WsEndpoint.java
@@ -68,7 +68,9 @@ public Producer createProducer() throws Exception {
 
     @Override
     public Consumer createConsumer(Processor processor) throws Exception {
-        return new WsConsumer(this, processor);
+    	WsConsumer consumer = new WsConsumer(this, processor);
+    	configureConsumer(consumer);
+    	return consumer;
     }
 
     WebSocket getWebSocket() throws Exception {

From 7ea92b42a2467d68f25f7b0664a100151561b6a1 Mon Sep 17 00:00:00 2001
From: Andrea Cosentino <ancosen@gmail.com>
Date: Thu, 15 Nov 2018 09:53:00 +0100
Subject: [PATCH 020/125] CAMEL-12932 - Fixed CS

---
 .../java/org/apache/camel/component/ahc/ws/WsEndpoint.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/components/camel-ahc-ws/src/main/java/org/apache/camel/component/ahc/ws/WsEndpoint.java b/components/camel-ahc-ws/src/main/java/org/apache/camel/component/ahc/ws/WsEndpoint.java
index 876e051f5f4fe..9ce71a2d262d7 100644
--- a/components/camel-ahc-ws/src/main/java/org/apache/camel/component/ahc/ws/WsEndpoint.java
+++ b/components/camel-ahc-ws/src/main/java/org/apache/camel/component/ahc/ws/WsEndpoint.java
@@ -68,9 +68,9 @@ public Producer createProducer() throws Exception {
 
     @Override
     public Consumer createConsumer(Processor processor) throws Exception {
-    	WsConsumer consumer = new WsConsumer(this, processor);
-    	configureConsumer(consumer);
-    	return consumer;
+        WsConsumer consumer = new WsConsumer(this, processor);
+        configureConsumer(consumer);
+        return consumer;
     }
 
     WebSocket getWebSocket() throws Exception {

From 229d37d7e4de9030c19532f570e5683df7c2d4a1 Mon Sep 17 00:00:00 2001
From: Thomas Diesler <tdiesler@redhat.com>
Date: Fri, 14 Sep 2018 14:21:21 +0200
Subject: [PATCH 021/125] [IPFS] Add initial support for IPFS

CAMEL-12810
---
 .../src/main/descriptors/common-bin.xml       |   1 +
 components/camel-ipfs/pom.xml                 |  62 +++++
 .../src/main/docs/ipfs-component.adoc         |  93 ++++++++
 .../camel/component/ipfs/IPFSComponent.java   |  64 ++++++
 .../component/ipfs/IPFSConfiguration.java     |  79 +++++++
 .../camel/component/ipfs/IPFSEndpoint.java    | 107 +++++++++
 .../camel/component/ipfs/IPFSProducer.java    |  87 +++++++
 .../src/main/resources/META-INF/LICENSE.txt   | 203 ++++++++++++++++
 .../src/main/resources/META-INF/NOTICE.txt    |  11 +
 .../services/org/apache/camel/component/ipfs  |  18 ++
 .../camel/component/ipfs/SimpleIPFSTest.java  | 217 ++++++++++++++++++
 .../src/test/resources/html/chap/ch01.html    |  13 ++
 .../src/test/resources/html/css/default.css   |  38 +++
 .../src/test/resources/html/etc/userfile.txt  |   1 +
 .../src/test/resources/html/img/logo.png      | Bin 0 -> 6715 bytes
 .../src/test/resources/html/index.html        |  13 ++
 .../src/test/resources/log4j2.properties      |  30 +++
 components/pom.xml                            |   1 +
 parent/pom.xml                                |   6 +
 19 files changed, 1044 insertions(+)
 create mode 100644 components/camel-ipfs/pom.xml
 create mode 100644 components/camel-ipfs/src/main/docs/ipfs-component.adoc
 create mode 100644 components/camel-ipfs/src/main/java/org/apache/camel/component/ipfs/IPFSComponent.java
 create mode 100644 components/camel-ipfs/src/main/java/org/apache/camel/component/ipfs/IPFSConfiguration.java
 create mode 100644 components/camel-ipfs/src/main/java/org/apache/camel/component/ipfs/IPFSEndpoint.java
 create mode 100644 components/camel-ipfs/src/main/java/org/apache/camel/component/ipfs/IPFSProducer.java
 create mode 100644 components/camel-ipfs/src/main/resources/META-INF/LICENSE.txt
 create mode 100644 components/camel-ipfs/src/main/resources/META-INF/NOTICE.txt
 create mode 100644 components/camel-ipfs/src/main/resources/META-INF/services/org/apache/camel/component/ipfs
 create mode 100644 components/camel-ipfs/src/test/java/org/apache/camel/component/ipfs/SimpleIPFSTest.java
 create mode 100644 components/camel-ipfs/src/test/resources/html/chap/ch01.html
 create mode 100644 components/camel-ipfs/src/test/resources/html/css/default.css
 create mode 100644 components/camel-ipfs/src/test/resources/html/etc/userfile.txt
 create mode 100644 components/camel-ipfs/src/test/resources/html/img/logo.png
 create mode 100644 components/camel-ipfs/src/test/resources/html/index.html
 create mode 100644 components/camel-ipfs/src/test/resources/log4j2.properties

diff --git a/apache-camel/src/main/descriptors/common-bin.xml b/apache-camel/src/main/descriptors/common-bin.xml
index 8c63bdbc68eb2..93dc9bd016ad1 100644
--- a/apache-camel/src/main/descriptors/common-bin.xml
+++ b/apache-camel/src/main/descriptors/common-bin.xml
@@ -134,6 +134,7 @@
         <include>org.apache.camel:camel-infinispan</include>
         <include>org.apache.camel:camel-influxdb</include>
         <include>org.apache.camel:camel-ignite</include>
+        <include>org.apache.camel:camel-ipfs</include>
         <include>org.apache.camel:camel-irc</include>
         <include>org.apache.camel:camel-ironmq</include>
         <include>org.apache.camel:camel-jackson</include>
diff --git a/components/camel-ipfs/pom.xml b/components/camel-ipfs/pom.xml
new file mode 100644
index 0000000000000..20b6f7c959e61
--- /dev/null
+++ b/components/camel-ipfs/pom.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    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.
+
+-->
+<project xmlns="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">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <artifactId>components</artifactId>
+    <groupId>org.apache.camel</groupId>
+    <version>2.23.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>camel-ipfs</artifactId>
+  <packaging>jar</packaging>
+  <name>Camel :: IPFS</name>
+  <description>Camel IPFS support</description>
+
+  <properties>
+    <camel.osgi.export.pkg>org.apache.camel.component.ipfs.*</camel.osgi.export.pkg>
+    <camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=ipfs</camel.osgi.export.service>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.camel</groupId>
+      <artifactId>camel-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>io.nessus</groupId>
+      <artifactId>nessus-ipfs</artifactId>
+    </dependency>
+
+    <!-- Test -->
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-slf4j-impl</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+</project>
diff --git a/components/camel-ipfs/src/main/docs/ipfs-component.adoc b/components/camel-ipfs/src/main/docs/ipfs-component.adoc
new file mode 100644
index 0000000000000..6a3fcc4ef23cf
--- /dev/null
+++ b/components/camel-ipfs/src/main/docs/ipfs-component.adoc
@@ -0,0 +1,93 @@
+[[ipfs-component]]
+== IPFS Component
+
+*Available as of Camel version 2.23*
+
+The *ipfs:* component provides access to the Interplanetary File System https://ipfs.io/[(IPFS)].
+
+Maven users will need to add the following dependency to their `pom.xml`
+for this component:
+
+[source,xml]
+------------------------------------------------------------
+<dependency>
+    <groupId>org.apache.camel</groupId>
+    <artifactId>camel-ipfs</artifactId>
+    <version>x.x.x</version>
+    <!-- use the same version as your Camel core version -->
+</dependency>
+------------------------------------------------------------
+
+### URI format
+
+[source,java]
+---------------------------------
+ipfs://cmd?options
+---------------------------------
+
+### Options
+
+// component options: START
+The IPFS component has no options.
+// component options: END
+
+// endpoint options: START
+The IPFS endpoint is configured using URI syntax:
+
+----
+ipfs:cmd
+----
+
+with the following path and query parameters:
+
+==== Path Parameters (3 parameters):
+
+
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *ipfsCmd* | The ipfs command |  | String
+| *ipfsHost* | The ipfs host |  | String
+| *ipfsPort* | The ipfs port |  | int
+|===
+
+
+==== Query Parameters (2 parameters):
+
+
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *outdir* (producer) | The ipfs output directory |  | Path
+| *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
+// spring-boot-auto-configure options: START
+=== Spring Boot Auto-Configuration
+
+
+The component supports 2 options, which are listed below.
+
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *camel.component.ipfs.enabled* | Whether to enable auto configuration of the ipfs component. This is enabled by default. |  | Boolean
+| *camel.component.ipfs.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
+|===
+// spring-boot-auto-configure options: END
+
+
+### Message Headers
+
+[TODO]
+
+### Samples
+
+In this sample we add a file to IPFS, get a file from IPFS and finally access the content of an IPFS file. 
+
+[source,java]
+---------------------------------------------------------------------------------------------
+from("direct:start").to("ipfs:add")
+from("direct:start").to("ipfs:get?outdir=target")
+from("direct:start").to("ipfs:cat");
+---------------------------------------------------------------------------------------------
diff --git a/components/camel-ipfs/src/main/java/org/apache/camel/component/ipfs/IPFSComponent.java b/components/camel-ipfs/src/main/java/org/apache/camel/component/ipfs/IPFSComponent.java
new file mode 100644
index 0000000000000..9d5b228607fe9
--- /dev/null
+++ b/components/camel-ipfs/src/main/java/org/apache/camel/component/ipfs/IPFSComponent.java
@@ -0,0 +1,64 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.ipfs;
+
+import java.net.URI;
+import java.util.Map;
+
+import org.apache.camel.Endpoint;
+import org.apache.camel.impl.DefaultComponent;
+
+import io.nessus.ipfs.IPFSClient;
+import io.nessus.ipfs.impl.DefaultIPFSClient;
+
+public class IPFSComponent extends DefaultComponent {
+
+    private IPFSClient client;
+    
+    @Override
+    protected Endpoint createEndpoint(String urispec, String remaining, Map<String, Object> params) throws Exception {
+
+        // Init the configuration
+        IPFSConfiguration config = new IPFSConfiguration(this);
+        setProperties(config, params);
+
+        // Derive host:port and cmd from the give uri
+        URI uri = new URI(urispec);
+        String host = uri.getHost();
+        int port = uri.getPort();
+        String cmd = remaining;
+        if (!cmd.equals(host)) {
+            if (host != null) config.setIpfsHost(host);
+            if (port > 0) config.setIpfsPort(port);
+            int idx = cmd.indexOf('/');
+            cmd = cmd.substring(idx + 1);
+        }
+        config.setIpfsCmd(cmd);
+        
+        client = createClient(config);
+        
+        return new IPFSEndpoint(urispec, this, config);
+    }
+
+    public IPFSClient getIPFSClient() {
+        return client;
+    }
+
+    private synchronized IPFSClient createClient(IPFSConfiguration config) {
+        return new DefaultIPFSClient(config.getIpfsHost(), config.getIpfsPort());
+    }
+}
\ No newline at end of file
diff --git a/components/camel-ipfs/src/main/java/org/apache/camel/component/ipfs/IPFSConfiguration.java b/components/camel-ipfs/src/main/java/org/apache/camel/component/ipfs/IPFSConfiguration.java
new file mode 100644
index 0000000000000..5a78d6478549b
--- /dev/null
+++ b/components/camel-ipfs/src/main/java/org/apache/camel/component/ipfs/IPFSConfiguration.java
@@ -0,0 +1,79 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.ipfs;
+
+
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import org.apache.camel.spi.UriParam;
+import org.apache.camel.spi.UriParams;
+import org.apache.camel.spi.UriPath;
+import org.apache.camel.util.ObjectHelper;
+
+@UriParams
+public class IPFSConfiguration {
+
+    // Available commands
+    public enum IPFSCommand {
+        add, cat, get, version 
+    }
+    
+    @UriPath(description = "The ipfs command")
+    private String ipfsCmd;
+    @UriParam(description = "The ipfs output directory")
+    private Path outdir;
+
+    private String ipfsHost = "127.0.0.1";
+    private int ipfsPort = 5001;
+    
+    public IPFSConfiguration(IPFSComponent component) {
+        ObjectHelper.notNull(component, "component");
+    }
+
+    public String getIpfsCmd() {
+        return ipfsCmd;
+    }
+
+    public void setIpfsCmd(String cmd) {
+        this.ipfsCmd = cmd;
+    }
+
+    public String getIpfsHost() {
+        return ipfsHost;
+    }
+
+    public void setIpfsHost(String ipfsHost) {
+        this.ipfsHost = ipfsHost;
+    }
+
+    public int getIpfsPort() {
+        return ipfsPort;
+    }
+
+    public void setIpfsPort(int ipfsPort) {
+        this.ipfsPort = ipfsPort;
+    }
+
+    public Path getOutdir() {
+        return outdir;
+    }
+
+    public void setOutdir(String outdir) {
+        this.outdir = Paths.get(outdir);
+    }
+}
diff --git a/components/camel-ipfs/src/main/java/org/apache/camel/component/ipfs/IPFSEndpoint.java b/components/camel-ipfs/src/main/java/org/apache/camel/component/ipfs/IPFSEndpoint.java
new file mode 100644
index 0000000000000..6709332d8300d
--- /dev/null
+++ b/components/camel-ipfs/src/main/java/org/apache/camel/component/ipfs/IPFSEndpoint.java
@@ -0,0 +1,107 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.ipfs;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Path;
+import java.util.List;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
+
+import org.apache.camel.Consumer;
+import org.apache.camel.Processor;
+import org.apache.camel.Producer;
+import org.apache.camel.component.ipfs.IPFSConfiguration.IPFSCommand;
+import org.apache.camel.impl.DefaultEndpoint;
+import org.apache.camel.spi.UriEndpoint;
+import org.apache.camel.spi.UriParam;
+
+import io.nessus.ipfs.IPFSClient;
+
+/**
+ * The camel-ipfs component provides access to the Interplanetary File System (IPFS).
+ */
+@UriEndpoint(firstVersion = "2.23.0", scheme = "ipfs", title = "IPFS", syntax = "ipfs:host:port/cmd", producerOnly = true, label = "file,ipfs")
+public class IPFSEndpoint extends DefaultEndpoint {
+
+    @UriParam
+    private final IPFSConfiguration configuration;
+    
+    public IPFSEndpoint(String uri, IPFSComponent component, IPFSConfiguration configuration) {
+        super(uri, component);
+        this.configuration = configuration;
+    }
+
+    @Override
+    public IPFSComponent getComponent() {
+        return (IPFSComponent) super.getComponent();
+    }
+
+    @Override
+    public Consumer createConsumer(Processor processor) throws Exception {
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public Producer createProducer() throws Exception {
+        return new IPFSProducer(this);
+    }
+
+    @Override
+    public boolean isSingleton() {
+        return false;
+    }
+
+    IPFSConfiguration getConfiguration() {
+        return configuration;
+    }
+
+    IPFSCommand getCommand() {
+        String cmd = configuration.getIpfsCmd();
+        try {
+            return IPFSCommand.valueOf(cmd);
+        } catch (IllegalArgumentException ex) {
+            throw new IllegalArgumentException("Unsupported command: " + cmd);
+        }
+    }
+    
+    String ipfsVersion() throws IOException {
+        return ipfs().version();
+    }
+
+    List<String> ipfsAdd(Path path) throws IOException {
+        return ipfs().add(path);
+    }
+
+    InputStream ipfsCat(String cid) throws IOException {
+        return ipfs().cat(cid);
+    }
+
+    Path ipfsGet(String cid, Path outdir) throws IOException {
+        Future<Path> future = ipfs().get(cid, outdir);
+        try {
+            return future.get();
+        } catch (InterruptedException | ExecutionException ex) {
+            throw new IOException("Cannot obtain: " + cid, ex);
+        }
+    }
+
+    private IPFSClient ipfs() {
+        return getComponent().getIPFSClient();
+    }
+}
diff --git a/components/camel-ipfs/src/main/java/org/apache/camel/component/ipfs/IPFSProducer.java b/components/camel-ipfs/src/main/java/org/apache/camel/component/ipfs/IPFSProducer.java
new file mode 100644
index 0000000000000..0f6e5333911a3
--- /dev/null
+++ b/components/camel-ipfs/src/main/java/org/apache/camel/component/ipfs/IPFSProducer.java
@@ -0,0 +1,87 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.ipfs;
+
+import java.io.File;
+import java.io.InputStream;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.List;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.impl.DefaultProducer;
+
+import org.apache.camel.component.ipfs.IPFSConfiguration.IPFSCommand;
+
+public class IPFSProducer extends DefaultProducer {
+    
+    public IPFSProducer(IPFSEndpoint endpoint) {
+        super(endpoint);
+    }
+
+    @Override
+    public IPFSEndpoint getEndpoint() {
+        return (IPFSEndpoint) super.getEndpoint();
+    }
+
+    @Override
+    public void process(Exchange exchange) throws Exception {
+
+        IPFSEndpoint endpoint = getEndpoint();
+        IPFSCommand cmd = endpoint.getCommand();
+        
+        if (IPFSCommand.version == cmd) {
+            
+            String resp = endpoint.ipfsVersion();
+            exchange.getMessage().setBody(resp);
+            
+        }  else if (IPFSCommand.add == cmd) {
+            
+            Path path = pathFromBody(exchange);
+            List<String> cids = endpoint.ipfsAdd(path);
+            Object resp = cids;
+            if (path.toFile().isFile()) {
+                resp = cids.size() > 0 ? cids.get(0) : null;
+            }
+            exchange.getMessage().setBody(resp);
+            
+        }  else if (IPFSCommand.cat == cmd) {
+
+            String cid = exchange.getMessage().getBody(String.class);
+            InputStream resp = endpoint.ipfsCat(cid);
+            exchange.getMessage().setBody(resp);
+            
+        }  else if (IPFSCommand.get == cmd) {
+
+            Path outdir = endpoint.getConfiguration().getOutdir();
+            String cid = exchange.getMessage().getBody(String.class);
+            Path resp = endpoint.ipfsGet(cid, outdir);
+            exchange.getMessage().setBody(resp);
+            
+        } else {
+            throw new UnsupportedOperationException(cmd.toString());
+        }
+    }
+
+    private Path pathFromBody(Exchange exchange) {
+        Object body = exchange.getMessage().getBody();
+        if (body instanceof Path) return (Path) body;
+        if (body instanceof String) return Paths.get((String) body);
+        if (body instanceof File) return ((File) body).toPath();
+        throw new IllegalArgumentException("Invalid path: " + body);
+    }
+}
diff --git a/components/camel-ipfs/src/main/resources/META-INF/LICENSE.txt b/components/camel-ipfs/src/main/resources/META-INF/LICENSE.txt
new file mode 100644
index 0000000000000..6b0b1270ff0ca
--- /dev/null
+++ b/components/camel-ipfs/src/main/resources/META-INF/LICENSE.txt
@@ -0,0 +1,203 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed 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.
+
diff --git a/components/camel-ipfs/src/main/resources/META-INF/NOTICE.txt b/components/camel-ipfs/src/main/resources/META-INF/NOTICE.txt
new file mode 100644
index 0000000000000..2e215bf2e6b1f
--- /dev/null
+++ b/components/camel-ipfs/src/main/resources/META-INF/NOTICE.txt
@@ -0,0 +1,11 @@
+   =========================================================================
+   ==  NOTICE file corresponding to the section 4 d of                    ==
+   ==  the Apache License, Version 2.0,                                   ==
+   ==  in this case for the Apache Camel distribution.                    ==
+   =========================================================================
+
+   This product includes software developed by
+   The Apache Software Foundation (http://www.apache.org/).
+
+   Please read the different LICENSE files present in the licenses directory of
+   this distribution.
diff --git a/components/camel-ipfs/src/main/resources/META-INF/services/org/apache/camel/component/ipfs b/components/camel-ipfs/src/main/resources/META-INF/services/org/apache/camel/component/ipfs
new file mode 100644
index 0000000000000..179ce43a3beef
--- /dev/null
+++ b/components/camel-ipfs/src/main/resources/META-INF/services/org/apache/camel/component/ipfs
@@ -0,0 +1,18 @@
+#
+# 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.
+#
+
+class=org.apache.camel.component.ipfs.IPFSComponent
diff --git a/components/camel-ipfs/src/test/java/org/apache/camel/component/ipfs/SimpleIPFSTest.java b/components/camel-ipfs/src/test/java/org/apache/camel/component/ipfs/SimpleIPFSTest.java
new file mode 100644
index 0000000000000..589b919c2dcf3
--- /dev/null
+++ b/components/camel-ipfs/src/test/java/org/apache/camel/component/ipfs/SimpleIPFSTest.java
@@ -0,0 +1,217 @@
+/*
+ * #%L
+ * Wildfly Camel :: Testsuite
+ * %%
+ * Copyright (C) 2013 - 2014 RedHat
+ * %%
+ * Licensed 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.
+ * #L%
+ */
+
+package org.apache.camel.component.ipfs;
+
+import java.io.ByteArrayOutputStream;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Arrays;
+import java.util.List;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.ProducerTemplate;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.impl.DefaultCamelContext;
+import org.junit.Assert;
+import org.junit.Assume;
+import org.junit.Test;
+
+import io.nessus.utils.StreamUtils;
+
+public class SimpleIPFSTest {
+
+    @Test
+    public void ipfsVersion() throws Exception {
+
+        CamelContext camelctx = new DefaultCamelContext();
+        camelctx.addRoutes(new RouteBuilder() {
+            @Override
+            public void configure() throws Exception {
+                from("direct:startA").to("ipfs:version");
+                from("direct:startB").to("ipfs:127.0.0.1/version");
+                from("direct:startC").to("ipfs:127.0.0.1:5001/version");
+            }
+        });
+
+        camelctx.start();
+        assumeIPFS(camelctx);
+        
+        try {
+            ProducerTemplate producer = camelctx.createProducerTemplate();
+            String resA = producer.requestBody("direct:startA", null, String.class);
+            String resB = producer.requestBody("direct:startB", null, String.class);
+            String resC = producer.requestBody("direct:startC", null, String.class);
+            Arrays.asList(resA, resB, resC).forEach(res -> {
+                Assert.assertTrue("Expecting 0.4 in: " + resA, resA.startsWith("0.4"));
+            });
+        } finally {
+            camelctx.stop();
+        }
+    }
+
+    @Test
+    public void ipfsAddSingle() throws Exception {
+
+        String HASH = "QmYgjSRbXFPdPYKqQSnUjmXLYLudVahEJQotMaAJKt6Lbd";
+        
+        CamelContext camelctx = new DefaultCamelContext();
+        camelctx.addRoutes(new RouteBuilder() {
+            @Override
+            public void configure() throws Exception {
+                from("direct:start").to("ipfs:add");
+            }
+        });
+
+        Path path = Paths.get("src/test/resources/html/index.html");
+        
+        camelctx.start();
+        assumeIPFS(camelctx);
+        
+        try {
+            ProducerTemplate producer = camelctx.createProducerTemplate();
+            String res = producer.requestBody("direct:start", path, String.class);
+            Assert.assertEquals(HASH, res);
+        } finally {
+            camelctx.stop();
+        }
+    }
+
+    @Test
+    @SuppressWarnings("unchecked")
+    public void ipfsAddRecursive() throws Exception {
+
+        String HASH = "Qme6hd6tYXTFb7bb7L3JZ5U6ygktpAHKxbaeffYyQN85mW";
+        
+        CamelContext camelctx = new DefaultCamelContext();
+        camelctx.addRoutes(new RouteBuilder() {
+            @Override
+            public void configure() throws Exception {
+                from("direct:start").to("ipfs:add");
+            }
+        });
+
+        Path path = Paths.get("src/test/resources/html");
+        
+        camelctx.start();
+        assumeIPFS(camelctx);
+        
+        try {
+            ProducerTemplate producer = camelctx.createProducerTemplate();
+            List<String> res = producer.requestBody("direct:start", path, List.class);
+            Assert.assertEquals(10, res.size());
+            Assert.assertEquals(HASH, res.get(9));
+        } finally {
+            camelctx.stop();
+        }
+    }
+
+    @Test
+    public void ipfsCat() throws Exception {
+
+        String HASH = "QmUD7uG5prAMHbcCfp4x1G1mMSpywcSMHTGpq62sbpDAg6";
+        
+        CamelContext camelctx = new DefaultCamelContext();
+        camelctx.addRoutes(new RouteBuilder() {
+            @Override
+            public void configure() throws Exception {
+                from("direct:start").to("ipfs:cat");
+            }
+        });
+
+        camelctx.start();
+        assumeIPFS(camelctx);
+        
+        try {
+            ProducerTemplate producer = camelctx.createProducerTemplate();
+            InputStream res = producer.requestBody("direct:start", HASH, InputStream.class);
+            verifyFileContent(res);
+        } finally {
+            camelctx.stop();
+        }
+    }
+
+    @Test
+    public void ipfsGetSingle() throws Exception {
+
+        String HASH = "QmUD7uG5prAMHbcCfp4x1G1mMSpywcSMHTGpq62sbpDAg6";
+        
+        CamelContext camelctx = new DefaultCamelContext();
+        camelctx.addRoutes(new RouteBuilder() {
+            @Override
+            public void configure() throws Exception {
+                from("direct:start").to("ipfs:get?outdir=target");
+            }
+        });
+
+        camelctx.start();
+        assumeIPFS(camelctx);
+        
+        try {
+            ProducerTemplate producer = camelctx.createProducerTemplate();
+            Path res = producer.requestBody("direct:start", HASH, Path.class);
+            Assert.assertEquals(Paths.get("target", HASH), res);
+            verifyFileContent(new FileInputStream(res.toFile()));
+        } finally {
+            camelctx.stop();
+        }
+    }
+
+    @Test
+    public void ipfsGetRecursive() throws Exception {
+
+        String HASH = "Qme6hd6tYXTFb7bb7L3JZ5U6ygktpAHKxbaeffYyQN85mW";
+        
+        CamelContext camelctx = new DefaultCamelContext();
+        camelctx.addRoutes(new RouteBuilder() {
+            @Override
+            public void configure() throws Exception {
+                from("direct:start").to("ipfs:get?outdir=target");
+            }
+        });
+
+        camelctx.start();
+        assumeIPFS(camelctx);
+        
+        try {
+            ProducerTemplate producer = camelctx.createProducerTemplate();
+            Path res = producer.requestBody("direct:start", HASH, Path.class);
+            Assert.assertEquals(Paths.get("target", HASH), res);
+            Assert.assertTrue(res.toFile().isDirectory());
+            Assert.assertTrue(res.resolve("index.html").toFile().exists());
+        } finally {
+            camelctx.stop();
+        }
+    }
+
+    private void verifyFileContent(InputStream ins) throws IOException {
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        StreamUtils.copyStream(ins, baos);
+        Assert.assertEquals("The quick brown fox jumps over the lazy dog.", new String (baos.toByteArray()));
+    }
+
+    private void assumeIPFS(CamelContext camelctx) {
+        IPFSComponent comp = camelctx.getComponent("ipfs", IPFSComponent.class);
+        Assume.assumeTrue(comp.getIPFSClient().hasConnection());
+    }
+}
\ No newline at end of file
diff --git a/components/camel-ipfs/src/test/resources/html/chap/ch01.html b/components/camel-ipfs/src/test/resources/html/chap/ch01.html
new file mode 100644
index 0000000000000..4edc3fd6b87d8
--- /dev/null
+++ b/components/camel-ipfs/src/test/resources/html/chap/ch01.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <title>IPFS</title>
+    <meta charset="utf-8" />
+    <link rel="stylesheet" href="./../css/default.css">
+</head>
+<body>
+<p><a href="../index.html">Home</a></p>
+<h2>Chapter 01</h2>
+<p><img src="../img/logo.png" alt="logo" /></p>
+</body>
+</html>
diff --git a/components/camel-ipfs/src/test/resources/html/css/default.css b/components/camel-ipfs/src/test/resources/html/css/default.css
new file mode 100644
index 0000000000000..8c0b2d558f3d0
--- /dev/null
+++ b/components/camel-ipfs/src/test/resources/html/css/default.css
@@ -0,0 +1,38 @@
+body {
+    font-family: "Verdana";
+    color: #137cb9
+}
+
+a {
+    #text-decoration: none;
+    color: #137cb9
+}
+
+a.gray {
+    color: gray;
+}
+
+h1 {
+	font-weight: normal;
+    font-size: 20px;
+}
+
+h2 {
+    font-weight: normal;
+	font-size: 15px;
+}
+
+th {
+	text-align: left;
+    font-weight: normal;
+    font-size: 14px;
+    color: gray;
+}
+
+td.gray {
+    color: gray;
+}
+tr.gray {
+    color: gray;
+}
+
diff --git a/components/camel-ipfs/src/test/resources/html/etc/userfile.txt b/components/camel-ipfs/src/test/resources/html/etc/userfile.txt
new file mode 100644
index 0000000000000..8fe2a4b5ad117
--- /dev/null
+++ b/components/camel-ipfs/src/test/resources/html/etc/userfile.txt
@@ -0,0 +1 @@
+The quick brown fox jumps over the lazy dog.
\ No newline at end of file
diff --git a/components/camel-ipfs/src/test/resources/html/img/logo.png b/components/camel-ipfs/src/test/resources/html/img/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..ddda52e086e85692a94c2d014626bdf26f94e9c6
GIT binary patch
literal 6715
zcmd5>_g53lwoT~LrG@|jLFt4lH3S5tC`Eb@siBC{lh8prNEJ~)se*z6(xsQsMY>e!
zgf2Do&eQMSci(&e!JD;a&dixTd(WAl&N}n*k&ZeQIhY&(08nXasOtZ*ul{y2l0W0B
z8m{J#0iyKPl>x>5Z0mm(H{3K#Q2+o1{of7*yiW)H0hl@(BG3qJEjgsCGt}DF)y59$
z?d<jk4FJHr<^D{a?a<bo-p)=gC^>Hhu7416f98MPB3zvRK+w+>xDeWpI8|Id>^Sd2
zC845RaB@ygPMC+Sy_~+P+P{zgSt)QmMWfy1L`1y2yr5nZP*)EJ5iwa=SrJij5pi+h
zKL}xzj|<w`Ti6A~{V$UL=25jnAw3-3(2lMyoPT+(ZCo*E1um|?LjP(1x+mJv{(qEQ
zQ2!3=Pk<tScSOXXq9Xs{{&N)e*DI&%;b`|q`7b|Q4E7K5|M>o`0~7fx{=Y8suSoy#
z{s|RM4iov$v%$%=T6s+Y0Fa-i>ODhm;FdXs8~dmayxxz)*DQI7H}KUi2piVVp#PZQ
z-m4((BnEMVT4&|Sm$yEJIjU$p1=~c$-bsrE((67~=B(*`Bgv`%^EH}0)?i<f>bCPc
z8}bMcS)kc#JB8xy#`Cq~jC%FQmNSKZB|^XSPp{wU)_WbNS2#59Z@sue9o_oW9tN~l
z0@0HEe>HsFO0<ZtTU%n`cHNb)l|WIVR^JrPKGUCmZJp!#$j4s}PY(X<2Ayv3IqG1Q
z@-M?IcB&<b*UdR4E%#bkJt(<4I`T}Dv|2~`bVt-H<`Y~Wd24U+Zx7Dv^pv|!`R;2g
zk`J@JO`dAcQzSIF&DkmYJl%O~3(Eg=rnGF7{9;rGcJ&g_95CKDS%yeIZ*V$tlwUw!
zTy(N#E$<k&tAAg$eyiD$Crg+F<@8iH7c|ia{7zz(4xI1`y_>la2sbu&K3%We@hdKO
z>Y|1XL`J>I(3*4+2*<2)z?Q2O{r3CnQ>7nMzlhP+CE?Lla&~ssF)?ATFUbDds4!$c
z?q)E5HdjfHCy7!Y6@IdIPg18KU;Xr5Y&rc6qnVK+p{~6%uO0V>1#6cbiu9AStBBwA
zFMMV&rtu?_#>JI-#Y{^FA9q8|3z5vUxb&*={_?sy4~x~G_08wMI5&zhbT93Ud-cBU
zuhe$`s$ge(x`enlFW9cg-Ah`!(AGFR*mNm2xBoUp^E$y}<m*(^)nS&Xo*8SyWI1~<
zIr2+lY`I4(3&?Tg#z@${EVq0A9oB7G%hRi`Ka8_Nyywl|PZuOJk-8@k4}{{hHIURS
zS1YaM^Do)Rcv(Nz(fG6}D2Rz<7zf)aSj!hIu1e1wP>j)ZC7nd6YH>?^HPw5YgV)^1
z(~c>stOl3$6(Gb}bfqLu?xI%s&}LF>6kPTP&uBF?k&ma;^dE}xfaTnjKAoRCOK0>?
z=xmZE)1#F&>P>YHPVV%)B{KM-#3C&3d*O*T*}8aH9JX<7F}};Vd|HUadnYAn{g&a?
zGg;;IY<b$KwGhjcWu{_5p`2q!Ledc2=*RBMEt0lw9ADu%HQrQrLjdWOw-MsI#vk&;
z{?xC5g-=&07S*quP9I+kt=-RD4&K3J`^gQcjT<O<Wtz=|$&f~D$wcl&vtQft-+m@W
zM(gdTa(>)J(5{{eJPD_-a0!?8jXwP*J$Va1bn--JW>#M~0G*B+&zmFn_xiSc{$kD0
z=u1JTT8VEz8>^TuwBK6VP{+$?`!sA>48Awa@?v*Bm~&=4U)||P8OJxmdelarbkh&q
zV-!9y(@UV*ThnWkl7aD&WPgp#aGq?N<BluAKqJK52-8pu{hTH}pq{>H$grwa*~Fj^
z;;=JNnVoOC^z?KaRQ7-4VbgDKdFo}=?itmgzM(MGrrET|BJ+DCuRo$T#WS`{dd@90
zUih)}G$teM5aMoA)`J@z#h=}eX_%}<-5l?9VqX;<w)M?W#z-$CPiR~ncv)G6qsI5e
z--YdkQi#qSgwu#v2HK7f>s~%nH%W<47^!j&e;`m5caK?whmfx-dpTcXokG|YP@RI*
zGSU2X+9hagiE>JIw%YTsJV>>lS>k{0b8uttCI!jo(uX?@tBa{p7LkdgT_>#OZ_S3M
zH#xEQ(^0rZW0J|H9nvo<kqsj)p<>Y!eIK*B_^0=JE$0r{HYgWQ-*TDornf5QS?jdh
z@+D{&R<^7mzMFOX=Ms>2phlC0;{s+Byl!m>^smkf9KRoc4M&fUO{U))vxg~fkH0+a
zaiQvD+1kVg&0RK^km_))&%@JNZI@`KXG5hGUv#lIp4H~==792Z@@*_Bl;9JL+eCZ9
z5mc*yhDehKZyZ0alN<qgpvYgUAJk-tr&c2z)u)J9AApASQ%itf8Y&rrZwmKZJI^~=
z-FQT}>tFMNZ2sVTJgtzR)6=52qD(nozZUjvD+j-;^wKdx4i{*>P<&C7EzmhdLut$Z
zc}TP6LH{tD-RtDU`N<Ap+7TL)_Z_SiP@;sP_kM8>yjM5XrwUxdW9i;m0yBv^N=Z(h
z)a+Xem5_KJmX~S2_bpNc_L6pTr!Ko+-<$_vH3vBe&4Al6QbqjdQcl+fL0qC;9lvWj
z%jvKd^EOt@*oJAHT$z5tCg2kSNy1ODHaV}ZSiH$jsH}cRjh0DqW!uS55|C*Si*@)J
zXHvgPy3wUgRTz9cXOhak0;5s0s5pf6z1-~Nvxg{Rc3*)fs!iN8qmtR#TGRC&obw3Y
zlrYJfHNnv|MvF-)-{MYm65TElc*9x#6}(Xq)Pb$V9%6NaH-Z$D3{_9QG=ft!vnTMi
z&8d1tlH3qzGl3HkV#j|mkn0+8pvA!6LJ^J0{~QzjR8>jiqwwzh4k1Tw;dBRcVZm4?
zX+_)bT{G9hf?sh3o-G97H&hH4Ks=Ovz#elPqV|SbjKs(@w;hYOvIMh(8Tv}^f&=?m
ztV`{YWUmGuc87v+??me|vl2gokjEnwk0^&=x6>M=fGZzlJ&{=?nZ!__w_U|+o-9*w
zk@}`_V6uE>8I<97p^|0lE4#f`Q{riQ7m1iHgb&#2xPfEdsEfiHQp%8xh`JBhXz}2O
zB(o^EUa)-=Bfvo|X1Yx)4Ev^Q$?3hH)s*PoB2ji);O}kwED4UU7Ocr4pdc9eMM`RL
zlXWP|jg00|duUCE*z`=O9BzRo$oy+opYlY7krAo_3?GSercL%_%H@6B0`3;H9|~aC
zIPe0LOn$D;1$`G}T~?ki0dzvzu>4s2c?rO984MbSKc>LG4Z3NMZq{^2=2095;f30L
z^EHF)Xq0G9p4ys~8AWGenwY#rwHOpu-G<j}ih@e-xDkf?Jtjvf6p$-Fz<3p2Dfk%%
zk!V@T<0$WHSRWqkxzrc9IO=)A;N5t=cuPU1VFDJI_aiD`pcEmVNI+ha>>kw@Z|#f%
zMaRUWsG?ALQL<o_UF3k%K@qP*oJF{r^^)a>*x<GMQ5-;B05c&2SYhZs76o8cn9~Zq
zfB#)p=S6&U&r&_PJWGCApl$HX3KDS4T4Kz{k)U37`H)PgGR`a^M{=0LUA0Xxi)(=q
zUh0|!CIV^EACRff`X$^eiceVk<}LAt%HK)KgOzYL&uk$u)uyyJ=57qqhE8t*D9MIO
zEM|7iUps46`CXi1_-;j^Dmpf0O0o&haO!AEu{T9C4Y**o+Itd#;m)?9YOh?Tb^MvS
zeEMB|vFw^v6t_^NUsT!;gNl$DK#XI|^nmNzQRZ}uY?72E+olgw1bT_Ta8nj61lZiY
zORKN%7c!e6Z)9YURFI}<>E$KIu^J<=KBnar?hx+AZ4`5N#tZaKJ)N*5g=&!vCXn;&
z@e1E8_LJMecUq&4+sQg+vtO8bKlLg^SV8-IB?YU8=*#rkz}Ix5arHzSmCC0cejewY
zQ?5VVyOAIf8Q${Hu21)mSF0GVdKMY!(JgEp#0=UlVMGb-h|i}7!$t+w>I<66GlMnX
zJ~SGEbAE8D**LX>ULN<L7xh7Uw-`_RNC&44!RDjD@Egh*DelxOK9xaqhg5abi2z6|
z<fd<B(=aL{R|JV!h;~F*1c)c+rP-L;XAr!n6Vz2&8Kk|p{jAy$gQCEFG?jx|Gq>G*
z6`vr=g>$7oe?A|#R_4*>Le2^g;l9nS;mhX|?&d#kpyGG@96vZUSRvZkO-=O$QU2hr
zkVOc#33!T{F@i3>!RN$eEh)0)us#eIOu`Txu;pzm@bym+BfgMM#Ca5im?LT}s5Bp%
z*%8?IeBiy&dh(fC#n;oEflA$J(^y7+Qw;8VY|h>`;&DZWzj?pqBs`ZVujL7Sbj2V$
zWUS32I(&tiyFYk*VXe?}*54csVeiJ6Bpua6!AI~XZ6vw8qBBeh-BxdnA1F;*x`d{c
zTPSBL0w)5XBr@sEB;N@n^KvJi3QZ}wem>A$CJ<K_RaTa!3k897;Vc$kOb@x?4>;gO
zHfz6~qGIp4?xeZmEFQ-&DS>T<A}+esNM@>zjHlJC-QkffejZFKX)@Y?#G(2)xPz_t
z4@QZ&>++nX6e=$!Hxg_o&a?lBNdgsOZz^PtmhZVcb4xwIl8_G({gly-$BlOv<_7ql
zfa2qWB-oV}l{@1I#3O@fd%4-W&wSs?EK(|La!fRu+0E;LO5E1^Op##AWid6e<#yme
zm~}1bKxhgzs?9@-dF^J#OVk64qP&sCDoGRk+Kpvu=i;YQ5w*YNOZ(B&q~iruz)Iyf
zJGBRDw6$+OU6%{_%8`eu9Crl^1Yu4T=DV=)pca^VSUO@!vQ1v;03np?bZa>awx=`5
z_p!8$MG2)bu=-y1z+oEMHT0D#f5F@huJO?QWLGE_CBu$Ag(wKQI*o7*=N4XA`Gpvz
z<v4{}*QQ(Y*)ARBVx6(%K@!cep%CCKfDik$Z6Uu3g+JZ_4oiirc7{z`5W)Z#tk}IZ
z)0(B7hrrn%qTGr_zfV8tT5Aqc6UYaf1UX}kgDOfZZ4P_3sIK2XfP8arRpcZGFLL|7
zKTFcVO|cZPnuF%fqesV{y0)J`XUnT!XHZ?;__Z0)5wjn${MLK-#`p<BJP`6umza;-
zmx?>$S&;})Kgk4UH#(2mO3ngb4d{qn7IitTu(?6*^nzuI52OOxXz84z_NP1%a=Ys$
zHb|x#rxJ)G2$EQ-4{9dfCee~zX()9p(k>3tI%RkrZ^lX8F6vFIoscK9usT0R8frJ|
zGU#>eeoNM<JKbB$i;;YYL7FP%_S>XjRoTv)g9ccEAoJMTI_+F!l9WsS#M;c>@j6kW
z;(=5JAii|3PZB;1W6B}!nIq;)jsZm1vxs)WI0&{0iUGz1jX_@ojk_jC$oPEOqJsBT
zfh(R9+Ik2{iS*T?yTnp$v2i^SE9Icb&GK2&EBcdLyE00->Nagm;!<N0SPWp1`Sn|F
zN<rdSyDjSKRX_48`%45*j}`6NFfC#&EpOGj8@f#os5b*|Tx!nWw34;@!H-C=;Z5*Q
zvZAFyvUIAZgO=iSb)ewI&oT5#Z0=(0$XphiBEAyC*9{Dx37-L7bb&Jfg+6(}A|=wP
z*9Ir%2nyYlR1`okJ+pF==#sF(y*9top?yJ=9ofKUHI9)Jr5vo+|2{_;J?8g}IE;IE
zasJeCH0;+#TfOJ{L?moK(}-?>X|&HWn-?7CV3W*Z<N6_!t&eu`ouiDDZBq*0n*@vS
zPP<!rYZ-}(S_Uq4pHmS;;rDW-FIljD4k83Gz{$G+;&y*nf>@UrvDMrNOXEYf<32Ex
za5P(ch{O9rB**2^Gur`5Q|*YurPpy8G#<}2q^X$gS-h;lFKq-#c`j?hSGH^+A&25P
z4XX^ux&;>0IHbIvJGfUv7DYPNws+wYji(hu)fMwacBZAOeYf;bWOd|8y-C0E!-osW
zFnX~|DiR^)IZY(F^1a-;PRy!3^QB>I&IbqKXV(KnwlaLaO&o97^UjNw{Np0uv39pl
zMCDfJ7(Y?U^W%SyIokpyCVa3tGs1h1en)2=Ksu&Q)+STY&Gf%|6PGe~kI5PnFYlA9
z>-P_@)xLlFd%c0WC9U=jyN}l8iAP;|i_dF`wjW|pi8649s<Bq7ZcC~&Tj%hU5J?jN
zw7A5(8lGCL1+<R9dbmZhd5!o;ycyW*4Z9`P(Wb6+l1DP`F1;LT-x(^@_R^K~iV;EV
zPnNBxWgGr5q*Z*1FLOBP1;IqPp3t<bnk{ih=w-Nr-Y<Yt)b_ZgiEvFlWHBjx^Jm@{
ze5Vix>$;yq3S`T1=y@@Z;R0R<-4H-8H*wouoc(x|FR5Clm~1F?nR=da-Z@AGql5lg
zv1`9cH?N#cHQy*69SvDc!xk>cRWnwK#X~F!D0Yn_A|0}wrG6wHdllvx=<=uf)H!{u
zIRyz>%C~Aifx!&j<x|o=OrziG(+f-2S!l}U72<lO70B!FJf>F)rtRb-%gcWhyDENO
z<E*gD9+V>_0NG^iyO=aJf826HUJ{y5&d>eiyY~=%$@fz0yfL01rcjR6)DsOdm$AKX
zloW^6LL384$*%VLuViJ8^}c`C#n^VG#)y=c{2cX&w=B?7!O7i*vDQ#|1GB5Ur9D)F
z?{}yq90<AHaie&Y9QSH)bS#hYNfO#Zn<}5<Q58mb+YFCPfi$%t7p%q7bjg1g`u*g+
ziai!C?5|Zl5Vy|Wp{73bX5z;p%f;XiLcEr$+rhsBJHi(7BV!nyG<H-&A^~(~7O4}P
z5)Wr{&$xpKxLxb~g%Xy3i`&fwdq7Au+G}zln<93wNa^5jN~CUJH{Y5k(RUQ+h<nfn
zh776eIEzlXxO0TGfuf7xQ}ya6C*jn2Pnu4zVjgMns-kbcSj6iyyPC=PV-RyEBX%4a
z8SCU=aGLv#xo2CQ8;bsZ$Te)>-Sd&*1L63gE+dK+XicI!7;aUpxbu2lo^3HB&|e)-
zJZ*PAc67Lrbwi>o<c=nvTad^8+q7crtvob6F}6-yb^1WZZgnwOEiUU`aMUDTyPdcB
z;?rv8MT|%QEa}0eY+a;+_fz;-<06KF2J6>wh^^-4p?w|;d01jJTg5<4we!g*pgC~r
z2itng!e~}NW=iALr^5~C2=3lx;>XvWcD{7#ZjFczEihD&pQF3$+r?r+T1{-mrZykJ
zm{_yZ6;Cg`V$Mm>492Iz+`0^k2^83tIG!1Q{S7y_JJXwzVQZwF(**x)S&Hq-1znKa
zud9ni`(_&)N(|mnpxsxIaWX=iKrB#I_;nVF86)z{RlgIuE_RWsYSd2(jyvO)y(Lj$
zV!R@(KkS19*v21obCf)BzrI|ZmnWZ74r+X@a$fLD+hQi<lxg-yDJDBE0_u%K=lsc$
zVo~$>-DeVt%G-;22>(Pj=2U0J2#wnP4$Q{EB7?O8f4a>qa(e$w20b$SV-UK`C+qa`
z^1S*<1QaO@d83$>@MWw&YX|qC43~A9ksY*#*#)A=^1B`$AFT~cw3s!9sI!{5T6&!)
z6{Q`?^dxsT-%CZDbD)a%h!`LdWqR`Cr|z!p4+J3-dns#bE*)$6#B=&f8!{H<A2RVR
zLo<)V34YEnMyz;;45^fE?UtF4eIcc%WEZ3>+sT2PooqcH6SWx5RfiaCo=7}O4AMHx
z!4Ku{1gza2cXw@}y?)%=e7gW_e~O`C-fg3(EveaK;Y2LxAwY!he0V%fG-4vRFI!Yd
zPkBi5smo7pZ-y4LqnoCGow6n~D!^aFWXO>4+|DkoGk(65^|k2aDmekCVo+GNL$emQ
zn_K`n;)a*YyfA#El>bQSuA6-=C(FL}T5(;Y)Ah~RqFs)FH-{2)FTF0*9nK%Zc;cC-
zc&=liA7A(i#ot#tqZ|yMD7k+{)w*}i(Lgsd`8aBgn}KRJ!|N6gX*Eb_Hharwk?PVB
z)K7Rf!?P~%Glc#H5Z;-6{g8%7^z_+2b<e%@VW0ZIq<gsZ^;^lx-(>88@02mst-qXl
z?_~JR1>l(&ub<63xV9XJ+Pk+)J@2Lyk&szCSO}%?_X>P^4L53z5~1fgP&6D$XsEML
zY#J$pSD^73XB_<>Rztm)IQm&$=P!8tB(m)n24@vblrP&}?APACH&zc8VZg}`J7!tj
zND7jIy|RdOD98KKxL9>?#2a-qUHbc-mzWw?vKdqf<#YV4vIazhK71=?xy-LmQQXCL
z2}>j5<S$a(!@|8*D%uog+yimMGo!}K2zC(++6ig#5+xZbu`=){34sN4sz2$_r|Ez;
zAD_S2Y)4ivj(v9w*l9RtQgfc0ZF1S7!R(0&)Af|XmUNkJ5pKp)vY0sgG~j>kIGy0s
zi<<+hesyyGD(cY(@pT3<GSbn9H|LK~Fcro+WqqL(g}3@s7l^dJ`{K-Z$n^iVoc^cK
fAN;NldkuX2>vco-4`|ijA05s6I;zFWRw4fdj6P18

literal 0
HcmV?d00001

diff --git a/components/camel-ipfs/src/test/resources/html/index.html b/components/camel-ipfs/src/test/resources/html/index.html
new file mode 100644
index 0000000000000..3781300297051
--- /dev/null
+++ b/components/camel-ipfs/src/test/resources/html/index.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <title>IPFS</title>
+    <meta charset="utf-8" />
+    <link rel="stylesheet" href="./css/default.css">
+</head>
+<body>
+<p><a href="index.html">Home</a></p>
+<p><a href="chap/ch01.html">chapter one</a></p>
+<p><img src="img/logo.png" alt="logo" /></p>
+</body>
+</html>
diff --git a/components/camel-ipfs/src/test/resources/log4j2.properties b/components/camel-ipfs/src/test/resources/log4j2.properties
new file mode 100644
index 0000000000000..081914f91a3be
--- /dev/null
+++ b/components/camel-ipfs/src/test/resources/log4j2.properties
@@ -0,0 +1,30 @@
+## ---------------------------------------------------------------------------
+## 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.
+## ---------------------------------------------------------------------------
+
+rootLogger.level = DEBUG
+rootLogger.appenderRef.file.ref = file
+
+appender.file.name = file
+appender.file.type = File
+appender.file.fileName = target/camel-test.log
+appender.file.layout.type = PatternLayout
+appender.file.layout.pattern = %d [%-15.15t] %-5p %-30.30c{1} - %m%n
+
+appender.out.name = out
+appender.out.type = Console
+appender.out.layout.type = PatternLayout
+appender.out.layout.pattern = %d [%-15.15t] %-5p %-30.30c{1} - %m%n
diff --git a/components/pom.xml b/components/pom.xml
index 4356c930d7a27..a280e252942be 100644
--- a/components/pom.xml
+++ b/components/pom.xml
@@ -55,6 +55,7 @@
     <module>camel-http</module>
     <module>camel-http4</module>
     <module>camel-hystrix</module>
+    <module>camel-ipfs</module>
     <module>camel-jetty-common</module>
     <module>camel-jetty</module>
     <module>camel-jetty9</module>
diff --git a/parent/pom.xml b/parent/pom.xml
index 983ecc6d2ec13..f3bc214e4e510 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -513,6 +513,7 @@
     <mvel-version>2.4.2.Final</mvel-version>
     <mybatis-version>3.4.6</mybatis-version>
     <narayana-version>5.9.0.Final</narayana-version>
+    <nessus-version>1.0.0.Beta1</nessus-version>
     <nsq-client-version>1.0.0.RC4</nsq-client-version>
     <neethi-bundle-version>3.0.1</neethi-bundle-version>
     <nekohtml-version>1.9.22</nekohtml-version>
@@ -4930,6 +4931,11 @@
         <version>${pdfbox-version}</version>
       </dependency>
 
+      <dependency>
+        <groupId>io.nessus</groupId>
+        <artifactId>nessus-ipfs</artifactId>
+        <version>${nessus-version}</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 

From 16d6aeb2637cdd95fa6850906ce8fb442421afec Mon Sep 17 00:00:00 2001
From: Andrea Cosentino <ancosen@gmail.com>
Date: Thu, 15 Nov 2018 13:33:46 +0100
Subject: [PATCH 022/125] CAMEL-12810 - Added explicit repository for Nessus
 and Spring Boot starter related

---
 components/camel-ipfs/pom.xml                 |  14 ++
 .../src/main/docs/ipfs-component.adoc         |   6 +-
 .../camel-ipfs-starter/pom.xml                |  68 ++++++
 .../IPFSComponentAutoConfiguration.java       | 128 +++++++++++
 .../IPFSComponentConfiguration.java           |  55 +++++
 .../src/main/resources/META-INF/LICENSE.txt   | 203 ++++++++++++++++++
 .../src/main/resources/META-INF/NOTICE.txt    |  11 +
 .../main/resources/META-INF/spring.factories  |  19 ++
 .../main/resources/META-INF/spring.provides   |  17 ++
 .../spring-boot/components-starter/pom.xml    |   1 +
 10 files changed, 518 insertions(+), 4 deletions(-)
 create mode 100644 platforms/spring-boot/components-starter/camel-ipfs-starter/pom.xml
 create mode 100644 platforms/spring-boot/components-starter/camel-ipfs-starter/src/main/java/org/apache/camel/component/ipfs/springboot/IPFSComponentAutoConfiguration.java
 create mode 100644 platforms/spring-boot/components-starter/camel-ipfs-starter/src/main/java/org/apache/camel/component/ipfs/springboot/IPFSComponentConfiguration.java
 create mode 100644 platforms/spring-boot/components-starter/camel-ipfs-starter/src/main/resources/META-INF/LICENSE.txt
 create mode 100644 platforms/spring-boot/components-starter/camel-ipfs-starter/src/main/resources/META-INF/NOTICE.txt
 create mode 100644 platforms/spring-boot/components-starter/camel-ipfs-starter/src/main/resources/META-INF/spring.factories
 create mode 100644 platforms/spring-boot/components-starter/camel-ipfs-starter/src/main/resources/META-INF/spring.provides

diff --git a/components/camel-ipfs/pom.xml b/components/camel-ipfs/pom.xml
index 20b6f7c959e61..f0ec0dc4dc7a9 100644
--- a/components/camel-ipfs/pom.xml
+++ b/components/camel-ipfs/pom.xml
@@ -36,6 +36,20 @@
     <camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=ipfs</camel.osgi.export.service>
   </properties>
 
+  <repositories>
+    <repository>
+      <id>jboss.ea</id>
+      <name>JBoss Repository</name>
+      <url>https://repository.jboss.org/nexus/content/groups/ea</url>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+      <releases>
+        <enabled>true</enabled>
+      </releases>
+    </repository>
+  </repositories>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.camel</groupId>
diff --git a/components/camel-ipfs/src/main/docs/ipfs-component.adoc b/components/camel-ipfs/src/main/docs/ipfs-component.adoc
index 6a3fcc4ef23cf..a88cc1029f992 100644
--- a/components/camel-ipfs/src/main/docs/ipfs-component.adoc
+++ b/components/camel-ipfs/src/main/docs/ipfs-component.adoc
@@ -35,20 +35,18 @@ The IPFS component has no options.
 The IPFS endpoint is configured using URI syntax:
 
 ----
-ipfs:cmd
+ipfs:host:port/cmd
 ----
 
 with the following path and query parameters:
 
-==== Path Parameters (3 parameters):
+==== Path Parameters (1 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
 | *ipfsCmd* | The ipfs command |  | String
-| *ipfsHost* | The ipfs host |  | String
-| *ipfsPort* | The ipfs port |  | int
 |===
 
 
diff --git a/platforms/spring-boot/components-starter/camel-ipfs-starter/pom.xml b/platforms/spring-boot/components-starter/camel-ipfs-starter/pom.xml
new file mode 100644
index 0000000000000..76694fd5a45c4
--- /dev/null
+++ b/platforms/spring-boot/components-starter/camel-ipfs-starter/pom.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    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.
+
+-->
+<project xmlns="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">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.camel</groupId>
+    <artifactId>components-starter</artifactId>
+    <version>2.23.0-SNAPSHOT</version>
+  </parent>
+  <artifactId>camel-ipfs-starter</artifactId>
+  <packaging>jar</packaging>
+  <name>Spring-Boot Starter :: Camel :: IPFS</name>
+  <description>Spring-Boot Starter for Camel IPFS support</description>
+  <dependencies>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter</artifactId>
+      <version>${spring-boot-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.camel</groupId>
+      <artifactId>camel-ipfs</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <!--START OF GENERATED CODE-->
+    <dependency>
+      <groupId>org.apache.camel</groupId>
+      <artifactId>camel-core-starter</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.camel</groupId>
+      <artifactId>camel-spring-boot-starter</artifactId>
+    </dependency>
+    <!--END OF GENERATED CODE-->
+  </dependencies>
+  <!--START OF GENERATED CODE-->
+  <repositories>
+    <repository>
+      <id>jboss.ea</id>
+      <name>JBoss Repository</name>
+      <url>https://repository.jboss.org/nexus/content/groups/ea</url>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+      <releases>
+        <enabled>true</enabled>
+      </releases>
+    </repository>
+  </repositories>
+  <!--END OF GENERATED CODE-->
+</project>
diff --git a/platforms/spring-boot/components-starter/camel-ipfs-starter/src/main/java/org/apache/camel/component/ipfs/springboot/IPFSComponentAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-ipfs-starter/src/main/java/org/apache/camel/component/ipfs/springboot/IPFSComponentAutoConfiguration.java
new file mode 100644
index 0000000000000..30f92ac146c3a
--- /dev/null
+++ b/platforms/spring-boot/components-starter/camel-ipfs-starter/src/main/java/org/apache/camel/component/ipfs/springboot/IPFSComponentAutoConfiguration.java
@@ -0,0 +1,128 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.ipfs.springboot;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import javax.annotation.Generated;
+import org.apache.camel.CamelContext;
+import org.apache.camel.component.ipfs.IPFSComponent;
+import org.apache.camel.spi.ComponentCustomizer;
+import org.apache.camel.spi.HasId;
+import org.apache.camel.spring.boot.CamelAutoConfiguration;
+import org.apache.camel.spring.boot.ComponentConfigurationProperties;
+import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
+import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
+import org.apache.camel.spring.boot.util.GroupCondition;
+import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
+import org.apache.camel.util.IntrospectionSupport;
+import org.apache.camel.util.ObjectHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Conditional;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Lazy;
+
+/**
+ * Generated by camel-package-maven-plugin - do not edit this file!
+ */
+@Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo")
+@Configuration
+@Conditional({ConditionalOnCamelContextAndAutoConfigurationBeans.class,
+        IPFSComponentAutoConfiguration.GroupConditions.class})
+@AutoConfigureAfter(CamelAutoConfiguration.class)
+@EnableConfigurationProperties({ComponentConfigurationProperties.class,
+        IPFSComponentConfiguration.class})
+public class IPFSComponentAutoConfiguration {
+
+    private static final Logger LOGGER = LoggerFactory
+            .getLogger(IPFSComponentAutoConfiguration.class);
+    @Autowired
+    private ApplicationContext applicationContext;
+    @Autowired
+    private CamelContext camelContext;
+    @Autowired
+    private IPFSComponentConfiguration configuration;
+    @Autowired(required = false)
+    private List<ComponentCustomizer<IPFSComponent>> customizers;
+
+    static class GroupConditions extends GroupCondition {
+        public GroupConditions() {
+            super("camel.component", "camel.component.ipfs");
+        }
+    }
+
+    @Lazy
+    @Bean(name = "ipfs-component")
+    @ConditionalOnMissingBean(IPFSComponent.class)
+    public IPFSComponent configureIPFSComponent() throws Exception {
+        IPFSComponent component = new IPFSComponent();
+        component.setCamelContext(camelContext);
+        Map<String, Object> parameters = new HashMap<>();
+        IntrospectionSupport.getProperties(configuration, parameters, null,
+                false);
+        for (Map.Entry<String, Object> entry : parameters.entrySet()) {
+            Object value = entry.getValue();
+            Class<?> paramClass = value.getClass();
+            if (paramClass.getName().endsWith("NestedConfiguration")) {
+                Class nestedClass = null;
+                try {
+                    nestedClass = (Class) paramClass.getDeclaredField(
+                            "CAMEL_NESTED_CLASS").get(null);
+                    HashMap<String, Object> nestedParameters = new HashMap<>();
+                    IntrospectionSupport.getProperties(value, nestedParameters,
+                            null, false);
+                    Object nestedProperty = nestedClass.newInstance();
+                    CamelPropertiesHelper.setCamelProperties(camelContext,
+                            nestedProperty, nestedParameters, false);
+                    entry.setValue(nestedProperty);
+                } catch (NoSuchFieldException e) {
+                }
+            }
+        }
+        CamelPropertiesHelper.setCamelProperties(camelContext, component,
+                parameters, false);
+        if (ObjectHelper.isNotEmpty(customizers)) {
+            for (ComponentCustomizer<IPFSComponent> customizer : customizers) {
+                boolean useCustomizer = (customizer instanceof HasId)
+                        ? HierarchicalPropertiesEvaluator.evaluate(
+                                applicationContext.getEnvironment(),
+                                "camel.component.customizer",
+                                "camel.component.ipfs.customizer",
+                                ((HasId) customizer).getId())
+                        : HierarchicalPropertiesEvaluator.evaluate(
+                                applicationContext.getEnvironment(),
+                                "camel.component.customizer",
+                                "camel.component.ipfs.customizer");
+                if (useCustomizer) {
+                    LOGGER.debug("Configure component {}, with customizer {}",
+                            component, customizer);
+                    customizer.customize(component);
+                }
+            }
+        }
+        return component;
+    }
+}
\ No newline at end of file
diff --git a/platforms/spring-boot/components-starter/camel-ipfs-starter/src/main/java/org/apache/camel/component/ipfs/springboot/IPFSComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-ipfs-starter/src/main/java/org/apache/camel/component/ipfs/springboot/IPFSComponentConfiguration.java
new file mode 100644
index 0000000000000..8046aa3491893
--- /dev/null
+++ b/platforms/spring-boot/components-starter/camel-ipfs-starter/src/main/java/org/apache/camel/component/ipfs/springboot/IPFSComponentConfiguration.java
@@ -0,0 +1,55 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.ipfs.springboot;
+
+import javax.annotation.Generated;
+import org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+/**
+ * The camel-ipfs component provides access to the Interplanetary File System
+ * (IPFS).
+ * 
+ * Generated by camel-package-maven-plugin - do not edit this file!
+ */
+@Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo")
+@ConfigurationProperties(prefix = "camel.component.ipfs")
+public class IPFSComponentConfiguration
+        extends
+            ComponentConfigurationPropertiesCommon {
+
+    /**
+     * Whether to enable auto configuration of the ipfs component. This is
+     * enabled by default.
+     */
+    private Boolean enabled;
+    /**
+     * Whether the component should resolve property placeholders on itself when
+     * starting. Only properties which are of String type can use property
+     * placeholders.
+     */
+    private Boolean resolvePropertyPlaceholders = true;
+
+    public Boolean getResolvePropertyPlaceholders() {
+        return resolvePropertyPlaceholders;
+    }
+
+    public void setResolvePropertyPlaceholders(
+            Boolean resolvePropertyPlaceholders) {
+        this.resolvePropertyPlaceholders = resolvePropertyPlaceholders;
+    }
+}
\ No newline at end of file
diff --git a/platforms/spring-boot/components-starter/camel-ipfs-starter/src/main/resources/META-INF/LICENSE.txt b/platforms/spring-boot/components-starter/camel-ipfs-starter/src/main/resources/META-INF/LICENSE.txt
new file mode 100644
index 0000000000000..6b0b1270ff0ca
--- /dev/null
+++ b/platforms/spring-boot/components-starter/camel-ipfs-starter/src/main/resources/META-INF/LICENSE.txt
@@ -0,0 +1,203 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed 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.
+
diff --git a/platforms/spring-boot/components-starter/camel-ipfs-starter/src/main/resources/META-INF/NOTICE.txt b/platforms/spring-boot/components-starter/camel-ipfs-starter/src/main/resources/META-INF/NOTICE.txt
new file mode 100644
index 0000000000000..2e215bf2e6b1f
--- /dev/null
+++ b/platforms/spring-boot/components-starter/camel-ipfs-starter/src/main/resources/META-INF/NOTICE.txt
@@ -0,0 +1,11 @@
+   =========================================================================
+   ==  NOTICE file corresponding to the section 4 d of                    ==
+   ==  the Apache License, Version 2.0,                                   ==
+   ==  in this case for the Apache Camel distribution.                    ==
+   =========================================================================
+
+   This product includes software developed by
+   The Apache Software Foundation (http://www.apache.org/).
+
+   Please read the different LICENSE files present in the licenses directory of
+   this distribution.
diff --git a/platforms/spring-boot/components-starter/camel-ipfs-starter/src/main/resources/META-INF/spring.factories b/platforms/spring-boot/components-starter/camel-ipfs-starter/src/main/resources/META-INF/spring.factories
new file mode 100644
index 0000000000000..d839f9786d29a
--- /dev/null
+++ b/platforms/spring-boot/components-starter/camel-ipfs-starter/src/main/resources/META-INF/spring.factories
@@ -0,0 +1,19 @@
+## ---------------------------------------------------------------------------
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements.  See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License.  You may obtain a copy of the License at
+##
+##      http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+## ---------------------------------------------------------------------------
+
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+org.apache.camel.component.ipfs.springboot.IPFSComponentAutoConfiguration
diff --git a/platforms/spring-boot/components-starter/camel-ipfs-starter/src/main/resources/META-INF/spring.provides b/platforms/spring-boot/components-starter/camel-ipfs-starter/src/main/resources/META-INF/spring.provides
new file mode 100644
index 0000000000000..19172a6d9a1cf
--- /dev/null
+++ b/platforms/spring-boot/components-starter/camel-ipfs-starter/src/main/resources/META-INF/spring.provides
@@ -0,0 +1,17 @@
+## ---------------------------------------------------------------------------
+## 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.
+## ---------------------------------------------------------------------------
+provides: camel-ipfs
diff --git a/platforms/spring-boot/components-starter/pom.xml b/platforms/spring-boot/components-starter/pom.xml
index 8208920b731ef..d8d57c4a00ecd 100644
--- a/platforms/spring-boot/components-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/pom.xml
@@ -204,6 +204,7 @@
     <module>camel-ignite-starter</module>
     <module>camel-infinispan-starter</module>
     <module>camel-influxdb-starter</module>
+    <module>camel-ipfs-starter</module>
     <module>camel-irc-starter</module>
     <module>camel-ironmq-starter</module>
     <module>camel-jackson-starter</module>

From 61517d6fa614b1568226955652217dcffc1e46d9 Mon Sep 17 00:00:00 2001
From: Andrea Cosentino <ancosen@gmail.com>
Date: Thu, 15 Nov 2018 13:38:17 +0100
Subject: [PATCH 023/125] CAMEL-12810 - Added camel-ipfs to kit

---
 apache-camel/src/main/descriptors/common-bin.xml |  1 +
 bom/camel-bom/pom.xml                            | 10 ++++++++++
 parent/pom.xml                                   | 10 ++++++++++
 3 files changed, 21 insertions(+)

diff --git a/apache-camel/src/main/descriptors/common-bin.xml b/apache-camel/src/main/descriptors/common-bin.xml
index 93dc9bd016ad1..3436d48a2047b 100644
--- a/apache-camel/src/main/descriptors/common-bin.xml
+++ b/apache-camel/src/main/descriptors/common-bin.xml
@@ -458,6 +458,7 @@
         <include>org.apache.camel:camel-ignite-starter</include>
         <include>org.apache.camel:camel-infinispan-starter</include>
         <include>org.apache.camel:camel-influxdb-starter</include>
+        <include>org.apache.camel:camel-ipfs-starter</include>
         <include>org.apache.camel:camel-irc-starter</include>
         <include>org.apache.camel:camel-ironmq-starter</include>
         <include>org.apache.camel:camel-jackson-starter</include>
diff --git a/bom/camel-bom/pom.xml b/bom/camel-bom/pom.xml
index 69a6f752ca5a3..b8266714fecfb 100644
--- a/bom/camel-bom/pom.xml
+++ b/bom/camel-bom/pom.xml
@@ -1188,6 +1188,16 @@
         <artifactId>camel-influxdb-starter</artifactId>
         <version>${project.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.camel</groupId>
+        <artifactId>camel-ipfs</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.camel</groupId>
+        <artifactId>camel-ipfs-starter</artifactId>
+        <version>${project.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-irc</artifactId>
diff --git a/parent/pom.xml b/parent/pom.xml
index f3bc214e4e510..fa9b2d0aeaa25 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1389,6 +1389,11 @@
         <artifactId>camel-ignite</artifactId>
         <version>${project.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.camel</groupId>
+        <artifactId>camel-ipfs</artifactId>
+        <version>${project.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-irc</artifactId>
@@ -2908,6 +2913,11 @@
         <artifactId>camel-influxdb-starter</artifactId>
         <version>${project.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.camel</groupId>
+        <artifactId>camel-ipfs-starter</artifactId>
+        <version>${project.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-irc-starter</artifactId>

From f8b59a591a67100ad482cdcb091ac2d97e06abd0 Mon Sep 17 00:00:00 2001
From: Andrea Cosentino <ancosen@gmail.com>
Date: Thu, 15 Nov 2018 14:20:08 +0100
Subject: [PATCH 024/125] Regen

---
 .../src/main/docs/aws-sqs-component.adoc      |   3 +-
 .../src/main/docs/ipfs-component.adoc         |   2 +
 components/readme.adoc                        |   5 +-
 docs/user-manual/en/SUMMARY.md                |   1 +
 .../camel-spring-boot-dependencies/pom.xml    | 164 +++++++++++-------
 5 files changed, 107 insertions(+), 68 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 970bb77f4c014..d5dc6e82edde6 100644
--- a/components/camel-aws/src/main/docs/aws-sqs-component.adoc
+++ b/components/camel-aws/src/main/docs/aws-sqs-component.adoc
@@ -128,7 +128,7 @@ with the following path and query parameters:
 === Spring Boot Auto-Configuration
 
 
-The component supports 30 options, which are listed below.
+The component supports 31 options, which are listed below.
 
 
 
@@ -142,6 +142,7 @@ The component supports 30 options, which are listed below.
 | *camel.component.aws-sqs.configuration.attribute-names* | A list of attribute names to receive when consuming. Multiple names can be separated by comma. |  | String
 | *camel.component.aws-sqs.configuration.concurrent-consumers* | Allows you to use multiple threads to poll the sqs queue to increase throughput | 1 | Integer
 | *camel.component.aws-sqs.configuration.default-visibility-timeout* | The default visibility timeout (in seconds) |  | Integer
+| *camel.component.aws-sqs.configuration.delay-queue* | Define if you want to apply delaySeconds option to the queue or on single messages | false | Boolean
 | *camel.component.aws-sqs.configuration.delay-seconds* | Delay sending messages for a number of seconds. |  | Integer
 | *camel.component.aws-sqs.configuration.delete-after-read* | Delete message from SQS after it has been read | true | Boolean
 | *camel.component.aws-sqs.configuration.delete-if-filtered* | Whether or not to send the DeleteMessage to the SQS queue if an exchange fails to get through a filter. If 'false' and exchange does not make it through a Camel filter upstream in the route, then don't send DeleteMessage. | true | Boolean
diff --git a/components/camel-ipfs/src/main/docs/ipfs-component.adoc b/components/camel-ipfs/src/main/docs/ipfs-component.adoc
index a88cc1029f992..a975f43ad6063 100644
--- a/components/camel-ipfs/src/main/docs/ipfs-component.adoc
+++ b/components/camel-ipfs/src/main/docs/ipfs-component.adoc
@@ -66,6 +66,8 @@ with the following path and query parameters:
 
 The component supports 2 options, which are listed below.
 
+
+
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
diff --git a/components/readme.adoc b/components/readme.adoc
index 5122b4217ecdd..163b1837c278a 100644
--- a/components/readme.adoc
+++ b/components/readme.adoc
@@ -2,7 +2,7 @@ Components
 ^^^^^^^^^^
 
 // components: START
-Number of Components: 303 in 205 JAR artifacts (22 deprecated)
+Number of Components: 304 in 206 JAR artifacts (22 deprecated)
 
 [width="100%",cols="4,1,5",options="header"]
 |===
@@ -413,6 +413,9 @@ Number of Components: 303 in 205 JAR artifacts (22 deprecated)
 | link:camel-influxdb/src/main/docs/influxdb-component.adoc[InfluxDB] (camel-influxdb) +
 `influxdb:connectionBean` | 2.18 | The influxdb component allows you to interact with InfluxDB, a time series database.
 
+| link:camel-ipfs/src/main/docs/ipfs-component.adoc[IPFS] (camel-ipfs) +
+`ipfs:host:port/cmd` | 2.23 | The camel-ipfs component provides access to the Interplanetary File System (IPFS).
+
 | link:camel-irc/src/main/docs/irc-component.adoc[IRC] (camel-irc) +
 `irc:hostname:port` | 1.1 | The irc component implements an IRC (Internet Relay Chat) transport.
 
diff --git a/docs/user-manual/en/SUMMARY.md b/docs/user-manual/en/SUMMARY.md
index 628f5592b5da8..21fbd478ac290 100644
--- a/docs/user-manual/en/SUMMARY.md
+++ b/docs/user-manual/en/SUMMARY.md
@@ -294,6 +294,7 @@
 	* [IMAP](imap-component.adoc)
 	* [Infinispan](infinispan-component.adoc)
 	* [InfluxDB](influxdb-component.adoc)
+	* [IPFS](ipfs-component.adoc)
 	* [IRC](irc-component.adoc)
 	* [IronMQ](ironmq-component.adoc)
 	* [JavaSpace](javaspace-component.adoc)
diff --git a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
index 2d1d0f0b92744..0c7bb419ceea8 100644
--- a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
+++ b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
@@ -171,6 +171,11 @@
         <artifactId>httpunit</artifactId>
         <version>1.7</version>
       </dependency>
+      <dependency>
+        <groupId>io.nessus</groupId>
+        <artifactId>nessus-ipfs</artifactId>
+        <version>1.0.0.Beta1</version>
+      </dependency>
       <dependency>
         <groupId>javax.annotation</groupId>
         <artifactId>jsr250-api</artifactId>
@@ -1389,6 +1394,16 @@
         <artifactId>camel-influxdb-starter</artifactId>
         <version>${project.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.camel</groupId>
+        <artifactId>camel-ipfs</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.camel</groupId>
+        <artifactId>camel-ipfs-starter</artifactId>
+        <version>${project.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-irc</artifactId>
@@ -3464,7 +3479,7 @@
       <dependency>
         <groupId>org.knowm.xchange</groupId>
         <artifactId>xchange-core</artifactId>
-        <version>4.3.11</version>
+        <version>4.3.12</version>
       </dependency>
       <dependency>
         <groupId>org.mozilla</groupId>
@@ -3474,342 +3489,359 @@
       <dependency>
         <groupId>org.optaplanner</groupId>
         <artifactId>optaplanner-benchmark</artifactId>
-        <version>7.3.0.Final</version>
+        <version>7.14.0.Final</version>
       </dependency>
       <dependency>
         <groupId>org.optaplanner</groupId>
         <artifactId>optaplanner-benchmark</artifactId>
-        <version>7.3.0.Final</version>
+        <version>7.14.0.Final</version>
         <classifier>sources</classifier>
       </dependency>
       <dependency>
         <groupId>org.optaplanner</groupId>
         <artifactId>optaplanner-benchmark</artifactId>
-        <version>7.3.0.Final</version>
+        <version>7.14.0.Final</version>
         <type>test-jar</type>
       </dependency>
       <dependency>
         <groupId>org.optaplanner</groupId>
         <artifactId>optaplanner-benchmark</artifactId>
-        <version>7.3.0.Final</version>
+        <version>7.14.0.Final</version>
         <classifier>javadoc</classifier>
       </dependency>
       <dependency>
         <groupId>org.optaplanner</groupId>
         <artifactId>optaplanner-core</artifactId>
-        <version>7.3.0.Final</version>
+        <version>7.14.0.Final</version>
       </dependency>
       <dependency>
         <groupId>org.optaplanner</groupId>
         <artifactId>optaplanner-core</artifactId>
-        <version>7.3.0.Final</version>
+        <version>7.14.0.Final</version>
         <classifier>sources</classifier>
       </dependency>
       <dependency>
         <groupId>org.optaplanner</groupId>
         <artifactId>optaplanner-core</artifactId>
-        <version>7.3.0.Final</version>
+        <version>7.14.0.Final</version>
         <type>test-jar</type>
       </dependency>
       <dependency>
         <groupId>org.optaplanner</groupId>
         <artifactId>optaplanner-core</artifactId>
-        <version>7.3.0.Final</version>
+        <version>7.14.0.Final</version>
         <classifier>javadoc</classifier>
       </dependency>
       <dependency>
         <groupId>org.optaplanner</groupId>
         <artifactId>optaplanner-core-gwt</artifactId>
-        <version>7.3.0.Final</version>
+        <version>7.14.0.Final</version>
         <type>gwt-lib</type>
       </dependency>
       <dependency>
         <groupId>org.optaplanner</groupId>
         <artifactId>optaplanner-distribution</artifactId>
-        <version>7.3.0.Final</version>
+        <version>7.14.0.Final</version>
         <type>zip</type>
       </dependency>
       <dependency>
         <groupId>org.optaplanner</groupId>
         <artifactId>optaplanner-docs</artifactId>
-        <version>7.3.0.Final</version>
+        <version>7.14.0.Final</version>
         <type>zip</type>
       </dependency>
       <dependency>
         <groupId>org.optaplanner</groupId>
         <artifactId>optaplanner-examples</artifactId>
-        <version>7.3.0.Final</version>
+        <version>7.14.0.Final</version>
       </dependency>
       <dependency>
         <groupId>org.optaplanner</groupId>
         <artifactId>optaplanner-examples</artifactId>
-        <version>7.3.0.Final</version>
+        <version>7.14.0.Final</version>
         <classifier>sources</classifier>
       </dependency>
       <dependency>
         <groupId>org.optaplanner</groupId>
         <artifactId>optaplanner-examples</artifactId>
-        <version>7.3.0.Final</version>
+        <version>7.14.0.Final</version>
         <type>test-jar</type>
       </dependency>
       <dependency>
         <groupId>org.optaplanner</groupId>
         <artifactId>optaplanner-persistence-common</artifactId>
-        <version>7.3.0.Final</version>
+        <version>7.14.0.Final</version>
       </dependency>
       <dependency>
         <groupId>org.optaplanner</groupId>
         <artifactId>optaplanner-persistence-common</artifactId>
-        <version>7.3.0.Final</version>
+        <version>7.14.0.Final</version>
         <classifier>sources</classifier>
       </dependency>
       <dependency>
         <groupId>org.optaplanner</groupId>
         <artifactId>optaplanner-persistence-common</artifactId>
-        <version>7.3.0.Final</version>
+        <version>7.14.0.Final</version>
         <type>test-jar</type>
       </dependency>
       <dependency>
         <groupId>org.optaplanner</groupId>
         <artifactId>optaplanner-persistence-common</artifactId>
-        <version>7.3.0.Final</version>
+        <version>7.14.0.Final</version>
         <classifier>javadoc</classifier>
       </dependency>
       <dependency>
         <groupId>org.optaplanner</groupId>
         <artifactId>optaplanner-persistence-jackson</artifactId>
-        <version>7.3.0.Final</version>
+        <version>7.14.0.Final</version>
       </dependency>
       <dependency>
         <groupId>org.optaplanner</groupId>
         <artifactId>optaplanner-persistence-jackson</artifactId>
-        <version>7.3.0.Final</version>
+        <version>7.14.0.Final</version>
         <classifier>sources</classifier>
       </dependency>
       <dependency>
         <groupId>org.optaplanner</groupId>
         <artifactId>optaplanner-persistence-jackson</artifactId>
-        <version>7.3.0.Final</version>
+        <version>7.14.0.Final</version>
         <type>test-jar</type>
       </dependency>
       <dependency>
         <groupId>org.optaplanner</groupId>
         <artifactId>optaplanner-persistence-jackson</artifactId>
-        <version>7.3.0.Final</version>
+        <version>7.14.0.Final</version>
         <classifier>javadoc</classifier>
       </dependency>
       <dependency>
         <groupId>org.optaplanner</groupId>
         <artifactId>optaplanner-persistence-jaxb</artifactId>
-        <version>7.3.0.Final</version>
+        <version>7.14.0.Final</version>
       </dependency>
       <dependency>
         <groupId>org.optaplanner</groupId>
         <artifactId>optaplanner-persistence-jaxb</artifactId>
-        <version>7.3.0.Final</version>
+        <version>7.14.0.Final</version>
         <classifier>sources</classifier>
       </dependency>
       <dependency>
         <groupId>org.optaplanner</groupId>
         <artifactId>optaplanner-persistence-jaxb</artifactId>
-        <version>7.3.0.Final</version>
+        <version>7.14.0.Final</version>
         <type>test-jar</type>
       </dependency>
       <dependency>
         <groupId>org.optaplanner</groupId>
         <artifactId>optaplanner-persistence-jaxb</artifactId>
-        <version>7.3.0.Final</version>
+        <version>7.14.0.Final</version>
         <classifier>javadoc</classifier>
       </dependency>
       <dependency>
         <groupId>org.optaplanner</groupId>
         <artifactId>optaplanner-persistence-jpa</artifactId>
-        <version>7.3.0.Final</version>
+        <version>7.14.0.Final</version>
       </dependency>
       <dependency>
         <groupId>org.optaplanner</groupId>
         <artifactId>optaplanner-persistence-jpa</artifactId>
-        <version>7.3.0.Final</version>
+        <version>7.14.0.Final</version>
         <classifier>sources</classifier>
       </dependency>
       <dependency>
         <groupId>org.optaplanner</groupId>
         <artifactId>optaplanner-persistence-jpa</artifactId>
-        <version>7.3.0.Final</version>
+        <version>7.14.0.Final</version>
         <type>test-jar</type>
       </dependency>
       <dependency>
         <groupId>org.optaplanner</groupId>
         <artifactId>optaplanner-persistence-jpa</artifactId>
-        <version>7.3.0.Final</version>
+        <version>7.14.0.Final</version>
         <classifier>javadoc</classifier>
       </dependency>
       <dependency>
         <groupId>org.optaplanner</groupId>
         <artifactId>optaplanner-persistence-xstream</artifactId>
-        <version>7.3.0.Final</version>
+        <version>7.14.0.Final</version>
       </dependency>
       <dependency>
         <groupId>org.optaplanner</groupId>
         <artifactId>optaplanner-persistence-xstream</artifactId>
-        <version>7.3.0.Final</version>
+        <version>7.14.0.Final</version>
         <classifier>sources</classifier>
       </dependency>
       <dependency>
         <groupId>org.optaplanner</groupId>
         <artifactId>optaplanner-persistence-xstream</artifactId>
-        <version>7.3.0.Final</version>
+        <version>7.14.0.Final</version>
         <type>test-jar</type>
       </dependency>
       <dependency>
         <groupId>org.optaplanner</groupId>
         <artifactId>optaplanner-persistence-xstream</artifactId>
-        <version>7.3.0.Final</version>
+        <version>7.14.0.Final</version>
         <classifier>javadoc</classifier>
       </dependency>
       <dependency>
         <groupId>org.optaplanner</groupId>
         <artifactId>optaplanner-test</artifactId>
-        <version>7.3.0.Final</version>
+        <version>7.14.0.Final</version>
       </dependency>
       <dependency>
         <groupId>org.optaplanner</groupId>
         <artifactId>optaplanner-test</artifactId>
-        <version>7.3.0.Final</version>
+        <version>7.14.0.Final</version>
         <classifier>sources</classifier>
       </dependency>
       <dependency>
         <groupId>org.optaplanner</groupId>
         <artifactId>optaplanner-test</artifactId>
-        <version>7.3.0.Final</version>
+        <version>7.14.0.Final</version>
         <type>test-jar</type>
       </dependency>
       <dependency>
         <groupId>org.optaplanner</groupId>
         <artifactId>optaplanner-test</artifactId>
-        <version>7.3.0.Final</version>
+        <version>7.14.0.Final</version>
         <classifier>javadoc</classifier>
       </dependency>
       <dependency>
         <groupId>org.optaplanner</groupId>
         <artifactId>optaplanner-wb-domain-editor-api</artifactId>
-        <version>7.3.0.Final</version>
+        <version>7.14.0.Final</version>
       </dependency>
       <dependency>
         <groupId>org.optaplanner</groupId>
         <artifactId>optaplanner-wb-domain-editor-api</artifactId>
-        <version>7.3.0.Final</version>
+        <version>7.14.0.Final</version>
         <classifier>sources</classifier>
       </dependency>
       <dependency>
         <groupId>org.optaplanner</groupId>
         <artifactId>optaplanner-wb-domain-editor-backend</artifactId>
-        <version>7.3.0.Final</version>
+        <version>7.14.0.Final</version>
       </dependency>
       <dependency>
         <groupId>org.optaplanner</groupId>
         <artifactId>optaplanner-wb-domain-editor-backend</artifactId>
-        <version>7.3.0.Final</version>
+        <version>7.14.0.Final</version>
         <classifier>sources</classifier>
       </dependency>
       <dependency>
         <groupId>org.optaplanner</groupId>
         <artifactId>optaplanner-wb-domain-editor-client</artifactId>
-        <version>7.3.0.Final</version>
+        <version>7.14.0.Final</version>
       </dependency>
       <dependency>
         <groupId>org.optaplanner</groupId>
         <artifactId>optaplanner-wb-domain-editor-client</artifactId>
-        <version>7.3.0.Final</version>
+        <version>7.14.0.Final</version>
         <classifier>sources</classifier>
       </dependency>
       <dependency>
         <groupId>org.optaplanner</groupId>
         <artifactId>optaplanner-wb-guided-rule-editor-api</artifactId>
-        <version>7.3.0.Final</version>
+        <version>7.14.0.Final</version>
       </dependency>
       <dependency>
         <groupId>org.optaplanner</groupId>
         <artifactId>optaplanner-wb-guided-rule-editor-api</artifactId>
-        <version>7.3.0.Final</version>
+        <version>7.14.0.Final</version>
         <classifier>sources</classifier>
       </dependency>
       <dependency>
         <groupId>org.optaplanner</groupId>
         <artifactId>optaplanner-wb-guided-rule-editor-backend</artifactId>
-        <version>7.3.0.Final</version>
+        <version>7.14.0.Final</version>
       </dependency>
       <dependency>
         <groupId>org.optaplanner</groupId>
         <artifactId>optaplanner-wb-guided-rule-editor-backend</artifactId>
-        <version>7.3.0.Final</version>
+        <version>7.14.0.Final</version>
         <classifier>sources</classifier>
       </dependency>
       <dependency>
         <groupId>org.optaplanner</groupId>
         <artifactId>optaplanner-wb-guided-rule-editor-client</artifactId>
-        <version>7.3.0.Final</version>
+        <version>7.14.0.Final</version>
       </dependency>
       <dependency>
         <groupId>org.optaplanner</groupId>
         <artifactId>optaplanner-wb-guided-rule-editor-client</artifactId>
-        <version>7.3.0.Final</version>
+        <version>7.14.0.Final</version>
         <classifier>sources</classifier>
       </dependency>
       <dependency>
         <groupId>org.optaplanner</groupId>
         <artifactId>optaplanner-wb-solver-editor-api</artifactId>
-        <version>7.3.0.Final</version>
+        <version>7.14.0.Final</version>
       </dependency>
       <dependency>
         <groupId>org.optaplanner</groupId>
         <artifactId>optaplanner-wb-solver-editor-api</artifactId>
-        <version>7.3.0.Final</version>
+        <version>7.14.0.Final</version>
         <classifier>sources</classifier>
       </dependency>
       <dependency>
         <groupId>org.optaplanner</groupId>
         <artifactId>optaplanner-wb-solver-editor-backend</artifactId>
-        <version>7.3.0.Final</version>
+        <version>7.14.0.Final</version>
       </dependency>
       <dependency>
         <groupId>org.optaplanner</groupId>
         <artifactId>optaplanner-wb-solver-editor-backend</artifactId>
-        <version>7.3.0.Final</version>
+        <version>7.14.0.Final</version>
         <classifier>sources</classifier>
       </dependency>
       <dependency>
         <groupId>org.optaplanner</groupId>
         <artifactId>optaplanner-wb-solver-editor-client</artifactId>
-        <version>7.3.0.Final</version>
+        <version>7.14.0.Final</version>
       </dependency>
       <dependency>
         <groupId>org.optaplanner</groupId>
         <artifactId>optaplanner-wb-solver-editor-client</artifactId>
-        <version>7.3.0.Final</version>
+        <version>7.14.0.Final</version>
         <classifier>sources</classifier>
       </dependency>
       <dependency>
         <groupId>org.optaplanner</groupId>
-        <artifactId>optaplanner-wb-upstream-model</artifactId>
-        <version>7.3.0.Final</version>
+        <artifactId>optaplanner-wb-ui</artifactId>
+        <version>7.14.0.Final</version>
+        <type>war</type>
       </dependency>
       <dependency>
         <groupId>org.optaplanner</groupId>
-        <artifactId>optaplanner-wb-upstream-model</artifactId>
-        <version>7.3.0.Final</version>
-        <classifier>sources</classifier>
+        <artifactId>optaplanner-webexamples</artifactId>
+        <version>7.14.0.Final</version>
+        <type>war</type>
       </dependency>
       <dependency>
         <groupId>org.optaplanner</groupId>
         <artifactId>optaplanner-webexamples</artifactId>
-        <version>7.3.0.Final</version>
-        <type>war</type>
+        <version>7.14.0.Final</version>
+        <classifier>sources</classifier>
       </dependency>
       <dependency>
         <groupId>org.optaplanner</groupId>
-        <artifactId>optaplanner-webexamples</artifactId>
-        <version>7.3.0.Final</version>
+        <artifactId>optaplanner-workbench-models-core</artifactId>
+        <version>7.14.0.Final</version>
+      </dependency>
+      <dependency>
+        <groupId>org.optaplanner</groupId>
+        <artifactId>optaplanner-workbench-models-core</artifactId>
+        <version>7.14.0.Final</version>
+        <classifier>sources</classifier>
+      </dependency>
+      <dependency>
+        <groupId>org.optaplanner</groupId>
+        <artifactId>optaplanner-workbench-models-datamodel-api</artifactId>
+        <version>7.14.0.Final</version>
+      </dependency>
+      <dependency>
+        <groupId>org.optaplanner</groupId>
+        <artifactId>optaplanner-workbench-models-datamodel-api</artifactId>
+        <version>7.14.0.Final</version>
         <classifier>sources</classifier>
       </dependency>
       <dependency>

From 8e96df649421455c745988630e5256572b5dd2e8 Mon Sep 17 00:00:00 2001
From: Andrea Cosentino <ancosen@gmail.com>
Date: Thu, 15 Nov 2018 14:28:11 +0100
Subject: [PATCH 025/125] CAMEL-12810 - Fixed CS

---
 .../camel/component/ipfs/IPFSComponent.java   | 22 +++---
 .../camel/component/ipfs/IPFSEndpoint.java    | 13 ++--
 .../camel/component/ipfs/IPFSProducer.java    | 39 +++++-----
 .../camel/component/ipfs/SimpleIPFSTest.java  | 76 +++++++++----------
 4 files changed, 78 insertions(+), 72 deletions(-)

diff --git a/components/camel-ipfs/src/main/java/org/apache/camel/component/ipfs/IPFSComponent.java b/components/camel-ipfs/src/main/java/org/apache/camel/component/ipfs/IPFSComponent.java
index 9d5b228607fe9..f6cb6f85e3fd9 100644
--- a/components/camel-ipfs/src/main/java/org/apache/camel/component/ipfs/IPFSComponent.java
+++ b/components/camel-ipfs/src/main/java/org/apache/camel/component/ipfs/IPFSComponent.java
@@ -19,16 +19,16 @@
 import java.net.URI;
 import java.util.Map;
 
-import org.apache.camel.Endpoint;
-import org.apache.camel.impl.DefaultComponent;
-
 import io.nessus.ipfs.IPFSClient;
 import io.nessus.ipfs.impl.DefaultIPFSClient;
 
+import org.apache.camel.Endpoint;
+import org.apache.camel.impl.DefaultComponent;
+
 public class IPFSComponent extends DefaultComponent {
 
     private IPFSClient client;
-    
+
     @Override
     protected Endpoint createEndpoint(String urispec, String remaining, Map<String, Object> params) throws Exception {
 
@@ -42,15 +42,19 @@ protected Endpoint createEndpoint(String urispec, String remaining, Map<String,
         int port = uri.getPort();
         String cmd = remaining;
         if (!cmd.equals(host)) {
-            if (host != null) config.setIpfsHost(host);
-            if (port > 0) config.setIpfsPort(port);
+            if (host != null) {
+                config.setIpfsHost(host);
+            }
+            if (port > 0) {
+                config.setIpfsPort(port);
+            }
             int idx = cmd.indexOf('/');
             cmd = cmd.substring(idx + 1);
         }
         config.setIpfsCmd(cmd);
-        
+
         client = createClient(config);
-        
+
         return new IPFSEndpoint(urispec, this, config);
     }
 
@@ -61,4 +65,4 @@ public IPFSClient getIPFSClient() {
     private synchronized IPFSClient createClient(IPFSConfiguration config) {
         return new DefaultIPFSClient(config.getIpfsHost(), config.getIpfsPort());
     }
-}
\ No newline at end of file
+}
diff --git a/components/camel-ipfs/src/main/java/org/apache/camel/component/ipfs/IPFSEndpoint.java b/components/camel-ipfs/src/main/java/org/apache/camel/component/ipfs/IPFSEndpoint.java
index 6709332d8300d..049415185ff21 100644
--- a/components/camel-ipfs/src/main/java/org/apache/camel/component/ipfs/IPFSEndpoint.java
+++ b/components/camel-ipfs/src/main/java/org/apache/camel/component/ipfs/IPFSEndpoint.java
@@ -23,6 +23,8 @@
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 
+import io.nessus.ipfs.IPFSClient;
+
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
@@ -31,17 +33,16 @@
 import org.apache.camel.spi.UriEndpoint;
 import org.apache.camel.spi.UriParam;
 
-import io.nessus.ipfs.IPFSClient;
-
 /**
- * The camel-ipfs component provides access to the Interplanetary File System (IPFS).
+ * The camel-ipfs component provides access to the Interplanetary File System
+ * (IPFS).
  */
 @UriEndpoint(firstVersion = "2.23.0", scheme = "ipfs", title = "IPFS", syntax = "ipfs:host:port/cmd", producerOnly = true, label = "file,ipfs")
 public class IPFSEndpoint extends DefaultEndpoint {
 
     @UriParam
     private final IPFSConfiguration configuration;
-    
+
     public IPFSEndpoint(String uri, IPFSComponent component, IPFSConfiguration configuration) {
         super(uri, component);
         this.configuration = configuration;
@@ -49,7 +50,7 @@ public IPFSEndpoint(String uri, IPFSComponent component, IPFSConfiguration confi
 
     @Override
     public IPFSComponent getComponent() {
-        return (IPFSComponent) super.getComponent();
+        return (IPFSComponent)super.getComponent();
     }
 
     @Override
@@ -79,7 +80,7 @@ IPFSCommand getCommand() {
             throw new IllegalArgumentException("Unsupported command: " + cmd);
         }
     }
-    
+
     String ipfsVersion() throws IOException {
         return ipfs().version();
     }
diff --git a/components/camel-ipfs/src/main/java/org/apache/camel/component/ipfs/IPFSProducer.java b/components/camel-ipfs/src/main/java/org/apache/camel/component/ipfs/IPFSProducer.java
index 0f6e5333911a3..155492769f5c0 100644
--- a/components/camel-ipfs/src/main/java/org/apache/camel/component/ipfs/IPFSProducer.java
+++ b/components/camel-ipfs/src/main/java/org/apache/camel/component/ipfs/IPFSProducer.java
@@ -23,19 +23,18 @@
 import java.util.List;
 
 import org.apache.camel.Exchange;
-import org.apache.camel.impl.DefaultProducer;
-
 import org.apache.camel.component.ipfs.IPFSConfiguration.IPFSCommand;
+import org.apache.camel.impl.DefaultProducer;
 
 public class IPFSProducer extends DefaultProducer {
-    
+
     public IPFSProducer(IPFSEndpoint endpoint) {
         super(endpoint);
     }
 
     @Override
     public IPFSEndpoint getEndpoint() {
-        return (IPFSEndpoint) super.getEndpoint();
+        return (IPFSEndpoint)super.getEndpoint();
     }
 
     @Override
@@ -43,14 +42,14 @@ public void process(Exchange exchange) throws Exception {
 
         IPFSEndpoint endpoint = getEndpoint();
         IPFSCommand cmd = endpoint.getCommand();
-        
+
         if (IPFSCommand.version == cmd) {
-            
+
             String resp = endpoint.ipfsVersion();
             exchange.getMessage().setBody(resp);
-            
-        }  else if (IPFSCommand.add == cmd) {
-            
+
+        } else if (IPFSCommand.add == cmd) {
+
             Path path = pathFromBody(exchange);
             List<String> cids = endpoint.ipfsAdd(path);
             Object resp = cids;
@@ -58,20 +57,20 @@ public void process(Exchange exchange) throws Exception {
                 resp = cids.size() > 0 ? cids.get(0) : null;
             }
             exchange.getMessage().setBody(resp);
-            
-        }  else if (IPFSCommand.cat == cmd) {
+
+        } else if (IPFSCommand.cat == cmd) {
 
             String cid = exchange.getMessage().getBody(String.class);
             InputStream resp = endpoint.ipfsCat(cid);
             exchange.getMessage().setBody(resp);
-            
-        }  else if (IPFSCommand.get == cmd) {
+
+        } else if (IPFSCommand.get == cmd) {
 
             Path outdir = endpoint.getConfiguration().getOutdir();
             String cid = exchange.getMessage().getBody(String.class);
             Path resp = endpoint.ipfsGet(cid, outdir);
             exchange.getMessage().setBody(resp);
-            
+
         } else {
             throw new UnsupportedOperationException(cmd.toString());
         }
@@ -79,9 +78,15 @@ public void process(Exchange exchange) throws Exception {
 
     private Path pathFromBody(Exchange exchange) {
         Object body = exchange.getMessage().getBody();
-        if (body instanceof Path) return (Path) body;
-        if (body instanceof String) return Paths.get((String) body);
-        if (body instanceof File) return ((File) body).toPath();
+        if (body instanceof Path) {
+            return (Path)body;
+        }
+        if (body instanceof String) {
+            return Paths.get((String)body);
+        }
+        if (body instanceof File) {
+            return ((File)body).toPath();
+        }
         throw new IllegalArgumentException("Invalid path: " + body);
     }
 }
diff --git a/components/camel-ipfs/src/test/java/org/apache/camel/component/ipfs/SimpleIPFSTest.java b/components/camel-ipfs/src/test/java/org/apache/camel/component/ipfs/SimpleIPFSTest.java
index 589b919c2dcf3..07aec74ccb34c 100644
--- a/components/camel-ipfs/src/test/java/org/apache/camel/component/ipfs/SimpleIPFSTest.java
+++ b/components/camel-ipfs/src/test/java/org/apache/camel/component/ipfs/SimpleIPFSTest.java
@@ -1,12 +1,10 @@
-/*
- * #%L
- * Wildfly Camel :: Testsuite
- * %%
- * Copyright (C) 2013 - 2014 RedHat
- * %%
- * Licensed 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
+/**
+ * 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
  *
@@ -15,9 +13,7 @@
  * 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.
- * #L%
  */
-
 package org.apache.camel.component.ipfs;
 
 import java.io.ByteArrayOutputStream;
@@ -29,6 +25,8 @@
 import java.util.Arrays;
 import java.util.List;
 
+import io.nessus.utils.StreamUtils;
+
 import org.apache.camel.CamelContext;
 import org.apache.camel.ProducerTemplate;
 import org.apache.camel.builder.RouteBuilder;
@@ -37,8 +35,6 @@
 import org.junit.Assume;
 import org.junit.Test;
 
-import io.nessus.utils.StreamUtils;
-
 public class SimpleIPFSTest {
 
     @Test
@@ -56,7 +52,7 @@ public void configure() throws Exception {
 
         camelctx.start();
         assumeIPFS(camelctx);
-        
+
         try {
             ProducerTemplate producer = camelctx.createProducerTemplate();
             String resA = producer.requestBody("direct:startA", null, String.class);
@@ -73,8 +69,8 @@ public void configure() throws Exception {
     @Test
     public void ipfsAddSingle() throws Exception {
 
-        String HASH = "QmYgjSRbXFPdPYKqQSnUjmXLYLudVahEJQotMaAJKt6Lbd";
-        
+        String hash = "QmYgjSRbXFPdPYKqQSnUjmXLYLudVahEJQotMaAJKt6Lbd";
+
         CamelContext camelctx = new DefaultCamelContext();
         camelctx.addRoutes(new RouteBuilder() {
             @Override
@@ -84,14 +80,14 @@ public void configure() throws Exception {
         });
 
         Path path = Paths.get("src/test/resources/html/index.html");
-        
+
         camelctx.start();
         assumeIPFS(camelctx);
-        
+
         try {
             ProducerTemplate producer = camelctx.createProducerTemplate();
             String res = producer.requestBody("direct:start", path, String.class);
-            Assert.assertEquals(HASH, res);
+            Assert.assertEquals(hash, res);
         } finally {
             camelctx.stop();
         }
@@ -101,8 +97,8 @@ public void configure() throws Exception {
     @SuppressWarnings("unchecked")
     public void ipfsAddRecursive() throws Exception {
 
-        String HASH = "Qme6hd6tYXTFb7bb7L3JZ5U6ygktpAHKxbaeffYyQN85mW";
-        
+        String hash = "Qme6hd6tYXTFb7bb7L3JZ5U6ygktpAHKxbaeffYyQN85mW";
+
         CamelContext camelctx = new DefaultCamelContext();
         camelctx.addRoutes(new RouteBuilder() {
             @Override
@@ -112,15 +108,15 @@ public void configure() throws Exception {
         });
 
         Path path = Paths.get("src/test/resources/html");
-        
+
         camelctx.start();
         assumeIPFS(camelctx);
-        
+
         try {
             ProducerTemplate producer = camelctx.createProducerTemplate();
             List<String> res = producer.requestBody("direct:start", path, List.class);
             Assert.assertEquals(10, res.size());
-            Assert.assertEquals(HASH, res.get(9));
+            Assert.assertEquals(hash, res.get(9));
         } finally {
             camelctx.stop();
         }
@@ -129,8 +125,8 @@ public void configure() throws Exception {
     @Test
     public void ipfsCat() throws Exception {
 
-        String HASH = "QmUD7uG5prAMHbcCfp4x1G1mMSpywcSMHTGpq62sbpDAg6";
-        
+        String hash = "QmUD7uG5prAMHbcCfp4x1G1mMSpywcSMHTGpq62sbpDAg6";
+
         CamelContext camelctx = new DefaultCamelContext();
         camelctx.addRoutes(new RouteBuilder() {
             @Override
@@ -141,10 +137,10 @@ public void configure() throws Exception {
 
         camelctx.start();
         assumeIPFS(camelctx);
-        
+
         try {
             ProducerTemplate producer = camelctx.createProducerTemplate();
-            InputStream res = producer.requestBody("direct:start", HASH, InputStream.class);
+            InputStream res = producer.requestBody("direct:start", hash, InputStream.class);
             verifyFileContent(res);
         } finally {
             camelctx.stop();
@@ -154,8 +150,8 @@ public void configure() throws Exception {
     @Test
     public void ipfsGetSingle() throws Exception {
 
-        String HASH = "QmUD7uG5prAMHbcCfp4x1G1mMSpywcSMHTGpq62sbpDAg6";
-        
+        String hash = "QmUD7uG5prAMHbcCfp4x1G1mMSpywcSMHTGpq62sbpDAg6";
+
         CamelContext camelctx = new DefaultCamelContext();
         camelctx.addRoutes(new RouteBuilder() {
             @Override
@@ -166,11 +162,11 @@ public void configure() throws Exception {
 
         camelctx.start();
         assumeIPFS(camelctx);
-        
+
         try {
             ProducerTemplate producer = camelctx.createProducerTemplate();
-            Path res = producer.requestBody("direct:start", HASH, Path.class);
-            Assert.assertEquals(Paths.get("target", HASH), res);
+            Path res = producer.requestBody("direct:start", hash, Path.class);
+            Assert.assertEquals(Paths.get("target", hash), res);
             verifyFileContent(new FileInputStream(res.toFile()));
         } finally {
             camelctx.stop();
@@ -180,8 +176,8 @@ public void configure() throws Exception {
     @Test
     public void ipfsGetRecursive() throws Exception {
 
-        String HASH = "Qme6hd6tYXTFb7bb7L3JZ5U6ygktpAHKxbaeffYyQN85mW";
-        
+        String hash = "Qme6hd6tYXTFb7bb7L3JZ5U6ygktpAHKxbaeffYyQN85mW";
+
         CamelContext camelctx = new DefaultCamelContext();
         camelctx.addRoutes(new RouteBuilder() {
             @Override
@@ -192,11 +188,11 @@ public void configure() throws Exception {
 
         camelctx.start();
         assumeIPFS(camelctx);
-        
+
         try {
             ProducerTemplate producer = camelctx.createProducerTemplate();
-            Path res = producer.requestBody("direct:start", HASH, Path.class);
-            Assert.assertEquals(Paths.get("target", HASH), res);
+            Path res = producer.requestBody("direct:start", hash, Path.class);
+            Assert.assertEquals(Paths.get("target", hash), res);
             Assert.assertTrue(res.toFile().isDirectory());
             Assert.assertTrue(res.resolve("index.html").toFile().exists());
         } finally {
@@ -207,11 +203,11 @@ public void configure() throws Exception {
     private void verifyFileContent(InputStream ins) throws IOException {
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
         StreamUtils.copyStream(ins, baos);
-        Assert.assertEquals("The quick brown fox jumps over the lazy dog.", new String (baos.toByteArray()));
+        Assert.assertEquals("The quick brown fox jumps over the lazy dog.", new String(baos.toByteArray()));
     }
 
     private void assumeIPFS(CamelContext camelctx) {
         IPFSComponent comp = camelctx.getComponent("ipfs", IPFSComponent.class);
         Assume.assumeTrue(comp.getIPFSClient().hasConnection());
     }
-}
\ No newline at end of file
+}

From d0994de713f705332d48709bac1dbd6457f386a8 Mon Sep 17 00:00:00 2001
From: Andrea Cosentino <ancosen@gmail.com>
Date: Thu, 15 Nov 2018 15:11:05 +0100
Subject: [PATCH 026/125] CAMEL-12810 - Added a note about the Karaf feature
 missing

---
 components/camel-ipfs/src/main/docs/ipfs-component.adoc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/components/camel-ipfs/src/main/docs/ipfs-component.adoc b/components/camel-ipfs/src/main/docs/ipfs-component.adoc
index a975f43ad6063..78f6742a3c445 100644
--- a/components/camel-ipfs/src/main/docs/ipfs-component.adoc
+++ b/components/camel-ipfs/src/main/docs/ipfs-component.adoc
@@ -76,6 +76,9 @@ The component supports 2 options, which are listed below.
 |===
 // spring-boot-auto-configure options: END
 
+### Karaf support
+
+Actually this component is not supported in Karaf
 
 ### Message Headers
 

From 047bf5c22ca0502f234100951313f90001756702 Mon Sep 17 00:00:00 2001
From: Andrea Cosentino <ancosen@gmail.com>
Date: Thu, 15 Nov 2018 15:50:33 +0100
Subject: [PATCH 027/125] CAMEL-12810 - Changed the referenced repository for
 nessus deps

---
 components/camel-ipfs/pom.xml                                 | 4 ++--
 .../spring-boot/components-starter/camel-ipfs-starter/pom.xml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/components/camel-ipfs/pom.xml b/components/camel-ipfs/pom.xml
index f0ec0dc4dc7a9..60fa640b91bb0 100644
--- a/components/camel-ipfs/pom.xml
+++ b/components/camel-ipfs/pom.xml
@@ -38,9 +38,9 @@
 
   <repositories>
     <repository>
-      <id>jboss.ea</id>
+      <id>jboss.thirdparty</id>
       <name>JBoss Repository</name>
-      <url>https://repository.jboss.org/nexus/content/groups/ea</url>
+      <url>https://repository.jboss.org/nexus/service/local/repositories/thirdparty-releases/content/</url>
       <snapshots>
         <enabled>false</enabled>
       </snapshots>
diff --git a/platforms/spring-boot/components-starter/camel-ipfs-starter/pom.xml b/platforms/spring-boot/components-starter/camel-ipfs-starter/pom.xml
index 76694fd5a45c4..3e5b17be79b10 100644
--- a/platforms/spring-boot/components-starter/camel-ipfs-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-ipfs-starter/pom.xml
@@ -53,9 +53,9 @@
   <!--START OF GENERATED CODE-->
   <repositories>
     <repository>
-      <id>jboss.ea</id>
+      <id>jboss.thirdparty</id>
       <name>JBoss Repository</name>
-      <url>https://repository.jboss.org/nexus/content/groups/ea</url>
+      <url>https://repository.jboss.org/nexus/service/local/repositories/thirdparty-releases/content/</url>
       <snapshots>
         <enabled>false</enabled>
       </snapshots>

From 92cbacf2ab3c53a342bc193508f3001c4c3ae439 Mon Sep 17 00:00:00 2001
From: aldettinger <aldettinger@gmail.com>
Date: Thu, 15 Nov 2018 18:57:10 +0100
Subject: [PATCH 028/125] CAMEL-12940: Fixed an issue where dynamic
 doneFileName does not manage filename with 2 dots

---
 .../component/file/GenericFileEndpoint.java   |  4 +-
 ...umeDynamicDoneFileNameWithTwoDotsTest.java | 68 +++++++++++++++++++
 ...pleDynamicDoneFileNameWithTwoDotsTest.java | 68 +++++++++++++++++++
 3 files changed, 138 insertions(+), 2 deletions(-)
 create mode 100644 camel-core/src/test/java/org/apache/camel/component/file/FileConsumeDynamicDoneFileNameWithTwoDotsTest.java
 create mode 100644 camel-core/src/test/java/org/apache/camel/component/file/FileConsumeSimpleDynamicDoneFileNameWithTwoDotsTest.java

diff --git a/camel-core/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java b/camel-core/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java
index fac9e7e8fbe6f..c60312375aded 100644
--- a/camel-core/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java
+++ b/camel-core/src/main/java/org/apache/camel/component/file/GenericFileEndpoint.java
@@ -1420,8 +1420,8 @@ protected String createDoneFileName(String fileName) {
 
         pattern = pattern.replaceFirst("\\$\\{file:name\\}", onlyName);
         pattern = pattern.replaceFirst("\\$simple\\{file:name\\}", onlyName);
-        pattern = pattern.replaceFirst("\\$\\{file:name.noext\\}", FileUtil.stripExt(onlyName));
-        pattern = pattern.replaceFirst("\\$simple\\{file:name.noext\\}", FileUtil.stripExt(onlyName));
+        pattern = pattern.replaceFirst("\\$\\{file:name.noext\\}", FileUtil.stripExt(onlyName, true));
+        pattern = pattern.replaceFirst("\\$simple\\{file:name.noext\\}", FileUtil.stripExt(onlyName, true));
 
         // must be able to resolve all placeholders supported
         if (StringHelper.hasStartToken(pattern, "simple")) {
diff --git a/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeDynamicDoneFileNameWithTwoDotsTest.java b/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeDynamicDoneFileNameWithTwoDotsTest.java
new file mode 100644
index 0000000000000..a45905a36b453
--- /dev/null
+++ b/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeDynamicDoneFileNameWithTwoDotsTest.java
@@ -0,0 +1,68 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.file;
+
+import java.io.File;
+import java.lang.invoke.MethodHandles;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Exchange;
+import org.apache.camel.builder.NotifyBuilder;
+import org.apache.camel.builder.RouteBuilder;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * This class tests an issue where an input file is not picked up due to a dynamic
+ * doneFileName containing two dots.
+ */
+public class FileConsumeDynamicDoneFileNameWithTwoDotsTest extends ContextTestSupport {
+
+    private static final String TARGET_DIR_NAME = "target/" + MethodHandles.lookup().lookupClass().getSimpleName();
+
+    @Override
+    @Before
+    public void setUp() throws Exception {
+        deleteDirectory(TARGET_DIR_NAME);
+        super.setUp();
+    }
+
+    @Test
+    public void testDynamicDoneFileNameContainingTwoDots() throws Exception {
+        NotifyBuilder notify = new NotifyBuilder(context).whenDone(1).create();
+        getMockEndpoint("mock:result").expectedBodiesReceivedInAnyOrder("input-body");
+
+        template.sendBodyAndHeader("file:" + TARGET_DIR_NAME, "input-body", Exchange.FILE_NAME, "test.twodot.txt");
+        template.sendBodyAndHeader("file:" + TARGET_DIR_NAME, "done-body", Exchange.FILE_NAME, "test.twodot.done");
+
+        assertMockEndpointsSatisfied();
+        assertTrue(notify.matchesMockWaitTime());
+
+        assertFalse("Input file should be deleted", new File(TARGET_DIR_NAME, "test.twodot.txt").exists());
+        assertFalse("Done file should be deleted", new File(TARGET_DIR_NAME, "test.twodot.done").exists());
+    }
+
+    @Override
+    protected RouteBuilder createRouteBuilder() throws Exception {
+        return new RouteBuilder() {
+            @Override
+            public void configure() throws Exception {
+                from("file:" + TARGET_DIR_NAME + "?doneFileName=${file:name.noext}.done&initialDelay=0").to("mock:result");
+            }
+        };
+    }
+}
diff --git a/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeSimpleDynamicDoneFileNameWithTwoDotsTest.java b/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeSimpleDynamicDoneFileNameWithTwoDotsTest.java
new file mode 100644
index 0000000000000..d1de7a94bc4af
--- /dev/null
+++ b/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeSimpleDynamicDoneFileNameWithTwoDotsTest.java
@@ -0,0 +1,68 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.file;
+
+import java.io.File;
+import java.lang.invoke.MethodHandles;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Exchange;
+import org.apache.camel.builder.NotifyBuilder;
+import org.apache.camel.builder.RouteBuilder;
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * This class tests an issue where an input file is not picked up due to a
+ * dynamic doneFileName using the simple syntax and containing two dots.
+ */
+public class FileConsumeSimpleDynamicDoneFileNameWithTwoDotsTest extends ContextTestSupport {
+
+    private static final String TARGET_DIR_NAME = "target/" + MethodHandles.lookup().lookupClass().getSimpleName();
+
+    @Override
+    @Before
+    public void setUp() throws Exception {
+        deleteDirectory(TARGET_DIR_NAME);
+        super.setUp();
+    }
+
+    @Test
+    public void testSimpleDynamicDoneFileNameContainingTwoDots() throws Exception {
+        NotifyBuilder notify = new NotifyBuilder(context).whenDone(1).create();
+        getMockEndpoint("mock:result").expectedBodiesReceivedInAnyOrder("input-body");
+
+        template.sendBodyAndHeader("file:" + TARGET_DIR_NAME, "input-body", Exchange.FILE_NAME, "test.twodot.txt");
+        template.sendBodyAndHeader("file:" + TARGET_DIR_NAME, "done-body", Exchange.FILE_NAME, "test.twodot.done");
+
+        assertMockEndpointsSatisfied();
+        assertTrue(notify.matchesMockWaitTime());
+
+        assertFalse("Input file should be deleted", new File(TARGET_DIR_NAME, "test.twodot.txt").exists());
+        assertFalse("Done file should be deleted", new File(TARGET_DIR_NAME, "test.twodot.done").exists());
+    }
+
+    @Override
+    protected RouteBuilder createRouteBuilder() throws Exception {
+        return new RouteBuilder() {
+            @Override
+            public void configure() throws Exception {
+                from("file:" + TARGET_DIR_NAME + "?doneFileName=$simple{file:name.noext}.done&initialDelay=0").to("mock:result");
+            }
+        };
+    }
+}

From e9eea21b6d1041410d3c1297336dae6946727d14 Mon Sep 17 00:00:00 2001
From: Andrea Cosentino <ancosen@gmail.com>
Date: Fri, 16 Nov 2018 09:28:34 +0100
Subject: [PATCH 029/125] Camel-Jbpm: Fixed CS

---
 .../component/jbpm/JBPMConfiguration.java     |  28 ++--
 .../camel/component/jbpm/JBPMEndpoint.java    |  12 +-
 .../camel/component/jbpm/JBPMProducer.java    | 148 +++++++++++-------
 .../jbpm/server/CamelKieServerExtension.java  |  67 ++++----
 .../jbpm/JBPMComponentIntegrationTest.java    |  41 +++--
 5 files changed, 169 insertions(+), 127 deletions(-)

diff --git a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMConfiguration.java b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMConfiguration.java
index 9633aaa765ee6..b415bfea30564 100644
--- a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMConfiguration.java
+++ b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMConfiguration.java
@@ -30,11 +30,13 @@
 @UriParams
 public class JBPMConfiguration {
 
-    @UriPath @Metadata(required = "true")
+    @UriPath
+    @Metadata(required = "true")
     private URL connectionURL;
     @UriParam(label = "producer", defaultValue = "startProcess")
     private String operation;
-    @UriParam @Metadata(required = "true")
+    @UriParam
+    @Metadata(required = "true")
     private String deploymentId;
     @UriParam
     private Long processInstanceId;
@@ -84,7 +86,7 @@ public class JBPMConfiguration {
     private Class[] extraJaxbClasses;
     @UriParam
     private Boolean emitterSendItems;
-    
+
     @UriPath
     private String eventListenerType;
 
@@ -159,7 +161,8 @@ public Object getEvent() {
     }
 
     /**
-     * the data associated with this event when signalEvent operation is performed
+     * the data associated with this event when signalEvent operation is
+     * performed
      */
     public void setEvent(Object event) {
         this.event = event;
@@ -203,7 +206,7 @@ public Long getTaskId() {
     }
 
     /**
-     *the id of the task
+     * the id of the task
      */
     public void setTaskId(Long taskId) {
         this.taskId = taskId;
@@ -241,7 +244,7 @@ public Integer getPage() {
     public void setPage(Integer page) {
         this.page = page;
     }
-    
+
     public Integer getPageSize() {
         return pageSize;
     }
@@ -374,7 +377,6 @@ public void setExtraJaxbClasses(Class[] extraJaxbClasses) {
         this.extraJaxbClasses = extraJaxbClasses;
     }
 
-    
     public String getEventListenerType() {
         return eventListenerType;
     }
@@ -385,13 +387,14 @@ public String getEventListenerType() {
     public void setEventListenerType(String eventListenerType) {
         this.eventListenerType = eventListenerType;
     }
-    
+
     public Boolean getEmitterSendItems() {
         return emitterSendItems;
     }
 
     /**
-     * Sets if event produced by emitter should be sent as single items or complete collection
+     * Sets if event produced by emitter should be sent as single items or
+     * complete collection
      */
     public void setEmitterSendItems(Boolean emiterSendItems) {
         this.emitterSendItems = emiterSendItems;
@@ -399,6 +402,11 @@ public void setEmitterSendItems(Boolean emiterSendItems) {
 
     @Override
     public String toString() {
-        return "JBPMConfiguration [connectionURL=" + connectionURL + ", operation=" + operation + ", deploymentId=" + deploymentId + ", processInstanceId=" + processInstanceId + ", value=" + value + ", processId=" + processId + ", eventType=" + eventType + ", event=" + event + ", maxNumber=" + maxNumber + ", identifier=" + identifier + ", workItemId=" + workItemId + ", taskId=" + taskId + ", userId=" + userId + ", page=" + page + ", pageSize=" + pageSize + ", targetUserId=" + targetUserId + ", attachmentId=" + attachmentId + ", contentId=" + contentId + ", task=" + task + ", entities=" + entities + ", statuses=" + statuses + ", userName=" + userName + ", password=" + password + ", timeout=" + timeout + ", parameters=" + parameters + ", extraJaxbClasses=" + Arrays.toString(extraJaxbClasses) + ", eventListenerType=" + eventListenerType + "]";
+        return "JBPMConfiguration [connectionURL=" + connectionURL + ", operation=" + operation + ", deploymentId=" + deploymentId + ", processInstanceId=" + processInstanceId
+               + ", value=" + value + ", processId=" + processId + ", eventType=" + eventType + ", event=" + event + ", maxNumber=" + maxNumber + ", identifier=" + identifier
+               + ", workItemId=" + workItemId + ", taskId=" + taskId + ", userId=" + userId + ", page=" + page + ", pageSize=" + pageSize + ", targetUserId=" + targetUserId
+               + ", attachmentId=" + attachmentId + ", contentId=" + contentId + ", task=" + task + ", entities=" + entities + ", statuses=" + statuses + ", userName=" + userName
+               + ", password=" + password + ", timeout=" + timeout + ", parameters=" + parameters + ", extraJaxbClasses=" + Arrays.toString(extraJaxbClasses)
+               + ", eventListenerType=" + eventListenerType + "]";
     }
 }
diff --git a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMEndpoint.java b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMEndpoint.java
index eb0472f94c6c2..a8af4eeff648e 100644
--- a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMEndpoint.java
+++ b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMEndpoint.java
@@ -35,7 +35,8 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * The jbpm component provides integration with jBPM (Business Process Management).
+ * The jbpm component provides integration with jBPM (Business Process
+ * Management).
  */
 @UriEndpoint(firstVersion = "2.6.0", scheme = "jbpm", title = "JBPM", syntax = "jbpm:connectionURL", label = "process")
 public class JBPMEndpoint extends DefaultEndpoint {
@@ -50,8 +51,9 @@ public JBPMEndpoint(String uri, JBPMComponent component, JBPMConfiguration confi
     }
 
     public Producer createProducer() throws Exception {
-        KieServicesConfiguration kieConfiguration = KieServicesFactory.newRestConfiguration(configuration.getConnectionURL().toExternalForm(), configuration.getUserName(), configuration.getPassword());
-  
+        KieServicesConfiguration kieConfiguration = KieServicesFactory.newRestConfiguration(configuration.getConnectionURL().toExternalForm(), configuration.getUserName(),
+                                                                                            configuration.getPassword());
+
         if (configuration.getTimeout() != null) {
             kieConfiguration.setTimeout(configuration.getTimeout());
         }
@@ -59,8 +61,8 @@ public Producer createProducer() throws Exception {
             List<Class<?>> classes = Arrays.asList(configuration.getExtraJaxbClasses());
             kieConfiguration.addExtraClasses(new LinkedHashSet<>(classes));
         }
-        
-        KieServicesClient kieServerClient = KieServicesFactory.newKieServicesClient(kieConfiguration);        
+
+        KieServicesClient kieServerClient = KieServicesFactory.newKieServicesClient(kieConfiguration);
         LOGGER.debug("JBPM Producer created with KieServerClient configured for {}", configuration.getConnectionURL());
         return new JBPMProducer(this, kieServerClient);
     }
diff --git a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMProducer.java b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMProducer.java
index c9f218b3e940b..9688a40ff2e94 100644
--- a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMProducer.java
+++ b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMProducer.java
@@ -49,15 +49,14 @@ public class JBPMProducer extends DefaultProducer {
     private static final transient Logger LOGGER = LoggerFactory.getLogger(JBPMProducer.class);
 
     private static KieCommands commandsFactory = KieServices.get().getCommands();
-    
+
     private JBPMConfiguration configuration;
     private KieServicesClient kieServicesClient;
-    
 
     public JBPMProducer(JBPMEndpoint endpoint, KieServicesClient kieServicesClient) {
         super(endpoint);
         this.configuration = endpoint.getConfiguration();
-        this.kieServicesClient = kieServicesClient;        
+        this.kieServicesClient = kieServicesClient;
     }
 
     @Override
@@ -69,7 +68,7 @@ protected void doStart() throws Exception {
 
     @Override
     protected void doStop() throws Exception {
-        super.doStop();        
+        super.doStop();
     }
 
     public void process(Exchange exchange) throws Exception {
@@ -90,7 +89,7 @@ Operation getOperation(Exchange exchange) {
 
     enum Operation {
 
-        //PROCESS OPERATIONS
+        // PROCESS OPERATIONS
         startProcess {
             @Override
             void execute(KieServicesClient kieServicesClient, JBPMConfiguration configuration, Exchange exchange) {
@@ -98,31 +97,36 @@ void execute(KieServicesClient kieServicesClient, JBPMConfiguration configuratio
                 Long processInstance = processClient.startProcess(configuration.getDeploymentId(), getProcessId(configuration, exchange), getParameters(configuration, exchange));
                 setResult(exchange, processInstance);
             }
-        }, abortProcessInstance {
+        },
+        abortProcessInstance {
             @Override
             void execute(KieServicesClient kieServicesClient, JBPMConfiguration configuration, Exchange exchange) {
                 ProcessServicesClient processClient = kieServicesClient.getServicesClient(ProcessServicesClient.class);
                 processClient.abortProcessInstance(configuration.getDeploymentId(), safe(getProcessInstanceId(configuration, exchange)));
             }
-        }, signalEvent {
+        },
+        signalEvent {
             @Override
             void execute(KieServicesClient kieServicesClient, JBPMConfiguration configuration, Exchange exchange) {
                 ProcessServicesClient processClient = kieServicesClient.getServicesClient(ProcessServicesClient.class);
                 Long processInstanceId = getProcessInstanceId(configuration, exchange);
                 if (processInstanceId != null) {
-                    processClient.signalProcessInstance(configuration.getDeploymentId(), processInstanceId, getEventType(configuration, exchange), getEvent(configuration, exchange));
+                    processClient.signalProcessInstance(configuration.getDeploymentId(), processInstanceId, getEventType(configuration, exchange),
+                                                        getEvent(configuration, exchange));
                 } else {
                     processClient.signal(configuration.getDeploymentId(), getEventType(configuration, exchange), getEvent(configuration, exchange));
                 }
             }
-        }, getProcessInstance {
+        },
+        getProcessInstance {
             @Override
             void execute(KieServicesClient kieServicesClient, JBPMConfiguration configuration, Exchange exchange) {
                 ProcessServicesClient processClient = kieServicesClient.getServicesClient(ProcessServicesClient.class);
                 ProcessInstance processInstance = processClient.getProcessInstance(configuration.getDeploymentId(), safe(getProcessInstanceId(configuration, exchange)));
                 setResult(exchange, processInstance);
             }
-        }, getProcessInstances {
+        },
+        getProcessInstances {
             @Override
             void execute(KieServicesClient kieServicesClient, JBPMConfiguration configuration, Exchange exchange) {
                 QueryServicesClient queryClient = kieServicesClient.getServicesClient(QueryServicesClient.class);
@@ -131,24 +135,25 @@ void execute(KieServicesClient kieServicesClient, JBPMConfiguration configuratio
             }
         },
 
-        //RULE OPERATIONS
+        // RULE OPERATIONS
         fireAllRules {
             @Override
             void execute(KieServicesClient kieServicesClient, JBPMConfiguration configuration, Exchange exchange) {
                 RuleServicesClient ruleClient = kieServicesClient.getServicesClient(RuleServicesClient.class);
                 List<Command<?>> commands = new ArrayList<Command<?>>();
                 BatchExecutionCommand executionCommand = commandsFactory.newBatchExecution(commands);
-                
+
                 Integer max = getMaxNumber(configuration, exchange);
                 if (max != null) {
                     commands.add(commandsFactory.newFireAllRules(max));
                 } else {
                     commands.add(commandsFactory.newFireAllRules());
                 }
-                ServiceResponse<ExecutionResults> reply = ruleClient.executeCommandsWithResults(configuration.getDeploymentId(), executionCommand);                
+                ServiceResponse<ExecutionResults> reply = ruleClient.executeCommandsWithResults(configuration.getDeploymentId(), executionCommand);
                 setResult(exchange, reply.getResult());
             }
-        }, getGlobal {
+        },
+        getGlobal {
             @Override
             void execute(KieServicesClient kieServicesClient, JBPMConfiguration configuration, Exchange exchange) {
                 RuleServicesClient ruleClient = kieServicesClient.getServicesClient(RuleServicesClient.class);
@@ -157,10 +162,11 @@ void execute(KieServicesClient kieServicesClient, JBPMConfiguration configuratio
                 String identifier = getIdentifier(configuration, exchange);
                 commands.add(commandsFactory.newGetGlobal(identifier, identifier));
 
-                ServiceResponse<ExecutionResults> reply = ruleClient.executeCommandsWithResults(configuration.getDeploymentId(), executionCommand);  
+                ServiceResponse<ExecutionResults> reply = ruleClient.executeCommandsWithResults(configuration.getDeploymentId(), executionCommand);
                 setResult(exchange, reply.getResult().getValue(identifier));
             }
-        }, setGlobal {
+        },
+        setGlobal {
             @Override
             void execute(KieServicesClient kieServicesClient, JBPMConfiguration configuration, Exchange exchange) {
                 RuleServicesClient ruleClient = kieServicesClient.getServicesClient(RuleServicesClient.class);
@@ -169,165 +175,196 @@ void execute(KieServicesClient kieServicesClient, JBPMConfiguration configuratio
 
                 commands.add(commandsFactory.newSetGlobal(getIdentifier(configuration, exchange), getValue(configuration, exchange)));
 
-                ruleClient.executeCommandsWithResults(configuration.getDeploymentId(), executionCommand);                
+                ruleClient.executeCommandsWithResults(configuration.getDeploymentId(), executionCommand);
             }
         },
 
-        //WORK ITEM OPERATIONS
+        // WORK ITEM OPERATIONS
         abortWorkItem {
             @Override
             void execute(KieServicesClient kieServicesClient, JBPMConfiguration configuration, Exchange exchange) {
                 ProcessServicesClient processClient = kieServicesClient.getServicesClient(ProcessServicesClient.class);
                 processClient.abortWorkItem(configuration.getDeploymentId(), safe(getProcessInstanceId(configuration, exchange)), safe(getWorkItemId(configuration, exchange)));
             }
-        }, completeWorkItem {
+        },
+        completeWorkItem {
             @Override
             void execute(KieServicesClient kieServicesClient, JBPMConfiguration configuration, Exchange exchange) {
                 ProcessServicesClient processClient = kieServicesClient.getServicesClient(ProcessServicesClient.class);
-                processClient.completeWorkItem(configuration.getDeploymentId(), safe(getProcessInstanceId(configuration, exchange)), safe(getWorkItemId(configuration, exchange)), getParameters(configuration, exchange));
+                processClient.completeWorkItem(configuration.getDeploymentId(), safe(getProcessInstanceId(configuration, exchange)), safe(getWorkItemId(configuration, exchange)),
+                                               getParameters(configuration, exchange));
             }
         },
 
-        //TASK OPERATIONS
+        // TASK OPERATIONS
         activateTask {
             @Override
             void execute(KieServicesClient kieServicesClient, JBPMConfiguration configuration, Exchange exchange) {
                 UserTaskServicesClient taskClient = kieServicesClient.getServicesClient(UserTaskServicesClient.class);
                 taskClient.activateTask(configuration.getDeploymentId(), safe(getTaskId(configuration, exchange)), getUserId(configuration, exchange));
             }
-        }, claimTask {
+        },
+        claimTask {
             @Override
             void execute(KieServicesClient kieServicesClient, JBPMConfiguration configuration, Exchange exchange) {
                 UserTaskServicesClient taskClient = kieServicesClient.getServicesClient(UserTaskServicesClient.class);
                 taskClient.claimTask(configuration.getDeploymentId(), safe(getTaskId(configuration, exchange)), getUserId(configuration, exchange));
             }
-        }, completeTask {
+        },
+        completeTask {
             @Override
             void execute(KieServicesClient kieServicesClient, JBPMConfiguration configuration, Exchange exchange) {
                 UserTaskServicesClient taskClient = kieServicesClient.getServicesClient(UserTaskServicesClient.class);
-                taskClient.completeAutoProgress(configuration.getDeploymentId(), safe(getTaskId(configuration, exchange)), getUserId(configuration, exchange), getParameters(configuration, exchange));
+                taskClient.completeAutoProgress(configuration.getDeploymentId(), safe(getTaskId(configuration, exchange)), getUserId(configuration, exchange),
+                                                getParameters(configuration, exchange));
             }
-        }, delegateTask {
+        },
+        delegateTask {
             @Override
             void execute(KieServicesClient kieServicesClient, JBPMConfiguration configuration, Exchange exchange) {
                 UserTaskServicesClient taskClient = kieServicesClient.getServicesClient(UserTaskServicesClient.class);
-                taskClient.delegateTask(configuration.getDeploymentId(), safe(getTaskId(configuration, exchange)), getUserId(configuration, exchange), getTargetUserId(configuration, exchange));
+                taskClient.delegateTask(configuration.getDeploymentId(), safe(getTaskId(configuration, exchange)), getUserId(configuration, exchange),
+                                        getTargetUserId(configuration, exchange));
             }
-        }, exitTask {
+        },
+        exitTask {
             @Override
             void execute(KieServicesClient kieServicesClient, JBPMConfiguration configuration, Exchange exchange) {
                 UserTaskServicesClient taskClient = kieServicesClient.getServicesClient(UserTaskServicesClient.class);
                 taskClient.exitTask(configuration.getDeploymentId(), safe(getTaskId(configuration, exchange)), getUserId(configuration, exchange));
             }
-        }, failTask {
+        },
+        failTask {
             @Override
             void execute(KieServicesClient kieServicesClient, JBPMConfiguration configuration, Exchange exchange) {
                 UserTaskServicesClient taskClient = kieServicesClient.getServicesClient(UserTaskServicesClient.class);
-                taskClient.failTask(configuration.getDeploymentId(), safe(getTaskId(configuration, exchange)), getUserId(configuration, exchange), getParameters(configuration, exchange));
+                taskClient.failTask(configuration.getDeploymentId(), safe(getTaskId(configuration, exchange)), getUserId(configuration, exchange),
+                                    getParameters(configuration, exchange));
             }
-        }, getAttachment {
+        },
+        getAttachment {
             @Override
             void execute(KieServicesClient kieServicesClient, JBPMConfiguration configuration, Exchange exchange) {
                 UserTaskServicesClient taskClient = kieServicesClient.getServicesClient(UserTaskServicesClient.class);
-                TaskAttachment attachment = taskClient.getTaskAttachmentById(configuration.getDeploymentId(), safe(getTaskId(configuration, exchange)), safe(getAttachmentId(configuration, exchange)));
+                TaskAttachment attachment = taskClient.getTaskAttachmentById(configuration.getDeploymentId(), safe(getTaskId(configuration, exchange)),
+                                                                             safe(getAttachmentId(configuration, exchange)));
                 setResult(exchange, attachment);
             }
-        }, getTasksAssignedAsBusinessAdministrator {
+        },
+        getTasksAssignedAsBusinessAdministrator {
             @Override
             void execute(KieServicesClient kieServicesClient, JBPMConfiguration configuration, Exchange exchange) {
                 UserTaskServicesClient taskClient = kieServicesClient.getServicesClient(UserTaskServicesClient.class);
-                List<TaskSummary> taskSummaries = taskClient.findTasksAssignedAsBusinessAdministrator(getUserId(configuration, exchange), getPage(configuration, exchange), getPageSize(configuration, exchange));
+                List<TaskSummary> taskSummaries = taskClient.findTasksAssignedAsBusinessAdministrator(getUserId(configuration, exchange), getPage(configuration, exchange),
+                                                                                                      getPageSize(configuration, exchange));
                 setResult(exchange, taskSummaries);
             }
-        }, getTasksAssignedAsPotentialOwnerByStatus {
+        },
+        getTasksAssignedAsPotentialOwnerByStatus {
             @Override
             void execute(KieServicesClient kieServicesClient, JBPMConfiguration configuration, Exchange exchange) {
                 UserTaskServicesClient taskClient = kieServicesClient.getServicesClient(UserTaskServicesClient.class);
-                List<TaskSummary> taskSummaries = taskClient.findTasksAssignedAsPotentialOwner(getUserId(configuration, exchange), getStatuses(configuration, exchange), getPage(configuration, exchange), getPageSize(configuration, exchange));
+                List<TaskSummary> taskSummaries = taskClient.findTasksAssignedAsPotentialOwner(getUserId(configuration, exchange), getStatuses(configuration, exchange),
+                                                                                               getPage(configuration, exchange), getPageSize(configuration, exchange));
                 setResult(exchange, taskSummaries);
             }
-        }, getTaskByWorkItem {
+        },
+        getTaskByWorkItem {
             @Override
             void execute(KieServicesClient kieServicesClient, JBPMConfiguration configuration, Exchange exchange) {
                 UserTaskServicesClient taskClient = kieServicesClient.getServicesClient(UserTaskServicesClient.class);
                 TaskInstance task = taskClient.findTaskByWorkItemId(safe(getWorkItemId(configuration, exchange)));
                 setResult(exchange, task);
             }
-        }, getTaskBy {
+        },
+        getTaskBy {
             @Override
             void execute(KieServicesClient kieServicesClient, JBPMConfiguration configuration, Exchange exchange) {
                 UserTaskServicesClient taskClient = kieServicesClient.getServicesClient(UserTaskServicesClient.class);
                 TaskInstance task = taskClient.findTaskById(safe(getTaskId(configuration, exchange)));
                 setResult(exchange, task);
             }
-        }, getTaskContent {
+        },
+        getTaskContent {
             @Override
             void execute(KieServicesClient kieServicesClient, JBPMConfiguration configuration, Exchange exchange) {
                 UserTaskServicesClient taskClient = kieServicesClient.getServicesClient(UserTaskServicesClient.class);
                 Map<String, Object> content = taskClient.getTaskOutputContentByTaskId(configuration.getDeploymentId(), safe(getTaskId(configuration, exchange)));
                 setResult(exchange, content);
             }
-        }, getTasksByProcessInstance {
+        },
+        getTasksByProcessInstance {
             @Override
             void execute(KieServicesClient kieServicesClient, JBPMConfiguration configuration, Exchange exchange) {
                 UserTaskServicesClient taskClient = kieServicesClient.getServicesClient(UserTaskServicesClient.class);
                 List<TaskSummary> processInstanceIds = taskClient.findTasksByStatusByProcessInstanceId(safe(getProcessInstanceId(configuration, exchange)), Collections.emptyList(),
-                        getPage(configuration, exchange), getPageSize(configuration, exchange));
+                                                                                                       getPage(configuration, exchange), getPageSize(configuration, exchange));
                 setResult(exchange, processInstanceIds);
             }
-        }, getTasksByStatusByProcessInstance {
+        },
+        getTasksByStatusByProcessInstance {
             @Override
             void execute(KieServicesClient kieServicesClient, JBPMConfiguration configuration, Exchange exchange) {
                 UserTaskServicesClient taskClient = kieServicesClient.getServicesClient(UserTaskServicesClient.class);
-                List<TaskSummary> taskSummaryList = taskClient.findTasksByStatusByProcessInstanceId(
-                        safe(getProcessInstanceId(configuration, exchange)), getStatuses(configuration, exchange),
-                        getPage(configuration, exchange), getPageSize(configuration, exchange));
+                List<TaskSummary> taskSummaryList = taskClient.findTasksByStatusByProcessInstanceId(safe(getProcessInstanceId(configuration, exchange)),
+                                                                                                    getStatuses(configuration, exchange), getPage(configuration, exchange),
+                                                                                                    getPageSize(configuration, exchange));
                 setResult(exchange, taskSummaryList);
             }
-        }, getTasksOwned {
+        },
+        getTasksOwned {
             @Override
             void execute(KieServicesClient kieServicesClient, JBPMConfiguration configuration, Exchange exchange) {
                 UserTaskServicesClient taskClient = kieServicesClient.getServicesClient(UserTaskServicesClient.class);
-                List<TaskSummary> summaryList = taskClient.findTasksOwned(getUserId(configuration, exchange), getPage(configuration, exchange), getPageSize(configuration, exchange));
+                List<TaskSummary> summaryList = taskClient.findTasksOwned(getUserId(configuration, exchange), getPage(configuration, exchange),
+                                                                          getPageSize(configuration, exchange));
                 setResult(exchange, summaryList);
             }
-        }, nominateTask {
+        },
+        nominateTask {
             @Override
             void execute(KieServicesClient kieServicesClient, JBPMConfiguration configuration, Exchange exchange) {
                 UserTaskServicesClient taskClient = kieServicesClient.getServicesClient(UserTaskServicesClient.class);
-                taskClient.nominateTask(configuration.getDeploymentId(), safe(getTaskId(configuration, exchange)), getUserId(configuration, exchange), getEntities(configuration, exchange));
+                taskClient.nominateTask(configuration.getDeploymentId(), safe(getTaskId(configuration, exchange)), getUserId(configuration, exchange),
+                                        getEntities(configuration, exchange));
             }
-        }, releaseTask {
+        },
+        releaseTask {
             @Override
             void execute(KieServicesClient kieServicesClient, JBPMConfiguration configuration, Exchange exchange) {
                 UserTaskServicesClient taskClient = kieServicesClient.getServicesClient(UserTaskServicesClient.class);
                 taskClient.releaseTask(configuration.getDeploymentId(), safe(getTaskId(configuration, exchange)), getUserId(configuration, exchange));
             }
-        }, resumeTask {
+        },
+        resumeTask {
             @Override
             void execute(KieServicesClient kieServicesClient, JBPMConfiguration configuration, Exchange exchange) {
                 UserTaskServicesClient taskClient = kieServicesClient.getServicesClient(UserTaskServicesClient.class);
                 taskClient.resumeTask(configuration.getDeploymentId(), safe(getTaskId(configuration, exchange)), getUserId(configuration, exchange));
             }
-        }, skipTask {
+        },
+        skipTask {
             @Override
             void execute(KieServicesClient kieServicesClient, JBPMConfiguration configuration, Exchange exchange) {
                 UserTaskServicesClient taskClient = kieServicesClient.getServicesClient(UserTaskServicesClient.class);
                 taskClient.skipTask(configuration.getDeploymentId(), safe(getTaskId(configuration, exchange)), getUserId(configuration, exchange));
             }
-        }, startTask {
+        },
+        startTask {
             @Override
             void execute(KieServicesClient kieServicesClient, JBPMConfiguration configuration, Exchange exchange) {
                 UserTaskServicesClient taskClient = kieServicesClient.getServicesClient(UserTaskServicesClient.class);
                 taskClient.startTask(configuration.getDeploymentId(), safe(getTaskId(configuration, exchange)), getUserId(configuration, exchange));
             }
-        }, stopTask {
+        },
+        stopTask {
             @Override
             void execute(KieServicesClient kieServicesClient, JBPMConfiguration configuration, Exchange exchange) {
                 UserTaskServicesClient taskClient = kieServicesClient.getServicesClient(UserTaskServicesClient.class);
                 taskClient.stopTask(configuration.getDeploymentId(), safe(getTaskId(configuration, exchange)), getUserId(configuration, exchange));
             }
-        }, suspendTask {
+        },
+        suspendTask {
             @Override
             void execute(KieServicesClient kieServicesClient, JBPMConfiguration configuration, Exchange exchange) {
                 UserTaskServicesClient taskClient = kieServicesClient.getServicesClient(UserTaskServicesClient.class);
@@ -382,7 +419,7 @@ Integer getPage(JBPMConfiguration configuration, Exchange exchange) {
             }
             return page;
         }
-        
+
         Integer getPageSize(JBPMConfiguration configuration, Exchange exchange) {
             Integer pageSize = exchange.getIn().getHeader(JBPMConstants.RESULT_PAGE_SIZE, Integer.class);
             if (pageSize == null) {
@@ -502,4 +539,3 @@ void setResult(Exchange exchange, Object result) {
         abstract void execute(KieServicesClient kieServicesClient, JBPMConfiguration configuration, Exchange exchange);
     }
 }
-
diff --git a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/server/CamelKieServerExtension.java b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/server/CamelKieServerExtension.java
index 3a8a0ea9bb0d6..fbc4448d59cac 100644
--- a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/server/CamelKieServerExtension.java
+++ b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/server/CamelKieServerExtension.java
@@ -36,29 +36,28 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-
 public class CamelKieServerExtension implements KieServerExtension {
     public static final String EXTENSION_NAME = "Camel";
 
-    private static final Logger logger = LoggerFactory.getLogger(CamelKieServerExtension.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(CamelKieServerExtension.class);
 
-    private static final Boolean disabled = Boolean.parseBoolean(System.getProperty("org.camel.server.ext.disabled", "false"));
+    private static final Boolean DISABLED = Boolean.parseBoolean(System.getProperty("org.camel.server.ext.disabled", "false"));
 
     protected DefaultCamelContext camel;
-    
+
     protected boolean managedCamel;
 
     protected Map<String, DefaultCamelContext> camelContexts = new HashMap<>();
-    
+
     public CamelKieServerExtension() {
         this.managedCamel = true;
     }
-    
+
     public CamelKieServerExtension(DefaultCamelContext camel) {
         this.camel = camel;
         this.managedCamel = false;
     }
-    
+
     @Override
     public boolean isInitialized() {
         return camel != null;
@@ -66,7 +65,7 @@ public boolean isInitialized() {
 
     @Override
     public boolean isActive() {
-        return disabled == false;
+        return !DISABLED;
     }
 
     @Override
@@ -74,55 +73,55 @@ public void init(KieServerImpl kieServer, KieServerRegistry registry) {
         if (this.managedCamel && this.camel == null) {
             this.camel = new DefaultCamelContext();
             this.camel.setName("KIE Server Camel context");
-            
+
             try (InputStream is = this.getClass().getResourceAsStream("/global-camel-routes.xml")) {
                 if (is != null) {
-                                        
-                    RoutesDefinition routes = camel.loadRoutesDefinition(is);                                  
-                    camel.addRouteDefinitions(routes.getRoutes());            
+
+                    RoutesDefinition routes = camel.loadRoutesDefinition(is);
+                    camel.addRouteDefinitions(routes.getRoutes());
                 }
             } catch (Exception e) {
-                logger.error("Error while adding Camel context for KIE Server", e);
+                LOGGER.error("Error while adding Camel context for KIE Server", e);
             }
         }
-        
+
         ServiceRegistry.get().register("GlobalCamelService", this.camel);
     }
 
     @Override
     public void destroy(KieServerImpl kieServer, KieServerRegistry registry) {
         ServiceRegistry.get().remove("GlobalCamelService");
-        
+
         if (this.managedCamel && this.camel != null) {
             try {
                 this.camel.stop();
             } catch (Exception e) {
-                logger.error("Failed at stopping KIE Server extension {}", EXTENSION_NAME);
+                LOGGER.error("Failed at stopping KIE Server extension {}", EXTENSION_NAME);
             }
         }
     }
 
     @Override
     public void createContainer(String id, KieContainerInstance kieContainerInstance, Map<String, Object> parameters) {
-        
+
         ClassLoader classloader = kieContainerInstance.getKieContainer().getClassLoader();
         try (InputStream is = classloader.getResourceAsStream("camel-routes.xml")) {
             if (is != null) {
-                
+
                 DefaultCamelContext context = new DefaultCamelContext();
-                context.setName("KIE Server Camel context for container " + kieContainerInstance.getContainerId());                            
-                
-                RoutesDefinition routes = context.loadRoutesDefinition(is);              
+                context.setName("KIE Server Camel context for container " + kieContainerInstance.getContainerId());
+
+                RoutesDefinition routes = context.loadRoutesDefinition(is);
                 annotateKJarRoutes(routes, id);
                 context.addRouteDefinitions(routes.getRoutes());
                 context.start();
                 camelContexts.put(id, context);
-                
+
                 ServiceRegistry.get().register(id + "_CamelService", this.camel);
-               
+
             }
         } catch (Exception e) {
-            logger.error("Error while adding Camel context for {}", kieContainerInstance.getContainerId(), e);
+            LOGGER.error("Error while adding Camel context for {}", kieContainerInstance.getContainerId(), e);
         }
     }
 
@@ -140,14 +139,14 @@ public boolean isUpdateContainerAllowed(String id, KieContainerInstance kieConta
     @Override
     public void disposeContainer(String id, KieContainerInstance kieContainerInstance, Map<String, Object> parameters) {
         DefaultCamelContext context = camelContexts.get(id);
-        
+
         if (context != null) {
-            
+
             ServiceRegistry.get().remove(id + "_CamelService");
             try {
                 context.stop();
             } catch (Exception e) {
-                logger.error("Error while removing Camel context for container {}", id, e);
+                LOGGER.error("Error while removing Camel context for container {}", id, e);
             }
         }
     }
@@ -181,18 +180,18 @@ public String getExtensionName() {
     public Integer getStartOrder() {
         return 50;
     }
-    
+
     @Override
     public void serverStarted() {
         if (this.managedCamel && this.camel != null && !this.camel.isStarted()) {
             try {
                 this.camel.start();
             } catch (Exception e) {
-                logger.error("Failed at start Camel context", e);
+                LOGGER.error("Failed at start Camel context", e);
             }
         }
     }
-    
+
     @Override
     public String toString() {
         return EXTENSION_NAME + " KIE Server extension";
@@ -200,12 +199,12 @@ public String toString() {
 
     protected void annotateKJarRoutes(RoutesDefinition routes, String deploymentId) {
         for (RouteDefinition route : routes.getRoutes()) {
-            
+
             for (FromDefinition from : route.getInputs()) {
-                
+
                 if (from.getUri().startsWith("jbpm:events") && !from.getUri().contains("deploymentId")) {
                     StringBuilder uri = new StringBuilder(from.getUri());
-                    
+
                     String[] split = from.getUri().split("\\?");
                     if (split.length == 1) {
                         // no query given
@@ -217,7 +216,7 @@ protected void annotateKJarRoutes(RoutesDefinition routes, String deploymentId)
                     uri.append("deploymentId=").append(deploymentId);
                     from.setUri(uri.toString());
                 }
-                
+
                 System.out.println(from.getUri());
             }
         }
diff --git a/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/JBPMComponentIntegrationTest.java b/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/JBPMComponentIntegrationTest.java
index 18e1055a94d13..fbab216fb0055 100644
--- a/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/JBPMComponentIntegrationTest.java
+++ b/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/JBPMComponentIntegrationTest.java
@@ -29,11 +29,10 @@
 import org.kie.server.api.model.instance.TaskSummary;
 
 /**
- * To run this example you need jBPM to run locally, easiest is to use single zip 
- * distribution - download from jbpm.org
- * 
- * Next, start it and import Evaluation sample project, build and deploy.
- * Once done this test can be ran out of the box.
+ * To run this example you need jBPM to run locally, easiest is to use single
+ * zip distribution - download from jbpm.org Next, start it and import
+ * Evaluation sample project, build and deploy. Once done this test can be ran
+ * out of the box.
  */
 @Ignore("This is an integration test that needs jBPM running on the local machine")
 public class JBPMComponentIntegrationTest extends CamelTestSupport {
@@ -42,46 +41,46 @@ public class JBPMComponentIntegrationTest extends CamelTestSupport {
     @Test
     public void interactsOverRest() throws Exception {
         getMockEndpoint("mock:result").expectedMessageCount(1);
-        
+
         // let's start process instance for evaluation process
         Map<String, Object> params = new HashMap<>();
         params.put("employee", "wbadmin");
         params.put("reason", "Camel asks for it");
-        
+
         Map<String, Object> headers = new HashMap<>();
         headers.put(JBPMConstants.PROCESS_ID, "evaluation");
         headers.put(JBPMConstants.PARAMETERS, params);
-        
+
         template.sendBodyAndHeaders("direct:start", null, headers);
         assertMockEndpointsSatisfied();
-        Long processInstanceId = (Long) getMockEndpoint("mock:result").getExchanges().get(0).getIn().getBody();
+        Long processInstanceId = (Long)getMockEndpoint("mock:result").getExchanges().get(0).getIn().getBody();
         assertNotNull(processInstanceId);
-        
+
         // now let's collect user tasks
-        headers = new HashMap<>();        
+        headers = new HashMap<>();
         headers.put(JBPMConstants.OPERATION, JBPMConstants.OPERATION + Operation.getTasksOwned);
-        
+
         template.sendBodyAndHeaders("direct:start", null, headers);
         getMockEndpoint("mock:result").expectedMessageCount(2);
         assertMockEndpointsSatisfied();
-        
-        List<TaskSummary> tasks = (List<TaskSummary>) getMockEndpoint("mock:result").getExchanges().get(1).getIn().getBody();
+
+        List<TaskSummary> tasks = (List<TaskSummary>)getMockEndpoint("mock:result").getExchanges().get(1).getIn().getBody();
         assertEquals(1, tasks.size());
-        
+
         // let's complete first user task
         headers = new HashMap<>();
         headers.put(JBPMConstants.TASK_ID, tasks.get(0).getId());
         headers.put(JBPMConstants.OPERATION, JBPMConstants.OPERATION + Operation.completeTask);
-        
+
         template.sendBodyAndHeaders("direct:start", null, headers);
         getMockEndpoint("mock:result").expectedMessageCount(3);
         assertMockEndpointsSatisfied();
-        
+
         // lastly let's abort process instance we just created
         headers = new HashMap<>();
         headers.put(JBPMConstants.PROCESS_INSTANCE_ID, processInstanceId);
         headers.put(JBPMConstants.OPERATION, JBPMConstants.OPERATION + Operation.abortProcessInstance);
-        
+
         template.sendBodyAndHeaders("direct:start", null, headers);
         getMockEndpoint("mock:result").expectedMessageCount(4);
         assertMockEndpointsSatisfied();
@@ -92,10 +91,8 @@ protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             @Override
             public void configure() {
-                from("direct:start")
-                        .to("jbpm:http://localhost:8080/kie-server/services/rest/server?userName=wbadmin&password=wbadmin"
-                            + "&deploymentId=evaluation")
-                        .to("mock:result");
+                from("direct:start").to("jbpm:http://localhost:8080/kie-server/services/rest/server?userName=wbadmin&password=wbadmin" + "&deploymentId=evaluation")
+                    .to("mock:result");
             }
         };
     }

From 12113b86b650e1818d53f6af74c5546e5aa791c4 Mon Sep 17 00:00:00 2001
From: Andrea Cosentino <ancosen@gmail.com>
Date: Fri, 16 Nov 2018 09:33:39 +0100
Subject: [PATCH 030/125] Camel-Schematron: Fixed CS

---
 .../component/schematron/SchematronProducer.java   | 14 +++++++-------
 .../schematron/SchematronProducerTest.java         | 13 ++++++-------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/SchematronProducer.java b/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/SchematronProducer.java
index bef9c50805a7a..94770b55d59e5 100644
--- a/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/SchematronProducer.java
+++ b/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/SchematronProducer.java
@@ -16,6 +16,11 @@
  */
 package org.apache.camel.component.schematron;
 
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.xml.transform.Source;
+
 import org.apache.camel.Exchange;
 import org.apache.camel.component.schematron.constant.Constants;
 import org.apache.camel.component.schematron.exception.SchematronValidationException;
@@ -25,10 +30,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import javax.xml.transform.Source;
-import java.util.HashMap;
-import java.util.Map;
-
 /**
  * The Schematron producer.
  */
@@ -36,7 +37,6 @@ public class SchematronProducer extends DefaultProducer {
     private Logger logger = LoggerFactory.getLogger(SchematronProducer.class);
     private SchematronEndpoint endpoint;
 
-
     /**
      * @param endpoint the schematron endpoint.
      */
@@ -58,10 +58,10 @@ public void process(Exchange exchange) throws Exception {
 
         if (payload instanceof Source) {
             logger.debug("Applying schematron validation on payload: {}", payload);
-            report = schematronProcessor.validate((Source) payload);
+            report = schematronProcessor.validate((Source)payload);
         } else if (payload instanceof String) {
             logger.debug("Applying schematron validation on payload: {}", payload);
-            report = schematronProcessor.validate((String) payload);
+            report = schematronProcessor.validate((String)payload);
         } else {
             String stringPayload = exchange.getIn().getBody(String.class);
             logger.debug("Applying schematron validation on payload: {}", stringPayload);
diff --git a/components/camel-schematron/src/test/java/org/apache/camel/component/schematron/SchematronProducerTest.java b/components/camel-schematron/src/test/java/org/apache/camel/component/schematron/SchematronProducerTest.java
index ebf2594c6816a..e588bd3d6070c 100644
--- a/components/camel-schematron/src/test/java/org/apache/camel/component/schematron/SchematronProducerTest.java
+++ b/components/camel-schematron/src/test/java/org/apache/camel/component/schematron/SchematronProducerTest.java
@@ -15,14 +15,19 @@
  * limitations under the License.
  */
 package org.apache.camel.component.schematron;
+
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
 import javax.xml.transform.Templates;
 import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.sax.SAXSource;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+import org.xml.sax.XMLReader;
 
 import net.sf.saxon.TransformerFactoryImpl;
+
 import org.apache.camel.Exchange;
 import org.apache.camel.ExchangePattern;
 import org.apache.camel.component.schematron.constant.Constants;
@@ -30,16 +35,11 @@
 import org.apache.camel.component.schematron.processor.TemplatesFactory;
 import org.apache.camel.impl.DefaultExchange;
 import org.apache.camel.test.junit4.CamelTestSupport;
-import org.apache.commons.io.IOUtils;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-import org.xml.sax.XMLReader;
 
 /**
  * Schematron Producer Unit Test.
- *
  */
 public class SchematronProducerTest extends CamelTestSupport {
 
@@ -50,8 +50,7 @@ public static void setUP() {
         SchematronEndpoint endpoint = new SchematronEndpoint();
         TransformerFactory fac = new TransformerFactoryImpl();
         fac.setURIResolver(new ClassPathURIResolver(Constants.SCHEMATRON_TEMPLATES_ROOT_DIR, endpoint.getUriResolver()));
-        Templates templates = TemplatesFactory.newInstance().getTemplates(ClassLoader.
-                getSystemResourceAsStream("sch/schematron-1.sch"), fac);
+        Templates templates = TemplatesFactory.newInstance().getTemplates(ClassLoader.getSystemResourceAsStream("sch/schematron-1.sch"), fac);
         endpoint.setRules(templates);
         producer = new SchematronProducer(endpoint);
     }

From 0eb34c9752ddbd3c54d34217c86b926a675aec10 Mon Sep 17 00:00:00 2001
From: Jan <jbouska@redhat.com>
Date: Tue, 13 Nov 2018 10:28:39 +0100
Subject: [PATCH 031/125] Refactor dopbox tests

---
 components/camel-dropbox/pom.xml              |  32 ++++--
 .../dropbox/DropboxConsumerTest.java          |  16 ++-
 .../integration/DropboxTestSupport.java       |  66 +++++++++--
 .../DropboxConsumerGetSingleTest.java         |  25 ++---
 .../DropboxConsumerSearchQueryTest.java       |  23 ++--
 .../consumer/DropboxConsumerSearchTest.java   |  56 ---------
 .../producer/DropboxProducerDelTest.java      |  54 +++------
 .../DropboxProducerGetFolderTest.java         | 106 +++++-------------
 .../DropboxProducerGetSingleTest.java         |  61 ++++------
 .../producer/DropboxProducerMoveTest.java     |  59 ++++------
 .../DropboxProducerPutSingleFileTest.java     |  99 +++++++++-------
 ...oducerPutSingleFileWithRemotePathTest.java |  96 ----------------
 .../DropboxProducerPutWithRemotePathTest.java |  95 ----------------
 .../DropboxProducerSearchQueryTest.java       |  66 ++++-------
 .../producer/DropboxProducerSearchTest.java   |  92 ---------------
 .../test/resources/test-options.properties    |   3 +-
 16 files changed, 268 insertions(+), 681 deletions(-)
 delete mode 100644 components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/consumer/DropboxConsumerSearchTest.java
 delete mode 100644 components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerPutSingleFileWithRemotePathTest.java
 delete mode 100644 components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerPutWithRemotePathTest.java
 delete mode 100644 components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerSearchTest.java

diff --git a/components/camel-dropbox/pom.xml b/components/camel-dropbox/pom.xml
index f93165b070f2f..dcbdeefe69ae2 100644
--- a/components/camel-dropbox/pom.xml
+++ b/components/camel-dropbox/pom.xml
@@ -97,27 +97,39 @@
     </dependency>
   </dependencies>
 
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <excludes>
+            <exclude>
+              **/integration/**
+            </exclude>
+          </excludes>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
   <profiles>
     <profile>
-      <id>no-integration-test</id>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-      </activation>
+      <id>dropbox-test</id>
       <build>
         <plugins>
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-surefire-plugin</artifactId>
-            <configuration>
-              <excludes>
-                <exclude>
-                  **/integration/**
-                </exclude>
-              </excludes>
+            <configuration combine.self="override">
+              <includes>
+                <include>**/*Test.java</include>
+              </includes>
             </configuration>
           </plugin>
         </plugins>
       </build>
+
     </profile>
   </profiles>
 
diff --git a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/DropboxConsumerTest.java b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/DropboxConsumerTest.java
index 199d5daaba573..6fee8a640c4f2 100644
--- a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/DropboxConsumerTest.java
+++ b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/DropboxConsumerTest.java
@@ -21,22 +21,20 @@
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.dropbox.integration.DropboxTestSupport;
 import org.apache.camel.component.dropbox.integration.consumer.DropboxScheduledPollGetConsumer;
+import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.Assert;
 import org.junit.Test;
 
-public class DropboxConsumerTest extends DropboxTestSupport {
-
-    public DropboxConsumerTest() throws Exception {
-    }
+public class DropboxConsumerTest extends CamelTestSupport {
 
     @Override
-    protected RouteBuilder createRouteBuilder() throws Exception {
+    protected RouteBuilder createRouteBuilder() {
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from("dropbox://get?accessToken={{accessToken}}&remotePath=/path").to("mock:test1");
+                from("dropbox://get?accessToken=accessToken&remotePath=/path").to("mock:test1");
                 
-                from("dropbox://get?accessToken={{accessToken}}&remotePath=/path with spaces/file").to("mock:test2");
+                from("dropbox://get?accessToken=accessToken&remotePath=/path with spaces/file").to("mock:test2");
             }
         };
     }
@@ -44,7 +42,7 @@ public void configure() throws Exception {
     @Test
     public void shouldCreateGetConsumer() throws Exception {
         // Given
-        Endpoint dropboxEndpoint1 = context.getEndpoint("dropbox://get?accessToken={{accessToken}}&remotePath=/path");
+        Endpoint dropboxEndpoint1 = context.getEndpoint("dropbox://get?accessToken=accessToken&remotePath=/path");
 
         // When
         Consumer consumer1 = dropboxEndpoint1.createConsumer(null);
@@ -53,7 +51,7 @@ public void shouldCreateGetConsumer() throws Exception {
         Assert.assertTrue(consumer1 instanceof DropboxScheduledPollGetConsumer);
         
         // Given
-        Endpoint dropboxEndpoint2 = context.getEndpoint("dropbox://get?accessToken={{accessToken}}&remotePath=/path with spaces/file");
+        Endpoint dropboxEndpoint2 = context.getEndpoint("dropbox://get?accessToken=accessToken&remotePath=/path with spaces/file");
 
         // When
         Consumer consumer2 = dropboxEndpoint2.createConsumer(null);
diff --git a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/DropboxTestSupport.java b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/DropboxTestSupport.java
index 9636142b34599..ef174b7d611cc 100644
--- a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/DropboxTestSupport.java
+++ b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/DropboxTestSupport.java
@@ -16,36 +16,78 @@
  */
 package org.apache.camel.component.dropbox.integration;
 
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.net.URL;
 import java.util.Properties;
-
+import com.dropbox.core.DbxDownloader;
+import com.dropbox.core.DbxException;
+import com.dropbox.core.DbxRequestConfig;
+import com.dropbox.core.v2.DbxClientV2;
+import com.dropbox.core.v2.files.FileMetadata;
 import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Before;
 
 
 public class DropboxTestSupport extends CamelTestSupport {
 
+
     protected final Properties properties;
+    protected String workdir;
+    protected String token;
+    private DbxClientV2 client;
 
     protected DropboxTestSupport() {
-        URL url = getClass().getResource("/test-options.properties");
-
-        InputStream inStream;
-        try {
-            inStream = url.openStream();
+        properties = new Properties();
+        try (InputStream inStream = getClass().getResourceAsStream("/test-options.properties")) {
+            properties.load(inStream);
         } catch (IOException e) {
             e.printStackTrace();
             throw new IllegalAccessError("test-options.properties could not be found");
         }
 
-        properties = new Properties();
+        workdir = properties.getProperty("workDir");
+        token = properties.getProperty("accessToken");
+
+        DbxRequestConfig config = DbxRequestConfig.newBuilder(properties.getProperty("clientIdentifier")).build();
+        client = new DbxClientV2(config, token);
+
+    }
+
+    @Before
+    public void setUpWorkingFolder() throws DbxException {
+        createDir(workdir);
+    }
+
+    protected void createDir(String name) throws DbxException {
         try {
-            properties.load(inStream);
-        } catch (IOException e) {
-            e.printStackTrace();
-            throw new IllegalAccessError("test-options.properties could not be found");
+            removeDir(name);
+        } finally {
+            client.files().createFolder(name);
+        }
+    }
+
+    protected void removeDir(String name) throws DbxException {
+        client.files().delete(name);
+    }
+
+    protected void createFile(String fileName, String content) throws IOException {
+        try {
+            client.files().uploadBuilder(workdir + "/" + fileName).uploadAndFinish(new ByteArrayInputStream(content.getBytes()));
+        } catch (DbxException e) {
+            log.info("folder is already created");
+        }
+
+    }
+
+    protected String getFileContent(String path) throws DbxException, IOException {
+        ByteArrayOutputStream target = new ByteArrayOutputStream();
+        DbxDownloader<FileMetadata> downloadedFile = client.files().download(path);
+        if (downloadedFile != null) {
+            downloadedFile.download(target);
         }
+        return new String(target.toByteArray());
     }
 
     @Override
diff --git a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/consumer/DropboxConsumerGetSingleTest.java b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/consumer/DropboxConsumerGetSingleTest.java
index b9b340cdae0db..c923c682a0ae4 100644
--- a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/consumer/DropboxConsumerGetSingleTest.java
+++ b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/consumer/DropboxConsumerGetSingleTest.java
@@ -16,9 +16,6 @@
  */
 package org.apache.camel.component.dropbox.integration.consumer;
 
-import java.util.List;
-
-import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.dropbox.integration.DropboxTestSupport;
 import org.apache.camel.component.dropbox.util.DropboxResultHeader;
@@ -27,29 +24,27 @@
 
 public class DropboxConsumerGetSingleTest extends DropboxTestSupport {
 
-    public DropboxConsumerGetSingleTest() throws Exception { }
+    public static final String FILE_NAME = "myFile.txt";
 
     @Test
     public void testCamelDropbox() throws Exception {
+        final String content = "Hi camels";
+        createFile(FILE_NAME, content);
 
-        MockEndpoint mock = getMockEndpoint("mock:result");
-        mock.expectedMinimumMessageCount(1);       
-        assertMockEndpointsSatisfied();
+        context.startRoute("consumer");
 
-        List<Exchange> exchanges = mock.getReceivedExchanges();
-        Exchange exchange = exchanges.get(0);
-        Object header =  exchange.getIn().getHeader(DropboxResultHeader.DOWNLOADED_FILE.name());
-        Object body = exchange.getIn().getBody();
-        assertNotNull(header);
-        assertNotNull(body);
+        MockEndpoint mock = getMockEndpoint("mock:result");
+        mock.expectedMinimumMessageCount(1);
+        mock.expectedBodiesReceived(content);
+        mock.expectedHeaderReceived(DropboxResultHeader.DOWNLOADED_FILE.name(), String.format("%s/%s", workdir, FILE_NAME));
+        mock.assertIsSatisfied();
     }
 
     @Override
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             public void configure() {
-                from("dropbox://get?accessToken={{accessToken}}&remotePath=XXX")
-                        .to("file:XXX")
+                from(String.format("dropbox://get?accessToken={{accessToken}}&remotePath=%s/%s", workdir, FILE_NAME)).autoStartup(false).id("consumer")
                         .to("mock:result");
             }
         };
diff --git a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/consumer/DropboxConsumerSearchQueryTest.java b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/consumer/DropboxConsumerSearchQueryTest.java
index 253efd1bc1bee..d343a7537ad3d 100644
--- a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/consumer/DropboxConsumerSearchQueryTest.java
+++ b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/consumer/DropboxConsumerSearchQueryTest.java
@@ -16,9 +16,6 @@
  */
 package org.apache.camel.component.dropbox.integration.consumer;
 
-import java.util.List;
-
-import org.apache.camel.Exchange;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.dropbox.integration.DropboxTestSupport;
 import org.apache.camel.component.dropbox.util.DropboxResultHeader;
@@ -27,28 +24,26 @@
 
 public class DropboxConsumerSearchQueryTest extends DropboxTestSupport {
 
-    public DropboxConsumerSearchQueryTest() throws Exception { }
+    public static final String FILE_NAME = "myTestFile.txt";
 
     @Test
     public void testCamelDropbox() throws Exception {
+        final String content = "Hi camels";
+        createFile(FILE_NAME, content);
 
-        MockEndpoint mock = getMockEndpoint("mock:result");
-        mock.expectedMinimumMessageCount(1);       
-        assertMockEndpointsSatisfied();
+        context.startRoute("consumer");
 
-        List<Exchange> exchanges = mock.getReceivedExchanges();
-        Exchange exchange = exchanges.get(0);
-        Object header =  exchange.getIn().getHeader(DropboxResultHeader.FOUND_FILES.name());
-        Object body = exchange.getIn().getBody();
-        assertNotNull(header);
-        assertNotNull(body);
+        MockEndpoint mock = getMockEndpoint("mock:result");
+        mock.expectedMinimumMessageCount(1);
+        mock.message(0).header(DropboxResultHeader.FOUND_FILES.name()).contains(String.format("%s/%s", workdir, FILE_NAME));
+        mock.assertIsSatisfied();
     }
 
     @Override
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             public void configure() {
-                from("dropbox://search?accessToken={{accessToken}}&remotePath=/XXX&query=XXX")
+                from(String.format("dropbox://search?accessToken={{accessToken}}&remotePath=%s&query=%s", workdir, FILE_NAME)).id("consumer").autoStartup(false)
                         .to("mock:result");
             }
         };
diff --git a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/consumer/DropboxConsumerSearchTest.java b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/consumer/DropboxConsumerSearchTest.java
deleted file mode 100644
index b6f32730d4d58..0000000000000
--- a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/consumer/DropboxConsumerSearchTest.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.dropbox.integration.consumer;
-
-import java.util.List;
-
-import org.apache.camel.Exchange;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.dropbox.integration.DropboxTestSupport;
-import org.apache.camel.component.dropbox.util.DropboxResultHeader;
-import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
-
-public class DropboxConsumerSearchTest extends DropboxTestSupport {
-
-    public DropboxConsumerSearchTest() throws Exception { }
-
-    @Test
-    public void testCamelDropbox() throws Exception {
-
-        MockEndpoint mock = getMockEndpoint("mock:result");
-        mock.expectedMinimumMessageCount(1);       
-        assertMockEndpointsSatisfied();
-
-        List<Exchange> exchanges = mock.getReceivedExchanges();
-        Exchange exchange = exchanges.get(0);
-        Object header =  exchange.getIn().getHeader(DropboxResultHeader.FOUND_FILES.name());
-        Object body = exchange.getIn().getBody();
-        assertNotNull(header);
-        assertNotNull(body);
-    }
-
-    @Override
-    protected RouteBuilder createRouteBuilder() throws Exception {
-        return new RouteBuilder() {
-            public void configure() {
-                from("dropbox://search?accessToken={{accessToken}}&remotePath=/XXX")
-                        .to("mock:result");
-            }
-        };
-    }
-}
diff --git a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerDelTest.java b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerDelTest.java
index 766a22c897cde..1934edbcf0c7d 100644
--- a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerDelTest.java
+++ b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerDelTest.java
@@ -16,63 +16,41 @@
  */
 package org.apache.camel.component.dropbox.integration.producer;
 
-import java.util.List;
-
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
+import java.io.IOException;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.dropbox.integration.DropboxTestSupport;
 import org.apache.camel.component.dropbox.util.DropboxConstants;
 import org.apache.camel.component.dropbox.util.DropboxResultHeader;
 import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.Before;
 import org.junit.Test;
 
 public class DropboxProducerDelTest extends DropboxTestSupport {
 
-    public DropboxProducerDelTest() throws Exception { }
+    public static final String FILE_NAME = "file.txt";
+
+    @Before
+    public void createFile() throws IOException {
+        createFile(FILE_NAME, "content");
+    }
 
     @Test
     public void testCamelDropbox() throws Exception {
-        template.send("direct:start", new Processor() {
-            @Override
-            public void process(Exchange exchange) throws Exception {
-                exchange.getIn().setHeader("test", "test");
-            }
-        });
-
-
-        MockEndpoint mock = getMockEndpoint("mock:result");
-        mock.expectedMinimumMessageCount(1);       
-        assertMockEndpointsSatisfied();
-
-        List<Exchange> exchanges = mock.getReceivedExchanges();
-        Exchange exchange = exchanges.get(0);
-        Object header =  exchange.getIn().getHeader(DropboxResultHeader.DELETED_PATH.name());
-        Object body = exchange.getIn().getBody();
-        assertNotNull(header);
-        assertNotNull(body);
+        test("direct:start");
     }
 
     @Test
     public void testCamelDropboxWithOptionInHeader() throws Exception {
-        template.send("direct:start2", new Processor() {
-            @Override
-            public void process(Exchange exchange) throws Exception {
-                exchange.getIn().setHeader("test", "test");
-            }
-        });
+        test("direct:start2");
+    }
 
 
+    private void test(String endpointURI) throws InterruptedException {
+        template.sendBody(endpointURI, null);
         MockEndpoint mock = getMockEndpoint("mock:result");
         mock.expectedMinimumMessageCount(1);
+        mock.expectedHeaderReceived(DropboxResultHeader.DELETED_PATH.name(), workdir + "/" + FILE_NAME);
         assertMockEndpointsSatisfied();
-
-        List<Exchange> exchanges = mock.getReceivedExchanges();
-        Exchange exchange = exchanges.get(0);
-        Object header =  exchange.getIn().getHeader(DropboxResultHeader.DELETED_PATH.name());
-        Object body = exchange.getIn().getBody();
-        assertNotNull(header);
-        assertNotNull(body);
     }
 
     @Override
@@ -80,11 +58,11 @@ protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             public void configure() {
                 from("direct:start")
-                        .to("dropbox://del?accessToken={{accessToken}}&remotePath=/XXX")
+                        .to("dropbox://del?accessToken={{accessToken}}&remotePath=" + workdir + "/" + FILE_NAME)
                         .to("mock:result");
 
                 from("direct:start2")
-                    .setHeader(DropboxConstants.HEADER_REMOTE_PATH, constant("/XXX"))
+                        .setHeader(DropboxConstants.HEADER_REMOTE_PATH, constant(workdir + "/" + FILE_NAME))
                     .to("dropbox://del?accessToken={{accessToken}}")
                     .to("mock:result");
             }
diff --git a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerGetFolderTest.java b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerGetFolderTest.java
index f39d213c58789..6d8eb8288d0a2 100644
--- a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerGetFolderTest.java
+++ b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerGetFolderTest.java
@@ -16,120 +16,74 @@
  */
 package org.apache.camel.component.dropbox.integration.producer;
 
-import java.util.List;
-
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
+import java.io.IOException;
+import java.util.Map;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.dropbox.integration.DropboxTestSupport;
 import org.apache.camel.component.dropbox.util.DropboxConstants;
 import org.apache.camel.component.dropbox.util.DropboxResultHeader;
 import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.Before;
 import org.junit.Test;
 
 public class DropboxProducerGetFolderTest extends DropboxTestSupport {
 
-    public DropboxProducerGetFolderTest() throws Exception { }
+    public static final String FILE_NAME1 = "myFile.txt";
+    public static final String FILE_NAME2 = "myFile2.txt";
+    private static final String CONTENT1 = "content1";
+    private static final String CONTENT2 = "content2";
+
+    @Before
+    public void createFile() throws IOException {
+        createFile(FILE_NAME1, CONTENT1);
+        createFile(FILE_NAME2, CONTENT2);
+    }
 
     @Test
     public void testCamelDropbox() throws Exception {
-        template.send("direct:start", new Processor() {
-            @Override
-            public void process(Exchange exchange) throws Exception {
-                exchange.getIn().setHeader("test", "test");
-            }
-        });
-
-        MockEndpoint mock = getMockEndpoint("mock:result");
-        mock.expectedMinimumMessageCount(1);
-        assertMockEndpointsSatisfied();
-
-        List<Exchange> exchanges = mock.getReceivedExchanges();
-        Exchange exchange = exchanges.get(0);
-        Object header =  exchange.getIn().getHeader(DropboxResultHeader.DOWNLOADED_FILES.name());
-        Object body = exchange.getIn().getBody();
-        assertNotNull(header);
-        assertNotNull(body);
+        test("direct:start");
     }
 
     @Test
     public void testCamelDropboxWithOptionInHeader() throws Exception {
-        template.send("direct:start2", new Processor() {
-            @Override
-            public void process(Exchange exchange) throws Exception {
-                exchange.getIn().setHeader("test", "test");
-            }
-        });
-
-
-        template.send("direct:start3", new Processor() {
-            @Override
-            public void process(Exchange exchange) throws Exception {
-                exchange.getIn().setHeader("test", "test");
-                exchange.getIn().setHeader(DropboxConstants.HEADER_REMOTE_PATH, "/XXX");
-            }
-        });
-
-
-        MockEndpoint mock = getMockEndpoint("mock:result");
-        mock.expectedMinimumMessageCount(2);
-        assertMockEndpointsSatisfied();
-
-        List<Exchange> exchanges = mock.getReceivedExchanges();
-        Exchange exchange = exchanges.get(0);
-        Object header =  exchange.getIn().getHeader(DropboxResultHeader.DOWNLOADED_FILES.name());
-        Object body = exchange.getIn().getBody();
-        assertNotNull(header);
-        assertNotNull(body);
-
-        exchange = exchanges.get(1);
-        header =  exchange.getIn().getHeader(DropboxResultHeader.DOWNLOADED_FILES.name());
-        body = exchange.getIn().getBody();
-        assertNotNull(header);
-        assertNotNull(body);
+        test("direct:start2");
     }
 
 
     @Test
     public void testCamelDropboxHeaderHasPriorityOnParameter() throws Exception {
-        template.send("direct:start4", new Processor() {
-            @Override
-            public void process(Exchange exchange) throws Exception {
-                exchange.getIn().setHeader("test", "test");
-            }
-        });
+        test("direct:start3");
+    }
 
+    private void test(String endpoint) throws InterruptedException {
+        template.sendBody(endpoint, null);
         MockEndpoint mock = getMockEndpoint("mock:result");
         mock.expectedMinimumMessageCount(1);
-        assertMockEndpointsSatisfied();
+        mock.message(0).header(DropboxResultHeader.DOWNLOADED_FILES.name()).contains(String.format("%s/%s", workdir, FILE_NAME1));
+        mock.message(0).header(DropboxResultHeader.DOWNLOADED_FILES.name()).contains(String.format("%s/%s", workdir, FILE_NAME2));
+        mock.assertIsSatisfied();
 
-        List<Exchange> exchanges = mock.getReceivedExchanges();
-        Exchange exchange = exchanges.get(0);
-        Object header =  exchange.getIn().getHeader(DropboxResultHeader.DOWNLOADED_FILES.name());
-        Object body = exchange.getIn().getBody();
-        assertNotNull(header);
-        assertNotNull(body);
+        final Map<String, byte[]> items = mock.getExchanges().get(0).getIn().getBody(Map.class);
+        assertEquals(CONTENT1, new String(items.get(String.format("%s/%s", workdir, FILE_NAME1))));
+        assertEquals(CONTENT2, new String(items.get(String.format("%s/%s", workdir, FILE_NAME2))));
     }
 
     @Override
-    protected RouteBuilder createRouteBuilder() throws Exception {
+    protected RouteBuilder createRouteBuilder() {
         return new RouteBuilder() {
             public void configure() {
                 from("direct:start")
-                        .to("dropbox://get?accessToken={{accessToken}}&remotePath=/XXX")
+                        .to("dropbox://get?accessToken={{accessToken}}&remotePath=" + workdir)
                         .to("mock:result");
 
                 from("direct:start2")
-                    .setHeader(DropboxConstants.HEADER_REMOTE_PATH, constant("/XXX"))
+                        .setHeader(DropboxConstants.HEADER_REMOTE_PATH, constant(workdir))
                     .to("dropbox://get?accessToken={{accessToken}}")
                     .to("mock:result");
 
-                from("direct:start3")
-                    .to("dropbox://get?accessToken={{accessToken}}")
-                    .to("mock:result");
 
-                from("direct:start4")
-                    .setHeader(DropboxConstants.HEADER_REMOTE_PATH, constant("/XXX"))
+                from("direct:start3")
+                        .setHeader(DropboxConstants.HEADER_REMOTE_PATH, constant(workdir))
                     .to("dropbox://get?accessToken={{accessToken}}&remotePath=/aWrongPath")
                     .to("mock:result");
 
diff --git a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerGetSingleTest.java b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerGetSingleTest.java
index 27f604b95d217..fd4cbc228db7a 100644
--- a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerGetSingleTest.java
+++ b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerGetSingleTest.java
@@ -16,63 +16,42 @@
  */
 package org.apache.camel.component.dropbox.integration.producer;
 
-import java.util.List;
-
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
+import java.io.IOException;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.dropbox.integration.DropboxTestSupport;
 import org.apache.camel.component.dropbox.util.DropboxConstants;
 import org.apache.camel.component.dropbox.util.DropboxResultHeader;
 import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.Before;
 import org.junit.Test;
 
 public class DropboxProducerGetSingleTest extends DropboxTestSupport {
 
-    public DropboxProducerGetSingleTest() throws Exception { }
+    public static final String FILE_NAME = "myFile.txt";
+    public static final String CONTENT = "Hi camels";
+
+    @Before
+    public void createFile() throws IOException {
+        createFile(FILE_NAME, CONTENT);
+    }
 
     @Test
     public void testCamelDropbox() throws Exception {
-        template.send("direct:start", new Processor() {
-            @Override
-            public void process(Exchange exchange) throws Exception {
-                exchange.getIn().setHeader("test", "test");
-            }
-        });
-
-
-        MockEndpoint mock = getMockEndpoint("mock:result");
-        mock.expectedMinimumMessageCount(1);       
-        assertMockEndpointsSatisfied();
-
-        List<Exchange> exchanges = mock.getReceivedExchanges();
-        Exchange exchange = exchanges.get(0);
-        Object header =  exchange.getIn().getHeader(DropboxResultHeader.DOWNLOADED_FILE.name());
-        Object body = exchange.getIn().getBody();
-        assertNotNull(header);
-        assertNotNull(body);
+        test("direct:start");
     }
 
     @Test
     public void testCamelDropboxWithOptionInHeader() throws Exception {
-        template.send("direct:start2", new Processor() {
-            @Override
-            public void process(Exchange exchange) throws Exception {
-                exchange.getIn().setHeader("test", "test");
-            }
-        });
-
+        test("direct:start2");
+    }
 
+    private void test(String endpoint) throws InterruptedException {
+        template.sendBody(endpoint, null);
         MockEndpoint mock = getMockEndpoint("mock:result");
         mock.expectedMinimumMessageCount(1);
-        assertMockEndpointsSatisfied();
-
-        List<Exchange> exchanges = mock.getReceivedExchanges();
-        Exchange exchange = exchanges.get(0);
-        Object header =  exchange.getIn().getHeader(DropboxResultHeader.DOWNLOADED_FILE.name());
-        Object body = exchange.getIn().getBody();
-        assertNotNull(header);
-        assertNotNull(body);
+        mock.message(0).header(DropboxResultHeader.DOWNLOADED_FILE.name()).contains(String.format("%s/%s", workdir, FILE_NAME));
+        mock.message(0).body(String.class).isEqualTo(CONTENT);
+        mock.assertIsSatisfied();
     }
 
     @Override
@@ -80,14 +59,12 @@ protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             public void configure() {
                 from("direct:start")
-                        .to("dropbox://get?accessToken={{accessToken}}&remotePath=/XXX")
-                        .to("file:///XXX?fileName=XXX")
+                        .to("dropbox://get?accessToken={{accessToken}}&remotePath=" + workdir + "/" + FILE_NAME)
                         .to("mock:result");
 
                 from("direct:start2")
-                    .setHeader(DropboxConstants.HEADER_REMOTE_PATH, constant("/XXX"))
+                        .setHeader(DropboxConstants.HEADER_REMOTE_PATH, constant(workdir + "/" + FILE_NAME))
                     .to("dropbox://get?accessToken={{accessToken}}")
-                    .to("file:///XXX?fileName=XXX")
                     .to("mock:result");
             }
         };
diff --git a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerMoveTest.java b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerMoveTest.java
index f396897374529..086ab583f0c57 100644
--- a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerMoveTest.java
+++ b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerMoveTest.java
@@ -16,63 +16,44 @@
  */
 package org.apache.camel.component.dropbox.integration.producer;
 
-import java.util.List;
-
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
+import java.io.IOException;
+import com.dropbox.core.DbxException;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.dropbox.integration.DropboxTestSupport;
 import org.apache.camel.component.dropbox.util.DropboxConstants;
 import org.apache.camel.component.dropbox.util.DropboxResultHeader;
 import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.Before;
 import org.junit.Test;
 
 public class DropboxProducerMoveTest extends DropboxTestSupport {
 
-    public DropboxProducerMoveTest() throws Exception { }
+    public static final String COPY_WORKDIR = "/test-workdir";
+    public static final String FILE = "file.txt";
+
+    @Before
+    public void removeDir() throws DbxException, IOException {
+        createDir(COPY_WORKDIR);
+        createFile(FILE, "content");
+    }
 
     @Test
     public void testCamelDropbox() throws Exception {
-        template.send("direct:start", new Processor() {
-            @Override
-            public void process(Exchange exchange) throws Exception {
-                exchange.getIn().setHeader("test", "test");
-            }
-        });
-
-
-        MockEndpoint mock = getMockEndpoint("mock:result");
-        mock.expectedMinimumMessageCount(1);       
-        assertMockEndpointsSatisfied();
-
-        List<Exchange> exchanges = mock.getReceivedExchanges();
-        Exchange exchange = exchanges.get(0);
-        Object header =  exchange.getIn().getHeader(DropboxResultHeader.MOVED_PATH.name());
-        Object body = exchange.getIn().getBody();
-        assertNotNull(header);
-        assertNotNull(body);
+        test("direct:start");
     }
 
     @Test
     public void testCamelDropboxWithOptionInHeader() throws Exception {
-        template.send("direct:start2", new Processor() {
-            @Override
-            public void process(Exchange exchange) throws Exception {
-                exchange.getIn().setHeader("test", "test");
-            }
-        });
+        test("direct:start2");
+    }
 
+    private void test(String endpoint) throws InterruptedException {
+        template.sendBody(endpoint, null);
 
         MockEndpoint mock = getMockEndpoint("mock:result");
         mock.expectedMinimumMessageCount(1);
+        mock.expectedHeaderReceived(DropboxResultHeader.MOVED_PATH.name(), workdir + "/" + FILE);
         assertMockEndpointsSatisfied();
-
-        List<Exchange> exchanges = mock.getReceivedExchanges();
-        Exchange exchange = exchanges.get(0);
-        Object header =  exchange.getIn().getHeader(DropboxResultHeader.MOVED_PATH.name());
-        Object body = exchange.getIn().getBody();
-        assertNotNull(header);
-        assertNotNull(body);
     }
 
     @Override
@@ -80,12 +61,12 @@ protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             public void configure() {
                 from("direct:start")
-                        .to("dropbox://move?accessToken={{accessToken}}&remotePath=/XXX&newRemotePath=/XXX")
+                        .to(String.format("dropbox://move?accessToken={{accessToken}}&remotePath=%s&newRemotePath=%s", workdir + "/" + FILE, COPY_WORKDIR + "/" + FILE))
                         .to("mock:result");
 
                 from("direct:start2")
-                    .setHeader(DropboxConstants.HEADER_REMOTE_PATH, constant("/XXX"))
-                    .setHeader(DropboxConstants.HEADER_NEW_REMOTE_PATH, constant("/XXX"))
+                        .setHeader(DropboxConstants.HEADER_REMOTE_PATH, constant(workdir + "/" + FILE))
+                        .setHeader(DropboxConstants.HEADER_NEW_REMOTE_PATH, constant(COPY_WORKDIR + "/" + FILE))
                     .to("dropbox://move?accessToken={{accessToken}}")
                     .to("mock:result");
             }
diff --git a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerPutSingleFileTest.java b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerPutSingleFileTest.java
index a4acea71a381a..a7ba22d5afe5d 100644
--- a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerPutSingleFileTest.java
+++ b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerPutSingleFileTest.java
@@ -16,64 +16,85 @@
  */
 package org.apache.camel.component.dropbox.integration.producer;
 
-import java.util.List;
-
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
+import java.io.BufferedWriter;
+import java.io.FileWriter;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.dropbox.integration.DropboxTestSupport;
 import org.apache.camel.component.dropbox.util.DropboxConstants;
+import org.apache.camel.component.dropbox.util.DropboxException;
 import org.apache.camel.component.dropbox.util.DropboxResultHeader;
 import org.apache.camel.component.dropbox.util.DropboxUploadMode;
 import org.apache.camel.component.mock.MockEndpoint;
+import org.hamcrest.core.IsInstanceOf;
+import org.junit.Assert;
+import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.ExpectedException;
 
 public class DropboxProducerPutSingleFileTest extends DropboxTestSupport {
+    public static final String FILENAME = "newFile.txt";
 
-    public DropboxProducerPutSingleFileTest() throws Exception { }
+    @Rule
+    public ExpectedException thrown = ExpectedException.none();
 
     @Test
-    public void testCamelDropbox() throws Exception {
-        template.send("direct:start", new Processor() {
-            @Override
-            public void process(Exchange exchange) throws Exception {
-                exchange.getIn().setHeader("test", "test");
-            }
-        });
+    public void testCamelDropboxWithOptionInHeader() throws Exception {
+        final Path file = Files.createTempFile("camel", ".txt");
+        final Map<String, Object> headers = new HashMap<>();
+        headers.put(DropboxConstants.HEADER_LOCAL_PATH, file.toAbsolutePath().toString());
+        headers.put(DropboxConstants.HEADER_UPLOAD_MODE, DropboxUploadMode.add);
+        template.sendBodyAndHeaders("direct:start", null, headers);
 
+        assertFileUploaded();
+    }
 
-        MockEndpoint mock = getMockEndpoint("mock:result");
-        mock.expectedMinimumMessageCount(1);       
-        assertMockEndpointsSatisfied();
+    @Test
+    public void uploadBodyTest() throws Exception {
+        template.sendBodyAndHeader("direct:start", "Helo Camels", DropboxConstants.HEADER_UPLOAD_MODE, DropboxUploadMode.add);
 
-        List<Exchange> exchanges = mock.getReceivedExchanges();
-        Exchange exchange = exchanges.get(0);
-        Object header =  exchange.getIn().getHeader(DropboxResultHeader.UPLOADED_FILE.name());
-        Object body = exchange.getIn().getBody();
-        assertNotNull(header);
-        assertNotNull(body);
+        assertFileUploaded();
     }
 
     @Test
-    public void testCamelDropboxWithOptionInHeader() throws Exception {
-        template.send("direct:start2", new Processor() {
-            @Override
-            public void process(Exchange exchange) throws Exception {
-                exchange.getIn().setHeader("test", "test");
-            }
-        });
+    public void uploadIfExistsAddTest() throws Exception {
+        thrown.expectCause(IsInstanceOf.instanceOf(DropboxException.class));
+        createFile(FILENAME, "content");
+        final Path file = Files.createTempFile("camel", ".txt");
+        final Map<String, Object> headers = new HashMap<>();
+        headers.put(DropboxConstants.HEADER_LOCAL_PATH, file.toAbsolutePath().toString());
+        headers.put(DropboxConstants.HEADER_UPLOAD_MODE, DropboxUploadMode.add);
+        template.sendBodyAndHeaders("direct:start", null, headers);
+    }
+
+    @Test
+    public void uploadIfExistsForceTest() throws Exception {
+        final String newContent = UUID.randomUUID().toString();
+        createFile(FILENAME, "Hi camels");
+        final Path file = Files.createTempFile("camel", ".txt");
+        try (BufferedWriter bw = new BufferedWriter(new FileWriter(file.toFile()))) {
+            bw.write(newContent);
+            bw.flush();
+        }
+        final Map<String, Object> headers = new HashMap<>();
+        headers.put(DropboxConstants.HEADER_LOCAL_PATH, file.toAbsolutePath().toString());
+        headers.put(DropboxConstants.HEADER_UPLOAD_MODE, DropboxUploadMode.force);
+        template.sendBodyAndHeaders("direct:start", null, headers);
 
+        assertFileUploaded();
 
+        Assert.assertEquals(newContent, getFileContent(workdir + "/" + FILENAME));
+    }
+
+    private void assertFileUploaded() throws InterruptedException {
         MockEndpoint mock = getMockEndpoint("mock:result");
         mock.expectedMinimumMessageCount(1);
+        mock.expectedHeaderReceived(DropboxResultHeader.UPLOADED_FILE.name(), workdir + "/" + FILENAME);
         assertMockEndpointsSatisfied();
-
-        List<Exchange> exchanges = mock.getReceivedExchanges();
-        Exchange exchange = exchanges.get(0);
-        Object header =  exchange.getIn().getHeader(DropboxResultHeader.UPLOADED_FILE.name());
-        Object body = exchange.getIn().getBody();
-        assertNotNull(header);
-        assertNotNull(body);
     }
 
     @Override
@@ -81,13 +102,7 @@ protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             public void configure() {
                 from("direct:start")
-                        .to("dropbox://put?accessToken={{accessToken}}&uploadMode=add&localPath=/XXX")
-                        .to("mock:result");
-
-                from("direct:start2")
-                    .setHeader(DropboxConstants.HEADER_LOCAL_PATH, constant("/XXX"))
-                    .setHeader(DropboxConstants.HEADER_UPLOAD_MODE, constant(DropboxUploadMode.add))
-                    .to("dropbox://put?accessToken={{accessToken}}")
+                        .to("dropbox://put?accessToken={{accessToken}}&remotePath=" + workdir + "/" + FILENAME)
                     .to("mock:result");
             }
         };
diff --git a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerPutSingleFileWithRemotePathTest.java b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerPutSingleFileWithRemotePathTest.java
deleted file mode 100644
index 42bd460018ac7..0000000000000
--- a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerPutSingleFileWithRemotePathTest.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.dropbox.integration.producer;
-
-import java.util.List;
-
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.dropbox.integration.DropboxTestSupport;
-import org.apache.camel.component.dropbox.util.DropboxConstants;
-import org.apache.camel.component.dropbox.util.DropboxResultHeader;
-import org.apache.camel.component.dropbox.util.DropboxUploadMode;
-import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
-
-public class DropboxProducerPutSingleFileWithRemotePathTest extends DropboxTestSupport {
-
-    public DropboxProducerPutSingleFileWithRemotePathTest() throws Exception { }
-
-    @Test
-    public void testCamelDropbox() throws Exception {
-        template.send("direct:start", new Processor() {
-            @Override
-            public void process(Exchange exchange) throws Exception {
-                exchange.getIn().setHeader("test", "test");
-            }
-        });
-
-
-        MockEndpoint mock = getMockEndpoint("mock:result");
-        mock.expectedMinimumMessageCount(1);       
-        assertMockEndpointsSatisfied();
-
-        List<Exchange> exchanges = mock.getReceivedExchanges();
-        Exchange exchange = exchanges.get(0);
-        Object header =  exchange.getIn().getHeader(DropboxResultHeader.UPLOADED_FILE.name());
-        Object body = exchange.getIn().getBody();
-        assertNotNull(header);
-        assertNotNull(body);
-    }
-
-    @Test
-    public void testCamelDropboxWithOptionInHeader() throws Exception {
-        template.send("direct:start2", new Processor() {
-            @Override
-            public void process(Exchange exchange) throws Exception {
-                exchange.getIn().setHeader("test", "test");
-            }
-        });
-
-
-        MockEndpoint mock = getMockEndpoint("mock:result");
-        mock.expectedMinimumMessageCount(1);
-        assertMockEndpointsSatisfied();
-
-        List<Exchange> exchanges = mock.getReceivedExchanges();
-        Exchange exchange = exchanges.get(0);
-        Object header =  exchange.getIn().getHeader(DropboxResultHeader.UPLOADED_FILE.name());
-        Object body = exchange.getIn().getBody();
-        assertNotNull(header);
-        assertNotNull(body);
-    }
-
-    @Override
-    protected RouteBuilder createRouteBuilder() throws Exception {
-        return new RouteBuilder() {
-            public void configure() {
-                from("direct:start")
-                        .to("dropbox://put?accessToken={{accessToken}}&uploadMode=add&localPath=/XXX&remotePath=/XXX")
-                        .to("mock:result");
-
-                from("direct:start2")
-                    .setHeader(DropboxConstants.HEADER_UPLOAD_MODE, constant(DropboxUploadMode.add))
-                    .setHeader(DropboxConstants.HEADER_LOCAL_PATH, constant("/tmp/toto.txt"))
-                    .setHeader(DropboxConstants.HEADER_REMOTE_PATH, constant("/test"))
-                    .to("dropbox://put?accessToken={{accessToken}}")
-                    .to("mock:result");
-            }
-        };
-    }
-}
diff --git a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerPutWithRemotePathTest.java b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerPutWithRemotePathTest.java
deleted file mode 100644
index 2de352c631789..0000000000000
--- a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerPutWithRemotePathTest.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.dropbox.integration.producer;
-
-import java.util.List;
-
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.dropbox.integration.DropboxTestSupport;
-import org.apache.camel.component.dropbox.util.DropboxConstants;
-import org.apache.camel.component.dropbox.util.DropboxResultHeader;
-import org.apache.camel.component.dropbox.util.DropboxUploadMode;
-import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
-
-public class DropboxProducerPutWithRemotePathTest extends DropboxTestSupport {
-
-    public DropboxProducerPutWithRemotePathTest() throws Exception { }
-
-    @Test
-    public void testCamelDropbox() throws Exception {
-        template.send("direct:start", new Processor() {
-            @Override
-            public void process(Exchange exchange) throws Exception {
-                exchange.getIn().setHeader("test", "test");
-            }
-        });
-
-
-        MockEndpoint mock = getMockEndpoint("mock:result");
-        mock.expectedMinimumMessageCount(1);       
-        assertMockEndpointsSatisfied();
-
-        List<Exchange> exchanges = mock.getReceivedExchanges();
-        Exchange exchange = exchanges.get(0);
-        Object header =  exchange.getIn().getHeader(DropboxResultHeader.UPLOADED_FILES.name());
-        Object body = exchange.getIn().getBody();
-        assertNotNull(header);
-        assertNotNull(body);
-    }
-
-    @Test
-    public void testCamelDropboxWithOptionInHeader() throws Exception {
-        template.send("direct:start2", new Processor() {
-            @Override
-            public void process(Exchange exchange) throws Exception {
-                exchange.getIn().setHeader("test", "test");
-            }
-        });
-
-        MockEndpoint mock = getMockEndpoint("mock:result");
-        mock.expectedMinimumMessageCount(1);
-        assertMockEndpointsSatisfied();
-
-        List<Exchange> exchanges = mock.getReceivedExchanges();
-        Exchange exchange = exchanges.get(0);
-        Object header =  exchange.getIn().getHeader(DropboxResultHeader.UPLOADED_FILES.name());
-        Object body = exchange.getIn().getBody();
-        assertNotNull(header);
-        assertNotNull(body);
-    }
-
-    @Override
-    protected RouteBuilder createRouteBuilder() throws Exception {
-        return new RouteBuilder() {
-            public void configure() {
-                from("direct:start")
-                        .to("dropbox://put?accessToken={{accessToken}}&uploadMode=add&localPath=/XXX&remotePath=/XXX")
-                        .to("mock:result");
-
-                from("direct:start2")
-                    .setHeader(DropboxConstants.HEADER_LOCAL_PATH, constant("/XXX"))
-                    .setHeader(DropboxConstants.HEADER_REMOTE_PATH, constant("/XXX"))
-                    .setHeader(DropboxConstants.HEADER_UPLOAD_MODE, constant(DropboxUploadMode.add))
-                    .to("dropbox://put?accessToken={{accessToken}}")
-                    .to("mock:result");
-            }
-        };
-    }
-}
diff --git a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerSearchQueryTest.java b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerSearchQueryTest.java
index 4c8939fa1f380..2a541cd9b6085 100644
--- a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerSearchQueryTest.java
+++ b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerSearchQueryTest.java
@@ -16,79 +16,57 @@
  */
 package org.apache.camel.component.dropbox.integration.producer;
 
-import java.util.List;
-
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
+import java.io.IOException;
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.dropbox.integration.DropboxTestSupport;
 import org.apache.camel.component.dropbox.util.DropboxConstants;
 import org.apache.camel.component.dropbox.util.DropboxResultHeader;
 import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.Before;
 import org.junit.Test;
 
 public class DropboxProducerSearchQueryTest extends DropboxTestSupport {
 
-    public DropboxProducerSearchQueryTest() throws Exception { }
-
-    @Test
-    public void testCamelDropbox() throws Exception {
-        template.send("direct:start", new Processor() {
-            @Override
-            public void process(Exchange exchange) throws Exception {
-                exchange.getIn().setHeader("test", "test");
-            }
-        });
-
-
-        MockEndpoint mock = getMockEndpoint("mock:result");
-        mock.expectedMinimumMessageCount(1);       
-        assertMockEndpointsSatisfied();
 
-        List<Exchange> exchanges = mock.getReceivedExchanges();
-        Exchange exchange = exchanges.get(0);
-        Object header =  exchange.getIn().getHeader(DropboxResultHeader.FOUND_FILES.name());
-        Object body = exchange.getIn().getBody();
-        assertNotNull(header);
-        assertNotNull(body);
+    public static final String FILE_NAME = "myTestFile.txt";
 
+    @Before
+    public void createFile() throws IOException {
+        final String content = "Hi camels";
+        createFile(FILE_NAME, content);
     }
 
+    @Test
+    public void testCamelDropbox() throws Exception {
+        test("direct:start");
+    }
 
     @Test
     public void testCamelDropboxWithOptionInHeader() throws Exception {
-        template.send("direct:start2", new Processor() {
-            @Override
-            public void process(Exchange exchange) throws Exception {
-                exchange.getIn().setHeader("test", "test");
-            }
-        });
+        test("direct:start2");
+    }
+
 
+    private void test(String endpoint) throws InterruptedException {
+        template.sendBody(endpoint, null);
 
         MockEndpoint mock = getMockEndpoint("mock:result");
         mock.expectedMinimumMessageCount(1);
-        assertMockEndpointsSatisfied();
-
-        List<Exchange> exchanges = mock.getReceivedExchanges();
-        Exchange exchange = exchanges.get(0);
-        Object header =  exchange.getIn().getHeader(DropboxResultHeader.FOUND_FILES.name());
-        Object body = exchange.getIn().getBody();
-        assertNotNull(header);
-        assertNotNull(body);
-
+        mock.message(0).header(DropboxResultHeader.FOUND_FILES.name()).contains(String.format("%s/%s", workdir, FILE_NAME));
+        mock.assertIsSatisfied();
     }
 
     @Override
-    protected RouteBuilder createRouteBuilder() throws Exception {
+    protected RouteBuilder createRouteBuilder() {
         return new RouteBuilder() {
             public void configure() {
                 from("direct:start")
-                        .to("dropbox://search?accessToken={{accessToken}}&remotePath=/XXX&query=XXX")
+                        .to(String.format("dropbox://search?accessToken={{accessToken}}&remotePath=%s&query=%s", workdir, FILE_NAME))
                         .to("mock:result");
 
                 from("direct:start2")
-                    .setHeader(DropboxConstants.HEADER_REMOTE_PATH, constant("/XXX"))
-                    .setHeader(DropboxConstants.HEADER_QUERY, constant("/XXX"))
+                        .setHeader(DropboxConstants.HEADER_REMOTE_PATH, constant(workdir))
+                        .setHeader(DropboxConstants.HEADER_QUERY, constant(FILE_NAME))
                     .to("dropbox://search?accessToken={{accessToken}}")
                     .to("mock:result");
             }
diff --git a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerSearchTest.java b/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerSearchTest.java
deleted file mode 100644
index 38ce2aa683576..0000000000000
--- a/components/camel-dropbox/src/test/java/org/apache/camel/component/dropbox/integration/producer/DropboxProducerSearchTest.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.dropbox.integration.producer;
-
-import java.util.List;
-
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.dropbox.integration.DropboxTestSupport;
-import org.apache.camel.component.dropbox.util.DropboxConstants;
-import org.apache.camel.component.dropbox.util.DropboxResultHeader;
-import org.apache.camel.component.mock.MockEndpoint;
-import org.junit.Test;
-
-public class DropboxProducerSearchTest extends DropboxTestSupport {
-
-    public DropboxProducerSearchTest() throws Exception { }
-
-    @Test
-    public void testCamelDropbox() throws Exception {
-        template.send("direct:start", new Processor() {
-            @Override
-            public void process(Exchange exchange) throws Exception {
-                exchange.getIn().setHeader("test", "test");
-            }
-        });
-
-        MockEndpoint mock = getMockEndpoint("mock:result");
-        mock.expectedMinimumMessageCount(1);       
-        assertMockEndpointsSatisfied();
-
-        List<Exchange> exchanges = mock.getReceivedExchanges();
-        Exchange exchange = exchanges.get(0);
-        Object header =  exchange.getIn().getHeader(DropboxResultHeader.FOUND_FILES.name());
-        Object body = exchange.getIn().getBody();
-        assertNotNull(header);
-        assertNotNull(body);
-    }
-
-    @Test
-    public void testCamelDropboxWithOptionInHeader() throws Exception {
-        template.send("direct:start2", new Processor() {
-            @Override
-            public void process(Exchange exchange) throws Exception {
-                exchange.getIn().setHeader("test", "test");
-            }
-        });
-
-
-        MockEndpoint mock = getMockEndpoint("mock:result");
-        mock.expectedMinimumMessageCount(1);
-        assertMockEndpointsSatisfied();
-
-        List<Exchange> exchanges = mock.getReceivedExchanges();
-        Exchange exchange = exchanges.get(0);
-        Object header =  exchange.getIn().getHeader(DropboxResultHeader.FOUND_FILES.name());
-        Object body = exchange.getIn().getBody();
-        assertNotNull(header);
-        assertNotNull(body);
-    }
-
-    @Override
-    protected RouteBuilder createRouteBuilder() throws Exception {
-        return new RouteBuilder() {
-            public void configure() {
-                from("direct:start")
-                        .to("dropbox://search?accessToken={{accessToken}}&remotePath=/XXX")
-                        .to("mock:result");
-
-                from("direct:start")
-                    .setHeader(DropboxConstants.HEADER_REMOTE_PATH, constant("/XXX"))
-                    .to("dropbox://search?accessToken={{accessToken}}")
-                    .to("mock:result");
-            }
-        };
-    }
-}
diff --git a/components/camel-dropbox/src/test/resources/test-options.properties b/components/camel-dropbox/src/test/resources/test-options.properties
index 84dfb21745a84..5c07059032083 100644
--- a/components/camel-dropbox/src/test/resources/test-options.properties
+++ b/components/camel-dropbox/src/test/resources/test-options.properties
@@ -15,5 +15,6 @@
 ## limitations under the License.
 ## ---------------------------------------------------------------------------
 
-accessToken=<access-token>
+accessToken=<api-token>
 clientIdentifier=camel-dropbox
+workDir=/camel-test

From 81b5625e67f1b1255359651eac98ae29845b5cbd Mon Sep 17 00:00:00 2001
From: Jan <jbouska@redhat.com>
Date: Fri, 16 Nov 2018 09:14:20 +0100
Subject: [PATCH 032/125] [CAMEL-12942] Fix dropbox put operation

---
 .../dropbox/core/DropboxAPIFacade.java        | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/core/DropboxAPIFacade.java b/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/core/DropboxAPIFacade.java
index 1b43179a3775d..d6e3c7b14ebc9 100644
--- a/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/core/DropboxAPIFacade.java
+++ b/components/camel-dropbox/src/main/java/org/apache/camel/component/dropbox/core/DropboxAPIFacade.java
@@ -92,31 +92,31 @@ public DropboxFileUploadResult put(String localPath, String remotePath, DropboxU
         // in case the remote path is not specified, the remotePath = localPath
         String dropboxPath = remotePath == null ? localPath : remotePath;
 
-        UploadUploader entry;
+        boolean isPresent = true;
         try {
-            entry = client.files().upload(dropboxPath);
+            client.files().getMetadata(dropboxPath);
         } catch (DbxException e) {
-            throw new DropboxException(dropboxPath + " does not exist or cannot obtain metadata", e);
+            isPresent = false;
         }
 
         if (localPath != null) {
-            return putFile(localPath, mode, dropboxPath, entry);
+            return putFile(localPath, mode, dropboxPath, isPresent);
         } else {
-            return putBody(exchange, mode, dropboxPath, entry);
+            return putBody(exchange, mode, dropboxPath, isPresent);
         }
     }
 
-    private DropboxFileUploadResult putFile(String localPath, DropboxUploadMode mode, String dropboxPath, UploadUploader entry) throws DropboxException {
+    private DropboxFileUploadResult putFile(String localPath, DropboxUploadMode mode, String dropboxPath, boolean isPresent) throws DropboxException {
         File fileLocalPath = new File(localPath);
         // verify uploading of a single file
         if (fileLocalPath.isFile()) {
             // check if dropbox file exists
-            if (entry != null && !DropboxUploadMode.force.equals(mode)) {
-                throw new DropboxException(dropboxPath + " exists on dropbox and is not a file!");
+            if (isPresent && !DropboxUploadMode.force.equals(mode)) {
+                throw new DropboxException(dropboxPath + " exists on dropbox. Use force upload mode to override");
             }
             // in case the entry not exists on dropbox check if the filename
             // should be appended
-            if (entry == null) {
+            if (!isPresent) {
                 if (dropboxPath.endsWith(DropboxConstants.DROPBOX_FILE_SEPARATOR)) {
                     dropboxPath = dropboxPath + fileLocalPath.getName();
                 }
@@ -139,7 +139,7 @@ private DropboxFileUploadResult putFile(String localPath, DropboxUploadMode mode
             // verify uploading of a list of files inside a dir
             LOG.debug("Uploading a dir...");
             // check if dropbox folder exists
-            if (entry != null && !DropboxUploadMode.force.equals(mode)) {
+            if (isPresent && !DropboxUploadMode.force.equals(mode)) {
                 throw new DropboxException(dropboxPath + " exists on dropbox and is not a folder!");
             }
             if (!dropboxPath.endsWith(DropboxConstants.DROPBOX_FILE_SEPARATOR)) {
@@ -181,7 +181,7 @@ private DropboxFileUploadResult putFile(String localPath, DropboxUploadMode mode
         }
     }
 
-    private DropboxFileUploadResult putBody(Exchange exchange, DropboxUploadMode mode, String dropboxPath, UploadUploader entry) throws DropboxException {
+    private DropboxFileUploadResult putBody(Exchange exchange, DropboxUploadMode mode, String dropboxPath, boolean isPresent) throws DropboxException {
         String name = exchange.getIn().getHeader(HEADER_PUT_FILE_NAME, String.class);
         if (name == null) {
             // fallback to use CamelFileName
@@ -194,7 +194,7 @@ private DropboxFileUploadResult putBody(Exchange exchange, DropboxUploadMode mod
 
         // in case the entry not exists on dropbox check if the filename should
         // be appended
-        if (entry == null) {
+        if (!isPresent) {
             if (dropboxPath.endsWith(DropboxConstants.DROPBOX_FILE_SEPARATOR)) {
                 dropboxPath = dropboxPath + name;
             }

From a95493768b5d5896368ef35d9b5aa4432994aec6 Mon Sep 17 00:00:00 2001
From: Dmitry Volodin <dmvolod@gmail.com>
Date: Thu, 15 Nov 2018 20:30:10 +0300
Subject: [PATCH 033/125] CAMEL-12865: camel-restdsl-swagger-plugin - Allow for
 specifying apiContextPath

---
 .../src/it/customized/pom.xml                          |  1 +
 .../src/it/customized/verify.groovy                    |  4 ++++
 .../src/main/docs/camel-restdsl-swagger-plugin.adoc    |  6 ++++--
 .../maven/generator/swagger/AbstractGenerateMojo.java  |  3 +++
 .../camel/maven/generator/swagger/GenerateMojo.java    |  4 ++++
 .../camel/generator/swagger/RestDslGenerator.java      | 10 ++++++++++
 .../generator/swagger/RestDslSourceCodeGenerator.java  |  3 +++
 .../camel/generator/swagger/RestDslXmlGenerator.java   |  9 +++++++--
 8 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/tooling/maven/camel-restdsl-swagger-plugin/src/it/customized/pom.xml b/tooling/maven/camel-restdsl-swagger-plugin/src/it/customized/pom.xml
index b91faba0b69e7..3aaad869f61ab 100644
--- a/tooling/maven/camel-restdsl-swagger-plugin/src/it/customized/pom.xml
+++ b/tooling/maven/camel-restdsl-swagger-plugin/src/it/customized/pom.xml
@@ -53,6 +53,7 @@
               <className>MyRestRoute</className>
               <indent>\t</indent>
               <destinationGenerator>com.example.MyDestinationGenerator</destinationGenerator>
+              <apiContextPath>/api-docs</apiContextPath>
             </configuration>
           </execution>
         </executions>
diff --git a/tooling/maven/camel-restdsl-swagger-plugin/src/it/customized/verify.groovy b/tooling/maven/camel-restdsl-swagger-plugin/src/it/customized/verify.groovy
index f65964b72fefe..3c154edeb5f0d 100644
--- a/tooling/maven/camel-restdsl-swagger-plugin/src/it/customized/verify.groovy
+++ b/tooling/maven/camel-restdsl-swagger-plugin/src/it/customized/verify.groovy
@@ -18,3 +18,7 @@
 def File restdsl = new File(basedir, "target/classes/generated/com/example/MyRestRoute.java")
 
 assert restdsl.exists()
+
+def String data = restdsl.text
+
+assert data.contains('restConfiguration().component("servlet").apiContextPath("/api-docs");')
diff --git a/tooling/maven/camel-restdsl-swagger-plugin/src/main/docs/camel-restdsl-swagger-plugin.adoc b/tooling/maven/camel-restdsl-swagger-plugin/src/main/docs/camel-restdsl-swagger-plugin.adoc
index 58066dec41638..356c0ba78eb52 100644
--- a/tooling/maven/camel-restdsl-swagger-plugin/src/main/docs/camel-restdsl-swagger-plugin.adoc
+++ b/tooling/maven/camel-restdsl-swagger-plugin/src/main/docs/camel-restdsl-swagger-plugin.adoc
@@ -66,7 +66,8 @@ in the `<configuration>` tag.
 | `indent` | `"&nbsp;&nbsp;&nbsp;&nbsp;"` | What identing character(s) to use, by default four spaces, you can use `\t` to signify tab character
 | `outputDirectory` | `generated-sources/restdsl-swagger` | Where to place the generated source file, by default `generated-sources/restdsl-swagger` within the project directory
 | `destinationGenerator` | | Fully qualified class name of the class that implements `org.apache.camel.generator.swagger.DestinationGenerator` interface for customizing destination endpoint
-| `restConfiguration` | `true` | Whether to include generation of the rest configuration with detected rest component to be used. |
+| `restConfiguration` | `true` | Whether to include generation of the rest configuration with detected rest component to be used. 
+| `apiContextPath` | | Define swagger endpoint path if `restConfiguration` is set to `true`. |
 |========================================
 
 === Spring Boot Project with Servlet component
@@ -138,7 +139,8 @@ in the `<configuration>` tag.
 | `fileName` | `camel-rest.xml` | The name of the XML file as output.
 | `blueprint` | `false` | If enabled generates OSGi Blueprint XML instead of Spring XML.
 | `destinationGenerator` | | Fully qualified class name of the class that implements `org.apache.camel.generator.swagger.DestinationGenerator` interface for customizing destination endpoint
-| `restConfiguration` | `true` | Whether to include generation of the rest configuration with detected rest component to be used. |
+| `restConfiguration` | `true` | Whether to include generation of the rest configuration with detected rest component to be used.
+| `apiContextPath` | | Define swagger endpoint path if `restConfiguration` is set to `true`. |
 |========================================
 
 == camel-restdsl-swagger:generate-xml-with-dto
diff --git a/tooling/maven/camel-restdsl-swagger-plugin/src/main/java/org/apache/camel/maven/generator/swagger/AbstractGenerateMojo.java b/tooling/maven/camel-restdsl-swagger-plugin/src/main/java/org/apache/camel/maven/generator/swagger/AbstractGenerateMojo.java
index 8dbbde73c03c5..7d1903dd3e15d 100644
--- a/tooling/maven/camel-restdsl-swagger-plugin/src/main/java/org/apache/camel/maven/generator/swagger/AbstractGenerateMojo.java
+++ b/tooling/maven/camel-restdsl-swagger-plugin/src/main/java/org/apache/camel/maven/generator/swagger/AbstractGenerateMojo.java
@@ -97,6 +97,9 @@ abstract class AbstractGenerateMojo extends AbstractMojo {
 
     @Parameter(defaultValue = "${session}", readonly = true)
     private MavenSession mavenSession;
+    
+    @Parameter
+    String apiContextPath;
 
     @Component
     private BuildPluginManager pluginManager;
diff --git a/tooling/maven/camel-restdsl-swagger-plugin/src/main/java/org/apache/camel/maven/generator/swagger/GenerateMojo.java b/tooling/maven/camel-restdsl-swagger-plugin/src/main/java/org/apache/camel/maven/generator/swagger/GenerateMojo.java
index 41aaa9473fd30..74b370286799f 100644
--- a/tooling/maven/camel-restdsl-swagger-plugin/src/main/java/org/apache/camel/maven/generator/swagger/GenerateMojo.java
+++ b/tooling/maven/camel-restdsl-swagger-plugin/src/main/java/org/apache/camel/maven/generator/swagger/GenerateMojo.java
@@ -118,6 +118,10 @@ public void execute() throws MojoExecutionException {
 
                 generator.withRestComponent("servlet");
             }
+            
+            if (ObjectHelper.isNotEmpty(apiContextPath)) {
+                generator.withApiContextPath(apiContextPath);
+            }
 
             // if its a spring boot project and we use servlet then we should generate additional source code
             if (detectSpringBootFromClasspath() && "servlet".equals(comp)) {
diff --git a/tooling/swagger-rest-dsl-generator/src/main/java/org/apache/camel/generator/swagger/RestDslGenerator.java b/tooling/swagger-rest-dsl-generator/src/main/java/org/apache/camel/generator/swagger/RestDslGenerator.java
index a96f2aa5e3a3b..a896962052544 100644
--- a/tooling/swagger-rest-dsl-generator/src/main/java/org/apache/camel/generator/swagger/RestDslGenerator.java
+++ b/tooling/swagger-rest-dsl-generator/src/main/java/org/apache/camel/generator/swagger/RestDslGenerator.java
@@ -36,6 +36,7 @@ public abstract class RestDslGenerator<G> {
     OperationFilter filter = new OperationFilter();
     String restComponent;
     String restContextPath;
+    String apiContextPath;
     boolean springComponent;
     boolean springBootProject;
 
@@ -92,6 +93,15 @@ public G withRestContextPath(String contextPath) {
 
         return that;
     }
+    
+    public G withApiContextPath(String contextPath) {
+        this.apiContextPath = contextPath;
+
+        @SuppressWarnings("unchecked")
+        final G that = (G) this;
+
+        return that;
+    }
 
     public G asSpringComponent() {
         this.springComponent = true;
diff --git a/tooling/swagger-rest-dsl-generator/src/main/java/org/apache/camel/generator/swagger/RestDslSourceCodeGenerator.java b/tooling/swagger-rest-dsl-generator/src/main/java/org/apache/camel/generator/swagger/RestDslSourceCodeGenerator.java
index a2fe715b35dad..7ec89222b7ad5 100644
--- a/tooling/swagger-rest-dsl-generator/src/main/java/org/apache/camel/generator/swagger/RestDslSourceCodeGenerator.java
+++ b/tooling/swagger-rest-dsl-generator/src/main/java/org/apache/camel/generator/swagger/RestDslSourceCodeGenerator.java
@@ -108,6 +108,9 @@ MethodSpec generateConfigureMethod(final Swagger swagger) {
             if (restContextPath != null) {
                 configure.addCode(".contextPath(\"" + restContextPath + "\")");
             }
+            if (ObjectHelper.isNotEmpty(apiContextPath)) {
+                configure.addCode(".apiContextPath(\"" + apiContextPath + "\")");
+            }
             configure.addCode(";\n\n");
         }
 
diff --git a/tooling/swagger-rest-dsl-generator/src/main/java/org/apache/camel/generator/swagger/RestDslXmlGenerator.java b/tooling/swagger-rest-dsl-generator/src/main/java/org/apache/camel/generator/swagger/RestDslXmlGenerator.java
index 20b849032fd22..36034d58bc79f 100644
--- a/tooling/swagger-rest-dsl-generator/src/main/java/org/apache/camel/generator/swagger/RestDslXmlGenerator.java
+++ b/tooling/swagger-rest-dsl-generator/src/main/java/org/apache/camel/generator/swagger/RestDslXmlGenerator.java
@@ -20,6 +20,7 @@
 import org.apache.camel.CamelContext;
 import org.apache.camel.model.ModelHelper;
 import org.apache.camel.model.rest.RestsDefinition;
+import org.apache.camel.util.ObjectHelper;
 
 public class RestDslXmlGenerator extends RestDslGenerator<RestDslXmlGenerator> {
 
@@ -51,10 +52,14 @@ public String generate(final CamelContext context) throws Exception {
         xml = xml.replaceAll(" customId=\"false\"", "");
 
         if (restComponent != null) {
-            String extra = "<restConfiguration component=\"" + restComponent + "\"/>";
+            String extra = "<restConfiguration component=\"" + restComponent + "\"";
             if (restContextPath != null) {
-                extra = "<restConfiguration component=\"" + restComponent + "\" contextPath=\"" + restContextPath + "\"/>";
+                extra = extra.concat(" contextPath=\"" + restContextPath + "\"");
             }
+            if (ObjectHelper.isNotEmpty(apiContextPath)) {
+                extra = extra.concat(" apiContextPath=\"" + apiContextPath + "\"");
+            }
+            extra = extra.concat("/>");
             xml = xml.replaceFirst("<rest>", extra + "\n    <rest>");
             xml = xml.replaceFirst("<rest ", extra + "\n    <rest ");
         }

From f3a1cb5492d897b24b45c8e9bd583f5d4259313b Mon Sep 17 00:00:00 2001
From: Dmitry Volodin <dmvolod@gmail.com>
Date: Thu, 15 Nov 2018 18:51:21 +0300
Subject: [PATCH 034/125] CAMEL-12869: ReplyTo destination must match endpoint
 type (topic or queue) that the message is sent on

---
 .../camel-sjms/src/main/docs/sjms-component.adoc    |  2 +-
 .../apache/camel/component/sjms/SjmsEndpoint.java   |  2 ++
 .../component/sjms/jms/DestinationNameParser.java   | 13 +++++++++++++
 .../component/sjms/producer/InOutProducer.java      | 11 ++++++++---
 4 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/components/camel-sjms/src/main/docs/sjms-component.adoc b/components/camel-sjms/src/main/docs/sjms-component.adoc
index 6e9ad12f220a1..bff4665a164af 100644
--- a/components/camel-sjms/src/main/docs/sjms-component.adoc
+++ b/components/camel-sjms/src/main/docs/sjms-component.adoc
@@ -150,7 +150,7 @@ with the following path and query parameters:
 | *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option 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
 | *messageSelector* (consumer) | Sets the JMS Message selector syntax. |  | String
-| *namedReplyTo* (producer) | Sets the reply to destination name used for InOut producer endpoints. |  | String
+| *namedReplyTo* (producer) | Sets the reply to destination name used for InOut producer endpoints. The type of the reply to destination can be determined by the starting prefix (topic: or queue:) in its name. |  | String
 | *persistent* (producer) | Flag used to enable/disable message persistence. | true | boolean
 | *producerCount* (producer) | Sets the number of producers used for this endpoint. | 1 | int
 | *ttl* (producer) | Flag used to adjust the Time To Live value of produced messages. | -1 | long
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsEndpoint.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsEndpoint.java
index c73ebb0847a55..faa01d0e62be4 100644
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsEndpoint.java
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/SjmsEndpoint.java
@@ -563,6 +563,8 @@ public String getNamedReplyTo() {
 
     /**
      * Sets the reply to destination name used for InOut producer endpoints.
+     * The type of the reply to destination can be determined by the starting 
+     * prefix (topic: or queue:) in its name. 
      */
     public void setNamedReplyTo(String namedReplyTo) {
         this.namedReplyTo = namedReplyTo;
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/DestinationNameParser.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/DestinationNameParser.java
index 41eab2d089e08..095d1c991b2f6 100644
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/DestinationNameParser.java
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/jms/DestinationNameParser.java
@@ -27,6 +27,19 @@ public boolean isTopic(String destinationName) {
         }
         return destinationName.startsWith("topic:");
     }
+    
+    public boolean isNamedReplyToTopic(String namedReplyTo, boolean isDestinationTopic) {
+        if (namedReplyTo == null) {
+            throw new IllegalArgumentException("namedReplyTo is null");
+        }
+        if (namedReplyTo.startsWith("topic:")) {
+            return true;
+        } else if (namedReplyTo.startsWith("queue:")) {
+            return false;
+        } else {
+            return isDestinationTopic;
+        }
+    }
 
     public String getShortName(String destinationName) {
         if (destinationName == null) {
diff --git a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/producer/InOutProducer.java b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/producer/InOutProducer.java
index 1be3630e37088..53be09eca7211 100644
--- a/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/producer/InOutProducer.java
+++ b/components/camel-sjms/src/main/java/org/apache/camel/component/sjms/producer/InOutProducer.java
@@ -38,6 +38,7 @@
 import org.apache.camel.component.sjms.SjmsMessage;
 import org.apache.camel.component.sjms.SjmsProducer;
 import org.apache.camel.component.sjms.jms.ConnectionResource;
+import org.apache.camel.component.sjms.jms.DestinationNameParser;
 import org.apache.camel.component.sjms.jms.JmsConstants;
 import org.apache.camel.component.sjms.jms.JmsMessageHelper;
 import org.apache.camel.spi.UuidGenerator;
@@ -87,12 +88,16 @@ public MessageConsumerResources makeObject() throws Exception {
                 }
 
                 Destination replyToDestination;
+                boolean isReplyToTopic = false;
                 if (ObjectHelper.isEmpty(getNamedReplyTo())) {
-                    replyToDestination = getEndpoint().getDestinationCreationStrategy().createTemporaryDestination(session, isTopic());
+                    isReplyToTopic = isTopic();
+                    replyToDestination = getEndpoint().getDestinationCreationStrategy().createTemporaryDestination(session, isReplyToTopic);
                 } else {
-                    replyToDestination = getEndpoint().getDestinationCreationStrategy().createDestination(session, getNamedReplyTo(), isTopic());
+                    DestinationNameParser parser = new DestinationNameParser();
+                    isReplyToTopic = parser.isNamedReplyToTopic(getNamedReplyTo(), isTopic());
+                    replyToDestination = getEndpoint().getDestinationCreationStrategy().createDestination(session, getNamedReplyTo(), isReplyToTopic);
                 }
-                MessageConsumer messageConsumer = getEndpoint().getJmsObjectFactory().createMessageConsumer(session, replyToDestination, null, isTopic(), null, true, false, false);
+                MessageConsumer messageConsumer = getEndpoint().getJmsObjectFactory().createMessageConsumer(session, replyToDestination, null, isReplyToTopic, null, true, false, false);
                 messageConsumer.setMessageListener(new MessageListener() {
                     @Override
                     public void onMessage(final Message message) {

From 9ee4dae67419b242b44f0fda190f935ba3352715 Mon Sep 17 00:00:00 2001
From: Dmitry Volodin <dmvolod@gmail.com>
Date: Thu, 1 Nov 2018 20:25:04 +0300
Subject: [PATCH 035/125] CAMEL-12908: Add reproducer code

---
 .../resources/org/apache/camel/component/rest/RestRefTest.xml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/camel-spring/src/test/resources/org/apache/camel/component/rest/RestRefTest.xml b/components/camel-spring/src/test/resources/org/apache/camel/component/rest/RestRefTest.xml
index c53d943f7d204..246c2a9079965 100644
--- a/components/camel-spring/src/test/resources/org/apache/camel/component/rest/RestRefTest.xml
+++ b/components/camel-spring/src/test/resources/org/apache/camel/component/rest/RestRefTest.xml
@@ -54,7 +54,7 @@
         <constant>Hello World</constant>
       </transform>
     </route>
-    <route>
+    <route id="route1">
       <from uri="direct:bye"/>
       <transform>
         <constant>Bye World</constant>

From fb9df2dbed717517ca50994d15b74f34aa9e7e37 Mon Sep 17 00:00:00 2001
From: Dmitry Volodin <dmvolod@gmail.com>
Date: Tue, 13 Nov 2018 16:43:59 +0300
Subject: [PATCH 036/125] CAMEL-12908: Cannot start route using rest dsl due to
 a mysterious duplicate route id

---
 .../camel/model/RouteDefinitionHelper.java    | 33 ++++++++++++++++++-
 .../camel/model/rest/RestDefinition.java      |  6 +++-
 .../camel/model/rest/VerbDefinition.java      |  2 +-
 3 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/camel-core/src/main/java/org/apache/camel/model/RouteDefinitionHelper.java b/camel-core/src/main/java/org/apache/camel/model/RouteDefinitionHelper.java
index 041bdc212dcf9..b0059553bae64 100644
--- a/camel-core/src/main/java/org/apache/camel/model/RouteDefinitionHelper.java
+++ b/camel-core/src/main/java/org/apache/camel/model/RouteDefinitionHelper.java
@@ -19,14 +19,18 @@
 import java.io.UnsupportedEncodingException;
 import java.net.URISyntaxException;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.builder.ErrorHandlerBuilder;
+import org.apache.camel.model.rest.RestDefinition;
+import org.apache.camel.model.rest.VerbDefinition;
 import org.apache.camel.util.CamelContextHelper;
 import org.apache.camel.util.EndpointHelper;
 import org.apache.camel.util.ObjectHelper;
@@ -145,10 +149,11 @@ public void run() {
         for (final RouteDefinition route : routes) {
             if (route.getId() == null) {
                 // keep assigning id's until we find a free name
+                
                 boolean done = false;
                 String id = null;
                 while (!done) {
-                    id = context.getNodeIdFactory().createId(route);
+                    id = route.idOrCreate(context.getNodeIdFactory());
                     done = !customIds.contains(id);
                 }
                 route.setId(id);
@@ -162,6 +167,32 @@ public void run() {
                 route.setCustomId(false);
                 customIds.add(route.getId());
             }
+            RestDefinition rest = route.getRestDefinition();
+            if (rest != null && route.isRest()) {
+                for (VerbDefinition verb : rest.getVerbs()) {
+                    String id = verb.idOrCreate(context.getNodeIdFactory());
+                    if (!verb.getUsedForGeneratingNodeId()) {
+                        id = route.getId();
+                    }
+                    verb.setRouteId(id);
+                }
+                List<FromDefinition> fromDefinitions = route.getInputs();
+                
+                if (ObjectHelper.isNotEmpty(fromDefinitions)) {
+                    FromDefinition fromDefinition = fromDefinitions.get(0);
+                    String endpointUri = fromDefinition.getEndpointUri();
+                    if (ObjectHelper.isNotEmpty(endpointUri)) {
+                        Map<String, Object> options = new HashMap<String, Object>();
+                        options.put("routeId", route.getId());
+                        endpointUri = URISupport.appendParametersToURI(endpointUri, options);
+                     
+                        // replace uri with new routeId
+                        fromDefinition.setUri(endpointUri);
+                        fromDefinitions.set(0, fromDefinition);
+                        route.setInputs(fromDefinitions);
+                    }
+                }
+            }
         }
     }
 
diff --git a/camel-core/src/main/java/org/apache/camel/model/rest/RestDefinition.java b/camel-core/src/main/java/org/apache/camel/model/rest/RestDefinition.java
index 946fb76c16e15..a960827a36762 100644
--- a/camel-core/src/main/java/org/apache/camel/model/rest/RestDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/rest/RestDefinition.java
@@ -903,6 +903,7 @@ private void addRouteDefinition(CamelContext camelContext, List<RouteDefinition>
                 options.put("outType", outType);
             }
             // if no route id has been set, then use the verb id as route id
+            /*
             if (!route.hasCustomIdAssigned()) {
                 // use id of verb as route id
                 String id = verb.getId();
@@ -910,7 +911,9 @@ private void addRouteDefinition(CamelContext camelContext, List<RouteDefinition>
                     route.setId(id);
                 }
             }
+            */
 
+            /*
             String routeId = verb.idOrCreate(camelContext.getNodeIdFactory());
 
             if (!verb.getUsedForGeneratingNodeId()) {
@@ -919,6 +922,7 @@ private void addRouteDefinition(CamelContext camelContext, List<RouteDefinition>
 
             verb.setRouteId(routeId);
             options.put("routeId", routeId);
+            */
             if (component != null && !component.isEmpty()) {
                 options.put("componentName", component);
             }
@@ -1012,7 +1016,7 @@ private void addRouteDefinition(CamelContext camelContext, List<RouteDefinition>
 
             // the route should be from this rest endpoint
             route.fromRest(from);
-            route.routeId(routeId);
+            //route.routeId(routeId);
             route.setRestDefinition(this);
             answer.add(route);
         }
diff --git a/camel-core/src/main/java/org/apache/camel/model/rest/VerbDefinition.java b/camel-core/src/main/java/org/apache/camel/model/rest/VerbDefinition.java
index bf56005782ecd..acbe38a6b4b85 100644
--- a/camel-core/src/main/java/org/apache/camel/model/rest/VerbDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/rest/VerbDefinition.java
@@ -141,7 +141,7 @@ public List<RestOperationResponseMsgDefinition> getResponseMsgs() {
     /**
      * Sets swagger operation response messages.
      */
-    public void setResponseMsgs(List<RestOperationResponseMsgDefinition> params) {
+    public void setResponseMsgs(List<RestOperationResponseMsgDefinition> responseMsgs) {
         this.responseMsgs = responseMsgs;
     }
 

From 1a9b479047eddc475be7de39b6e78633a821f266 Mon Sep 17 00:00:00 2001
From: Dmitry Volodin <dmvolod@gmail.com>
Date: Tue, 13 Nov 2018 16:53:26 +0300
Subject: [PATCH 037/125] CAMEL-12908: Fix CS

---
 .../camel/model/rest/RestDefinition.java      | 21 -------------------
 1 file changed, 21 deletions(-)

diff --git a/camel-core/src/main/java/org/apache/camel/model/rest/RestDefinition.java b/camel-core/src/main/java/org/apache/camel/model/rest/RestDefinition.java
index a960827a36762..5fcce056d7b0a 100644
--- a/camel-core/src/main/java/org/apache/camel/model/rest/RestDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/rest/RestDefinition.java
@@ -902,27 +902,7 @@ private void addRouteDefinition(CamelContext camelContext, List<RouteDefinition>
             if (outType != null) {
                 options.put("outType", outType);
             }
-            // if no route id has been set, then use the verb id as route id
-            /*
-            if (!route.hasCustomIdAssigned()) {
-                // use id of verb as route id
-                String id = verb.getId();
-                if (id != null) {
-                    route.setId(id);
-                }
-            }
-            */
-
-            /*
-            String routeId = verb.idOrCreate(camelContext.getNodeIdFactory());
-
-            if (!verb.getUsedForGeneratingNodeId()) {
-                routeId = route.idOrCreate(camelContext.getNodeIdFactory());
-            }
 
-            verb.setRouteId(routeId);
-            options.put("routeId", routeId);
-            */
             if (component != null && !component.isEmpty()) {
                 options.put("componentName", component);
             }
@@ -1016,7 +996,6 @@ private void addRouteDefinition(CamelContext camelContext, List<RouteDefinition>
 
             // the route should be from this rest endpoint
             route.fromRest(from);
-            //route.routeId(routeId);
             route.setRestDefinition(this);
             answer.add(route);
         }

From cb6e8c2f11b31b25ae6f976ab36ee305307dfa8e Mon Sep 17 00:00:00 2001
From: Andrea Cosentino <ancosen@gmail.com>
Date: Fri, 16 Nov 2018 11:16:53 +0100
Subject: [PATCH 038/125] Upgrade Ehcache to version 3.6.2

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

diff --git a/parent/pom.xml b/parent/pom.xml
index fa9b2d0aeaa25..92615765b9e3a 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -190,7 +190,7 @@
     <egit-github-core-version>2.1.5</egit-github-core-version>
     <egit-github-core-bundle-version>2.1.5_1</egit-github-core-bundle-version>
     <ehcache-version>2.10.6</ehcache-version>
-    <ehcache3-version>3.6.1</ehcache3-version>
+    <ehcache3-version>3.6.2</ehcache3-version>
     <ekstazi-maven-plugin-version>5.3.0</ekstazi-maven-plugin-version>
     <elasticsearch-bundle-version>2.4.4_1</elasticsearch-bundle-version>
     <elasticsearch-guava-version>18.0</elasticsearch-guava-version>

From 732f55adaa89bd8f42b3586880a21b09658710c5 Mon Sep 17 00:00:00 2001
From: Andrea Cosentino <ancosen@gmail.com>
Date: Fri, 16 Nov 2018 11:58:37 +0100
Subject: [PATCH 039/125] CAMEL-12759 - Misleading documentation for Netty
 components - Netty4

---
 .../src/main/docs/netty4-component.adoc       | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/components/camel-netty4/src/main/docs/netty4-component.adoc b/components/camel-netty4/src/main/docs/netty4-component.adoc
index 0d6296442f098..0fce4abf529eb 100644
--- a/components/camel-netty4/src/main/docs/netty4-component.adoc
+++ b/components/camel-netty4/src/main/docs/netty4-component.adoc
@@ -37,7 +37,7 @@ The URI scheme for a netty component is as follows
 
 [source,text]
 ----
-netty4:tcp://localhost:99999[?options]
+netty4:tcp://0.0.0.0:99999[?options]
 netty4:udp://remotehost:99999/[?options]
 ----
 
@@ -360,7 +360,7 @@ operations.
 ----
 RouteBuilder builder = new RouteBuilder() {
   public void configure() {
-    from("netty4:udp://localhost:5155?sync=true")
+    from("netty4:udp://0.0.0.0:5155?sync=true")
       .process(new Processor() {
          public void process(Exchange exchange) throws Exception {
            Poetry poetry = (Poetry) exchange.getIn().getBody();
@@ -378,7 +378,7 @@ RouteBuilder builder = new RouteBuilder() {
 ----
 RouteBuilder builder = new RouteBuilder() {
   public void configure() {
-       from("netty4:tcp://localhost:5150")
+       from("netty4:tcp://0.0.0.0:5150")
            .to("mock:result");
   }
 };
@@ -432,7 +432,7 @@ Spring DSL based configuration of endpoint
     </camel:keyManagers>
   </camel:sslContextParameters>...
 ...
-  <to uri="netty4:tcp://localhost:5150?sync=true&ssl=true&sslContextParameters=#sslContextParameters"/>
+  <to uri="netty4:tcp://0.0.0.0:5150?sync=true&ssl=true&sslContextParameters=#sslContextParameters"/>
 ...
 ----
 
@@ -450,7 +450,7 @@ context.createRegistry(registry);
 context.addRoutes(new RouteBuilder() {
   public void configure() {
       String netty_ssl_endpoint =
-         "netty4:tcp://localhost:5150?sync=true&ssl=true&passphrase=#password"
+         "netty4:tcp://0.0.0.0:5150?sync=true&ssl=true&passphrase=#password"
          + "&keyStoreFile=#ksf&trustStoreFile=#tsf";
       String return_string =
          "When You Go Home, Tell Them Of Us And Say,"
@@ -578,9 +578,9 @@ a comma separated list or contained in a List e.g.
 
 [source,java]
 ----
- from("direct:multiple-codec").to("netty4:tcp://localhost:{{port}}?encoders=#encoders&sync=false");
+ from("direct:multiple-codec").to("netty4:tcp://0.0.0.0:{{port}}?encoders=#encoders&sync=false");
                 
- from("netty4:tcp://localhost:{{port}}?decoders=#length-decoder,#string-decoder&sync=false").to("mock:multiple-codec");
+ from("netty4:tcp://0.0.0.0:{{port}}?decoders=#length-decoder,#string-decoder&sync=false").to("mock:multiple-codec");
 ----
 
 or via XML.
@@ -590,10 +590,10 @@ or via XML.
 <camelContext id="multiple-netty-codecs-context" xmlns="http://camel.apache.org/schema/spring">
     <route>
         <from uri="direct:multiple-codec"/>
-        <to uri="netty4:tcp://localhost:5150?encoders=#encoders&amp;sync=false"/>
+        <to uri="netty4:tcp://0.0.0.0:5150?encoders=#encoders&amp;sync=false"/>
     </route>
     <route>
-        <from uri="netty4:tcp://localhost:5150?decoders=#length-decoder,#string-decoder&amp;sync=false"/>
+        <from uri="netty4:tcp://0.0.0.0:5150?decoders=#length-decoder,#string-decoder&amp;sync=false"/>
         <to uri="mock:multiple-codec"/>
     </route>
 </camelContext>
@@ -615,7 +615,7 @@ written the bye message back to the client:
 
 [source,java]
 ----
-from("netty4:tcp://localhost:8080").process(new Processor() {
+from("netty4:tcp://0.0.0.0:8080").process(new Processor() {
     public void process(Exchange exchange) throws Exception {
         String body = exchange.getIn().getBody(String.class);
         exchange.getOut().setBody("Bye " + body);
@@ -685,7 +685,7 @@ registry.bind("spf", factory);
 context.addRoutes(new RouteBuilder() {
   public void configure() {
       String netty_ssl_endpoint =
-         "netty4:tcp://localhost:5150?serverInitializerFactory=#spf"
+         "netty4:tcp://0.0.0.0:5150?serverInitializerFactory=#spf"
       String return_string =
          "When You Go Home, Tell Them Of Us And Say,"
          + "For Your Tomorrow, We Gave Our Today.";
@@ -738,7 +738,7 @@ as shown below:
 [source,xml]
 ----
 <route>
-  <from uri="netty4:tcp://localhost:5021?textline=true&amp;sync=true&amp;workerPool=#sharedPool&amp;usingExecutorService=false"/>
+  <from uri="netty4:tcp://0.0.0.0:5021?textline=true&amp;sync=true&amp;workerPool=#sharedPool&amp;usingExecutorService=false"/>
   <to uri="log:result"/>
   ...
 </route>
@@ -749,7 +749,7 @@ And if we have another route we can refer to the shared worker pool:
 [source,xml]
 ----
 <route>
-  <from uri="netty4:tcp://localhost:5022?textline=true&amp;sync=true&amp;workerPool=#sharedPool&amp;usingExecutorService=false"/>
+  <from uri="netty4:tcp://0.0.0.0:5022?textline=true&amp;sync=true&amp;workerPool=#sharedPool&amp;usingExecutorService=false"/>
   <to uri="log:result"/>
   ...
 </route>

From c065ce18af9c9465f1746ce9f05b58c2dc4fa166 Mon Sep 17 00:00:00 2001
From: Andrea Cosentino <ancosen@gmail.com>
Date: Fri, 16 Nov 2018 12:00:26 +0100
Subject: [PATCH 040/125] CAMEL-12759 - Misleading documentation for Netty
 components - Netty4-http

---
 .../src/main/docs/netty4-http-component.adoc                  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/camel-netty4-http/src/main/docs/netty4-http-component.adoc b/components/camel-netty4-http/src/main/docs/netty4-http-component.adoc
index 6018cbde8ef06..144a257149562 100644
--- a/components/camel-netty4-http/src/main/docs/netty4-http-component.adoc
+++ b/components/camel-netty4-http/src/main/docs/netty4-http-component.adoc
@@ -39,7 +39,7 @@ The URI scheme for a netty component is as follows
 
 [source,java]
 -------------------------------------------
-netty4-http:http://localhost:8080[?options]
+netty4-http:http://0.0.0.0:8080[?options]
 -------------------------------------------
 
 You can append query options to the URI in the following format,
@@ -362,7 +362,7 @@ ProducerTemplate as shown below:
 
 [source,java]
 ------------------------------------------------------------------------------------------------------------
-    String out = template.requestBody("netty4-http:http://localhost:8080/foo", "Hello World", String.class);
+    String out = template.requestBody("netty4-http:http://0.0.0.0:8080/foo", "Hello World", String.class);
     System.out.println(out);
 ------------------------------------------------------------------------------------------------------------
 

From c0ff44454b823f2e8f69401ff8c3be3b5af389da Mon Sep 17 00:00:00 2001
From: Andrea Cosentino <ancosen@gmail.com>
Date: Fri, 16 Nov 2018 12:01:23 +0100
Subject: [PATCH 041/125] CAMEL-12759 - Misleading documentation for Netty
 components - Netty

---
 .../src/main/docs/netty-component.adoc         | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/components/camel-netty/src/main/docs/netty-component.adoc b/components/camel-netty/src/main/docs/netty-component.adoc
index f4f6012cf6713..b0a56a90d90e8 100644
--- a/components/camel-netty/src/main/docs/netty-component.adoc
+++ b/components/camel-netty/src/main/docs/netty-component.adoc
@@ -40,7 +40,7 @@ The URI scheme for a netty component is as follows
 
 [source,java]
 ---------------------------------------
-netty:tcp://localhost:99999[?options]
+netty:tcp://0.0.0.0:99999[?options]
 netty:udp://remotehost:99999/[?options]
 ---------------------------------------
 
@@ -385,7 +385,7 @@ netty.
 ------------------------------------------------------------------
 RouteBuilder builder = new RouteBuilder() {
   public void configure() {
-    from("netty:udp://localhost:5155?sync=true")
+    from("netty:udp://0.0.0.0:5155?sync=true")
       .process(new Processor() {
          public void process(Exchange exchange) throws Exception {
            Poetry poetry = (Poetry) exchange.getIn().getBody();
@@ -403,7 +403,7 @@ RouteBuilder builder = new RouteBuilder() {
 -------------------------------------------
 RouteBuilder builder = new RouteBuilder() {
   public void configure() {
-       from("netty:tcp://localhost:5150")
+       from("netty:tcp://0.0.0.0:5150")
            .to("mock:result");
   }
 };
@@ -457,7 +457,7 @@ Spring DSL based configuration of endpoint
     </camel:keyManagers>
   </camel:sslContextParameters>...
 ...
-  <to uri="netty:tcp://localhost:5150?sync=true&ssl=true&sslContextParameters=#sslContextParameters"/>
+  <to uri="netty:tcp://0.0.0.0:5150?sync=true&ssl=true&sslContextParameters=#sslContextParameters"/>
 ...
 ------------------------------------------------------------------------------------------------------
 
@@ -475,7 +475,7 @@ context.createRegistry(registry);
 context.addRoutes(new RouteBuilder() {
   public void configure() {
       String netty_ssl_endpoint =
-         "netty:tcp://localhost:5150?sync=true&ssl=true&passphrase=#password"
+         "netty:tcp://0.0.0.0:5150?sync=true&ssl=true&passphrase=#password"
          + "&keyStoreFile=#ksf&trustStoreFile=#tsf";
       String return_string =
          "When You Go Home, Tell Them Of Us And Say,"
@@ -561,7 +561,7 @@ written the bye message back to the client:
 
 [source,java]
 --------------------------------------------------------------------------------------------------------
-        from("netty:tcp://localhost:8080").process(new Processor() {
+        from("netty:tcp://0.0.0.0:8080").process(new Processor() {
             public void process(Exchange exchange) throws Exception {
                 String body = exchange.getIn().getBody(String.class);
                 exchange.getOut().setBody("Bye " + body);
@@ -632,7 +632,7 @@ registry.bind("spf", serverPipelineFactory);
 context.addRoutes(new RouteBuilder() {
   public void configure() {
       String netty_ssl_endpoint =
-         "netty:tcp://localhost:5150?serverPipelineFactory=#spf"
+         "netty:tcp://0.0.0.0:5150?serverPipelineFactory=#spf"
       String return_string =
          "When You Go Home, Tell Them Of Us And Say,"
          + "For Your Tomorrow, We Gave Our Today.";
@@ -687,7 +687,7 @@ as shown below:
 [source,xml]
 -----------------------------------------------------------------------------------------------------------------------------------------
     <route>
-      <from uri="netty:tcp://localhost:5021?textline=true&amp;sync=true&amp;workerPool=#sharedPool&amp;orderedThreadPoolExecutor=false"/>
+      <from uri="netty:tcp://0.0.0.0:5021?textline=true&amp;sync=true&amp;workerPool=#sharedPool&amp;orderedThreadPoolExecutor=false"/>
       <to uri="log:result"/>
       ...
     </route>
@@ -698,7 +698,7 @@ And if we have another route we can refer to the shared worker pool:
 [source,xml]
 -----------------------------------------------------------------------------------------------------------------------------------------
     <route>
-      <from uri="netty:tcp://localhost:5022?textline=true&amp;sync=true&amp;workerPool=#sharedPool&amp;orderedThreadPoolExecutor=false"/>
+      <from uri="netty:tcp://0.0.0.0:5022?textline=true&amp;sync=true&amp;workerPool=#sharedPool&amp;orderedThreadPoolExecutor=false"/>
       <to uri="log:result"/>
       ...
     </route>

From 69f30d3921688075fa23f52567445e0db4bc8fa0 Mon Sep 17 00:00:00 2001
From: Andrea Cosentino <ancosen@gmail.com>
Date: Fri, 16 Nov 2018 12:02:44 +0100
Subject: [PATCH 042/125] CAMEL-12759 - Misleading documentation for Netty
 components - Netty-http

---
 .../camel-netty-http/src/main/docs/netty-http-component.adoc  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/camel-netty-http/src/main/docs/netty-http-component.adoc b/components/camel-netty-http/src/main/docs/netty-http-component.adoc
index 1d3641bc480d9..2984a0e64ade1 100644
--- a/components/camel-netty-http/src/main/docs/netty-http-component.adoc
+++ b/components/camel-netty-http/src/main/docs/netty-http-component.adoc
@@ -42,7 +42,7 @@ The URI scheme for a netty component is as follows
 
 [source,java]
 ------------------------------------------
-netty-http:http://localhost:8080[?options]
+netty-http:http://0.0.0.0:8080[?options]
 ------------------------------------------
 
 You can append query options to the URI in the following format,
@@ -353,7 +353,7 @@ ProducerTemplate as shown below:
 
 [source,java]
 -----------------------------------------------------------------------------------------------------------
-    String out = template.requestBody("netty-http:http://localhost:8080/foo", "Hello World", String.class);
+    String out = template.requestBody("netty-http:http://0.0.0.0:8080/foo", "Hello World", String.class);
     System.out.println(out);
 -----------------------------------------------------------------------------------------------------------
 

From 16a7508fdd0be0fa179204f40beb6bfdda1f0467 Mon Sep 17 00:00:00 2001
From: Andrea Cosentino <ancosen@gmail.com>
Date: Fri, 16 Nov 2018 13:30:25 +0100
Subject: [PATCH 043/125] CAMEL-12631 - SFTP: Socket timeout overwrites Server
 Alive Interval

---
 .../camel/component/file/remote/SftpOperations.java       | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java
index b912151f119c1..23abe1e48b4d6 100644
--- a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java
+++ b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java
@@ -354,8 +354,12 @@ public String[] promptKeyboardInteractive(String destination, String name,
         });
 
         // set the SO_TIMEOUT for the time after the connect phase
-        if (configuration.getSoTimeout() > 0) {
-            session.setTimeout(configuration.getSoTimeout());
+        if (sftpConfig.getServerAliveInterval() == 0) {
+            if (configuration.getSoTimeout() > 0) {
+               session.setTimeout(configuration.getSoTimeout());
+            }
+        } else {
+        	LOG.debug("The Server Alive Internal is already set, the socket timeout won't be considered to avoid overidding the provided Server alive interval value");
         }
 
         // set proxy if configured

From 4856ecda0a293e34f836d6e1542b5b2b3a8c5657 Mon Sep 17 00:00:00 2001
From: Andrea Cosentino <ancosen@gmail.com>
Date: Fri, 16 Nov 2018 13:47:02 +0100
Subject: [PATCH 044/125] CAMEL-12631 - Fixed CS

---
 .../component/file/remote/SftpOperations.java | 114 ++++++++++--------
 1 file changed, 65 insertions(+), 49 deletions(-)

diff --git a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java
index 23abe1e48b4d6..834595aedbb58 100644
--- a/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java
+++ b/components/camel-ftp/src/main/java/org/apache/camel/component/file/remote/SftpOperations.java
@@ -47,6 +47,7 @@
 import com.jcraft.jsch.SocketFactory;
 import com.jcraft.jsch.UIKeyboardInteractive;
 import com.jcraft.jsch.UserInfo;
+
 import org.apache.camel.Exchange;
 import org.apache.camel.InvalidPayloadException;
 import org.apache.camel.LoggingLevel;
@@ -70,7 +71,8 @@
 /**
  * SFTP remote file operations
  * <p/>
- * The JSCH session and channel are not thread-safe so we need to synchronize access to using this operation.
+ * The JSCH session and channel are not thread-safe so we need to synchronize
+ * access to using this operation.
  */
 public class SftpOperations implements RemoteFileOperations<SftpRemoteFile> {
     private static final Logger LOG = LoggerFactory.getLogger(SftpOperations.class);
@@ -88,13 +90,14 @@ public SftpOperations(Proxy proxy) {
     }
 
     /**
-     * Extended user info which supports interactive keyboard mode, by entering the password.
+     * Extended user info which supports interactive keyboard mode, by entering
+     * the password.
      */
     public interface ExtendedUserInfo extends UserInfo, UIKeyboardInteractive {
     }
 
     public void setEndpoint(GenericFileEndpoint<SftpRemoteFile> endpoint) {
-        this.endpoint = (SftpEndpoint) endpoint;
+        this.endpoint = (SftpEndpoint)endpoint;
     }
 
     public synchronized boolean connect(RemoteFileConfiguration configuration) throws GenericFileOperationFailedException {
@@ -126,7 +129,7 @@ public synchronized boolean connect(RemoteFileConfiguration configuration) throw
                     }
 
                     LOG.trace("Channel isn't connected, trying to recreate and connect.");
-                    channel = (ChannelSftp) session.openChannel("sftp");
+                    channel = (ChannelSftp)session.openChannel("sftp");
 
                     if (endpoint.getConfiguration().getConnectTimeout() > 0) {
                         LOG.trace("Connecting use connectTimeout: {} ...", endpoint.getConfiguration().getConnectTimeout());
@@ -191,7 +194,7 @@ protected Session createSession(final RemoteFileConfiguration configuration) thr
         final JSch jsch = new JSch();
         JSch.setLogger(new JSchLogger(endpoint.getConfiguration().getJschLoggingLevel()));
 
-        SftpConfiguration sftpConfig = (SftpConfiguration) configuration;
+        SftpConfiguration sftpConfig = (SftpConfiguration)configuration;
 
         if (isNotEmpty(sftpConfig.getCiphers())) {
             LOG.debug("Using ciphers: {}", sftpConfig.getCiphers());
@@ -333,7 +336,8 @@ public boolean promptPassphrase(String s) {
 
             public boolean promptYesNo(String s) {
                 LOG.warn("Server asks for confirmation (yes|no): {}. Camel will answer no.", s);
-                // Return 'false' indicating modification of the hosts file is disabled.
+                // Return 'false' indicating modification of the hosts file is
+                // disabled.
                 return false;
             }
 
@@ -341,13 +345,12 @@ public void showMessage(String s) {
                 LOG.trace("Message received from Server: {}", s);
             }
 
-            public String[] promptKeyboardInteractive(String destination, String name,
-                                                      String instruction, String[] prompt, boolean[] echo) {
+            public String[] promptKeyboardInteractive(String destination, String name, String instruction, String[] prompt, boolean[] echo) {
                 // must return an empty array if password is null
                 if (configuration.getPassword() == null) {
                     return new String[0];
                 } else {
-                    return new String[]{configuration.getPassword()};
+                    return new String[] {configuration.getPassword()};
                 }
             }
 
@@ -356,10 +359,10 @@ public String[] promptKeyboardInteractive(String destination, String name,
         // set the SO_TIMEOUT for the time after the connect phase
         if (sftpConfig.getServerAliveInterval() == 0) {
             if (configuration.getSoTimeout() > 0) {
-               session.setTimeout(configuration.getSoTimeout());
+                session.setTimeout(configuration.getSoTimeout());
             }
         } else {
-        	LOG.debug("The Server Alive Internal is already set, the socket timeout won't be considered to avoid overidding the provided Server alive interval value");
+            LOG.debug("The Server Alive Internal is already set, the socket timeout won't be considered to avoid overidding the provided Server alive interval value");
         }
 
         // set proxy if configured
@@ -486,7 +489,7 @@ public synchronized boolean renameFile(String from, String to) throws GenericFil
         LOG.debug("Renaming file: {} to: {}", from, to);
         try {
             reconnectIfNecessary();
-            //make use of the '/' separator because JSch expects this 
+            // make use of the '/' separator because JSch expects this
             // as the file separator even on Windows
             to = FileUtil.compactPath(to, '/');
             channel.rename(from, to);
@@ -511,7 +514,8 @@ public synchronized boolean buildDirectory(String directory, boolean absolute) t
                 channel.ls(directory);
                 success = true;
             } catch (SftpException e) {
-                // ignore, we could not change directory so try to create it instead
+                // ignore, we could not change directory so try to create it
+                // instead
             }
 
             if (!success) {
@@ -521,7 +525,8 @@ public synchronized boolean buildDirectory(String directory, boolean absolute) t
                     channel.mkdir(directory);
                     success = true;
                 } catch (SftpException e) {
-                    // we are here if the server side doesn't create intermediate folders
+                    // we are here if the server side doesn't create
+                    // intermediate folders
                     // so create the folder one by one
                     success = buildDirectoryChunks(directory);
                 }
@@ -582,8 +587,10 @@ public synchronized void changeCurrentDirectory(String path) throws GenericFileO
             return;
         }
 
-        // must compact path so SFTP server can traverse correctly, make use of the '/'
-        // separator because JSch expects this as the file separator even on Windows
+        // must compact path so SFTP server can traverse correctly, make use of
+        // the '/'
+        // separator because JSch expects this as the file separator even on
+        // Windows
         String before = path;
         char separatorChar = '/';
         path = FileUtil.compactPath(path, separatorChar);
@@ -597,8 +604,9 @@ public synchronized void changeCurrentDirectory(String path) throws GenericFileO
             return;
         }
         if (getCurrentDirectory().startsWith(path)) {
-            // extract the path segment relative to the target path and make sure it keeps the preceding '/' for the regex op
-            String p = getCurrentDirectory().substring(path.length() - (path.endsWith("/") ?  1 : 0));
+            // extract the path segment relative to the target path and make
+            // sure it keeps the preceding '/' for the regex op
+            String p = getCurrentDirectory().substring(path.length() - (path.endsWith("/") ? 1 : 0));
             if (p.length() == 0) {
                 return;
             }
@@ -606,7 +614,8 @@ public synchronized void changeCurrentDirectory(String path) throws GenericFileO
             path = UP_DIR_PATTERN.matcher(p).replaceAll("/..").substring(1);
         }
 
-        // if it starts with the root path then a little special handling for that
+        // if it starts with the root path then a little special handling for
+        // that
         if (FileUtil.hasLeadingSeparator(path)) {
             // change to root path
             if (!FileUtil.isWindows()) {
@@ -677,7 +686,7 @@ public synchronized List<SftpRemoteFile> listFiles(String path) throws GenericFi
             // can return either null or an empty list depending on FTP servers
             if (files != null) {
                 for (Object file : files) {
-                    list.add(new SftpRemoteFileJCraft((ChannelSftp.LsEntry) file));
+                    list.add(new SftpRemoteFileJCraft((ChannelSftp.LsEntry)file));
                 }
             }
             return list;
@@ -689,7 +698,8 @@ public synchronized List<SftpRemoteFile> listFiles(String path) throws GenericFi
     public synchronized boolean retrieveFile(String name, Exchange exchange, long size) throws GenericFileOperationFailedException {
         LOG.trace("retrieveFile({})", name);
         if (ObjectHelper.isNotEmpty(endpoint.getLocalWorkDirectory())) {
-            // local work directory is configured so we should store file content as files in this local directory
+            // local work directory is configured so we should store file
+            // content as files in this local directory
             return retrieveFileToFileInLocalWorkDirectory(name, exchange);
         } else {
             // store file content directory as stream on the body
@@ -713,8 +723,7 @@ public synchronized void releaseRetrievedFileResources(Exchange exchange) throws
     private boolean retrieveFileToStreamInBody(String name, Exchange exchange) throws GenericFileOperationFailedException {
         String currentDir = null;
         try {
-            GenericFile<ChannelSftp.LsEntry> target =
-                    (GenericFile<ChannelSftp.LsEntry>) exchange.getProperty(FileComponent.FILE_EXCHANGE_FILE);
+            GenericFile<ChannelSftp.LsEntry> target = (GenericFile<ChannelSftp.LsEntry>)exchange.getProperty(FileComponent.FILE_EXCHANGE_FILE);
             ObjectHelper.notNull(target, "Exchange should have the " + FileComponent.FILE_EXCHANGE_FILE + " set");
 
             String remoteName = name;
@@ -723,12 +732,14 @@ private boolean retrieveFileToStreamInBody(String name, Exchange exchange) throw
                 currentDir = getCurrentDirectory();
 
                 // change directory to path where the file is to be retrieved
-                // (must do this as some FTP servers cannot retrieve using absolute path)
+                // (must do this as some FTP servers cannot retrieve using
+                // absolute path)
                 String path = FileUtil.onlyPath(name);
                 if (path != null) {
                     changeCurrentDirectory(path);
                 }
-                // remote name is now only the file name as we just changed directory
+                // remote name is now only the file name as we just changed
+                // directory
                 remoteName = FileUtil.stripPath(name);
             }
 
@@ -764,8 +775,7 @@ private boolean retrieveFileToFileInLocalWorkDirectory(String name, Exchange exc
         File temp;
         File local = new File(endpoint.getLocalWorkDirectory());
         OutputStream os;
-        GenericFile<ChannelSftp.LsEntry> file =
-                (GenericFile<ChannelSftp.LsEntry>) exchange.getProperty(FileComponent.FILE_EXCHANGE_FILE);
+        GenericFile<ChannelSftp.LsEntry> file = (GenericFile<ChannelSftp.LsEntry>)exchange.getProperty(FileComponent.FILE_EXCHANGE_FILE);
         ObjectHelper.notNull(file, "Exchange should have the " + FileComponent.FILE_EXCHANGE_FILE + " set");
         try {
             // use relative filename in local work directory
@@ -794,7 +804,8 @@ private boolean retrieveFileToFileInLocalWorkDirectory(String name, Exchange exc
                 throw new GenericFileOperationFailedException("Cannot create new local work file: " + temp);
             }
 
-            // store content as a file in the local work directory in the temp handle
+            // store content as a file in the local work directory in the temp
+            // handle
             os = new FileOutputStream(temp);
 
             // set header with the path to the local work file
@@ -813,12 +824,14 @@ private boolean retrieveFileToFileInLocalWorkDirectory(String name, Exchange exc
                 currentDir = getCurrentDirectory();
 
                 // change directory to path where the file is to be retrieved
-                // (must do this as some FTP servers cannot retrieve using absolute path)
+                // (must do this as some FTP servers cannot retrieve using
+                // absolute path)
                 String path = FileUtil.onlyPath(name);
                 if (path != null) {
                     changeCurrentDirectory(path);
                 }
-                // remote name is now only the file name as we just changed directory
+                // remote name is now only the file name as we just changed
+                // directory
                 remoteName = FileUtil.stripPath(name);
             }
 
@@ -826,7 +839,8 @@ private boolean retrieveFileToFileInLocalWorkDirectory(String name, Exchange exc
 
         } catch (SftpException e) {
             LOG.trace("Error occurred during retrieving file: {} to local directory. Deleting local work file: {}", name, temp);
-            // failed to retrieve the file so we need to close streams and delete in progress file
+            // failed to retrieve the file so we need to close streams and
+            // delete in progress file
             // must close stream before deleting file
             IOHelper.close(os, "retrieve: " + name, LOG);
             boolean deleted = FileUtil.deleteFile(temp);
@@ -845,7 +859,8 @@ private boolean retrieveFileToFileInLocalWorkDirectory(String name, Exchange exc
 
         LOG.debug("Retrieve file to local work file result: true");
 
-        // operation went okay so rename temp to local after we have retrieved the data
+        // operation went okay so rename temp to local after we have retrieved
+        // the data
         LOG.trace("Renaming local in progress file from: {} to: {}", temp, local);
         try {
             if (!FileUtil.renameFile(temp, local, false)) {
@@ -871,13 +886,15 @@ public synchronized boolean storeFile(String name, Exchange exchange, long size)
 
         try {
             if (path != null && endpoint.getConfiguration().isStepwise()) {
-                // must remember current dir so we stay in that directory after the write
+                // must remember current dir so we stay in that directory after
+                // the write
                 currentDir = getCurrentDirectory();
 
                 // change to path of name
                 changeCurrentDirectory(path);
 
-                // the target name should be without path, as we have changed directory
+                // the target name should be without path, as we have changed
+                // directory
                 targetName = FileUtil.stripPath(name);
             }
 
@@ -897,9 +914,7 @@ private boolean doStoreFile(String name, String targetName, Exchange exchange) t
         LOG.trace("doStoreFile({})", targetName);
 
         // if an existing file already exists what should we do?
-        if (endpoint.getFileExist() == GenericFileExist.Ignore
-                || endpoint.getFileExist() == GenericFileExist.Fail
-                || endpoint.getFileExist() == GenericFileExist.Move) {
+        if (endpoint.getFileExist() == GenericFileExist.Ignore || endpoint.getFileExist() == GenericFileExist.Fail || endpoint.getFileExist() == GenericFileExist.Move) {
             boolean existFile = existsFile(targetName);
             if (existFile && endpoint.getFileExist() == GenericFileExist.Ignore) {
                 // ignore but indicate that the file was written
@@ -918,7 +933,7 @@ private boolean doStoreFile(String name, String targetName, Exchange exchange) t
             // Do an explicit test for a null body and decide what to do
             if (endpoint.isAllowNullBody()) {
                 LOG.trace("Writing empty file.");
-                is = new ByteArrayInputStream(new byte[]{});
+                is = new ByteArrayInputStream(new byte[] {});
             } else {
                 throw new GenericFileOperationFailedException("Cannot write null body to file: " + name);
             }
@@ -949,8 +964,7 @@ private boolean doStoreFile(String name, String targetName, Exchange exchange) t
             }
             if (LOG.isDebugEnabled()) {
                 long time = watch.taken();
-                LOG.debug("Took {} ({} millis) to store file: {} and FTP client returned: true",
-                        new Object[]{TimeUtils.printDuration(time), time, targetName});
+                LOG.debug("Took {} ({} millis) to store file: {} and FTP client returned: true", new Object[] {TimeUtils.printDuration(time), time, targetName});
             }
 
             // after storing file, we may set chmod on the file
@@ -974,7 +988,7 @@ private boolean doStoreFile(String name, String targetName, Exchange exchange) t
             IOHelper.close(is, "store: " + name, LOG);
         }
     }
-    
+
     public synchronized boolean existsFile(String name) throws GenericFileOperationFailedException {
         LOG.trace("existsFile({})", name);
         if (endpoint.isFastExistsCheck()) {
@@ -996,7 +1010,7 @@ public synchronized boolean existsFile(String name) throws GenericFileOperationF
                 return false;
             }
             for (Object file : files) {
-                ChannelSftp.LsEntry entry = (ChannelSftp.LsEntry) file;
+                ChannelSftp.LsEntry entry = (ChannelSftp.LsEntry)file;
                 String existing = entry.getFilename();
                 LOG.trace("Existing file: {}, target file: {}", existing, name);
                 existing = FileUtil.stripPath(existing);
@@ -1006,7 +1020,8 @@ public synchronized boolean existsFile(String name) throws GenericFileOperationF
             }
             return false;
         } catch (SftpException e) {
-            // or an exception can be thrown with id 2 which means file does not exists
+            // or an exception can be thrown with id 2 which means file does not
+            // exists
             if (ChannelSftp.SSH_FX_NO_SUCH_FILE == e.id) {
                 return false;
             }
@@ -1025,7 +1040,8 @@ protected boolean fastExistsFile(String name) throws GenericFileOperationFailedE
             }
             return files.size() >= 1;
         } catch (SftpException e) {
-            // or an exception can be thrown with id 2 which means file does not exists
+            // or an exception can be thrown with id 2 which means file does not
+            // exists
             if (ChannelSftp.SSH_FX_NO_SUCH_FILE == e.id) {
                 return false;
             }
@@ -1054,10 +1070,9 @@ public synchronized boolean sendSiteCommand(String command) throws GenericFileOp
     }
 
     /*
-     * adapted from com.jcraft.jsch.Util.createSocket(String, int, int)
-     *
-     * added possibility to specify the address of the local network interface, against the
-     * connection should bind
+     * adapted from com.jcraft.jsch.Util.createSocket(String, int, int) added
+     * possibility to specify the address of the local network interface,
+     * against the connection should bind
      */
     static Socket createSocketUtil(final String host, final int port, final String bindAddress, final int timeout) {
         Socket socket = null;
@@ -1086,7 +1101,8 @@ public void run() {
                     if (sockp[0] != null && sockp[0].isConnected()) {
                         try {
                             sockp[0].close();
-                        } catch (Exception eee) { }
+                        } catch (Exception eee) {
+                        }
                     }
                     sockp[0] = null;
                 }

From ca6a1bf711a0248c820962d2a39257b17a39540c Mon Sep 17 00:00:00 2001
From: Andrea Cosentino <ancosen@gmail.com>
Date: Fri, 16 Nov 2018 15:18:59 +0100
Subject: [PATCH 045/125] Upgrade TestContainers to version 1.10.1

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

diff --git a/parent/pom.xml b/parent/pom.xml
index 92615765b9e3a..f45cb79484728 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -679,7 +679,7 @@
     <stringtemplate-version>4.0.8</stringtemplate-version>
     <tagsoup-bundle-version>1.2.1_1</tagsoup-bundle-version>
     <tagsoup-version>1.2.1</tagsoup-version>
-    <testcontainers-version>1.10.0</testcontainers-version>
+    <testcontainers-version>1.10.1</testcontainers-version>
     <testng-version>6.14.2</testng-version>
     <tinybundles-version>2.1.1</tinybundles-version>
     <tika-version>1.19.1</tika-version>

From 4c55060b8ce277504296bab92c2ef3a8543be7bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Gru=CC=88ndler?= <robert@dubture.com>
Date: Fri, 16 Nov 2018 15:02:34 +0100
Subject: [PATCH 046/125] UPDATED RestBindingAdvice

- Support for the catchAll */* MimeType
- Added some logs to ease debugging when clientRequestValidation is
turned on
---
 .../apache/camel/processor/RestBindingAdvice.java    | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/camel-core/src/main/java/org/apache/camel/processor/RestBindingAdvice.java b/camel-core/src/main/java/org/apache/camel/processor/RestBindingAdvice.java
index 7b401ac19c372..90fe9d4e332aa 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/RestBindingAdvice.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/RestBindingAdvice.java
@@ -34,6 +34,8 @@
 import org.apache.camel.util.ExchangeHelper;
 import org.apache.camel.util.MessageHelper;
 import org.apache.camel.util.ObjectHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * A {@link org.apache.camel.processor.CamelInternalProcessorAdvice} that binds the REST DSL incoming
@@ -47,6 +49,8 @@
  * @see CamelInternalProcessor
  */
 public class RestBindingAdvice implements CamelInternalProcessorAdvice<Map<String, Object>> {
+
+    private static final Logger LOG = LoggerFactory.getLogger(RestBindingAdvice.class);
     private static final String STATE_KEY_DO_MARSHAL = "doMarshal";
     private static final String STATE_KEY_ACCEPT = "accept";
     private static final String STATE_JSON = "json";
@@ -198,6 +202,7 @@ private void unmarshal(Exchange exchange, Map<String, Object> state) throws Exce
         if (clientRequestValidation) {
             // check if the content-type is accepted according to consumes
             if (!isValidOrAcceptedContentType(consumes, contentType)) {
+                LOG.trace("Consuming content type does not match contentType header {}. Stopping routing.", contentType);
                 // the content-type is not something we can process so its a HTTP_ERROR 415
                 exchange.getOut().setHeader(Exchange.HTTP_RESPONSE_CODE, 415);
                 // stop routing and return
@@ -207,6 +212,7 @@ private void unmarshal(Exchange exchange, Map<String, Object> state) throws Exce
 
             // check if what is produces is accepted by the client
             if (!isValidOrAcceptedContentType(produces, accept)) {
+                LOG.trace("Produced content type does not match accept header {}. Stopping routing.", contentType);
                 // the response type is not accepted by the client so its a HTTP_ERROR 406
                 exchange.getOut().setHeader(Exchange.HTTP_RESPONSE_CODE, 406);
                 // stop routing and return
@@ -507,6 +513,12 @@ private static boolean isValidOrAcceptedContentType(String valid, String target)
             return true;
         }
 
+        // Any MIME type
+        // https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Accept#Directives
+        if ("*/*".equals(target)) {
+          return true;
+        }
+
         boolean isXml = valid.toLowerCase(Locale.ENGLISH).contains("xml");
         boolean isJson = valid.toLowerCase(Locale.ENGLISH).contains("json");
 

From c704b6d3422db09cc321870feff5c4bc3e798ff3 Mon Sep 17 00:00:00 2001
From: Andrea Cosentino <ancosen@gmail.com>
Date: Fri, 16 Nov 2018 15:33:16 +0100
Subject: [PATCH 047/125] Camel-Ipfs: Removed html folder from test resources

---
 .../src/test/resources/html/chap/ch01.html    |  13 ------
 .../src/test/resources/html/css/default.css   |  38 ------------------
 .../src/test/resources/html/etc/userfile.txt  |   1 -
 .../src/test/resources/html/img/logo.png      | Bin 6715 -> 0 bytes
 .../src/test/resources/html/index.html        |  13 ------
 5 files changed, 65 deletions(-)
 delete mode 100644 components/camel-ipfs/src/test/resources/html/chap/ch01.html
 delete mode 100644 components/camel-ipfs/src/test/resources/html/css/default.css
 delete mode 100644 components/camel-ipfs/src/test/resources/html/etc/userfile.txt
 delete mode 100644 components/camel-ipfs/src/test/resources/html/img/logo.png
 delete mode 100644 components/camel-ipfs/src/test/resources/html/index.html

diff --git a/components/camel-ipfs/src/test/resources/html/chap/ch01.html b/components/camel-ipfs/src/test/resources/html/chap/ch01.html
deleted file mode 100644
index 4edc3fd6b87d8..0000000000000
--- a/components/camel-ipfs/src/test/resources/html/chap/ch01.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <title>IPFS</title>
-    <meta charset="utf-8" />
-    <link rel="stylesheet" href="./../css/default.css">
-</head>
-<body>
-<p><a href="../index.html">Home</a></p>
-<h2>Chapter 01</h2>
-<p><img src="../img/logo.png" alt="logo" /></p>
-</body>
-</html>
diff --git a/components/camel-ipfs/src/test/resources/html/css/default.css b/components/camel-ipfs/src/test/resources/html/css/default.css
deleted file mode 100644
index 8c0b2d558f3d0..0000000000000
--- a/components/camel-ipfs/src/test/resources/html/css/default.css
+++ /dev/null
@@ -1,38 +0,0 @@
-body {
-    font-family: "Verdana";
-    color: #137cb9
-}
-
-a {
-    #text-decoration: none;
-    color: #137cb9
-}
-
-a.gray {
-    color: gray;
-}
-
-h1 {
-	font-weight: normal;
-    font-size: 20px;
-}
-
-h2 {
-    font-weight: normal;
-	font-size: 15px;
-}
-
-th {
-	text-align: left;
-    font-weight: normal;
-    font-size: 14px;
-    color: gray;
-}
-
-td.gray {
-    color: gray;
-}
-tr.gray {
-    color: gray;
-}
-
diff --git a/components/camel-ipfs/src/test/resources/html/etc/userfile.txt b/components/camel-ipfs/src/test/resources/html/etc/userfile.txt
deleted file mode 100644
index 8fe2a4b5ad117..0000000000000
--- a/components/camel-ipfs/src/test/resources/html/etc/userfile.txt
+++ /dev/null
@@ -1 +0,0 @@
-The quick brown fox jumps over the lazy dog.
\ No newline at end of file
diff --git a/components/camel-ipfs/src/test/resources/html/img/logo.png b/components/camel-ipfs/src/test/resources/html/img/logo.png
deleted file mode 100644
index ddda52e086e85692a94c2d014626bdf26f94e9c6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6715
zcmd5>_g53lwoT~LrG@|jLFt4lH3S5tC`Eb@siBC{lh8prNEJ~)se*z6(xsQsMY>e!
zgf2Do&eQMSci(&e!JD;a&dixTd(WAl&N}n*k&ZeQIhY&(08nXasOtZ*ul{y2l0W0B
z8m{J#0iyKPl>x>5Z0mm(H{3K#Q2+o1{of7*yiW)H0hl@(BG3qJEjgsCGt}DF)y59$
z?d<jk4FJHr<^D{a?a<bo-p)=gC^>Hhu7416f98MPB3zvRK+w+>xDeWpI8|Id>^Sd2
zC845RaB@ygPMC+Sy_~+P+P{zgSt)QmMWfy1L`1y2yr5nZP*)EJ5iwa=SrJij5pi+h
zKL}xzj|<w`Ti6A~{V$UL=25jnAw3-3(2lMyoPT+(ZCo*E1um|?LjP(1x+mJv{(qEQ
zQ2!3=Pk<tScSOXXq9Xs{{&N)e*DI&%;b`|q`7b|Q4E7K5|M>o`0~7fx{=Y8suSoy#
z{s|RM4iov$v%$%=T6s+Y0Fa-i>ODhm;FdXs8~dmayxxz)*DQI7H}KUi2piVVp#PZQ
z-m4((BnEMVT4&|Sm$yEJIjU$p1=~c$-bsrE((67~=B(*`Bgv`%^EH}0)?i<f>bCPc
z8}bMcS)kc#JB8xy#`Cq~jC%FQmNSKZB|^XSPp{wU)_WbNS2#59Z@sue9o_oW9tN~l
z0@0HEe>HsFO0<ZtTU%n`cHNb)l|WIVR^JrPKGUCmZJp!#$j4s}PY(X<2Ayv3IqG1Q
z@-M?IcB&<b*UdR4E%#bkJt(<4I`T}Dv|2~`bVt-H<`Y~Wd24U+Zx7Dv^pv|!`R;2g
zk`J@JO`dAcQzSIF&DkmYJl%O~3(Eg=rnGF7{9;rGcJ&g_95CKDS%yeIZ*V$tlwUw!
zTy(N#E$<k&tAAg$eyiD$Crg+F<@8iH7c|ia{7zz(4xI1`y_>la2sbu&K3%We@hdKO
z>Y|1XL`J>I(3*4+2*<2)z?Q2O{r3CnQ>7nMzlhP+CE?Lla&~ssF)?ATFUbDds4!$c
z?q)E5HdjfHCy7!Y6@IdIPg18KU;Xr5Y&rc6qnVK+p{~6%uO0V>1#6cbiu9AStBBwA
zFMMV&rtu?_#>JI-#Y{^FA9q8|3z5vUxb&*={_?sy4~x~G_08wMI5&zhbT93Ud-cBU
zuhe$`s$ge(x`enlFW9cg-Ah`!(AGFR*mNm2xBoUp^E$y}<m*(^)nS&Xo*8SyWI1~<
zIr2+lY`I4(3&?Tg#z@${EVq0A9oB7G%hRi`Ka8_Nyywl|PZuOJk-8@k4}{{hHIURS
zS1YaM^Do)Rcv(Nz(fG6}D2Rz<7zf)aSj!hIu1e1wP>j)ZC7nd6YH>?^HPw5YgV)^1
z(~c>stOl3$6(Gb}bfqLu?xI%s&}LF>6kPTP&uBF?k&ma;^dE}xfaTnjKAoRCOK0>?
z=xmZE)1#F&>P>YHPVV%)B{KM-#3C&3d*O*T*}8aH9JX<7F}};Vd|HUadnYAn{g&a?
zGg;;IY<b$KwGhjcWu{_5p`2q!Ledc2=*RBMEt0lw9ADu%HQrQrLjdWOw-MsI#vk&;
z{?xC5g-=&07S*quP9I+kt=-RD4&K3J`^gQcjT<O<Wtz=|$&f~D$wcl&vtQft-+m@W
zM(gdTa(>)J(5{{eJPD_-a0!?8jXwP*J$Va1bn--JW>#M~0G*B+&zmFn_xiSc{$kD0
z=u1JTT8VEz8>^TuwBK6VP{+$?`!sA>48Awa@?v*Bm~&=4U)||P8OJxmdelarbkh&q
zV-!9y(@UV*ThnWkl7aD&WPgp#aGq?N<BluAKqJK52-8pu{hTH}pq{>H$grwa*~Fj^
z;;=JNnVoOC^z?KaRQ7-4VbgDKdFo}=?itmgzM(MGrrET|BJ+DCuRo$T#WS`{dd@90
zUih)}G$teM5aMoA)`J@z#h=}eX_%}<-5l?9VqX;<w)M?W#z-$CPiR~ncv)G6qsI5e
z--YdkQi#qSgwu#v2HK7f>s~%nH%W<47^!j&e;`m5caK?whmfx-dpTcXokG|YP@RI*
zGSU2X+9hagiE>JIw%YTsJV>>lS>k{0b8uttCI!jo(uX?@tBa{p7LkdgT_>#OZ_S3M
zH#xEQ(^0rZW0J|H9nvo<kqsj)p<>Y!eIK*B_^0=JE$0r{HYgWQ-*TDornf5QS?jdh
z@+D{&R<^7mzMFOX=Ms>2phlC0;{s+Byl!m>^smkf9KRoc4M&fUO{U))vxg~fkH0+a
zaiQvD+1kVg&0RK^km_))&%@JNZI@`KXG5hGUv#lIp4H~==792Z@@*_Bl;9JL+eCZ9
z5mc*yhDehKZyZ0alN<qgpvYgUAJk-tr&c2z)u)J9AApASQ%itf8Y&rrZwmKZJI^~=
z-FQT}>tFMNZ2sVTJgtzR)6=52qD(nozZUjvD+j-;^wKdx4i{*>P<&C7EzmhdLut$Z
zc}TP6LH{tD-RtDU`N<Ap+7TL)_Z_SiP@;sP_kM8>yjM5XrwUxdW9i;m0yBv^N=Z(h
z)a+Xem5_KJmX~S2_bpNc_L6pTr!Ko+-<$_vH3vBe&4Al6QbqjdQcl+fL0qC;9lvWj
z%jvKd^EOt@*oJAHT$z5tCg2kSNy1ODHaV}ZSiH$jsH}cRjh0DqW!uS55|C*Si*@)J
zXHvgPy3wUgRTz9cXOhak0;5s0s5pf6z1-~Nvxg{Rc3*)fs!iN8qmtR#TGRC&obw3Y
zlrYJfHNnv|MvF-)-{MYm65TElc*9x#6}(Xq)Pb$V9%6NaH-Z$D3{_9QG=ft!vnTMi
z&8d1tlH3qzGl3HkV#j|mkn0+8pvA!6LJ^J0{~QzjR8>jiqwwzh4k1Tw;dBRcVZm4?
zX+_)bT{G9hf?sh3o-G97H&hH4Ks=Ovz#elPqV|SbjKs(@w;hYOvIMh(8Tv}^f&=?m
ztV`{YWUmGuc87v+??me|vl2gokjEnwk0^&=x6>M=fGZzlJ&{=?nZ!__w_U|+o-9*w
zk@}`_V6uE>8I<97p^|0lE4#f`Q{riQ7m1iHgb&#2xPfEdsEfiHQp%8xh`JBhXz}2O
zB(o^EUa)-=Bfvo|X1Yx)4Ev^Q$?3hH)s*PoB2ji);O}kwED4UU7Ocr4pdc9eMM`RL
zlXWP|jg00|duUCE*z`=O9BzRo$oy+opYlY7krAo_3?GSercL%_%H@6B0`3;H9|~aC
zIPe0LOn$D;1$`G}T~?ki0dzvzu>4s2c?rO984MbSKc>LG4Z3NMZq{^2=2095;f30L
z^EHF)Xq0G9p4ys~8AWGenwY#rwHOpu-G<j}ih@e-xDkf?Jtjvf6p$-Fz<3p2Dfk%%
zk!V@T<0$WHSRWqkxzrc9IO=)A;N5t=cuPU1VFDJI_aiD`pcEmVNI+ha>>kw@Z|#f%
zMaRUWsG?ALQL<o_UF3k%K@qP*oJF{r^^)a>*x<GMQ5-;B05c&2SYhZs76o8cn9~Zq
zfB#)p=S6&U&r&_PJWGCApl$HX3KDS4T4Kz{k)U37`H)PgGR`a^M{=0LUA0Xxi)(=q
zUh0|!CIV^EACRff`X$^eiceVk<}LAt%HK)KgOzYL&uk$u)uyyJ=57qqhE8t*D9MIO
zEM|7iUps46`CXi1_-;j^Dmpf0O0o&haO!AEu{T9C4Y**o+Itd#;m)?9YOh?Tb^MvS
zeEMB|vFw^v6t_^NUsT!;gNl$DK#XI|^nmNzQRZ}uY?72E+olgw1bT_Ta8nj61lZiY
zORKN%7c!e6Z)9YURFI}<>E$KIu^J<=KBnar?hx+AZ4`5N#tZaKJ)N*5g=&!vCXn;&
z@e1E8_LJMecUq&4+sQg+vtO8bKlLg^SV8-IB?YU8=*#rkz}Ix5arHzSmCC0cejewY
zQ?5VVyOAIf8Q${Hu21)mSF0GVdKMY!(JgEp#0=UlVMGb-h|i}7!$t+w>I<66GlMnX
zJ~SGEbAE8D**LX>ULN<L7xh7Uw-`_RNC&44!RDjD@Egh*DelxOK9xaqhg5abi2z6|
z<fd<B(=aL{R|JV!h;~F*1c)c+rP-L;XAr!n6Vz2&8Kk|p{jAy$gQCEFG?jx|Gq>G*
z6`vr=g>$7oe?A|#R_4*>Le2^g;l9nS;mhX|?&d#kpyGG@96vZUSRvZkO-=O$QU2hr
zkVOc#33!T{F@i3>!RN$eEh)0)us#eIOu`Txu;pzm@bym+BfgMM#Ca5im?LT}s5Bp%
z*%8?IeBiy&dh(fC#n;oEflA$J(^y7+Qw;8VY|h>`;&DZWzj?pqBs`ZVujL7Sbj2V$
zWUS32I(&tiyFYk*VXe?}*54csVeiJ6Bpua6!AI~XZ6vw8qBBeh-BxdnA1F;*x`d{c
zTPSBL0w)5XBr@sEB;N@n^KvJi3QZ}wem>A$CJ<K_RaTa!3k897;Vc$kOb@x?4>;gO
zHfz6~qGIp4?xeZmEFQ-&DS>T<A}+esNM@>zjHlJC-QkffejZFKX)@Y?#G(2)xPz_t
z4@QZ&>++nX6e=$!Hxg_o&a?lBNdgsOZz^PtmhZVcb4xwIl8_G({gly-$BlOv<_7ql
zfa2qWB-oV}l{@1I#3O@fd%4-W&wSs?EK(|La!fRu+0E;LO5E1^Op##AWid6e<#yme
zm~}1bKxhgzs?9@-dF^J#OVk64qP&sCDoGRk+Kpvu=i;YQ5w*YNOZ(B&q~iruz)Iyf
zJGBRDw6$+OU6%{_%8`eu9Crl^1Yu4T=DV=)pca^VSUO@!vQ1v;03np?bZa>awx=`5
z_p!8$MG2)bu=-y1z+oEMHT0D#f5F@huJO?QWLGE_CBu$Ag(wKQI*o7*=N4XA`Gpvz
z<v4{}*QQ(Y*)ARBVx6(%K@!cep%CCKfDik$Z6Uu3g+JZ_4oiirc7{z`5W)Z#tk}IZ
z)0(B7hrrn%qTGr_zfV8tT5Aqc6UYaf1UX}kgDOfZZ4P_3sIK2XfP8arRpcZGFLL|7
zKTFcVO|cZPnuF%fqesV{y0)J`XUnT!XHZ?;__Z0)5wjn${MLK-#`p<BJP`6umza;-
zmx?>$S&;})Kgk4UH#(2mO3ngb4d{qn7IitTu(?6*^nzuI52OOxXz84z_NP1%a=Ys$
zHb|x#rxJ)G2$EQ-4{9dfCee~zX()9p(k>3tI%RkrZ^lX8F6vFIoscK9usT0R8frJ|
zGU#>eeoNM<JKbB$i;;YYL7FP%_S>XjRoTv)g9ccEAoJMTI_+F!l9WsS#M;c>@j6kW
z;(=5JAii|3PZB;1W6B}!nIq;)jsZm1vxs)WI0&{0iUGz1jX_@ojk_jC$oPEOqJsBT
zfh(R9+Ik2{iS*T?yTnp$v2i^SE9Icb&GK2&EBcdLyE00->Nagm;!<N0SPWp1`Sn|F
zN<rdSyDjSKRX_48`%45*j}`6NFfC#&EpOGj8@f#os5b*|Tx!nWw34;@!H-C=;Z5*Q
zvZAFyvUIAZgO=iSb)ewI&oT5#Z0=(0$XphiBEAyC*9{Dx37-L7bb&Jfg+6(}A|=wP
z*9Ir%2nyYlR1`okJ+pF==#sF(y*9top?yJ=9ofKUHI9)Jr5vo+|2{_;J?8g}IE;IE
zasJeCH0;+#TfOJ{L?moK(}-?>X|&HWn-?7CV3W*Z<N6_!t&eu`ouiDDZBq*0n*@vS
zPP<!rYZ-}(S_Uq4pHmS;;rDW-FIljD4k83Gz{$G+;&y*nf>@UrvDMrNOXEYf<32Ex
za5P(ch{O9rB**2^Gur`5Q|*YurPpy8G#<}2q^X$gS-h;lFKq-#c`j?hSGH^+A&25P
z4XX^ux&;>0IHbIvJGfUv7DYPNws+wYji(hu)fMwacBZAOeYf;bWOd|8y-C0E!-osW
zFnX~|DiR^)IZY(F^1a-;PRy!3^QB>I&IbqKXV(KnwlaLaO&o97^UjNw{Np0uv39pl
zMCDfJ7(Y?U^W%SyIokpyCVa3tGs1h1en)2=Ksu&Q)+STY&Gf%|6PGe~kI5PnFYlA9
z>-P_@)xLlFd%c0WC9U=jyN}l8iAP;|i_dF`wjW|pi8649s<Bq7ZcC~&Tj%hU5J?jN
zw7A5(8lGCL1+<R9dbmZhd5!o;ycyW*4Z9`P(Wb6+l1DP`F1;LT-x(^@_R^K~iV;EV
zPnNBxWgGr5q*Z*1FLOBP1;IqPp3t<bnk{ih=w-Nr-Y<Yt)b_ZgiEvFlWHBjx^Jm@{
ze5Vix>$;yq3S`T1=y@@Z;R0R<-4H-8H*wouoc(x|FR5Clm~1F?nR=da-Z@AGql5lg
zv1`9cH?N#cHQy*69SvDc!xk>cRWnwK#X~F!D0Yn_A|0}wrG6wHdllvx=<=uf)H!{u
zIRyz>%C~Aifx!&j<x|o=OrziG(+f-2S!l}U72<lO70B!FJf>F)rtRb-%gcWhyDENO
z<E*gD9+V>_0NG^iyO=aJf826HUJ{y5&d>eiyY~=%$@fz0yfL01rcjR6)DsOdm$AKX
zloW^6LL384$*%VLuViJ8^}c`C#n^VG#)y=c{2cX&w=B?7!O7i*vDQ#|1GB5Ur9D)F
z?{}yq90<AHaie&Y9QSH)bS#hYNfO#Zn<}5<Q58mb+YFCPfi$%t7p%q7bjg1g`u*g+
ziai!C?5|Zl5Vy|Wp{73bX5z;p%f;XiLcEr$+rhsBJHi(7BV!nyG<H-&A^~(~7O4}P
z5)Wr{&$xpKxLxb~g%Xy3i`&fwdq7Au+G}zln<93wNa^5jN~CUJH{Y5k(RUQ+h<nfn
zh776eIEzlXxO0TGfuf7xQ}ya6C*jn2Pnu4zVjgMns-kbcSj6iyyPC=PV-RyEBX%4a
z8SCU=aGLv#xo2CQ8;bsZ$Te)>-Sd&*1L63gE+dK+XicI!7;aUpxbu2lo^3HB&|e)-
zJZ*PAc67Lrbwi>o<c=nvTad^8+q7crtvob6F}6-yb^1WZZgnwOEiUU`aMUDTyPdcB
z;?rv8MT|%QEa}0eY+a;+_fz;-<06KF2J6>wh^^-4p?w|;d01jJTg5<4we!g*pgC~r
z2itng!e~}NW=iALr^5~C2=3lx;>XvWcD{7#ZjFczEihD&pQF3$+r?r+T1{-mrZykJ
zm{_yZ6;Cg`V$Mm>492Iz+`0^k2^83tIG!1Q{S7y_JJXwzVQZwF(**x)S&Hq-1znKa
zud9ni`(_&)N(|mnpxsxIaWX=iKrB#I_;nVF86)z{RlgIuE_RWsYSd2(jyvO)y(Lj$
zV!R@(KkS19*v21obCf)BzrI|ZmnWZ74r+X@a$fLD+hQi<lxg-yDJDBE0_u%K=lsc$
zVo~$>-DeVt%G-;22>(Pj=2U0J2#wnP4$Q{EB7?O8f4a>qa(e$w20b$SV-UK`C+qa`
z^1S*<1QaO@d83$>@MWw&YX|qC43~A9ksY*#*#)A=^1B`$AFT~cw3s!9sI!{5T6&!)
z6{Q`?^dxsT-%CZDbD)a%h!`LdWqR`Cr|z!p4+J3-dns#bE*)$6#B=&f8!{H<A2RVR
zLo<)V34YEnMyz;;45^fE?UtF4eIcc%WEZ3>+sT2PooqcH6SWx5RfiaCo=7}O4AMHx
z!4Ku{1gza2cXw@}y?)%=e7gW_e~O`C-fg3(EveaK;Y2LxAwY!he0V%fG-4vRFI!Yd
zPkBi5smo7pZ-y4LqnoCGow6n~D!^aFWXO>4+|DkoGk(65^|k2aDmekCVo+GNL$emQ
zn_K`n;)a*YyfA#El>bQSuA6-=C(FL}T5(;Y)Ah~RqFs)FH-{2)FTF0*9nK%Zc;cC-
zc&=liA7A(i#ot#tqZ|yMD7k+{)w*}i(Lgsd`8aBgn}KRJ!|N6gX*Eb_Hharwk?PVB
z)K7Rf!?P~%Glc#H5Z;-6{g8%7^z_+2b<e%@VW0ZIq<gsZ^;^lx-(>88@02mst-qXl
z?_~JR1>l(&ub<63xV9XJ+Pk+)J@2Lyk&szCSO}%?_X>P^4L53z5~1fgP&6D$XsEML
zY#J$pSD^73XB_<>Rztm)IQm&$=P!8tB(m)n24@vblrP&}?APACH&zc8VZg}`J7!tj
zND7jIy|RdOD98KKxL9>?#2a-qUHbc-mzWw?vKdqf<#YV4vIazhK71=?xy-LmQQXCL
z2}>j5<S$a(!@|8*D%uog+yimMGo!}K2zC(++6ig#5+xZbu`=){34sN4sz2$_r|Ez;
zAD_S2Y)4ivj(v9w*l9RtQgfc0ZF1S7!R(0&)Af|XmUNkJ5pKp)vY0sgG~j>kIGy0s
zi<<+hesyyGD(cY(@pT3<GSbn9H|LK~Fcro+WqqL(g}3@s7l^dJ`{K-Z$n^iVoc^cK
fAN;NldkuX2>vco-4`|ijA05s6I;zFWRw4fdj6P18

diff --git a/components/camel-ipfs/src/test/resources/html/index.html b/components/camel-ipfs/src/test/resources/html/index.html
deleted file mode 100644
index 3781300297051..0000000000000
--- a/components/camel-ipfs/src/test/resources/html/index.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <title>IPFS</title>
-    <meta charset="utf-8" />
-    <link rel="stylesheet" href="./css/default.css">
-</head>
-<body>
-<p><a href="index.html">Home</a></p>
-<p><a href="chap/ch01.html">chapter one</a></p>
-<p><img src="img/logo.png" alt="logo" /></p>
-</body>
-</html>

From ba41842546dcbaa563058dbc7b777e9c5a9d13c5 Mon Sep 17 00:00:00 2001
From: Andrea Cosentino <ancosen@gmail.com>
Date: Mon, 19 Nov 2018 08:49:07 +0100
Subject: [PATCH 048/125] Camel-RestDsl-Swagger-plugin: Fixed CS

---
 .../camel/maven/generator/swagger/AbstractGenerateMojo.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tooling/maven/camel-restdsl-swagger-plugin/src/main/java/org/apache/camel/maven/generator/swagger/AbstractGenerateMojo.java b/tooling/maven/camel-restdsl-swagger-plugin/src/main/java/org/apache/camel/maven/generator/swagger/AbstractGenerateMojo.java
index 7d1903dd3e15d..83bd4ec3a5339 100644
--- a/tooling/maven/camel-restdsl-swagger-plugin/src/main/java/org/apache/camel/maven/generator/swagger/AbstractGenerateMojo.java
+++ b/tooling/maven/camel-restdsl-swagger-plugin/src/main/java/org/apache/camel/maven/generator/swagger/AbstractGenerateMojo.java
@@ -92,14 +92,14 @@ abstract class AbstractGenerateMojo extends AbstractMojo {
     @Parameter(defaultValue = "true")
     String modelWithXml;
 
+    @Parameter
+    String apiContextPath;
+
     @Parameter(defaultValue = "${project}", readonly = true)
     private MavenProject mavenProject;
 
     @Parameter(defaultValue = "${session}", readonly = true)
     private MavenSession mavenSession;
-    
-    @Parameter
-    String apiContextPath;
 
     @Component
     private BuildPluginManager pluginManager;

From e490135fc7ff4c51743b9b78dc15ee34ae55f435 Mon Sep 17 00:00:00 2001
From: Andrea Cosentino <ancosen@gmail.com>
Date: Mon, 19 Nov 2018 08:52:29 +0100
Subject: [PATCH 049/125] Camel-Core: Fixed CS in RestBindingAdvice

---
 .../java/org/apache/camel/processor/RestBindingAdvice.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/camel-core/src/main/java/org/apache/camel/processor/RestBindingAdvice.java b/camel-core/src/main/java/org/apache/camel/processor/RestBindingAdvice.java
index 90fe9d4e332aa..3b6cabce491bb 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/RestBindingAdvice.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/RestBindingAdvice.java
@@ -516,7 +516,7 @@ private static boolean isValidOrAcceptedContentType(String valid, String target)
         // Any MIME type
         // https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Accept#Directives
         if ("*/*".equals(target)) {
-          return true;
+            return true;
         }
 
         boolean isXml = valid.toLowerCase(Locale.ENGLISH).contains("xml");
@@ -534,4 +534,4 @@ private static boolean isValidOrAcceptedContentType(String valid, String target)
         return true;
     }
 
-}
\ No newline at end of file
+}

From 7cd202ea014d927ed1531c416cbed0f42446cfe6 Mon Sep 17 00:00:00 2001
From: Andrea Cosentino <ancosen@gmail.com>
Date: Mon, 19 Nov 2018 09:17:37 +0100
Subject: [PATCH 050/125] Revert "Camel-Ipfs: Removed html folder from test
 resources"

This reverts commit c704b6d3422db09cc321870feff5c4bc3e798ff3.
---
 .../src/test/resources/html/chap/ch01.html    |  13 ++++++
 .../src/test/resources/html/css/default.css   |  38 ++++++++++++++++++
 .../src/test/resources/html/etc/userfile.txt  |   1 +
 .../src/test/resources/html/img/logo.png      | Bin 0 -> 6715 bytes
 .../src/test/resources/html/index.html        |  13 ++++++
 5 files changed, 65 insertions(+)
 create mode 100644 components/camel-ipfs/src/test/resources/html/chap/ch01.html
 create mode 100644 components/camel-ipfs/src/test/resources/html/css/default.css
 create mode 100644 components/camel-ipfs/src/test/resources/html/etc/userfile.txt
 create mode 100644 components/camel-ipfs/src/test/resources/html/img/logo.png
 create mode 100644 components/camel-ipfs/src/test/resources/html/index.html

diff --git a/components/camel-ipfs/src/test/resources/html/chap/ch01.html b/components/camel-ipfs/src/test/resources/html/chap/ch01.html
new file mode 100644
index 0000000000000..4edc3fd6b87d8
--- /dev/null
+++ b/components/camel-ipfs/src/test/resources/html/chap/ch01.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <title>IPFS</title>
+    <meta charset="utf-8" />
+    <link rel="stylesheet" href="./../css/default.css">
+</head>
+<body>
+<p><a href="../index.html">Home</a></p>
+<h2>Chapter 01</h2>
+<p><img src="../img/logo.png" alt="logo" /></p>
+</body>
+</html>
diff --git a/components/camel-ipfs/src/test/resources/html/css/default.css b/components/camel-ipfs/src/test/resources/html/css/default.css
new file mode 100644
index 0000000000000..8c0b2d558f3d0
--- /dev/null
+++ b/components/camel-ipfs/src/test/resources/html/css/default.css
@@ -0,0 +1,38 @@
+body {
+    font-family: "Verdana";
+    color: #137cb9
+}
+
+a {
+    #text-decoration: none;
+    color: #137cb9
+}
+
+a.gray {
+    color: gray;
+}
+
+h1 {
+	font-weight: normal;
+    font-size: 20px;
+}
+
+h2 {
+    font-weight: normal;
+	font-size: 15px;
+}
+
+th {
+	text-align: left;
+    font-weight: normal;
+    font-size: 14px;
+    color: gray;
+}
+
+td.gray {
+    color: gray;
+}
+tr.gray {
+    color: gray;
+}
+
diff --git a/components/camel-ipfs/src/test/resources/html/etc/userfile.txt b/components/camel-ipfs/src/test/resources/html/etc/userfile.txt
new file mode 100644
index 0000000000000..8fe2a4b5ad117
--- /dev/null
+++ b/components/camel-ipfs/src/test/resources/html/etc/userfile.txt
@@ -0,0 +1 @@
+The quick brown fox jumps over the lazy dog.
\ No newline at end of file
diff --git a/components/camel-ipfs/src/test/resources/html/img/logo.png b/components/camel-ipfs/src/test/resources/html/img/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..ddda52e086e85692a94c2d014626bdf26f94e9c6
GIT binary patch
literal 6715
zcmd5>_g53lwoT~LrG@|jLFt4lH3S5tC`Eb@siBC{lh8prNEJ~)se*z6(xsQsMY>e!
zgf2Do&eQMSci(&e!JD;a&dixTd(WAl&N}n*k&ZeQIhY&(08nXasOtZ*ul{y2l0W0B
z8m{J#0iyKPl>x>5Z0mm(H{3K#Q2+o1{of7*yiW)H0hl@(BG3qJEjgsCGt}DF)y59$
z?d<jk4FJHr<^D{a?a<bo-p)=gC^>Hhu7416f98MPB3zvRK+w+>xDeWpI8|Id>^Sd2
zC845RaB@ygPMC+Sy_~+P+P{zgSt)QmMWfy1L`1y2yr5nZP*)EJ5iwa=SrJij5pi+h
zKL}xzj|<w`Ti6A~{V$UL=25jnAw3-3(2lMyoPT+(ZCo*E1um|?LjP(1x+mJv{(qEQ
zQ2!3=Pk<tScSOXXq9Xs{{&N)e*DI&%;b`|q`7b|Q4E7K5|M>o`0~7fx{=Y8suSoy#
z{s|RM4iov$v%$%=T6s+Y0Fa-i>ODhm;FdXs8~dmayxxz)*DQI7H}KUi2piVVp#PZQ
z-m4((BnEMVT4&|Sm$yEJIjU$p1=~c$-bsrE((67~=B(*`Bgv`%^EH}0)?i<f>bCPc
z8}bMcS)kc#JB8xy#`Cq~jC%FQmNSKZB|^XSPp{wU)_WbNS2#59Z@sue9o_oW9tN~l
z0@0HEe>HsFO0<ZtTU%n`cHNb)l|WIVR^JrPKGUCmZJp!#$j4s}PY(X<2Ayv3IqG1Q
z@-M?IcB&<b*UdR4E%#bkJt(<4I`T}Dv|2~`bVt-H<`Y~Wd24U+Zx7Dv^pv|!`R;2g
zk`J@JO`dAcQzSIF&DkmYJl%O~3(Eg=rnGF7{9;rGcJ&g_95CKDS%yeIZ*V$tlwUw!
zTy(N#E$<k&tAAg$eyiD$Crg+F<@8iH7c|ia{7zz(4xI1`y_>la2sbu&K3%We@hdKO
z>Y|1XL`J>I(3*4+2*<2)z?Q2O{r3CnQ>7nMzlhP+CE?Lla&~ssF)?ATFUbDds4!$c
z?q)E5HdjfHCy7!Y6@IdIPg18KU;Xr5Y&rc6qnVK+p{~6%uO0V>1#6cbiu9AStBBwA
zFMMV&rtu?_#>JI-#Y{^FA9q8|3z5vUxb&*={_?sy4~x~G_08wMI5&zhbT93Ud-cBU
zuhe$`s$ge(x`enlFW9cg-Ah`!(AGFR*mNm2xBoUp^E$y}<m*(^)nS&Xo*8SyWI1~<
zIr2+lY`I4(3&?Tg#z@${EVq0A9oB7G%hRi`Ka8_Nyywl|PZuOJk-8@k4}{{hHIURS
zS1YaM^Do)Rcv(Nz(fG6}D2Rz<7zf)aSj!hIu1e1wP>j)ZC7nd6YH>?^HPw5YgV)^1
z(~c>stOl3$6(Gb}bfqLu?xI%s&}LF>6kPTP&uBF?k&ma;^dE}xfaTnjKAoRCOK0>?
z=xmZE)1#F&>P>YHPVV%)B{KM-#3C&3d*O*T*}8aH9JX<7F}};Vd|HUadnYAn{g&a?
zGg;;IY<b$KwGhjcWu{_5p`2q!Ledc2=*RBMEt0lw9ADu%HQrQrLjdWOw-MsI#vk&;
z{?xC5g-=&07S*quP9I+kt=-RD4&K3J`^gQcjT<O<Wtz=|$&f~D$wcl&vtQft-+m@W
zM(gdTa(>)J(5{{eJPD_-a0!?8jXwP*J$Va1bn--JW>#M~0G*B+&zmFn_xiSc{$kD0
z=u1JTT8VEz8>^TuwBK6VP{+$?`!sA>48Awa@?v*Bm~&=4U)||P8OJxmdelarbkh&q
zV-!9y(@UV*ThnWkl7aD&WPgp#aGq?N<BluAKqJK52-8pu{hTH}pq{>H$grwa*~Fj^
z;;=JNnVoOC^z?KaRQ7-4VbgDKdFo}=?itmgzM(MGrrET|BJ+DCuRo$T#WS`{dd@90
zUih)}G$teM5aMoA)`J@z#h=}eX_%}<-5l?9VqX;<w)M?W#z-$CPiR~ncv)G6qsI5e
z--YdkQi#qSgwu#v2HK7f>s~%nH%W<47^!j&e;`m5caK?whmfx-dpTcXokG|YP@RI*
zGSU2X+9hagiE>JIw%YTsJV>>lS>k{0b8uttCI!jo(uX?@tBa{p7LkdgT_>#OZ_S3M
zH#xEQ(^0rZW0J|H9nvo<kqsj)p<>Y!eIK*B_^0=JE$0r{HYgWQ-*TDornf5QS?jdh
z@+D{&R<^7mzMFOX=Ms>2phlC0;{s+Byl!m>^smkf9KRoc4M&fUO{U))vxg~fkH0+a
zaiQvD+1kVg&0RK^km_))&%@JNZI@`KXG5hGUv#lIp4H~==792Z@@*_Bl;9JL+eCZ9
z5mc*yhDehKZyZ0alN<qgpvYgUAJk-tr&c2z)u)J9AApASQ%itf8Y&rrZwmKZJI^~=
z-FQT}>tFMNZ2sVTJgtzR)6=52qD(nozZUjvD+j-;^wKdx4i{*>P<&C7EzmhdLut$Z
zc}TP6LH{tD-RtDU`N<Ap+7TL)_Z_SiP@;sP_kM8>yjM5XrwUxdW9i;m0yBv^N=Z(h
z)a+Xem5_KJmX~S2_bpNc_L6pTr!Ko+-<$_vH3vBe&4Al6QbqjdQcl+fL0qC;9lvWj
z%jvKd^EOt@*oJAHT$z5tCg2kSNy1ODHaV}ZSiH$jsH}cRjh0DqW!uS55|C*Si*@)J
zXHvgPy3wUgRTz9cXOhak0;5s0s5pf6z1-~Nvxg{Rc3*)fs!iN8qmtR#TGRC&obw3Y
zlrYJfHNnv|MvF-)-{MYm65TElc*9x#6}(Xq)Pb$V9%6NaH-Z$D3{_9QG=ft!vnTMi
z&8d1tlH3qzGl3HkV#j|mkn0+8pvA!6LJ^J0{~QzjR8>jiqwwzh4k1Tw;dBRcVZm4?
zX+_)bT{G9hf?sh3o-G97H&hH4Ks=Ovz#elPqV|SbjKs(@w;hYOvIMh(8Tv}^f&=?m
ztV`{YWUmGuc87v+??me|vl2gokjEnwk0^&=x6>M=fGZzlJ&{=?nZ!__w_U|+o-9*w
zk@}`_V6uE>8I<97p^|0lE4#f`Q{riQ7m1iHgb&#2xPfEdsEfiHQp%8xh`JBhXz}2O
zB(o^EUa)-=Bfvo|X1Yx)4Ev^Q$?3hH)s*PoB2ji);O}kwED4UU7Ocr4pdc9eMM`RL
zlXWP|jg00|duUCE*z`=O9BzRo$oy+opYlY7krAo_3?GSercL%_%H@6B0`3;H9|~aC
zIPe0LOn$D;1$`G}T~?ki0dzvzu>4s2c?rO984MbSKc>LG4Z3NMZq{^2=2095;f30L
z^EHF)Xq0G9p4ys~8AWGenwY#rwHOpu-G<j}ih@e-xDkf?Jtjvf6p$-Fz<3p2Dfk%%
zk!V@T<0$WHSRWqkxzrc9IO=)A;N5t=cuPU1VFDJI_aiD`pcEmVNI+ha>>kw@Z|#f%
zMaRUWsG?ALQL<o_UF3k%K@qP*oJF{r^^)a>*x<GMQ5-;B05c&2SYhZs76o8cn9~Zq
zfB#)p=S6&U&r&_PJWGCApl$HX3KDS4T4Kz{k)U37`H)PgGR`a^M{=0LUA0Xxi)(=q
zUh0|!CIV^EACRff`X$^eiceVk<}LAt%HK)KgOzYL&uk$u)uyyJ=57qqhE8t*D9MIO
zEM|7iUps46`CXi1_-;j^Dmpf0O0o&haO!AEu{T9C4Y**o+Itd#;m)?9YOh?Tb^MvS
zeEMB|vFw^v6t_^NUsT!;gNl$DK#XI|^nmNzQRZ}uY?72E+olgw1bT_Ta8nj61lZiY
zORKN%7c!e6Z)9YURFI}<>E$KIu^J<=KBnar?hx+AZ4`5N#tZaKJ)N*5g=&!vCXn;&
z@e1E8_LJMecUq&4+sQg+vtO8bKlLg^SV8-IB?YU8=*#rkz}Ix5arHzSmCC0cejewY
zQ?5VVyOAIf8Q${Hu21)mSF0GVdKMY!(JgEp#0=UlVMGb-h|i}7!$t+w>I<66GlMnX
zJ~SGEbAE8D**LX>ULN<L7xh7Uw-`_RNC&44!RDjD@Egh*DelxOK9xaqhg5abi2z6|
z<fd<B(=aL{R|JV!h;~F*1c)c+rP-L;XAr!n6Vz2&8Kk|p{jAy$gQCEFG?jx|Gq>G*
z6`vr=g>$7oe?A|#R_4*>Le2^g;l9nS;mhX|?&d#kpyGG@96vZUSRvZkO-=O$QU2hr
zkVOc#33!T{F@i3>!RN$eEh)0)us#eIOu`Txu;pzm@bym+BfgMM#Ca5im?LT}s5Bp%
z*%8?IeBiy&dh(fC#n;oEflA$J(^y7+Qw;8VY|h>`;&DZWzj?pqBs`ZVujL7Sbj2V$
zWUS32I(&tiyFYk*VXe?}*54csVeiJ6Bpua6!AI~XZ6vw8qBBeh-BxdnA1F;*x`d{c
zTPSBL0w)5XBr@sEB;N@n^KvJi3QZ}wem>A$CJ<K_RaTa!3k897;Vc$kOb@x?4>;gO
zHfz6~qGIp4?xeZmEFQ-&DS>T<A}+esNM@>zjHlJC-QkffejZFKX)@Y?#G(2)xPz_t
z4@QZ&>++nX6e=$!Hxg_o&a?lBNdgsOZz^PtmhZVcb4xwIl8_G({gly-$BlOv<_7ql
zfa2qWB-oV}l{@1I#3O@fd%4-W&wSs?EK(|La!fRu+0E;LO5E1^Op##AWid6e<#yme
zm~}1bKxhgzs?9@-dF^J#OVk64qP&sCDoGRk+Kpvu=i;YQ5w*YNOZ(B&q~iruz)Iyf
zJGBRDw6$+OU6%{_%8`eu9Crl^1Yu4T=DV=)pca^VSUO@!vQ1v;03np?bZa>awx=`5
z_p!8$MG2)bu=-y1z+oEMHT0D#f5F@huJO?QWLGE_CBu$Ag(wKQI*o7*=N4XA`Gpvz
z<v4{}*QQ(Y*)ARBVx6(%K@!cep%CCKfDik$Z6Uu3g+JZ_4oiirc7{z`5W)Z#tk}IZ
z)0(B7hrrn%qTGr_zfV8tT5Aqc6UYaf1UX}kgDOfZZ4P_3sIK2XfP8arRpcZGFLL|7
zKTFcVO|cZPnuF%fqesV{y0)J`XUnT!XHZ?;__Z0)5wjn${MLK-#`p<BJP`6umza;-
zmx?>$S&;})Kgk4UH#(2mO3ngb4d{qn7IitTu(?6*^nzuI52OOxXz84z_NP1%a=Ys$
zHb|x#rxJ)G2$EQ-4{9dfCee~zX()9p(k>3tI%RkrZ^lX8F6vFIoscK9usT0R8frJ|
zGU#>eeoNM<JKbB$i;;YYL7FP%_S>XjRoTv)g9ccEAoJMTI_+F!l9WsS#M;c>@j6kW
z;(=5JAii|3PZB;1W6B}!nIq;)jsZm1vxs)WI0&{0iUGz1jX_@ojk_jC$oPEOqJsBT
zfh(R9+Ik2{iS*T?yTnp$v2i^SE9Icb&GK2&EBcdLyE00->Nagm;!<N0SPWp1`Sn|F
zN<rdSyDjSKRX_48`%45*j}`6NFfC#&EpOGj8@f#os5b*|Tx!nWw34;@!H-C=;Z5*Q
zvZAFyvUIAZgO=iSb)ewI&oT5#Z0=(0$XphiBEAyC*9{Dx37-L7bb&Jfg+6(}A|=wP
z*9Ir%2nyYlR1`okJ+pF==#sF(y*9top?yJ=9ofKUHI9)Jr5vo+|2{_;J?8g}IE;IE
zasJeCH0;+#TfOJ{L?moK(}-?>X|&HWn-?7CV3W*Z<N6_!t&eu`ouiDDZBq*0n*@vS
zPP<!rYZ-}(S_Uq4pHmS;;rDW-FIljD4k83Gz{$G+;&y*nf>@UrvDMrNOXEYf<32Ex
za5P(ch{O9rB**2^Gur`5Q|*YurPpy8G#<}2q^X$gS-h;lFKq-#c`j?hSGH^+A&25P
z4XX^ux&;>0IHbIvJGfUv7DYPNws+wYji(hu)fMwacBZAOeYf;bWOd|8y-C0E!-osW
zFnX~|DiR^)IZY(F^1a-;PRy!3^QB>I&IbqKXV(KnwlaLaO&o97^UjNw{Np0uv39pl
zMCDfJ7(Y?U^W%SyIokpyCVa3tGs1h1en)2=Ksu&Q)+STY&Gf%|6PGe~kI5PnFYlA9
z>-P_@)xLlFd%c0WC9U=jyN}l8iAP;|i_dF`wjW|pi8649s<Bq7ZcC~&Tj%hU5J?jN
zw7A5(8lGCL1+<R9dbmZhd5!o;ycyW*4Z9`P(Wb6+l1DP`F1;LT-x(^@_R^K~iV;EV
zPnNBxWgGr5q*Z*1FLOBP1;IqPp3t<bnk{ih=w-Nr-Y<Yt)b_ZgiEvFlWHBjx^Jm@{
ze5Vix>$;yq3S`T1=y@@Z;R0R<-4H-8H*wouoc(x|FR5Clm~1F?nR=da-Z@AGql5lg
zv1`9cH?N#cHQy*69SvDc!xk>cRWnwK#X~F!D0Yn_A|0}wrG6wHdllvx=<=uf)H!{u
zIRyz>%C~Aifx!&j<x|o=OrziG(+f-2S!l}U72<lO70B!FJf>F)rtRb-%gcWhyDENO
z<E*gD9+V>_0NG^iyO=aJf826HUJ{y5&d>eiyY~=%$@fz0yfL01rcjR6)DsOdm$AKX
zloW^6LL384$*%VLuViJ8^}c`C#n^VG#)y=c{2cX&w=B?7!O7i*vDQ#|1GB5Ur9D)F
z?{}yq90<AHaie&Y9QSH)bS#hYNfO#Zn<}5<Q58mb+YFCPfi$%t7p%q7bjg1g`u*g+
ziai!C?5|Zl5Vy|Wp{73bX5z;p%f;XiLcEr$+rhsBJHi(7BV!nyG<H-&A^~(~7O4}P
z5)Wr{&$xpKxLxb~g%Xy3i`&fwdq7Au+G}zln<93wNa^5jN~CUJH{Y5k(RUQ+h<nfn
zh776eIEzlXxO0TGfuf7xQ}ya6C*jn2Pnu4zVjgMns-kbcSj6iyyPC=PV-RyEBX%4a
z8SCU=aGLv#xo2CQ8;bsZ$Te)>-Sd&*1L63gE+dK+XicI!7;aUpxbu2lo^3HB&|e)-
zJZ*PAc67Lrbwi>o<c=nvTad^8+q7crtvob6F}6-yb^1WZZgnwOEiUU`aMUDTyPdcB
z;?rv8MT|%QEa}0eY+a;+_fz;-<06KF2J6>wh^^-4p?w|;d01jJTg5<4we!g*pgC~r
z2itng!e~}NW=iALr^5~C2=3lx;>XvWcD{7#ZjFczEihD&pQF3$+r?r+T1{-mrZykJ
zm{_yZ6;Cg`V$Mm>492Iz+`0^k2^83tIG!1Q{S7y_JJXwzVQZwF(**x)S&Hq-1znKa
zud9ni`(_&)N(|mnpxsxIaWX=iKrB#I_;nVF86)z{RlgIuE_RWsYSd2(jyvO)y(Lj$
zV!R@(KkS19*v21obCf)BzrI|ZmnWZ74r+X@a$fLD+hQi<lxg-yDJDBE0_u%K=lsc$
zVo~$>-DeVt%G-;22>(Pj=2U0J2#wnP4$Q{EB7?O8f4a>qa(e$w20b$SV-UK`C+qa`
z^1S*<1QaO@d83$>@MWw&YX|qC43~A9ksY*#*#)A=^1B`$AFT~cw3s!9sI!{5T6&!)
z6{Q`?^dxsT-%CZDbD)a%h!`LdWqR`Cr|z!p4+J3-dns#bE*)$6#B=&f8!{H<A2RVR
zLo<)V34YEnMyz;;45^fE?UtF4eIcc%WEZ3>+sT2PooqcH6SWx5RfiaCo=7}O4AMHx
z!4Ku{1gza2cXw@}y?)%=e7gW_e~O`C-fg3(EveaK;Y2LxAwY!he0V%fG-4vRFI!Yd
zPkBi5smo7pZ-y4LqnoCGow6n~D!^aFWXO>4+|DkoGk(65^|k2aDmekCVo+GNL$emQ
zn_K`n;)a*YyfA#El>bQSuA6-=C(FL}T5(;Y)Ah~RqFs)FH-{2)FTF0*9nK%Zc;cC-
zc&=liA7A(i#ot#tqZ|yMD7k+{)w*}i(Lgsd`8aBgn}KRJ!|N6gX*Eb_Hharwk?PVB
z)K7Rf!?P~%Glc#H5Z;-6{g8%7^z_+2b<e%@VW0ZIq<gsZ^;^lx-(>88@02mst-qXl
z?_~JR1>l(&ub<63xV9XJ+Pk+)J@2Lyk&szCSO}%?_X>P^4L53z5~1fgP&6D$XsEML
zY#J$pSD^73XB_<>Rztm)IQm&$=P!8tB(m)n24@vblrP&}?APACH&zc8VZg}`J7!tj
zND7jIy|RdOD98KKxL9>?#2a-qUHbc-mzWw?vKdqf<#YV4vIazhK71=?xy-LmQQXCL
z2}>j5<S$a(!@|8*D%uog+yimMGo!}K2zC(++6ig#5+xZbu`=){34sN4sz2$_r|Ez;
zAD_S2Y)4ivj(v9w*l9RtQgfc0ZF1S7!R(0&)Af|XmUNkJ5pKp)vY0sgG~j>kIGy0s
zi<<+hesyyGD(cY(@pT3<GSbn9H|LK~Fcro+WqqL(g}3@s7l^dJ`{K-Z$n^iVoc^cK
fAN;NldkuX2>vco-4`|ijA05s6I;zFWRw4fdj6P18

literal 0
HcmV?d00001

diff --git a/components/camel-ipfs/src/test/resources/html/index.html b/components/camel-ipfs/src/test/resources/html/index.html
new file mode 100644
index 0000000000000..3781300297051
--- /dev/null
+++ b/components/camel-ipfs/src/test/resources/html/index.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <title>IPFS</title>
+    <meta charset="utf-8" />
+    <link rel="stylesheet" href="./css/default.css">
+</head>
+<body>
+<p><a href="index.html">Home</a></p>
+<p><a href="chap/ch01.html">chapter one</a></p>
+<p><img src="img/logo.png" alt="logo" /></p>
+</body>
+</html>

From ea00eecddf26e1c1f6bb18475227496a5bb3794d Mon Sep 17 00:00:00 2001
From: Andrea Cosentino <ancosen@gmail.com>
Date: Mon, 19 Nov 2018 13:53:17 +0100
Subject: [PATCH 051/125] Upgrade Qpid JMS client to version 0.38.0

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

diff --git a/parent/pom.xml b/parent/pom.xml
index f45cb79484728..4f59cc2b144c7 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -570,7 +570,7 @@
     <pubnub-version>4.20.0</pubnub-version>
     <qpid-broker-version>7.0.6</qpid-broker-version>
     <qpid-proton-j-version>0.29.0</qpid-proton-j-version>
-    <qpid-jms-client-version>0.37.0</qpid-jms-client-version>
+    <qpid-jms-client-version>0.38.0</qpid-jms-client-version>
     <quartz-bundle-version>1.8.6_1</quartz-bundle-version>
     <quartz-version>1.8.6</quartz-version>
     <quartz-version-range>[1.8,2)</quartz-version-range>

From c90c8d34eec8ffdc028bf6ae8eb41335bf7bcba7 Mon Sep 17 00:00:00 2001
From: Andrea Cosentino <ancosen@gmail.com>
Date: Mon, 19 Nov 2018 13:53:39 +0100
Subject: [PATCH 052/125] Upgrade Proton J to version 0.30.0

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

diff --git a/parent/pom.xml b/parent/pom.xml
index 4f59cc2b144c7..61174f3fb00c6 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -569,7 +569,7 @@
     <protonpack-version>1.8</protonpack-version>
     <pubnub-version>4.20.0</pubnub-version>
     <qpid-broker-version>7.0.6</qpid-broker-version>
-    <qpid-proton-j-version>0.29.0</qpid-proton-j-version>
+    <qpid-proton-j-version>0.30.0</qpid-proton-j-version>
     <qpid-jms-client-version>0.38.0</qpid-jms-client-version>
     <quartz-bundle-version>1.8.6_1</quartz-bundle-version>
     <quartz-version>1.8.6</quartz-version>

From 303c9b857216ee25d01a3d9018c656b75b761557 Mon Sep 17 00:00:00 2001
From: Andrea Cosentino <ancosen@gmail.com>
Date: Tue, 20 Nov 2018 11:08:31 +0100
Subject: [PATCH 053/125] Upgrade Awaitility to version 3.1.3

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

diff --git a/parent/pom.xml b/parent/pom.xml
index 61174f3fb00c6..ca1657ff4542b 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -80,7 +80,7 @@
     <avro-version>1.8.2</avro-version>
     <avro-bundle-version>1.8.2_1</avro-bundle-version>
     <avro-ipc-bundle-version>1.8.2_1</avro-ipc-bundle-version>
-    <awaitility-version>3.1.2</awaitility-version>
+    <awaitility-version>3.1.3</awaitility-version>
     <aws-java-sdk-bundle-version>1.11.438_1</aws-java-sdk-bundle-version>
     <aws-java-sdk-version>1.11.438</aws-java-sdk-version>
     <aws-xray-version>2.0.1</aws-xray-version>

From 1ee596d7f85bd6dc4fd4f5e02aaac5dd3756e163 Mon Sep 17 00:00:00 2001
From: Andrea Cosentino <ancosen@gmail.com>
Date: Tue, 20 Nov 2018 14:38:30 +0100
Subject: [PATCH 054/125] CAMEL-12774 - Error during type conversion from type:
 java.lang.String to the required type:
 org.elasticsearch.action.update.UpdateRequest - Take 2

---
 .../converter/ElasticsearchActionRequestConverter.java      | 2 +-
 .../ElasticsearchGetSearchDeleteExistsUpdateTest.java       | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/components/camel-elasticsearch-rest/src/main/java/org/apache/camel/component/elasticsearch/converter/ElasticsearchActionRequestConverter.java b/components/camel-elasticsearch-rest/src/main/java/org/apache/camel/component/elasticsearch/converter/ElasticsearchActionRequestConverter.java
index 1347219e8cf11..6572c960b5172 100644
--- a/components/camel-elasticsearch-rest/src/main/java/org/apache/camel/component/elasticsearch/converter/ElasticsearchActionRequestConverter.java
+++ b/components/camel-elasticsearch-rest/src/main/java/org/apache/camel/component/elasticsearch/converter/ElasticsearchActionRequestConverter.java
@@ -61,7 +61,7 @@ private static UpdateRequest createUpdateRequest(Object document, Exchange excha
         } else if (document instanceof Map) {
             updateRequest.doc((Map<String, Object>) document);
         } else if (document instanceof String) {
-            updateRequest.doc(XContentFactory.xContent((String) document), (String) document);
+            updateRequest.doc((String) document, XContentFactory.xContentType((String) document));
         } else if (document instanceof XContentBuilder) {
             updateRequest.doc((XContentBuilder) document);
         } else {
diff --git a/components/camel-elasticsearch-rest/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchGetSearchDeleteExistsUpdateTest.java b/components/camel-elasticsearch-rest/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchGetSearchDeleteExistsUpdateTest.java
index 96e994fee9314..161e629c6c95a 100644
--- a/components/camel-elasticsearch-rest/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchGetSearchDeleteExistsUpdateTest.java
+++ b/components/camel-elasticsearch-rest/src/test/java/org/apache/camel/component/elasticsearch/ElasticsearchGetSearchDeleteExistsUpdateTest.java
@@ -49,6 +49,7 @@ public void testGet() throws Exception {
         GetResponse response = template.requestBody("direct:get", indexId, GetResponse.class);
         assertNotNull("response should not be null", response);
         assertNotNull("response source should not be null", response.getSource());
+        System.err.println(response.getSource());
     }
 
     @Test
@@ -303,12 +304,15 @@ public void testStringUpdate() throws Exception {
         String indexId = template.requestBody("direct:index", map, String.class);
         assertNotNull("indexId should be set", indexId);
 
-        String body = "{\"id\" : 1}";
+        String body = "{\"teststringupdate-key\" : \"teststringupdate-updated\"}";
 
         Map<String, Object> headers = new HashMap<>();
         headers.put(ElasticsearchConstants.PARAM_INDEX_ID, indexId);
         indexId = template.requestBodyAndHeaders("direct:update", body, headers, String.class);
         assertNotNull("indexId should be set", indexId);
+        
+        GetResponse response = template.requestBody("direct:get", indexId, GetResponse.class);
+        assertEquals("teststringupdate-updated", response.getSource().get("teststringupdate-key"));
     }
 
     @Override

From e665dadbf866833fd9aa099a3c5b674dcd24988f Mon Sep 17 00:00:00 2001
From: Andrea Cosentino <ancosen@gmail.com>
Date: Wed, 21 Nov 2018 08:45:05 +0100
Subject: [PATCH 055/125] Upgrade Infinispan to version 9.4.2.Final

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

diff --git a/parent/pom.xml b/parent/pom.xml
index ca1657ff4542b..c7e2e8b883c0a 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -313,7 +313,7 @@
     <ibatis-version>2.3.4.726</ibatis-version>
     <ical4j-version>1.0.7</ical4j-version>
     <ignite-version>2.6.0</ignite-version>
-    <infinispan-version>9.4.1.Final</infinispan-version>
+    <infinispan-version>9.4.2.Final</infinispan-version>
     <infinispan-spring-boot-version>2.1.0.Final</infinispan-spring-boot-version>
     <influx-java-driver-version>2.14</influx-java-driver-version>
     <influx-java-driver-bundle-version>2.14_1</influx-java-driver-bundle-version>

From bf2eb7b2418c1a2203ee4d625ae9b7a1cde5626b Mon Sep 17 00:00:00 2001
From: Andrea Cosentino <ancosen@gmail.com>
Date: Wed, 21 Nov 2018 09:21:37 +0100
Subject: [PATCH 056/125] Add Camel-NSQ to apache-camel POM

---
 apache-camel/pom.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/apache-camel/pom.xml b/apache-camel/pom.xml
index be1d5431c77f6..625694ec431b9 100644
--- a/apache-camel/pom.xml
+++ b/apache-camel/pom.xml
@@ -760,6 +760,10 @@
     <dependency>
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-netty4-http</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.camel</groupId>
+      <artifactId>camel-nsq</artifactId>
     </dependency>
      <dependency>
       <groupId>org.apache.camel</groupId>
@@ -2062,6 +2066,11 @@
       <artifactId>camel-netty-starter</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.apache.camel</groupId>
+      <artifactId>camel-nsq-starter</artifactId>
+      <version>${project.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-ognl-starter</artifactId>

From 613a0fd9220927b608a87c6d8c5f54d6113cec0e Mon Sep 17 00:00:00 2001
From: Andrea Cosentino <ancosen@gmail.com>
Date: Wed, 21 Nov 2018 09:25:19 +0100
Subject: [PATCH 057/125] Added camel-ipfs to Apache-Camel POM

---
 apache-camel/pom.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/apache-camel/pom.xml b/apache-camel/pom.xml
index 625694ec431b9..af37d5ea136a9 100644
--- a/apache-camel/pom.xml
+++ b/apache-camel/pom.xml
@@ -490,6 +490,10 @@
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-influxdb</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.camel</groupId>
+      <artifactId>camel-ipfs</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-irc</artifactId>
@@ -1741,6 +1745,11 @@
       <artifactId>camel-influxdb-starter</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.apache.camel</groupId>
+      <artifactId>camel-ipfs-starter</artifactId>
+      <version>${project.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-irc-starter</artifactId>

From 886995ae955644253d1a6b9205ec6e4158126e87 Mon Sep 17 00:00:00 2001
From: Andrea Cosentino <ancosen@gmail.com>
Date: Wed, 21 Nov 2018 10:03:18 +0100
Subject: [PATCH 058/125] Regen

---
 .../spring-boot-dm/camel-spring-boot-dependencies/pom.xml       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
index 0c7bb419ceea8..f0ef8f43e3e25 100644
--- a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
+++ b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
@@ -3402,7 +3402,7 @@
       <dependency>
         <groupId>org.awaitility</groupId>
         <artifactId>awaitility</artifactId>
-        <version>3.1.2</version>
+        <version>3.1.3</version>
       </dependency>
       <dependency>
         <groupId>org.cassandraunit</groupId>

From 9469254ade49887e663833b2ae9906e9f9b43524 Mon Sep 17 00:00:00 2001
From: Andrea Cosentino <ancosen@gmail.com>
Date: Wed, 21 Nov 2018 13:06:11 +0100
Subject: [PATCH 059/125] Upgrade AWS Xray to version 2.1.0

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

diff --git a/parent/pom.xml b/parent/pom.xml
index c7e2e8b883c0a..94ee256118810 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -83,7 +83,7 @@
     <awaitility-version>3.1.3</awaitility-version>
     <aws-java-sdk-bundle-version>1.11.438_1</aws-java-sdk-bundle-version>
     <aws-java-sdk-version>1.11.438</aws-java-sdk-version>
-    <aws-xray-version>2.0.1</aws-xray-version>
+    <aws-xray-version>2.1.0</aws-xray-version>
     <axiom-version>1.2.14</axiom-version>
     <azure-storage-java-sdk-version>8.0.0</azure-storage-java-sdk-version>
     <azure-storage-java-sdk-bundle-version>8.0.0_1</azure-storage-java-sdk-bundle-version>

From 5f4530c7077e9871f56b49a59ea8f11f2cdd03eb Mon Sep 17 00:00:00 2001
From: Guillaume Nodet <gnodet@gmail.com>
Date: Wed, 21 Nov 2018 18:05:10 +0100
Subject: [PATCH 060/125] [CAMEL-12688] Fix generation and improve the
 generated code

---
 .../camel/tools/apt/ConverterProcessor.java   | 161 ++++++++++++++----
 1 file changed, 127 insertions(+), 34 deletions(-)

diff --git a/tooling/apt/src/main/java/org/apache/camel/tools/apt/ConverterProcessor.java b/tooling/apt/src/main/java/org/apache/camel/tools/apt/ConverterProcessor.java
index ac372e1123676..1757f21e6d647 100644
--- a/tooling/apt/src/main/java/org/apache/camel/tools/apt/ConverterProcessor.java
+++ b/tooling/apt/src/main/java/org/apache/camel/tools/apt/ConverterProcessor.java
@@ -21,9 +21,12 @@
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.io.Writer;
+import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.LinkedHashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
@@ -33,6 +36,8 @@
 import javax.annotation.processing.SupportedAnnotationTypes;
 import javax.annotation.processing.SupportedSourceVersion;
 import javax.lang.model.SourceVersion;
+import javax.lang.model.element.AnnotationMirror;
+import javax.lang.model.element.AnnotationValue;
 import javax.lang.model.element.Element;
 import javax.lang.model.element.ElementKind;
 import javax.lang.model.element.ExecutableElement;
@@ -50,20 +55,25 @@ public class ConverterProcessor extends AbstractProcessor {
     @Override
     public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment roundEnv) {
         try {
-            if (this.processingEnv.getElementUtils().getTypeElement("org.apache.camel.impl.converter.CoreFallbackConverter") != null) {
+            if (roundEnv.processingOver()) {
                 return false;
             }
 
-            if (roundEnv.processingOver()) {
+            if (this.processingEnv.getElementUtils().getTypeElement("org.apache.camel.impl.converter.CoreStaticTypeConverterLoader") != null) {
+                return false;
+            }
+
+            // We're in tests, do not generate anything
+            if (this.processingEnv.getElementUtils().getTypeElement("org.apache.camel.converter.ObjectConverter") == null) {
                 return false;
             }
 
             Comparator<TypeMirror> comparator = (o1, o2) -> processingEnv.getTypeUtils().isAssignable(o1, o2)
                     ? -1 : processingEnv.getTypeUtils().isAssignable(o2, o1) ? +1 : o1.toString().compareTo(o2.toString());
 
-            Map<String, Map<TypeMirror, ExecutableElement>> converters = new HashMap<>();
-            TypeElement annotationType = this.processingEnv.getElementUtils().getTypeElement("org.apache.camel.Converter");
-            for (Element element : roundEnv.getElementsAnnotatedWith(annotationType)) {
+            Map<String, Map<TypeMirror, ExecutableElement>> converters = new TreeMap<>();
+            TypeElement converterAnnotationType = this.processingEnv.getElementUtils().getTypeElement("org.apache.camel.Converter");
+            for (Element element : roundEnv.getElementsAnnotatedWith(converterAnnotationType)) {
                 if (element.getKind() == ElementKind.METHOD) {
                     ExecutableElement ee = (ExecutableElement) element;
                     TypeMirror to = ee.getReturnType();
@@ -81,57 +91,127 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
                     converters.computeIfAbsent(toString(to), c -> new TreeMap<>(comparator)).put(from, ee);
                 }
             }
-
-            // We're in tests, do not generate anything
-            if (this.processingEnv.getElementUtils().getTypeElement("org.apache.camel.converter.ObjectConverter") == null) {
-                return false;
+            TypeElement fallbackAnnotationType = this.processingEnv.getElementUtils().getTypeElement("org.apache.camel.FallbackConverter");
+            List<ExecutableElement> fallbackConverters = new ArrayList<>();
+            for (Element element : roundEnv.getElementsAnnotatedWith(fallbackAnnotationType)) {
+                if (element.getKind() == ElementKind.METHOD) {
+                    ExecutableElement ee = (ExecutableElement) element;
+                    fallbackConverters.add(ee);
+                }
             }
 
             String p = "org.apache.camel.impl.converter";
-            String c = "CoreFallbackConverter";
+            String c = "CoreStaticTypeConverterLoader";
             JavaFileObject jfo = processingEnv.getFiler().createSourceFile(p + "." + c);
             Set<String> converterClasses = new LinkedHashSet<>();
             try (Writer writer = jfo.openWriter()) {
 
                 writer.append("package ").append(p).append(";\n");
                 writer.append("\n");
-                writer.append("import org.apache.camel.support.TypeConverterSupport;\n");
                 writer.append("import org.apache.camel.Exchange;\n");
                 writer.append("import org.apache.camel.TypeConversionException;\n");
+                writer.append("import org.apache.camel.TypeConverterLoaderException;\n");
+                writer.append("import org.apache.camel.spi.TypeConverterLoader;\n");
+                writer.append("import org.apache.camel.spi.TypeConverterRegistry;\n");
+                writer.append("import org.apache.camel.support.TypeConverterSupport;\n");
                 writer.append("\n");
                 writer.append("@SuppressWarnings(\"unchecked\")\n");
-                writer.append("public class ").append(c).append(" extends TypeConverterSupport {\n");
+                writer.append("public class ").append(c).append(" implements TypeConverterLoader {\n");
+                writer.append("\n");
+                writer.append("    static abstract class SimpleTypeConverter extends TypeConverterSupport {\n");
+                writer.append("        private final boolean allowNull;\n");
                 writer.append("\n");
-                writer.append("    public <T> T convertTo(Class<T> type, Exchange exchange, Object value) throws TypeConversionException {\n");
-                writer.append("        try {\n");
-                writer.append("            return (T) doConvert(type, exchange, value);\n");
-                writer.append("        } catch (TypeConversionException e) {\n");
-                writer.append("            throw e;\n");
-                writer.append("        } catch (Exception e) {\n");
-                writer.append("            throw new TypeConversionException(value, type, e);\n");
+                writer.append("        public SimpleTypeConverter(boolean allowNull) {\n");
+                writer.append("            this.allowNull = allowNull;\n");
                 writer.append("        }\n");
-                writer.append("    }\n");
                 writer.append("\n");
-                writer.append("    private Object doConvert(Class<?> type, Exchange exchange, Object value) throws Exception {\n");
-                writer.append("        switch (type.getName()) {\n");
+                writer.append("        @Override\n");
+                writer.append("        public boolean allowNull() {\n");
+                writer.append("            return allowNull;\n");
+                writer.append("        }\n");
+                writer.append("\n");
+                writer.append("        @Override\n");
+                writer.append("        public <T> T convertTo(Class<T> type, Exchange exchange, Object value) throws TypeConversionException {\n");
+                writer.append("            try {\n");
+                writer.append("                return (T) doConvert(exchange, value);\n");
+                writer.append("            } catch (TypeConversionException e) {\n");
+                writer.append("                throw e;\n");
+                writer.append("            } catch (Exception e) {\n");
+                writer.append("                throw new TypeConversionException(value, type, e);\n");
+                writer.append("            }\n");
+                writer.append("        }\n");
+                writer.append("        protected abstract Object doConvert(Exchange exchange, Object value) throws Exception;\n");
+                writer.append("    };\n");
+                writer.append("\n");
+                writer.append("    @Override\n");
+                writer.append("    public void load(TypeConverterRegistry registry) throws TypeConverterLoaderException {\n");
+
                 for (Map.Entry<String, Map<TypeMirror, ExecutableElement>> to : converters.entrySet()) {
-                    writer.append("            case \"").append(to.getKey()).append("\": {\n");
                     for (Map.Entry<TypeMirror, ExecutableElement> from : to.getValue().entrySet()) {
-                        String name = toString(from.getKey());
-                        if ("java.lang.Object".equals(name)) {
-                            writer.append("                if (value != null) {\n");
-                        } else {
-                            writer.append("                if (value instanceof ").append(name).append(") {\n");
+                        boolean allowNull = false;
+                        for (AnnotationMirror ann : from.getValue().getAnnotationMirrors()) {
+                            if (ann.getAnnotationType().asElement() == converterAnnotationType) {
+                                for (Map.Entry<? extends ExecutableElement, ? extends AnnotationValue> entry : ann.getElementValues().entrySet()) {
+                                    switch (entry.getKey().getSimpleName().toString()) {
+                                        case "allowNull":
+                                            allowNull = (Boolean) entry.getValue().getValue();
+                                            break;
+                                        default:
+                                            throw new IllegalStateException();
+                                    }
+                                }
+                            }
+                        }
+                        writer.append("        registry.addTypeConverter(").append(to.getKey()).append(".class").append(", ")
+                                .append(toString(from.getKey())).append(".class, new SimpleTypeConverter(")
+                                .append(Boolean.toString(allowNull)).append(") {\n");
+                        writer.append("            @Override\n");
+                        writer.append("            public Object doConvert(Exchange exchange, Object value) throws Exception {\n");
+                        writer.append("                return ").append(toJava(from.getValue(), converterClasses)).append(";\n");
+                        writer.append("            }\n");
+                        writer.append("        });\n");
+                    }
+                }
+
+                for (ExecutableElement ee : fallbackConverters) {
+                    boolean allowNull = false;
+                    boolean canPromote = false;
+                    for (AnnotationMirror ann : ee.getAnnotationMirrors()) {
+                        if (ann.getAnnotationType().asElement() == fallbackAnnotationType) {
+                            for (Map.Entry<? extends ExecutableElement, ? extends AnnotationValue> entry : ann.getElementValues().entrySet()) {
+                                switch (entry.getKey().getSimpleName().toString()) {
+                                    case "allowNull":
+                                        allowNull = (Boolean) entry.getValue().getValue();
+                                        break;
+                                    case "canPromote":
+                                        canPromote = (Boolean) entry.getValue().getValue();
+                                        break;
+                                    default:
+                                        throw new IllegalStateException();
+                                }
+                            }
                         }
-                        writer.append("                    return ").append(toJava(from.getValue(), converterClasses)).append(";\n");
-                        writer.append("                }\n");
                     }
-                    writer.append("                break;\n");
+                    writer.append("        registry.addFallbackTypeConverter(new TypeConverterSupport() {\n");
+                    writer.append("            @Override\n");
+                    writer.append("            public boolean allowNull() {\n");
+                    writer.append("                return ").append(Boolean.toString(allowNull)).append(";\n");
                     writer.append("            }\n");
+                    writer.append("            @Override\n");
+                    writer.append("            public <T> T convertTo(Class<T> type, Exchange exchange, Object value) throws TypeConversionException {\n");
+                    writer.append("                try {\n");
+                    writer.append("                    return (T) ").append(toJavaFallback(ee, converterClasses)).append(";\n");
+                    writer.append("                } catch (TypeConversionException e) {\n");
+                    writer.append("                    throw e;\n");
+                    writer.append("                } catch (Exception e) {\n");
+                    writer.append("                    throw new TypeConversionException(value, type, e);\n");
+                    writer.append("                }\n");
+                    writer.append("            }\n");
+                    writer.append("        }, ").append(Boolean.toString(canPromote)).append(");\n");
                 }
-                writer.append("        }\n");
-                writer.append("        return null;\n");
+                writer.append("\n");
                 writer.append("    }\n");
+                writer.append("\n");
 
                 for (String f : converterClasses) {
                     String s = f.substring(f.lastIndexOf('.') + 1);
@@ -154,7 +234,7 @@ public boolean process(Set<? extends TypeElement> annotations, RoundEnvironment
             }
 
         } catch (Throwable e) {
-            processingEnv.getMessager().printMessage(Kind.ERROR, "Unable to process elements annotated with @UriEndpoint: " + e.getMessage());
+            processingEnv.getMessager().printMessage(Kind.ERROR, "Unable to process elements annotated with @Converter: " + e.getMessage());
             dumpExceptionToErrorFile("camel-apt-error.log", "Error processing @Converter", e);
         }
         return false;
@@ -177,6 +257,19 @@ private String toJava(ExecutableElement converter, Set<String> converterClasses)
         return pfx + "(" + cast + "value" + (converter.getParameters().size() == 2 ? ", exchange" : "") + ")";
     }
 
+    private String toJavaFallback(ExecutableElement converter, Set<String> converterClasses) {
+        String pfx;
+        if (converter.getModifiers().contains(Modifier.STATIC)) {
+            pfx = converter.getEnclosingElement().toString() + "." + converter.getSimpleName();
+        } else {
+            converterClasses.add(converter.getEnclosingElement().toString());
+            pfx = "get" + converter.getEnclosingElement().getSimpleName() + "()." + converter.getSimpleName();
+        }
+        String type = toString(converter.getParameters().get(converter.getParameters().size() - 2).asType());
+        String cast = type.equals("java.lang.Object") ? "" : "(" + type + ") ";
+        return pfx + "(type, " + (converter.getParameters().size() == 4 ? "exchange, " : "") + cast + "value" + ", registry)";
+    }
+
     public static void dumpExceptionToErrorFile(String fileName, String message, Throwable e) {
         File file = new File(fileName);
         try {

From e3cd3dc96a6e84393aade79a1c597db6b6a56639 Mon Sep 17 00:00:00 2001
From: Dmitry Volodin <dmvolod@gmail.com>
Date: Mon, 19 Nov 2018 19:22:27 +0300
Subject: [PATCH 061/125] CAMEL-12943: Rest DSL generates invalid swagger
 operation Id

---
 .../camel/model/RouteDefinitionHelper.java    | 29 ++++++++++-
 .../camel/model/rest/RestDefinition.java      | 10 +++-
 .../camel/impl/RouteIdRestDefinitionTest.java | 52 +++++++++++++++++++
 ...waggerReaderEnableVendorExtensionTest.java |  2 +-
 4 files changed, 90 insertions(+), 3 deletions(-)
 create mode 100644 camel-core/src/test/java/org/apache/camel/impl/RouteIdRestDefinitionTest.java

diff --git a/camel-core/src/main/java/org/apache/camel/model/RouteDefinitionHelper.java b/camel-core/src/main/java/org/apache/camel/model/RouteDefinitionHelper.java
index b0059553bae64..83e79f34748b5 100644
--- a/camel-core/src/main/java/org/apache/camel/model/RouteDefinitionHelper.java
+++ b/camel-core/src/main/java/org/apache/camel/model/RouteDefinitionHelper.java
@@ -142,6 +142,19 @@ public void run() {
                     });
                 }
                 customIds.add(id);
+            } else {
+                RestDefinition rest = route.getRestDefinition();
+                if (rest != null && route.isRest()) {
+                    VerbDefinition verb = findVerbDefinition(rest, route.getInputs().get(0).getUri());
+                    if (verb != null) {
+                        String id = verb.getId();
+                        if (verb.hasCustomIdAssigned() && ObjectHelper.isNotEmpty(id) && !customIds.contains(id)) {
+                            route.setId(id);
+                            customIds.add(id);
+                            break;
+                        }
+                    }
+                }
             }
         }
 
@@ -169,7 +182,8 @@ public void run() {
             }
             RestDefinition rest = route.getRestDefinition();
             if (rest != null && route.isRest()) {
-                for (VerbDefinition verb : rest.getVerbs()) {
+                VerbDefinition verb = findVerbDefinition(rest, route.getInputs().get(0).getUri());
+                if (verb != null) {
                     String id = verb.idOrCreate(context.getNodeIdFactory());
                     if (!verb.getUsedForGeneratingNodeId()) {
                         id = route.getId();
@@ -195,6 +209,19 @@ public void run() {
             }
         }
     }
+    
+    /**
+     * Find verb associated with the route by mapping uri
+     */
+    private static VerbDefinition findVerbDefinition(RestDefinition rest, String endpointUri) {
+        for (VerbDefinition verb : rest.getVerbs()) {
+            String verbUri = rest.buildFromUri(verb);
+            if (endpointUri.startsWith(verbUri)) {
+                return verb;
+            }
+        }
+        return null;
+    }
 
     /**
      * Validates that the target route has no duplicate id's from any of the existing routes.
diff --git a/camel-core/src/main/java/org/apache/camel/model/rest/RestDefinition.java b/camel-core/src/main/java/org/apache/camel/model/rest/RestDefinition.java
index 5fcce056d7b0a..3e09b9a14060b 100644
--- a/camel-core/src/main/java/org/apache/camel/model/rest/RestDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/rest/RestDefinition.java
@@ -658,6 +658,13 @@ public RouteDefinition route() {
         verb.setRoute(route);
         return route;
     }
+    
+    /**
+     * Build the from endpoint uri for the verb
+     */
+    public String buildFromUri(VerbDefinition verb) {
+        return "rest:" + verb.asVerb() + ":" + buildUri(verb);
+    }
 
     // Implementation
     //-------------------------------------------------------------------------
@@ -799,6 +806,7 @@ public static RouteDefinition asRouteApiDefinition(CamelContext camelContext, Re
         return answer;
     }
 
+    @SuppressWarnings("rawtypes")
     private void addRouteDefinition(CamelContext camelContext, List<RouteDefinition> answer, String component) {
         for (VerbDefinition verb : getVerbs()) {
             // either the verb has a singular to or a embedded route
@@ -877,7 +885,7 @@ private void addRouteDefinition(CamelContext camelContext, List<RouteDefinition>
             route.setRestBindingDefinition(binding);
 
             // create the from endpoint uri which is using the rest component
-            String from = "rest:" + verb.asVerb() + ":" + buildUri(verb);
+            String from = buildFromUri(verb);
 
             // append options
             Map<String, Object> options = new HashMap<>();
diff --git a/camel-core/src/test/java/org/apache/camel/impl/RouteIdRestDefinitionTest.java b/camel-core/src/test/java/org/apache/camel/impl/RouteIdRestDefinitionTest.java
new file mode 100644
index 0000000000000..30b132765d998
--- /dev/null
+++ b/camel-core/src/test/java/org/apache/camel/impl/RouteIdRestDefinitionTest.java
@@ -0,0 +1,52 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.impl;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.rest.DummyRestConsumerFactory;
+import org.apache.camel.component.rest.DummyRestProcessorFactory;
+import org.junit.Test;
+
+public class RouteIdRestDefinitionTest extends ContextTestSupport {
+
+    @Override
+    protected JndiRegistry createRegistry() throws Exception {
+        JndiRegistry jndi = super.createRegistry();
+        jndi.bind("dummy-rest", new DummyRestConsumerFactory());
+        jndi.bind("dummy-rest-api", new DummyRestProcessorFactory());
+        return jndi;
+    }
+
+    @Override
+    protected RouteBuilder createRouteBuilder() throws Exception {
+        return new RouteBuilder() {
+            @Override
+            public void configure() throws Exception {
+                from("direct:start1?timeout=30000").to("mock:result");
+                from("direct:start2").to("mock:result");
+                rest("/say/hello").get("/bar").id("getSayHelloBar").to("mock:result");
+            }
+        };
+    }
+
+    @Test
+    public void testSayHelloBar() {
+        assertEquals("getSayHelloBar", context.getRouteDefinitions().get(2).getId());
+    }
+    
+}
\ No newline at end of file
diff --git a/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderEnableVendorExtensionTest.java b/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderEnableVendorExtensionTest.java
index ac838059e34b2..a7b2d45e6e3b9 100644
--- a/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderEnableVendorExtensionTest.java
+++ b/components/camel-swagger-java/src/test/java/org/apache/camel/swagger/RestSwaggerReaderEnableVendorExtensionTest.java
@@ -58,7 +58,7 @@ public void configure() throws Exception {
                         .param().name("body").type(RestParamType.body).description("The user to update or create").endParam()
                         .to("bean:userService?method=updateUser")
 
-                    .get("/findAll").description("Find all users").outTypeList(User.class)
+                    .get("/findAll").description("Find all users").outType(User[].class)
                         .responseMessage().message("All the found users").endResponseMessage()
                         .to("bean:userService?method=listUsers");
             }

From 9c672800c515ba9620e8b3b922205fdc4c0c7faa Mon Sep 17 00:00:00 2001
From: Erhun Baycelik <erhun.baycelik@transferwise.com>
Date: Thu, 22 Nov 2018 09:54:02 +0200
Subject: [PATCH 062/125] Fix typo.

---
 examples/camel-example-kafka/README.adoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/examples/camel-example-kafka/README.adoc b/examples/camel-example-kafka/README.adoc
index d1f35cb4dad93..f439cde6c9c54 100644
--- a/examples/camel-example-kafka/README.adoc
+++ b/examples/camel-example-kafka/README.adoc
@@ -2,7 +2,7 @@
 
 === Introduction
 
-An example which shows how to integrate Camel with Kakfa.
+An example which shows how to integrate Camel with Kafka.
 
 This project consists of the following examples:
 

From 44597ebb1010cf1b33e865f690523bf9c445e12e Mon Sep 17 00:00:00 2001
From: Christoph Deppisch <cdeppisch@redhat.com>
Date: Thu, 22 Nov 2018 09:11:45 +0100
Subject: [PATCH 063/125] Avoid constants in interfaces

---
 .../bigquery/GoogleBigQueryConstants.java     | 17 ++++++++++-----
 .../internal/GoogleCalendarConstants.java     | 13 +++++++++---
 .../stream/GoogleCalendarStreamConstants.java | 21 ++++++++++++-------
 .../drive/internal/GoogleDriveConstants.java  | 13 +++++++++---
 .../mail/internal/GoogleMailConstants.java    | 13 +++++++++---
 .../stream/GoogleMailStreamConstants.java     | 21 ++++++++++++-------
 6 files changed, 70 insertions(+), 28 deletions(-)

diff --git a/components/camel-google-bigquery/src/main/java/org/apache/camel/component/google/bigquery/GoogleBigQueryConstants.java b/components/camel-google-bigquery/src/main/java/org/apache/camel/component/google/bigquery/GoogleBigQueryConstants.java
index 89d0eebac9238..cfd3c574df65d 100644
--- a/components/camel-google-bigquery/src/main/java/org/apache/camel/component/google/bigquery/GoogleBigQueryConstants.java
+++ b/components/camel-google-bigquery/src/main/java/org/apache/camel/component/google/bigquery/GoogleBigQueryConstants.java
@@ -16,9 +16,16 @@
  */
 package org.apache.camel.component.google.bigquery;
 
-public interface GoogleBigQueryConstants {
-    String TABLE_SUFFIX = "CamelGoogleBigQueryTableSuffix";
-    String TABLE_ID = "CamelGoogleBigQueryTableId";
-    String INSERT_ID = "CamelGoogleBigQueryInsertId";
-    String PARTITION_DECORATOR = "CamelGoogleBigQueryPartitionDecorator";
+public final class GoogleBigQueryConstants {
+    public static final String TABLE_SUFFIX = "CamelGoogleBigQueryTableSuffix";
+    public static final String TABLE_ID = "CamelGoogleBigQueryTableId";
+    public static final String INSERT_ID = "CamelGoogleBigQueryInsertId";
+    public static final String PARTITION_DECORATOR = "CamelGoogleBigQueryPartitionDecorator";
+
+    /**
+     * Prevent instantiation.
+     */
+    private GoogleBigQueryConstants() {
+        super();
+    }
 }
diff --git a/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/internal/GoogleCalendarConstants.java b/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/internal/GoogleCalendarConstants.java
index b604ad036c72f..f25f84c59d934 100644
--- a/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/internal/GoogleCalendarConstants.java
+++ b/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/internal/GoogleCalendarConstants.java
@@ -19,11 +19,18 @@
 /**
  * Constants for GoogleCalendar component.
  */
-public interface GoogleCalendarConstants {
+public final class GoogleCalendarConstants {
 
     // suffix for parameters when passed as exchange header properties
-    String PROPERTY_PREFIX = "CamelGoogleCalendar.";
+    public static final String PROPERTY_PREFIX = "CamelGoogleCalendar.";
 
     // thread profile name for this component
-    String THREAD_PROFILE_NAME = "CamelGoogleCalendar";
+    public static final String THREAD_PROFILE_NAME = "CamelGoogleCalendar";
+
+    /**
+     * Prevent instantiation.
+     */
+    private GoogleCalendarConstants() {
+        super();
+    }
 }
diff --git a/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/stream/GoogleCalendarStreamConstants.java b/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/stream/GoogleCalendarStreamConstants.java
index c671c544471d5..e590b743d6bd1 100644
--- a/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/stream/GoogleCalendarStreamConstants.java
+++ b/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/stream/GoogleCalendarStreamConstants.java
@@ -19,12 +19,19 @@
 /**
  * Constants used in Camel Google Calendar Stream
  */
-public interface GoogleCalendarStreamConstants {
+public final class GoogleCalendarStreamConstants {
 
-    String MAIL_TO = "CamelGoogleMailStreamTo";
-    String MAIL_FROM = "CamelGoogleMailStreamFrom";
-    String MAIL_CC = "CamelGoogleMailStreamCc";
-    String MAIL_BCC = "CamelGoogleMailStreamBcc";
-    String MAIL_SUBJECT = "CamelGoogleMailStreamSubject";
-    String MAIL_ID = "CamelGoogleMailId";
+    public static final String MAIL_TO = "CamelGoogleMailStreamTo";
+    public static final String MAIL_FROM = "CamelGoogleMailStreamFrom";
+    public static final String MAIL_CC = "CamelGoogleMailStreamCc";
+    public static final String MAIL_BCC = "CamelGoogleMailStreamBcc";
+    public static final String MAIL_SUBJECT = "CamelGoogleMailStreamSubject";
+    public static final String MAIL_ID = "CamelGoogleMailId";
+
+    /**
+     * Prevent instantiation.
+     */
+    private GoogleCalendarStreamConstants() {
+        super();
+    }
 }
diff --git a/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/internal/GoogleDriveConstants.java b/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/internal/GoogleDriveConstants.java
index 9f824f539c303..d19ba20c9abc6 100644
--- a/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/internal/GoogleDriveConstants.java
+++ b/components/camel-google-drive/src/main/java/org/apache/camel/component/google/drive/internal/GoogleDriveConstants.java
@@ -19,11 +19,18 @@
 /**
  * Constants for GoogleDrive component.
  */
-public interface GoogleDriveConstants {
+public final class GoogleDriveConstants {
 
     // suffix for parameters when passed as exchange header properties
-    String PROPERTY_PREFIX = "CamelGoogleDrive.";
+    public static final String PROPERTY_PREFIX = "CamelGoogleDrive.";
 
     // thread profile name for this component
-    String THREAD_PROFILE_NAME = "CamelGoogleDrive";
+    public static final String THREAD_PROFILE_NAME = "CamelGoogleDrive";
+
+    /**
+     * Prevent instantiation.
+     */
+    private GoogleDriveConstants() {
+        super();
+    }
 }
diff --git a/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/internal/GoogleMailConstants.java b/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/internal/GoogleMailConstants.java
index f788ff3c6e06f..a834549589370 100644
--- a/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/internal/GoogleMailConstants.java
+++ b/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/internal/GoogleMailConstants.java
@@ -19,11 +19,18 @@
 /**
  * Constants for GoogleMail component.
  */
-public interface GoogleMailConstants {
+public final class GoogleMailConstants {
 
     // suffix for parameters when passed as exchange header properties
-    String PROPERTY_PREFIX = "CamelGoogleMail.";
+    public static final String PROPERTY_PREFIX = "CamelGoogleMail.";
 
     // thread profile name for this component
-    String THREAD_PROFILE_NAME = "CamelGoogleMail";
+    public static final String THREAD_PROFILE_NAME = "CamelGoogleMail";
+
+    /**
+     * Prevent instantiation.
+     */
+    private GoogleMailConstants() {
+        super();
+    }
 }
diff --git a/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamConstants.java b/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamConstants.java
index ccd2c0fb6f181..e8ca7c2d224b3 100644
--- a/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamConstants.java
+++ b/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamConstants.java
@@ -19,12 +19,19 @@
 /**
  * Constants used in Camel Google Mail Stream
  */
-public interface GoogleMailStreamConstants {
+public final class GoogleMailStreamConstants {
 
-    String MAIL_TO = "CamelGoogleMailStreamTo";
-    String MAIL_FROM = "CamelGoogleMailStreamFrom";
-    String MAIL_CC = "CamelGoogleMailStreamCc";
-    String MAIL_BCC = "CamelGoogleMailStreamBcc";
-    String MAIL_SUBJECT = "CamelGoogleMailStreamSubject";
-    String MAIL_ID = "CamelGoogleMailId";
+    public static final String MAIL_TO = "CamelGoogleMailStreamTo";
+    public static final String MAIL_FROM = "CamelGoogleMailStreamFrom";
+    public static final String MAIL_CC = "CamelGoogleMailStreamCc";
+    public static final String MAIL_BCC = "CamelGoogleMailStreamBcc";
+    public static final String MAIL_SUBJECT = "CamelGoogleMailStreamSubject";
+    public static final String MAIL_ID = "CamelGoogleMailId";
+
+    /**
+     * Prevent instantiation.
+     */
+    private GoogleMailStreamConstants() {
+        super();
+    }
 }

From 81b4776ac788a82e2ebfb06d3dbb1ecdd9f65f82 Mon Sep 17 00:00:00 2001
From: Christoph Deppisch <cdeppisch@redhat.com>
Date: Thu, 22 Nov 2018 09:13:18 +0100
Subject: [PATCH 064/125] Remove gmail related naming from calendar component

---
 .../google-calendar-stream-component.adoc     | 18 ++++++++--------
 .../stream/GoogleCalendarStreamComponent.java |  9 ++++----
 .../GoogleCalendarStreamConfiguration.java    | 21 +++++++++----------
 .../stream/GoogleCalendarStreamConstants.java |  7 +------
 .../stream/GoogleCalendarStreamEndpoint.java  | 21 +++++++------------
 ...stractGoogleCalendarStreamTestSupport.java |  6 +++---
 ...eCalendarStreamComponentConfiguration.java | 10 ++++-----
 7 files changed, 40 insertions(+), 52 deletions(-)

diff --git a/components/camel-google-calendar/src/main/docs/google-calendar-stream-component.adoc b/components/camel-google-calendar/src/main/docs/google-calendar-stream-component.adoc
index 93090f493b722..624e34240746f 100644
--- a/components/camel-google-calendar/src/main/docs/google-calendar-stream-component.adoc
+++ b/components/camel-google-calendar/src/main/docs/google-calendar-stream-component.adoc
@@ -12,7 +12,7 @@ Google Calendar uses
 the https://developers.google.com/accounts/docs/OAuth2[OAuth 2.0
 protocol] for authenticating a Google account and authorizing access to
 user data. Before you can use this component, you will need
-to https://developers.google.com/gmail/api/auth/web-server[create an
+to https://developers.google.com/calendar/auth[create an
 account and generate OAuth credentials]. Credentials comprise of a
 clientId, clientSecret, and a refreshToken. A handy resource for
 generating a long-lived refreshToken is
@@ -27,7 +27,7 @@ for this component:
             <artifactId>camel-google-calendar</artifactId>
             <version>2.23.0</version>
     </dependency>
-        
+
 ------------------------------------------------------
 
 ### URI Format
@@ -36,10 +36,10 @@ The Google Calendar Component uses the following URI format:
 
 --------------------------------------------------------
         google-calendar-stream://index?[options]
-    
+
 --------------------------------------------------------
 
-### GoogleMailStreamComponent
+### GoogleCalendarStreamComponent
 
 
 // component options: START
@@ -88,14 +88,14 @@ with the following path and query parameters:
 | *applicationName* (consumer) | Google Calendar application name. Example would be camel-google-calendar/1.0 |  | 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
 | *calendarId* (consumer) | The calendarId to be used | primary | String
-| *clientId* (consumer) | Client ID of the mail application |  | String
-| *clientSecret* (consumer) | Client secret of the mail application |  | String
+| *clientId* (consumer) | Client ID of the calendar application |  | String
+| *clientSecret* (consumer) | Client secret of the calendar application |  | String
 | *considerLastUpdate* (consumer) | Take into account the lastUpdate of the last event polled as start date for the next poll | false | boolean
 | *consumeFromNow* (consumer) | Consume events in the selected calendar from now on | true | boolean
 | *maxResults* (consumer) | Max results to be returned | 10 | int
 | *query* (consumer) | The query to execute on calendar |  | String
 | *refreshToken* (consumer) | OAuth 2 refresh token. Using this, the Google Calendar component can obtain a new accessToken whenever the current one expires - a necessity if the application is long-lived. |  | String
-| *scopes* (consumer) | Specifies the level of permissions you want a mail application to have to a user account. See https://developers.google.com/calendar/api/auth/scopes for more info. |  | List
+| *scopes* (consumer) | Specifies the level of permissions you want a calendar application to have to a user account. See https://developers.google.com/calendar/auth for more info. |  | List
 | *sendEmptyMessageWhenIdle* (consumer) | If the polling consumer did not poll any files, you can enable this option to send an empty message (no body) instead. | false | boolean
 | *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option 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
@@ -148,7 +148,7 @@ The component supports 15 options, which are listed below.
 
 ### Consumer
 
-The consumer will poll by default with maxResults equals to 10.
+The consumer will poll by default with maxResults equals to 5.
 
 For example
 
@@ -157,6 +157,6 @@ For example
 from("google-calendar-stream://test?markAsRead=true&delay=5000&maxResults=5").to("mock:result");
 ---------------------------------------------------------
 
-This route will consume the next ten events starting from the date of polling.
+This route will consume the next five events starting from the date of polling.
 
    
diff --git a/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/stream/GoogleCalendarStreamComponent.java b/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/stream/GoogleCalendarStreamComponent.java
index 150e432fb36ca..4c55eef6f222c 100644
--- a/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/stream/GoogleCalendarStreamComponent.java
+++ b/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/stream/GoogleCalendarStreamComponent.java
@@ -19,7 +19,6 @@
 import java.util.Map;
 
 import com.google.api.services.calendar.Calendar;
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.Endpoint;
 import org.apache.camel.component.google.calendar.BatchGoogleCalendarClientFactory;
@@ -49,11 +48,11 @@ public GoogleCalendarStreamComponent(CamelContext context) {
         this.configuration = new GoogleCalendarStreamConfiguration();
     }
 
-    public Calendar getClient(GoogleCalendarStreamConfiguration googleMailConfiguration) {
+    public Calendar getClient(GoogleCalendarStreamConfiguration endpointConfiguration) {
         if (client == null) {
-            client = getClientFactory().makeClient(googleMailConfiguration.getClientId(), googleMailConfiguration.getClientSecret(), configuration.getScopes(),
-                                                   googleMailConfiguration.getApplicationName(), googleMailConfiguration.getRefreshToken(),
-                                                   googleMailConfiguration.getAccessToken(), null, null, "me");
+            client = getClientFactory().makeClient(endpointConfiguration.getClientId(), endpointConfiguration.getClientSecret(), endpointConfiguration.getScopes(),
+                                                    endpointConfiguration.getApplicationName(), endpointConfiguration.getRefreshToken(),
+                                                    endpointConfiguration.getAccessToken(), null, null, "me");
         }
         return client;
     }
diff --git a/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/stream/GoogleCalendarStreamConfiguration.java b/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/stream/GoogleCalendarStreamConfiguration.java
index 8b5648d56df89..4fbc43ecd3705 100644
--- a/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/stream/GoogleCalendarStreamConfiguration.java
+++ b/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/stream/GoogleCalendarStreamConfiguration.java
@@ -16,11 +16,10 @@
  */
 package org.apache.camel.component.google.calendar.stream;
 
-import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 
 import com.google.api.services.calendar.CalendarScopes;
-
 import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.spi.UriParam;
 import org.apache.camel.spi.UriParams;
@@ -31,7 +30,7 @@
  */
 @UriParams
 public class GoogleCalendarStreamConfiguration implements Cloneable {
-    private static final List<String> DEFAULT_SCOPES = Arrays.asList(CalendarScopes.CALENDAR);
+    private static final List<String> DEFAULT_SCOPES = Collections.singletonList(CalendarScopes.CALENDAR);
 
     @UriPath
     private String index;
@@ -59,13 +58,13 @@ public class GoogleCalendarStreamConfiguration implements Cloneable {
 
     @UriParam(defaultValue = "10")
     private int maxResults = 10;
-    
+
     @UriParam(defaultValue = "primary")
     private String calendarId = "primary";
-    
+
     @UriParam(defaultValue = "true")
     private boolean consumeFromNow = true;
-    
+
     @UriParam(defaultValue = "false")
     private boolean considerLastUpdate;
 
@@ -74,7 +73,7 @@ public String getClientId() {
     }
 
     /**
-     * Client ID of the mail application
+     * Client ID of the calendar application
      */
     public void setClientId(String clientId) {
         this.clientId = clientId;
@@ -85,7 +84,7 @@ public String getClientSecret() {
     }
 
     /**
-     * Client secret of the mail application
+     * Client secret of the calendar application
      */
     public void setClientSecret(String clientSecret) {
         this.clientSecret = clientSecret;
@@ -132,8 +131,8 @@ public List<String> getScopes() {
     }
 
     /**
-     * Specifies the level of permissions you want a mail application to have to
-     * a user account. See https://developers.google.com/calendar/api/auth/scopes
+     * Specifies the level of permissions you want a calendar application to have to
+     * a user account. See https://developers.google.com/calendar/auth
      * for more info.
      */
     public void setScopes(List<String> scopes) {
@@ -187,7 +186,7 @@ public void setCalendarId(String calendarId) {
     public boolean isConsumeFromNow() {
         return consumeFromNow;
     }
-    
+
     /**
      * Consume events in the selected calendar from now on
      */
diff --git a/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/stream/GoogleCalendarStreamConstants.java b/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/stream/GoogleCalendarStreamConstants.java
index e590b743d6bd1..6f61d54a9d499 100644
--- a/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/stream/GoogleCalendarStreamConstants.java
+++ b/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/stream/GoogleCalendarStreamConstants.java
@@ -21,12 +21,7 @@
  */
 public final class GoogleCalendarStreamConstants {
 
-    public static final String MAIL_TO = "CamelGoogleMailStreamTo";
-    public static final String MAIL_FROM = "CamelGoogleMailStreamFrom";
-    public static final String MAIL_CC = "CamelGoogleMailStreamCc";
-    public static final String MAIL_BCC = "CamelGoogleMailStreamBcc";
-    public static final String MAIL_SUBJECT = "CamelGoogleMailStreamSubject";
-    public static final String MAIL_ID = "CamelGoogleMailId";
+    public static final String EVENT_ID = "CamelGoogleCalendarEventId";
 
     /**
      * Prevent instantiation.
diff --git a/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/stream/GoogleCalendarStreamEndpoint.java b/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/stream/GoogleCalendarStreamEndpoint.java
index eab297bd02f1b..a2d55bfb40c1f 100644
--- a/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/stream/GoogleCalendarStreamEndpoint.java
+++ b/components/camel-google-calendar/src/main/java/org/apache/camel/component/google/calendar/stream/GoogleCalendarStreamEndpoint.java
@@ -16,12 +16,8 @@
  */
 package org.apache.camel.component.google.calendar.stream;
 
-import java.io.UnsupportedEncodingException;
-
 import com.google.api.services.calendar.Calendar;
-import com.google.api.services.calendar.model.CalendarListEntry;
 import com.google.api.services.calendar.model.Event;
-
 import org.apache.camel.Consumer;
 import org.apache.camel.Exchange;
 import org.apache.camel.ExchangePattern;
@@ -32,22 +28,21 @@
 import org.apache.camel.impl.ScheduledPollEndpoint;
 import org.apache.camel.spi.UriEndpoint;
 import org.apache.camel.spi.UriParam;
-import org.apache.camel.util.ObjectHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
  * The google-calendar component provides access to Google Calendar in a streaming mod.
  */
-@UriEndpoint(firstVersion = "2.23.0", 
-             scheme = "google-calendar-stream", 
-             title = "Google Calendar Stream", 
-             syntax = "google-calendar-stream:index", 
+@UriEndpoint(firstVersion = "2.23.0",
+             scheme = "google-calendar-stream",
+             title = "Google Calendar Stream",
+             syntax = "google-calendar-stream:index",
              consumerClass = GoogleCalendarStreamConsumer.class,
              consumerOnly = true,
              label = "api,cloud")
 public class GoogleCalendarStreamEndpoint extends ScheduledPollEndpoint {
-    
+
     private static final Logger LOG = LoggerFactory.getLogger(GoogleCalendarStreamEndpoint.class);
 
     @UriParam
@@ -91,11 +86,11 @@ public boolean isSingleton() {
         return true;
     }
 
-    public Exchange createExchange(ExchangePattern pattern, Event event) throws UnsupportedEncodingException {
-
-        Exchange exchange = super.createExchange();
+    public Exchange createExchange(ExchangePattern pattern, Event event) {
+        Exchange exchange = super.createExchange(pattern);
         Message message = exchange.getIn();
         message.setBody(event);
+        message.setHeader(GoogleCalendarStreamConstants.EVENT_ID, event.getId());
         return exchange;
     }
 }
diff --git a/components/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/stream/AbstractGoogleCalendarStreamTestSupport.java b/components/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/stream/AbstractGoogleCalendarStreamTestSupport.java
index 6cf4a25af4255..56e24fbf2af30 100644
--- a/components/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/stream/AbstractGoogleCalendarStreamTestSupport.java
+++ b/components/camel-google-calendar/src/test/java/org/apache/camel/component/google/calendar/stream/AbstractGoogleCalendarStreamTestSupport.java
@@ -26,7 +26,7 @@
 import org.apache.camel.util.IntrospectionSupport;
 
 /**
- * Abstract base class for GoogleMail Integration tests generated by Camel API
+ * Abstract base class for GoogleCalendar Integration tests generated by Camel API
  * component maven plugin.
  */
 public class AbstractGoogleCalendarStreamTestSupport extends CamelTestSupport {
@@ -40,7 +40,7 @@ protected CamelContext createCamelContext() throws Exception {
 
         final CamelContext context = super.createCamelContext();
 
-        // read GoogleMail component configuration from TEST_OPTIONS_PROPERTIES
+        // read GoogleCalendar component configuration from TEST_OPTIONS_PROPERTIES
         final Properties properties = new Properties();
         try {
             properties.load(getClass().getResourceAsStream(TEST_OPTIONS_PROPERTIES));
@@ -56,7 +56,7 @@ protected CamelContext createCamelContext() throws Exception {
         final GoogleCalendarStreamConfiguration configuration = new GoogleCalendarStreamConfiguration();
         IntrospectionSupport.setProperties(configuration, options);
 
-        // add GoogleMailComponent to Camel context
+        // add GoogleCalendarComponent to Camel context
         final GoogleCalendarStreamComponent component = new GoogleCalendarStreamComponent(context);
         component.setConfiguration(configuration);
         context.addComponent("google-calendar-stream", component);
diff --git a/platforms/spring-boot/components-starter/camel-google-calendar-starter/src/main/java/org/apache/camel/component/google/calendar/stream/springboot/GoogleCalendarStreamComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-google-calendar-starter/src/main/java/org/apache/camel/component/google/calendar/stream/springboot/GoogleCalendarStreamComponentConfiguration.java
index 5acded1012a5d..d8efcb8cf9c56 100644
--- a/platforms/spring-boot/components-starter/camel-google-calendar-starter/src/main/java/org/apache/camel/component/google/calendar/stream/springboot/GoogleCalendarStreamComponentConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-google-calendar-starter/src/main/java/org/apache/camel/component/google/calendar/stream/springboot/GoogleCalendarStreamComponentConfiguration.java
@@ -24,7 +24,7 @@
 /**
  * The google-calendar component provides access to Google Calendar in a
  * streaming mod.
- * 
+ *
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
 @Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo")
@@ -84,11 +84,11 @@ public void setResolvePropertyPlaceholders(
     public static class GoogleCalendarStreamConfigurationNestedConfiguration {
         public static final Class CAMEL_NESTED_CLASS = org.apache.camel.component.google.calendar.stream.GoogleCalendarStreamConfiguration.class;
         /**
-         * Client ID of the mail application
+         * Client ID of the calendar application
          */
         private String clientId;
         /**
-         * Client secret of the mail application
+         * Client secret of the calendar application
          */
         private String clientSecret;
         /**
@@ -108,9 +108,9 @@ public static class GoogleCalendarStreamConfigurationNestedConfiguration {
          */
         private String applicationName;
         /**
-         * Specifies the level of permissions you want a mail application to
+         * Specifies the level of permissions you want a calendar application to
          * have to a user account. See
-         * https://developers.google.com/calendar/api/auth/scopes for more info.
+         * https://developers.google.com/calendar/auth for more info.
          */
         private List scopes;
         /**

From 9353638da4d95aaf37deaee097bd9e8b92191ba1 Mon Sep 17 00:00:00 2001
From: Christoph Deppisch <cdeppisch@redhat.com>
Date: Thu, 22 Nov 2018 09:14:12 +0100
Subject: [PATCH 065/125] Remove unused oauth scopes in google mail component

---
 .../docs/google-mail-stream-component.adoc    |  7 +++---
 .../stream/GoogleMailStreamConfiguration.java | 23 -------------------
 ...oogleMailStreamComponentConfiguration.java | 17 +-------------
 3 files changed, 4 insertions(+), 43 deletions(-)

diff --git a/components/camel-google-mail/src/main/docs/google-mail-stream-component.adoc b/components/camel-google-mail/src/main/docs/google-mail-stream-component.adoc
index ed2086bc1eb1c..f6160dacf8568 100644
--- a/components/camel-google-mail/src/main/docs/google-mail-stream-component.adoc
+++ b/components/camel-google-mail/src/main/docs/google-mail-stream-component.adoc
@@ -27,7 +27,7 @@ for this component:
             <artifactId>camel-google-mail</artifactId>
             <version>2.22-SNAPSHOT</version>
     </dependency>
-        
+
 ------------------------------------------------------
 
 ### URI Format
@@ -36,7 +36,7 @@ The GoogleMail Component uses the following URI format:
 
 --------------------------------------------------------
         google-mail-stream://index?[options]
-    
+
 --------------------------------------------------------
 
 ### GoogleMailStreamComponent
@@ -78,7 +78,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (29 parameters):
+==== Query Parameters (28 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -94,7 +94,6 @@ with the following path and query parameters:
 | *maxResults* (consumer) | Max results to be returned | 10 | long
 | *query* (consumer) | The query to execute on gmail box | is:unread | String
 | *refreshToken* (consumer) | OAuth 2 refresh token. Using this, the Google Calendar component can obtain a new accessToken whenever the current one expires - a necessity if the application is long-lived. |  | String
-| *scopes* (consumer) | Specifies the level of permissions you want a mail application to have to a user account. See https://developers.google.com/gmail/api/auth/scopes for more info. |  | List
 | *sendEmptyMessageWhenIdle* (consumer) | If the polling consumer did not poll any files, you can enable this option to send an empty message (no body) instead. | false | boolean
 | *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option 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
diff --git a/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamConfiguration.java b/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamConfiguration.java
index a69f719d19fac..d8164782c321a 100644
--- a/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamConfiguration.java
+++ b/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamConfiguration.java
@@ -16,11 +16,6 @@
  */
 package org.apache.camel.component.google.mail.stream;
 
-import java.util.Arrays;
-import java.util.List;
-
-import com.google.api.services.gmail.GmailScopes;
-
 import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.spi.UriParam;
 import org.apache.camel.spi.UriParams;
@@ -31,14 +26,9 @@
  */
 @UriParams
 public class GoogleMailStreamConfiguration implements Cloneable {
-    private static final List<String> DEFAULT_SCOPES = Arrays.asList(GmailScopes.GMAIL_COMPOSE, GmailScopes.GMAIL_MODIFY, GmailScopes.MAIL_GOOGLE_COM);
-
     @UriPath
     private String index;
 
-    @UriParam
-    private List<String> scopes = DEFAULT_SCOPES;
-
     @UriParam
     private String clientId;
 
@@ -124,19 +114,6 @@ public void setApplicationName(String applicationName) {
         this.applicationName = applicationName;
     }
 
-    public List<String> getScopes() {
-        return scopes;
-    }
-
-    /**
-     * Specifies the level of permissions you want a mail application to have to
-     * a user account. See https://developers.google.com/gmail/api/auth/scopes
-     * for more info.
-     */
-    public void setScopes(List<String> scopes) {
-        this.scopes = scopes;
-    }
-
     public String getIndex() {
         return index;
     }
diff --git a/platforms/spring-boot/components-starter/camel-google-mail-starter/src/main/java/org/apache/camel/component/google/mail/stream/springboot/GoogleMailStreamComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-google-mail-starter/src/main/java/org/apache/camel/component/google/mail/stream/springboot/GoogleMailStreamComponentConfiguration.java
index 0a5d1e4323379..c790e30d370f6 100644
--- a/platforms/spring-boot/components-starter/camel-google-mail-starter/src/main/java/org/apache/camel/component/google/mail/stream/springboot/GoogleMailStreamComponentConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-google-mail-starter/src/main/java/org/apache/camel/component/google/mail/stream/springboot/GoogleMailStreamComponentConfiguration.java
@@ -16,14 +16,13 @@
  */
 package org.apache.camel.component.google.mail.stream.springboot;
 
-import java.util.List;
 import javax.annotation.Generated;
 import org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
 /**
  * The google-mail component provides access to Google Mail.
- * 
+ *
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
 @Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo")
@@ -104,12 +103,6 @@ public static class GoogleMailStreamConfigurationNestedConfiguration {
          * Google mail application name. Example would be camel-google-mail/1.0
          */
         private String applicationName;
-        /**
-         * Specifies the level of permissions you want a mail application to
-         * have to a user account. See
-         * https://developers.google.com/gmail/api/auth/scopes for more info.
-         */
-        private List scopes;
         /**
          * Specifies an index for the endpoint
          */
@@ -171,14 +164,6 @@ public void setApplicationName(String applicationName) {
             this.applicationName = applicationName;
         }
 
-        public List getScopes() {
-            return scopes;
-        }
-
-        public void setScopes(List scopes) {
-            this.scopes = scopes;
-        }
-
         public String getIndex() {
             return index;
         }

From 1540303df397fbfc57fe1059b0b6a2a37a690d3e Mon Sep 17 00:00:00 2001
From: Christoph Deppisch <cdeppisch@redhat.com>
Date: Thu, 22 Nov 2018 09:15:54 +0100
Subject: [PATCH 066/125] Use given exchange pattern when creating the exchange
 for incoming mail events

---
 .../mail/stream/GoogleMailStreamEndpoint.java | 22 ++++++++-----------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamEndpoint.java b/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamEndpoint.java
index 4f49ebaedd14f..34428dd9b61e2 100644
--- a/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamEndpoint.java
+++ b/components/camel-google-mail/src/main/java/org/apache/camel/component/google/mail/stream/GoogleMailStreamEndpoint.java
@@ -16,13 +16,10 @@
  */
 package org.apache.camel.component.google.mail.stream;
 
-import java.io.UnsupportedEncodingException;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.mail.internet.AddressException;
-
 import com.google.api.client.util.Base64;
 import com.google.api.services.gmail.Gmail;
 import com.google.api.services.gmail.model.Label;
@@ -30,7 +27,6 @@
 import com.google.api.services.gmail.model.MessagePart;
 import com.google.api.services.gmail.model.MessagePartHeader;
 import com.google.common.base.Splitter;
-
 import org.apache.camel.Consumer;
 import org.apache.camel.Exchange;
 import org.apache.camel.ExchangePattern;
@@ -46,10 +42,10 @@
 /**
  * The google-mail component provides access to Google Mail.
  */
-@UriEndpoint(firstVersion = "2.22.0", 
-             scheme = "google-mail-stream", 
-             title = "Google Mail Stream", 
-             syntax = "google-mail-stream:index", 
+@UriEndpoint(firstVersion = "2.22.0",
+             scheme = "google-mail-stream",
+             title = "Google Mail Stream",
+             syntax = "google-mail-stream:index",
              consumerClass = GoogleMailStreamConsumer.class,
              consumerOnly = true,
              label = "api,cloud,mail")
@@ -116,14 +112,14 @@ public boolean isSingleton() {
         return true;
     }
 
-    public Exchange createExchange(ExchangePattern pattern, com.google.api.services.gmail.model.Message mail) throws UnsupportedEncodingException {
+    public Exchange createExchange(ExchangePattern pattern, com.google.api.services.gmail.model.Message mail) {
 
-        Exchange exchange = super.createExchange();
+        Exchange exchange = super.createExchange(pattern);
         Message message = exchange.getIn();
         exchange.getIn().setHeader(GoogleMailStreamConstants.MAIL_ID, mail.getId());
         List<MessagePart> parts = mail.getPayload().getParts();
         if (parts != null && parts.get(0).getBody().getData() != null) {
-            byte[] bodyBytes = Base64.decodeBase64(parts.get(0).getBody().getData().trim().toString()); 
+            byte[] bodyBytes = Base64.decodeBase64(parts.get(0).getBody().getData().trim());
             String body = new String(bodyBytes, StandardCharsets.UTF_8);
             message.setBody(body);
         }
@@ -151,8 +147,8 @@ private void setHeaders(Message message, List<MessagePartHeader> headers) {
             }
         }
     }
-    
-    private List<String> splitLabels(String labels) throws AddressException {
+
+    private List<String> splitLabels(String labels) {
         return Splitter.on(',').splitToList(labels);
     }
 }

From d4427da10b6238ff3720af1f6509addec1aeff62 Mon Sep 17 00:00:00 2001
From: Christoph Deppisch <cdeppisch@redhat.com>
Date: Thu, 22 Nov 2018 09:01:35 +0100
Subject: [PATCH 067/125] Move integration Maven profile to camel-parent
 pom.xml in order to enable proper configuration propagation to submodules

---
 parent/pom.xml | 33 +++++++++++++++++++++++++++++++++
 pom.xml        | 29 -----------------------------
 2 files changed, 33 insertions(+), 29 deletions(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index 94ee256118810..e7dca50dfc903 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -5679,6 +5679,39 @@
       </dependencies>
     </profile>
 
+    <profile>
+      <id>integration</id>
+      <!--The profile for running the unit and integration test -->
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <version>${maven-surefire-plugin-version}</version>
+            <configuration>
+              <forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds>
+              <childDelegation>false</childDelegation>
+              <useFile>true</useFile>
+              <failIfNoTests>false</failIfNoTests>
+              <runOrder>alphabetical</runOrder>
+              <rerunFailingTestsCount>0</rerunFailingTestsCount>
+              <systemPropertyVariables>
+                <derby.stream.error.file>target/derby.log</derby.stream.error.file>
+                <java.awt.headless>${java.awt.headless}</java.awt.headless>
+              </systemPropertyVariables>
+              <includes>
+                <include>**/*Test.*</include>
+                <include>**/*IntegrationTest.*</include>
+              </includes>
+              <excludes>
+                <exclude>**/*XXXTest.*</exclude>
+              </excludes>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+
     <!-- experimental profile to activate ekstazi http://www.ekstazi.org -->
     <profile>
       <id>ekstazi</id>
diff --git a/pom.xml b/pom.xml
index fe6cf76e750f2..5d37e86f6252c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -560,35 +560,6 @@
       </build>
     </profile>
 
-    <profile>
-      <id>integration</id>
-      <!--The profile for running the unit and integration test -->
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <version>${maven-surefire-plugin-version}</version>
-            <configuration>
-              <forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds>
-              <childDelegation>false</childDelegation>
-              <useFile>true</useFile>
-              <failIfNoTests>false</failIfNoTests>
-              <runOrder>alphabetical</runOrder>
-              <systemPropertyVariables>
-                <derby.stream.error.file>target/derby.log</derby.stream.error.file>
-                <java.awt.headless>${java.awt.headless}</java.awt.headless>
-              </systemPropertyVariables>
-              <includes>
-                <include>**/*Test.*</include>
-                <include>**/*IntegrationTest.*</include>
-              </includes>
-            </configuration>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-
     <profile>
       <id>deploy</id>
       <build>

From e21f9b4f81cc0c43d3a82c7a531209f59fa049f4 Mon Sep 17 00:00:00 2001
From: Andrea Cosentino <ancosen@gmail.com>
Date: Thu, 22 Nov 2018 11:11:01 +0100
Subject: [PATCH 068/125] Regen

---
 .../src/main/docs/google-calendar-stream-component.adoc     | 6 +++---
 .../src/main/docs/google-mail-stream-component.adoc         | 3 +--
 .../GoogleCalendarStreamComponentConfiguration.java         | 2 +-
 .../springboot/GoogleMailStreamComponentConfiguration.java  | 2 +-
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/components/camel-google-calendar/src/main/docs/google-calendar-stream-component.adoc b/components/camel-google-calendar/src/main/docs/google-calendar-stream-component.adoc
index 624e34240746f..bcfe0362e89d4 100644
--- a/components/camel-google-calendar/src/main/docs/google-calendar-stream-component.adoc
+++ b/components/camel-google-calendar/src/main/docs/google-calendar-stream-component.adoc
@@ -131,15 +131,15 @@ The component supports 15 options, which are listed below.
 | *camel.component.google-calendar-stream.configuration.access-token* | OAuth 2 access token. This typically expires after an hour so refreshToken is recommended for long term usage. |  | String
 | *camel.component.google-calendar-stream.configuration.application-name* | Google Calendar application name. Example would be camel-google-calendar/1.0 |  | String
 | *camel.component.google-calendar-stream.configuration.calendar-id* | The calendarId to be used | primary | String
-| *camel.component.google-calendar-stream.configuration.client-id* | Client ID of the mail application |  | String
-| *camel.component.google-calendar-stream.configuration.client-secret* | Client secret of the mail application |  | String
+| *camel.component.google-calendar-stream.configuration.client-id* | Client ID of the calendar application |  | String
+| *camel.component.google-calendar-stream.configuration.client-secret* | Client secret of the calendar application |  | String
 | *camel.component.google-calendar-stream.configuration.consider-last-update* | Take into account the lastUpdate of the last event polled as start date for the next poll | false | Boolean
 | *camel.component.google-calendar-stream.configuration.consume-from-now* | Consume events in the selected calendar from now on | true | Boolean
 | *camel.component.google-calendar-stream.configuration.index* | Specifies an index for the endpoint |  | String
 | *camel.component.google-calendar-stream.configuration.max-results* | Max results to be returned | 10 | Integer
 | *camel.component.google-calendar-stream.configuration.query* | The query to execute on calendar |  | String
 | *camel.component.google-calendar-stream.configuration.refresh-token* | OAuth 2 refresh token. Using this, the Google Calendar component can obtain a new accessToken whenever the current one expires - a necessity if the application is long-lived. |  | String
-| *camel.component.google-calendar-stream.configuration.scopes* | Specifies the level of permissions you want a mail application to have to a user account. See https://developers.google.com/calendar/api/auth/scopes for more info. |  | List
+| *camel.component.google-calendar-stream.configuration.scopes* | Specifies the level of permissions you want a calendar application to have to a user account. See https://developers.google.com/calendar/auth for more info. |  | List
 | *camel.component.google-calendar-stream.enabled* | Whether to enable auto configuration of the google-calendar-stream component. This is enabled by default. |  | Boolean
 | *camel.component.google-calendar-stream.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
 |===
diff --git a/components/camel-google-mail/src/main/docs/google-mail-stream-component.adoc b/components/camel-google-mail/src/main/docs/google-mail-stream-component.adoc
index f6160dacf8568..ae40384e74c2a 100644
--- a/components/camel-google-mail/src/main/docs/google-mail-stream-component.adoc
+++ b/components/camel-google-mail/src/main/docs/google-mail-stream-component.adoc
@@ -118,7 +118,7 @@ with the following path and query parameters:
 === Spring Boot Auto-Configuration
 
 
-The component supports 14 options, which are listed below.
+The component supports 13 options, which are listed below.
 
 
 
@@ -136,7 +136,6 @@ The component supports 14 options, which are listed below.
 | *camel.component.google-mail-stream.configuration.max-results* | Max results to be returned | 10 | Long
 | *camel.component.google-mail-stream.configuration.query* | The query to execute on gmail box | is:unread | String
 | *camel.component.google-mail-stream.configuration.refresh-token* | OAuth 2 refresh token. Using this, the Google Calendar component can obtain a new accessToken whenever the current one expires - a necessity if the application is long-lived. |  | String
-| *camel.component.google-mail-stream.configuration.scopes* | Specifies the level of permissions you want a mail application to have to a user account. See https://developers.google.com/gmail/api/auth/scopes for more info. |  | List
 | *camel.component.google-mail-stream.enabled* | Whether to enable auto configuration of the google-mail-stream component. This is enabled by default. |  | Boolean
 | *camel.component.google-mail-stream.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
 |===
diff --git a/platforms/spring-boot/components-starter/camel-google-calendar-starter/src/main/java/org/apache/camel/component/google/calendar/stream/springboot/GoogleCalendarStreamComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-google-calendar-starter/src/main/java/org/apache/camel/component/google/calendar/stream/springboot/GoogleCalendarStreamComponentConfiguration.java
index d8efcb8cf9c56..0689c8dc9ae46 100644
--- a/platforms/spring-boot/components-starter/camel-google-calendar-starter/src/main/java/org/apache/camel/component/google/calendar/stream/springboot/GoogleCalendarStreamComponentConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-google-calendar-starter/src/main/java/org/apache/camel/component/google/calendar/stream/springboot/GoogleCalendarStreamComponentConfiguration.java
@@ -24,7 +24,7 @@
 /**
  * The google-calendar component provides access to Google Calendar in a
  * streaming mod.
- *
+ * 
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
 @Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo")
diff --git a/platforms/spring-boot/components-starter/camel-google-mail-starter/src/main/java/org/apache/camel/component/google/mail/stream/springboot/GoogleMailStreamComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-google-mail-starter/src/main/java/org/apache/camel/component/google/mail/stream/springboot/GoogleMailStreamComponentConfiguration.java
index c790e30d370f6..92074ed753883 100644
--- a/platforms/spring-boot/components-starter/camel-google-mail-starter/src/main/java/org/apache/camel/component/google/mail/stream/springboot/GoogleMailStreamComponentConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-google-mail-starter/src/main/java/org/apache/camel/component/google/mail/stream/springboot/GoogleMailStreamComponentConfiguration.java
@@ -22,7 +22,7 @@
 
 /**
  * The google-mail component provides access to Google Mail.
- *
+ * 
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
 @Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo")

From adae140be9466855798c1d6ffc7080b058fc90c1 Mon Sep 17 00:00:00 2001
From: Jan <jbouska@redhat.com>
Date: Tue, 20 Nov 2018 18:44:16 +0100
Subject: [PATCH 069/125] Refactor irc tests

---
 components/camel-irc/pom.xml                  | 37 ++++++++++
 .../irc/it/IrcIntegrationTestSupport.java     | 68 +++++++++++++++++++
 .../{ => it}/IrcMultiChannelRouteTest.java    | 63 +++++++++--------
 .../irc/{ => it}/IrcOnReplyTest.java          | 18 ++---
 .../irc/{ => it}/IrcPrivmsgTest.java          | 27 +++-----
 .../component/irc/{ => it}/IrcRouteTest.java  | 34 +++++-----
 .../IrcsListUsersTest.java}                   | 32 +++------
 .../component/irc/{ => it}/IrcsRouteTest.java | 17 ++---
 .../IrcsWithSslContextParamsRouteTest.java    |  2 +-
 ...t-users.properties => it-tests.properties} | 12 +++-
 10 files changed, 195 insertions(+), 115 deletions(-)
 create mode 100644 components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcIntegrationTestSupport.java
 rename components/camel-irc/src/test/java/org/apache/camel/component/irc/{ => it}/IrcMultiChannelRouteTest.java (59%)
 rename components/camel-irc/src/test/java/org/apache/camel/component/irc/{ => it}/IrcOnReplyTest.java (81%)
 rename components/camel-irc/src/test/java/org/apache/camel/component/irc/{ => it}/IrcPrivmsgTest.java (80%)
 rename components/camel-irc/src/test/java/org/apache/camel/component/irc/{ => it}/IrcRouteTest.java (81%)
 rename components/camel-irc/src/test/java/org/apache/camel/component/irc/{IrcsListUsersIntegrationTest.java => it/IrcsListUsersTest.java} (74%)
 rename components/camel-irc/src/test/java/org/apache/camel/component/irc/{ => it}/IrcsRouteTest.java (64%)
 rename components/camel-irc/src/test/java/org/apache/camel/component/irc/{ => it}/IrcsWithSslContextParamsRouteTest.java (98%)
 rename components/camel-irc/src/test/resources/{it-list-users.properties => it-tests.properties} (84%)

diff --git a/components/camel-irc/pom.xml b/components/camel-irc/pom.xml
index 85b7e179039fe..a65b459bcb104 100644
--- a/components/camel-irc/pom.xml
+++ b/components/camel-irc/pom.xml
@@ -39,6 +39,43 @@
     </camel.osgi.export.service>
   </properties>
 
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <excludes>
+            <exclude>
+              **/it/**
+            </exclude>
+          </excludes>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+  <profiles>
+    <profile>
+      <id>it-tests</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration combine.self="override">
+              <includes>
+                <include>**/*Test.java</include>
+              </includes>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+
+    </profile>
+  </profiles>
+
   <dependencies>
 
     <dependency>
diff --git a/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcIntegrationTestSupport.java b/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcIntegrationTestSupport.java
new file mode 100644
index 0000000000000..b459749310dc9
--- /dev/null
+++ b/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcIntegrationTestSupport.java
@@ -0,0 +1,68 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.irc.it;
+
+import java.io.IOException;
+import java.util.Properties;
+import java.util.concurrent.TimeUnit;
+import org.apache.camel.EndpointInject;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Before;
+
+public class IrcIntegrationTestSupport extends CamelTestSupport {
+
+    @EndpointInject(uri = "mock:result")
+    protected MockEndpoint resultEndpoint;
+
+    protected Properties properties;
+
+    @Before
+    public void doBefore() throws IOException {
+        properties = loadProperties();
+        resetMock(resultEndpoint);
+    }
+
+    protected void resetMock(MockEndpoint mock) {
+        mock.reset();
+        mock.setResultWaitTime(TimeUnit.MINUTES.toMillis(1));
+    }
+
+    private Properties loadProperties() throws IOException {
+        Properties p = new Properties();
+        p.load(this.getClass().getResourceAsStream("/it-tests.properties"));
+        return p;
+    }
+
+    @Override
+    protected Properties useOverridePropertiesWithPropertiesComponent() {
+        try {
+            return loadProperties();
+        } catch (IOException e) {
+            log.error("Can't load configuration properties");
+            return null;
+        }
+    }
+
+    protected String sendUri() {
+        return "ircs://{{camelTo}}@{{server}}?channels={{channel1}}";
+    }
+
+    protected String fromUri() {
+        return "ircs://{{camelFrom}}@{{server}}?&channels={{channel1}}";
+    }
+}
diff --git a/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcMultiChannelRouteTest.java b/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcMultiChannelRouteTest.java
similarity index 59%
rename from components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcMultiChannelRouteTest.java
rename to components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcMultiChannelRouteTest.java
index dd1dd73e9d4cb..51f62b20703ad 100644
--- a/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcMultiChannelRouteTest.java
+++ b/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcMultiChannelRouteTest.java
@@ -14,34 +14,40 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.component.irc;
+package org.apache.camel.component.irc.it;
 
 import java.util.List;
-
+import java.util.concurrent.TimeUnit;
+import org.apache.camel.EndpointInject;
 import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.irc.IrcConstants;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Ignore;
 import org.junit.Test;
 
 /**
  * @version 
  */
-public class IrcMultiChannelRouteTest extends CamelTestSupport {
-    protected MockEndpoint resultEndpoint;
+public class IrcMultiChannelRouteTest extends IrcIntegrationTestSupport {
     protected String body1 = "Message One";
     protected String body2 = "Message Two";
     protected String body3 = "Message Three";
-    private boolean sentMessages;    
 
-    @Ignore("test manual, irc.codehaus.org has been closed")
+    @EndpointInject(uri = "mock:joined")
+    private MockEndpoint joined;
+
+
     @Test
     public void testIrcMessages() throws Exception {
-        resultEndpoint = context.getEndpoint("mock:result", MockEndpoint.class);
+        resetMock(joined);
+        joined.expectedMessageCount(2);
+        joined.expectedHeaderValuesReceivedInAnyOrder(IrcConstants.IRC_TARGET, properties.get("channel1"), properties.get("channel2"));
+        joined.assertIsSatisfied();
+
+        sendMessages();
+
         //consumer is going to receive two copies of body3
-        resultEndpoint.expectedBodiesReceived(body1, body2, body3, body3);
+        resultEndpoint.expectedBodiesReceivedInAnyOrder(body1, body2, body3, body3);
 
         resultEndpoint.assertIsSatisfied();
 
@@ -56,38 +62,31 @@ protected RouteBuilder createRouteBuilder() throws Exception {
             public void configure() throws Exception {
                 from(fromUri()).
                         choice().
-                        when(header(IrcConstants.IRC_MESSAGE_TYPE).isEqualTo("PRIVMSG")).to("mock:result").
-                        when(header(IrcConstants.IRC_MESSAGE_TYPE).isEqualTo("JOIN")).to("seda:consumerJoined");
+                        when(header(IrcConstants.IRC_MESSAGE_TYPE).isEqualTo("PRIVMSG")).to("direct:mock").
+                        when(header(IrcConstants.IRC_MESSAGE_TYPE).isEqualTo("JOIN")).to(joined);
 
-                from("seda:consumerJoined").process(new Processor() {
-                    public void process(Exchange exchange) throws Exception {
-                        sendMessages();
-                    }
-                });
+                from("direct:mock").filter(e -> !e.getIn().getBody(String.class).contains("VERSION")).to(resultEndpoint);
             }
         };
     }
 
-    protected String sendUri() {
-        return "irc://camel-prd@irc.codehaus.org:6667?nickname=camel-prd&channels=#camel-test1,#camel-test2";
-    }
 
-    protected String fromUri() {
-        return "irc://camel-con@irc.codehaus.org:6667?nickname=camel-con&channels=#camel-test1,#camel-test2";
-    }    
-    
     /**
      * Lets send messages once the consumer has joined
      */
     protected void sendMessages() {
-        if (!sentMessages) {
-            sentMessages = true;
+        template.sendBodyAndHeader(sendUri(), body1, "irc.target", properties.get("channel1"));
+        template.sendBodyAndHeader(sendUri(), body2, "irc.target", properties.get("channel2"));
+        template.sendBody(sendUri(), body3);
+    }
 
-            // now the consumer has joined, lets send some messages
+    @Override
+    protected String sendUri() {
+        return "ircs://camel-prd@{{server}}?nickname=camel-prd&channels={{channel1}},{{channel2}}";
+    }
 
-            template.sendBodyAndHeader(sendUri(), body1, "irc.target", "#camel-test1");
-            template.sendBodyAndHeader(sendUri(), body2, "irc.target", "#camel-test2");
-            template.sendBody(sendUri(), body3);
-        }
+    @Override
+    protected String fromUri() {
+        return "ircs://camel-con@{{server}}??nickname=camel-con&channels={{channel1}},{{channel2}}";
     }
 }
diff --git a/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcOnReplyTest.java b/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcOnReplyTest.java
similarity index 81%
rename from components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcOnReplyTest.java
rename to components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcOnReplyTest.java
index 7f7b076eaf053..6a80301fd8d83 100644
--- a/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcOnReplyTest.java
+++ b/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcOnReplyTest.java
@@ -14,31 +14,26 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.component.irc;
+package org.apache.camel.component.irc.it;
 
 import java.util.List;
-
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.irc.IrcConstants;
 import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.test.junit4.CamelTestSupport;
-import org.junit.Ignore;
 import org.junit.Test;
 
 /**
  * @version 
  */
-public class IrcOnReplyTest extends CamelTestSupport {
-    protected MockEndpoint resultEndpoint;
+public class IrcOnReplyTest extends IrcIntegrationTestSupport {
     protected String command = "WHO #camel-test";
-    protected String resultEnd = "End of WHO list";
-    private boolean sentMessages;    
+    protected String resultEnd = "End of /WHO list.";
+    private boolean sentMessages;
 
-    @Ignore("test manual, irc.codehaus.org has been closed")
     @Test
     public void testIrcMessages() throws Exception {
-        resultEndpoint = context.getEndpoint("mock:result", MockEndpoint.class);
         resultEndpoint.expectedBodiesReceived(resultEnd);
 
         resultEndpoint.assertIsSatisfied();
@@ -67,7 +62,8 @@ public void process(Exchange exchange) throws Exception {
     }
 
     protected String fromUri() {
-        return "irc://camel-con@irc.codehaus.org:6667?nickname=camel-con&channels=#camel-test&onReply=true";
+        StringBuilder sb = new StringBuilder(super.fromUri());
+        return sb.append("&onReply=true").toString();
     }    
     
     /**
diff --git a/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcPrivmsgTest.java b/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcPrivmsgTest.java
similarity index 80%
rename from components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcPrivmsgTest.java
rename to components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcPrivmsgTest.java
index 22716a2783572..9c06081afe7b3 100644
--- a/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcPrivmsgTest.java
+++ b/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcPrivmsgTest.java
@@ -14,13 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.component.irc;
+package org.apache.camel.component.irc.it;
 
 import java.util.List;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.irc.IrcConstants;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.Ignore;
@@ -29,9 +30,7 @@
 /**
  * @version 
  */
-public class IrcPrivmsgTest extends CamelTestSupport {
-    protected MockEndpoint resultEndpoint;
-
+public class IrcPrivmsgTest extends IrcIntegrationTestSupport {
     protected String expectedBody1 = "Message One";
     protected String expectedBody2 = "Message Two";
 
@@ -40,10 +39,8 @@ public class IrcPrivmsgTest extends CamelTestSupport {
 
     private boolean sentMessages;    
 
-    @Ignore("test manual, irc.codehaus.org has been closed")
     @Test
     public void testIrcPrivateMessages() throws Exception {
-        resultEndpoint = context.getEndpoint("mock:result", MockEndpoint.class);
         resultEndpoint.expectedBodiesReceived(expectedBody1, expectedBody2);
 
         resultEndpoint.assertIsSatisfied();
@@ -59,7 +56,7 @@ protected RouteBuilder createRouteBuilder() throws Exception {
             public void configure() throws Exception {
                 from(fromUri()).
                         choice().
-                        when(header(IrcConstants.IRC_MESSAGE_TYPE).isEqualTo("PRIVMSG")).to("mock:result").
+                        when(header(IrcConstants.IRC_MESSAGE_TYPE).isEqualTo("PRIVMSG")).to("direct:mock").
                         when(header(IrcConstants.IRC_MESSAGE_TYPE).isEqualTo("JOIN")).to("seda:consumerJoined");
 
                 from("seda:consumerJoined")
@@ -68,28 +65,26 @@ public void process(Exchange exchange) throws Exception {
                             sendMessages();
                         }
                     });
+
+                from("direct:mock").filter(e -> !e.getIn().getBody(String.class).contains("VERSION")).to(resultEndpoint);
             }
         };
     }
 
+    @Override
     protected String sendUri() {
-        return "irc://camel-prd@irc.codehaus.org:6667/#camel-test?nickname=camel-prd";
+        return "ircs://{{camelTo}}@{{server}}?channels={{channel1}}&username={{username}}&password={{password}}";
     }
 
-    protected String fromUri() {
-        return "irc://camel-con@irc.codehaus.org:6667/#camel-test?nickname=camel-con";
-    }    
-    
     /**
      * Lets send messages once the consumer has joined
      */
-    protected void sendMessages() {
+    protected void sendMessages() throws InterruptedException {
         if (!sentMessages) {
             sentMessages = true;
 
-            // now the consumer has joined, lets send some messages
-            template.sendBodyAndHeader(sendUri(), body1, "irc.target", "camel-con");
-            template.sendBodyAndHeader(sendUri(), body2, "irc.target", "camel-con");
+            template.sendBodyAndHeader(sendUri(), body1, "irc.target", properties.get("camelFrom"));
+            template.sendBodyAndHeader(sendUri(), body2, "irc.target", properties.get("camelFrom"));
         }
     }
 }
diff --git a/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcRouteTest.java b/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcRouteTest.java
similarity index 81%
rename from components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcRouteTest.java
rename to components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcRouteTest.java
index 7b3d60ff8148d..43d6ce0895a0c 100644
--- a/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcRouteTest.java
+++ b/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcRouteTest.java
@@ -14,13 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.component.irc;
+package org.apache.camel.component.irc.it;
 
 import java.util.List;
 
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
 import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.irc.IrcConstants;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.Ignore;
@@ -29,32 +30,37 @@
 /**
  * @version 
  */
-public class IrcRouteTest extends CamelTestSupport {
-    protected MockEndpoint resultEndpoint;
+public class IrcRouteTest extends IrcIntegrationTestSupport {
     protected String body1 = "Message One";
     protected String body2 = "Message Two";
     private boolean sentMessages;    
 
-    @Ignore("test manual, irc.codehaus.org has been closed")   
     @Test
     public void testIrcMessages() throws Exception {
-        resultEndpoint = context.getEndpoint("mock:result", MockEndpoint.class);
-        resultEndpoint.expectedBodiesReceived(body1, body2);
-
+        resultEndpoint.expectedBodiesReceivedInAnyOrder(body1, body2);
         resultEndpoint.assertIsSatisfied();
 
         List<Exchange> list = resultEndpoint.getReceivedExchanges();
         for (Exchange exchange : list) {
             log.info("Received exchange: " + exchange + " headers: " + exchange.getIn().getHeaders());
         }
-    }   
+    }
+
+    protected String sendUri() {
+        return "irc://{{camelTo}}@{{non.ssl.server}}?channels={{channel1}}";
+    }
+
+    protected String fromUri() {
+        return "irc://{{camelFrom}}@{{non.ssl.server}}?&channels={{channel1}}";
+    }
     
     protected RouteBuilder createRouteBuilder() throws Exception {
         return new RouteBuilder() {
             public void configure() throws Exception {
                 from(fromUri()).
                         choice().
-                        when(header(IrcConstants.IRC_MESSAGE_TYPE).isEqualTo("PRIVMSG")).to("mock:result").
+                        when(header(IrcConstants.IRC_MESSAGE_TYPE).isEqualTo("PRIVMSG"))
+                        .to("direct:mock").
                         when(header(IrcConstants.IRC_MESSAGE_TYPE).isEqualTo("JOIN")).to("seda:consumerJoined");
 
                 from("seda:consumerJoined").process(new Processor() {
@@ -62,17 +68,11 @@ public void process(Exchange exchange) throws Exception {
                         sendMessages();
                     }
                 });
+
+                from("direct:mock").filter(e -> !e.getIn().getBody(String.class).contains("VERSION")).to(resultEndpoint);
             }
         };
     }
-
-    protected String sendUri() {
-        return "irc://camel-prd-user@irc.codehaus.org:6667/#camel-test?nickname=camel-prd";
-    }
-
-    protected String fromUri() {
-        return "irc://camel-con-user@irc.codehaus.org:6667/#camel-test?nickname=camel-con";
-    }    
     
     /**
      * Lets send messages once the consumer has joined
diff --git a/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcsListUsersIntegrationTest.java b/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcsListUsersTest.java
similarity index 74%
rename from components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcsListUsersIntegrationTest.java
rename to components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcsListUsersTest.java
index 7e629ee294f42..29569015c6061 100644
--- a/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcsListUsersIntegrationTest.java
+++ b/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcsListUsersTest.java
@@ -14,17 +14,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.component.irc;
+package org.apache.camel.component.irc.it;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Properties;
+import java.util.concurrent.TimeUnit;
 
 import org.apache.camel.EndpointInject;
 import org.apache.camel.RoutesBuilder;
 import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.irc.IrcConfiguration;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Before;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -34,27 +37,15 @@
  * Joins a channel and asserts that the username of the current test user is
  * listed for the channel.
  */
-public class IrcsListUsersIntegrationTest extends CamelTestSupport {
+public class IrcsListUsersTest extends IrcIntegrationTestSupport {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(IrcsListUsersIntegrationTest.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(IrcsListUsersTest.class);
 
     /** message code for a reply to a <code>NAMES</code> command. */
     private static final String IRC_RPL_NAMREPLY = "353";
 
     /** irc component uri. configured by properties */
-    private static final String PRODUCER_URI = "ircs:{{test.user}}@{{test.server}}/{{test.room}}";
-
-    @EndpointInject(uri = "mock:result")
-    protected MockEndpoint resultEndpoint;
-
-    protected Properties properties;
-
-    public IrcsListUsersIntegrationTest() throws IOException {
-        super();
-        properties = new Properties();
-        InputStream resourceAsStream = this.getClass().getResourceAsStream("/it-list-users.properties");
-        properties.load(resourceAsStream);
-    }
+    private static final String PRODUCER_URI = "ircs:{{camelFrom}}@{{server}}/{{channel1}}";
 
     @Override
     protected RoutesBuilder createRouteBuilder() throws Exception {
@@ -76,17 +67,12 @@ public void configure() throws Exception {
 
     @Test
     public void test() throws Exception {
-        resultEndpoint.setMinimumExpectedMessageCount(1);
+        resultEndpoint.expectedMessageCount(1);
         resultEndpoint.assertIsSatisfied();
         String body = resultEndpoint.getExchanges().get(0).getIn().getBody(String.class);
         LOGGER.debug("Received usernames: [{}]", body);
-        String username = properties.getProperty("test.user");
+        String username = properties.getProperty("camelFrom");
         assertTrue("userlist does not contain test user", body.contains(username));
     }
 
-    @Override
-    protected Properties useOverridePropertiesWithPropertiesComponent() {
-        return properties;
-    }
-
 }
diff --git a/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcsRouteTest.java b/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcsRouteTest.java
similarity index 64%
rename from components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcsRouteTest.java
rename to components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcsRouteTest.java
index d79e5ae21d092..466a9c5a1da71 100644
--- a/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcsRouteTest.java
+++ b/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcsRouteTest.java
@@ -14,25 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.component.irc;
+package org.apache.camel.component.irc.it;
 
-import org.junit.Ignore;
-
-@Ignore
 public class IrcsRouteTest extends IrcRouteTest {
 
-    // TODO This test is disabled until we can find a public SSL enabled IRC 
-    // server to test against. To use this you'll need to change the server 
-    // information below and the username/password. 
-
     @Override
     protected String sendUri() {
-        return "ircs://camel-prd@irc.codehaus.org:6667/#camel-test?nickname=camel-prd&password=blah";
+        return "ircs://{{camelTo}}@{{server}}?channels={{channel1}}";
     }
 
-    @Override    
+    @Override
     protected String fromUri() {
-        return "ircs://camel-con@irc.codehaus.org:6667/#camel-test?nickname=camel-con&password=blah";
-    }    
+        return "ircs://{{camelFrom}}@{{server}}?channels={{channel1}}";
+    }
 
 }
\ No newline at end of file
diff --git a/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcsWithSslContextParamsRouteTest.java b/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcsWithSslContextParamsRouteTest.java
similarity index 98%
rename from components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcsWithSslContextParamsRouteTest.java
rename to components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcsWithSslContextParamsRouteTest.java
index 8faab1a89ca79..819771a9c99b2 100644
--- a/components/camel-irc/src/test/java/org/apache/camel/component/irc/IrcsWithSslContextParamsRouteTest.java
+++ b/components/camel-irc/src/test/java/org/apache/camel/component/irc/it/IrcsWithSslContextParamsRouteTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.camel.component.irc;
+package org.apache.camel.component.irc.it;
 
 import org.apache.camel.impl.JndiRegistry;
 import org.apache.camel.util.jsse.KeyStoreParameters;
diff --git a/components/camel-irc/src/test/resources/it-list-users.properties b/components/camel-irc/src/test/resources/it-tests.properties
similarity index 84%
rename from components/camel-irc/src/test/resources/it-list-users.properties
rename to components/camel-irc/src/test/resources/it-tests.properties
index bebe5fbbc2e9b..81bc728649c0b 100644
--- a/components/camel-irc/src/test/resources/it-list-users.properties
+++ b/components/camel-irc/src/test/resources/it-tests.properties
@@ -15,6 +15,12 @@
 ## limitations under the License.
 ## ---------------------------------------------------------------------------
 
-test.server=chat.freenode.net:6697
-test.room=#testroom123
-test.user=camel-irc-ituser
+server=chat.freenode.net:6697
+non.ssl.server=chat.freenode.net:8002
+channel1=#camel-test1
+channel2=#testroom2
+username=
+password=
+camelFrom=camel-irc-ituser
+camelTo=camel-prod
+

From 8240ed3fc919da6058f561053361fc57d88d1a13 Mon Sep 17 00:00:00 2001
From: Christoph Deppisch <cdeppisch@redhat.com>
Date: Thu, 22 Nov 2018 09:41:52 +0100
Subject: [PATCH 070/125] CAMEL-12950: Add google-sheets component

---
 apache-camel/pom.xml                          |  11 +-
 .../src/main/descriptors/common-bin.xml       |   4 +-
 bom/camel-bom/pom.xml                         |  10 +
 components/camel-google-sheets/pom.xml        | 289 ++++++++++++++++++
 .../main/docs/google-sheets-component.adoc    | 180 +++++++++++
 .../docs/google-sheets-stream-component.adoc  | 164 ++++++++++
 .../BatchGoogleSheetsClientFactory.java       |  66 ++++
 .../sheets/GoogleSheetsClientFactory.java     |  25 ++
 .../google/sheets/GoogleSheetsComponent.java  | 102 +++++++
 .../sheets/GoogleSheetsConfiguration.java     | 130 ++++++++
 .../google/sheets/GoogleSheetsConsumer.java   |  52 ++++
 .../google/sheets/GoogleSheetsEndpoint.java   | 115 +++++++
 .../google/sheets/GoogleSheetsProducer.java   |  54 ++++
 .../sheets/GoogleSheetsVerifierExtension.java |  80 +++++
 .../internal/GoogleSheetsConstants.java       |  33 ++
 .../GoogleSheetsPropertiesHelper.java         |  39 +++
 .../stream/GoogleSheetsStreamComponent.java   |  96 ++++++
 .../GoogleSheetsStreamConfiguration.java      | 255 ++++++++++++++++
 .../stream/GoogleSheetsStreamConstants.java   |  37 +++
 .../stream/GoogleSheetsStreamConsumer.java    | 120 ++++++++
 .../stream/GoogleSheetsStreamEndpoint.java    |  99 ++++++
 .../src/main/resources/META-INF/LICENSE.txt   | 203 ++++++++++++
 .../src/main/resources/META-INF/NOTICE.txt    |  11 +
 .../org/apache/camel/component/google-sheets  |  17 ++
 .../camel/component/google-sheets-stream      |  17 ++
 .../AbstractGoogleSheetsTestSupport.java      | 164 ++++++++++
 .../GoogleSheetsVerifierExtensionTest.java    |  68 +++++
 .../sheets/SheetsConfigurationTest.java       |  64 ++++
 .../SheetsSpreadsheetsIntegrationTest.java    | 114 +++++++
 ...eetsSpreadsheetsValuesIntegrationTest.java | 159 ++++++++++
 ...AbstractGoogleSheetsStreamTestSupport.java |  44 +++
 .../SheetsStreamConsumerIntegrationTest.java  |  70 +++++
 .../src/test/resources/log4j2.properties      |  28 ++
 .../test/resources/test-options.properties    |  26 ++
 components/pom.xml                            |   3 +-
 components/readme.adoc                        |   8 +-
 docs/user-manual/en/SUMMARY.md                |   2 +
 parent/pom.xml                                |  15 +-
 .../features/src/main/resources/features.xml  |  38 ++-
 .../camel-google-sheets-starter/pom.xml       |  61 ++++
 ...oogleSheetsComponentAutoConfiguration.java | 129 ++++++++
 .../GoogleSheetsComponentConfiguration.java   | 174 +++++++++++
 ...heetsStreamComponentAutoConfiguration.java | 130 ++++++++
 ...gleSheetsStreamComponentConfiguration.java | 252 +++++++++++++++
 .../src/main/resources/META-INF/LICENSE.txt   | 203 ++++++++++++
 .../src/main/resources/META-INF/NOTICE.txt    |  11 +
 .../main/resources/META-INF/spring.factories  |  21 ++
 .../main/resources/META-INF/spring.provides   |  17 ++
 .../spring-boot/components-starter/pom.xml    |   1 +
 .../camel-spring-boot-dependencies/pom.xml    |  10 +
 .../itest/karaf/CamelGoogleSheetsTest.java    |  33 ++
 51 files changed, 4036 insertions(+), 18 deletions(-)
 create mode 100644 components/camel-google-sheets/pom.xml
 create mode 100644 components/camel-google-sheets/src/main/docs/google-sheets-component.adoc
 create mode 100644 components/camel-google-sheets/src/main/docs/google-sheets-stream-component.adoc
 create mode 100644 components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/BatchGoogleSheetsClientFactory.java
 create mode 100644 components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsClientFactory.java
 create mode 100644 components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsComponent.java
 create mode 100644 components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsConfiguration.java
 create mode 100644 components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsConsumer.java
 create mode 100644 components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsEndpoint.java
 create mode 100644 components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsProducer.java
 create mode 100644 components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsVerifierExtension.java
 create mode 100644 components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/internal/GoogleSheetsConstants.java
 create mode 100644 components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/internal/GoogleSheetsPropertiesHelper.java
 create mode 100644 components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamComponent.java
 create mode 100644 components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamConfiguration.java
 create mode 100644 components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamConstants.java
 create mode 100644 components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamConsumer.java
 create mode 100644 components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamEndpoint.java
 create mode 100644 components/camel-google-sheets/src/main/resources/META-INF/LICENSE.txt
 create mode 100644 components/camel-google-sheets/src/main/resources/META-INF/NOTICE.txt
 create mode 100644 components/camel-google-sheets/src/main/resources/META-INF/services/org/apache/camel/component/google-sheets
 create mode 100644 components/camel-google-sheets/src/main/resources/META-INF/services/org/apache/camel/component/google-sheets-stream
 create mode 100644 components/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/AbstractGoogleSheetsTestSupport.java
 create mode 100644 components/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/GoogleSheetsVerifierExtensionTest.java
 create mode 100644 components/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/SheetsConfigurationTest.java
 create mode 100644 components/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/SheetsSpreadsheetsIntegrationTest.java
 create mode 100644 components/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/SheetsSpreadsheetsValuesIntegrationTest.java
 create mode 100644 components/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/stream/AbstractGoogleSheetsStreamTestSupport.java
 create mode 100644 components/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/stream/SheetsStreamConsumerIntegrationTest.java
 create mode 100644 components/camel-google-sheets/src/test/resources/log4j2.properties
 create mode 100644 components/camel-google-sheets/src/test/resources/test-options.properties
 create mode 100644 platforms/spring-boot/components-starter/camel-google-sheets-starter/pom.xml
 create mode 100644 platforms/spring-boot/components-starter/camel-google-sheets-starter/src/main/java/org/apache/camel/component/google/sheets/springboot/GoogleSheetsComponentAutoConfiguration.java
 create mode 100644 platforms/spring-boot/components-starter/camel-google-sheets-starter/src/main/java/org/apache/camel/component/google/sheets/springboot/GoogleSheetsComponentConfiguration.java
 create mode 100644 platforms/spring-boot/components-starter/camel-google-sheets-starter/src/main/java/org/apache/camel/component/google/sheets/stream/springboot/GoogleSheetsStreamComponentAutoConfiguration.java
 create mode 100644 platforms/spring-boot/components-starter/camel-google-sheets-starter/src/main/java/org/apache/camel/component/google/sheets/stream/springboot/GoogleSheetsStreamComponentConfiguration.java
 create mode 100644 platforms/spring-boot/components-starter/camel-google-sheets-starter/src/main/resources/META-INF/LICENSE.txt
 create mode 100644 platforms/spring-boot/components-starter/camel-google-sheets-starter/src/main/resources/META-INF/NOTICE.txt
 create mode 100644 platforms/spring-boot/components-starter/camel-google-sheets-starter/src/main/resources/META-INF/spring.factories
 create mode 100644 platforms/spring-boot/components-starter/camel-google-sheets-starter/src/main/resources/META-INF/spring.provides
 create mode 100644 tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGoogleSheetsTest.java

diff --git a/apache-camel/pom.xml b/apache-camel/pom.xml
index af37d5ea136a9..24ecbb2cb8d9e 100644
--- a/apache-camel/pom.xml
+++ b/apache-camel/pom.xml
@@ -366,6 +366,10 @@
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-google-calendar</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.camel</groupId>
+      <artifactId>camel-google-sheets</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-google-drive</artifactId>
@@ -1549,7 +1553,7 @@
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-fhir-starter</artifactId>
       <version>${project.version}</version>
-    </dependency>    
+    </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-flatpack-starter</artifactId>
@@ -1605,6 +1609,11 @@
       <artifactId>camel-google-calendar-starter</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.apache.camel</groupId>
+      <artifactId>camel-google-sheets-starter</artifactId>
+      <version>${project.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-google-drive-starter</artifactId>
diff --git a/apache-camel/src/main/descriptors/common-bin.xml b/apache-camel/src/main/descriptors/common-bin.xml
index 3436d48a2047b..22c929a667001 100644
--- a/apache-camel/src/main/descriptors/common-bin.xml
+++ b/apache-camel/src/main/descriptors/common-bin.xml
@@ -105,6 +105,7 @@
         <include>org.apache.camel:camel-git</include>
         <include>org.apache.camel:camel-github</include>
         <include>org.apache.camel:camel-google-calendar</include>
+        <include>org.apache.camel:camel-google-sheets</include>
         <include>org.apache.camel:camel-google-drive</include>
         <include>org.apache.camel:camel-google-mail</include>
         <include>org.apache.camel:camel-google-bigquery</include>
@@ -430,6 +431,7 @@
         <include>org.apache.camel:camel-git-starter</include>
         <include>org.apache.camel:camel-google-bigquery-starter</include>
         <include>org.apache.camel:camel-google-calendar-starter</include>
+        <include>org.apache.camel:camel-google-sheets-starter</include>
         <include>org.apache.camel:camel-google-drive-starter</include>
         <include>org.apache.camel:camel-google-mail-starter</include>
         <include>org.apache.camel:camel-google-pubsub-starter</include>
@@ -506,7 +508,7 @@
         <include>org.apache.camel:camel-mail-starter</include>
         <include>org.apache.camel:camel-master-starter</include>
         <include>org.apache.camel:camel-metrics-starter</include>
-        <include>org.apache.camel:camel-micrometer-starter</include>		
+        <include>org.apache.camel:camel-micrometer-starter</include>
         <include>org.apache.camel:camel-milo-starter</include>
         <include>org.apache.camel:camel-mina2-starter</include>
         <include>org.apache.camel:camel-mllp-starter</include>
diff --git a/bom/camel-bom/pom.xml b/bom/camel-bom/pom.xml
index b8266714fecfb..fc9cacf8a5399 100644
--- a/bom/camel-bom/pom.xml
+++ b/bom/camel-bom/pom.xml
@@ -928,6 +928,16 @@
         <artifactId>camel-google-pubsub-starter</artifactId>
         <version>${project.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.camel</groupId>
+        <artifactId>camel-google-sheets</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.camel</groupId>
+        <artifactId>camel-google-sheets-starter</artifactId>
+        <version>${project.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-gora</artifactId>
diff --git a/components/camel-google-sheets/pom.xml b/components/camel-google-sheets/pom.xml
new file mode 100644
index 0000000000000..da26bd64c5828
--- /dev/null
+++ b/components/camel-google-sheets/pom.xml
@@ -0,0 +1,289 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    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.
+
+-->
+<project xmlns="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">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.camel</groupId>
+    <artifactId>components</artifactId>
+    <version>2.23.0-SNAPSHOT</version>
+  </parent>
+
+  <artifactId>camel-google-sheets</artifactId>
+  <packaging>jar</packaging>
+  <name>Camel :: GoogleSheets</name>
+  <description>Camel Component for GoogleSheets</description>
+
+  <properties>
+    <schemeName>google-sheets</schemeName>
+    <componentName>GoogleSheets</componentName>
+    <componentPackage>org.apache.camel.component.google.sheets</componentPackage>
+    <outPackage>org.apache.camel.component.google.sheets.internal</outPackage>
+    <camel.osgi.private.pkg>org.apache.camel.component.google.sheets.internal</camel.osgi.private.pkg>
+    <camel.osgi.export.pkg>org.apache.camel.component.google.sheets</camel.osgi.export.pkg>
+    <camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=google-sheets</camel.osgi.export.service>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.camel</groupId>
+      <artifactId>camel-core</artifactId>
+    </dependency>
+    <dependency>
+        <groupId>com.google.api-client</groupId>
+        <artifactId>google-api-client</artifactId>
+        <version>${google-api-client-version}</version>
+    </dependency>
+    <dependency>
+        <groupId>com.google.oauth-client</groupId>
+        <artifactId>google-oauth-client</artifactId>
+        <version>${google-api-client-version}</version>
+    </dependency>
+    <dependency>
+        <groupId>com.google.http-client</groupId>
+        <artifactId>google-http-client-jackson2</artifactId>
+        <version>${google-api-client-version}</version>
+    </dependency>
+    <dependency>
+        <groupId>com.google.apis</groupId>
+        <artifactId>google-api-services-sheets</artifactId>
+        <version>${google-api-services-sheets-version}</version>
+    </dependency>
+
+    <!-- Camel annotations in provided scope to avoid compile errors in IDEs -->
+    <dependency>
+      <groupId>org.apache.camel</groupId>
+      <artifactId>spi-annotations</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+
+    <!-- Component API javadoc in provided scope to read API signatures -->
+    <dependency>
+        <groupId>com.google.apis</groupId>
+        <artifactId>google-api-services-sheets</artifactId>
+        <version>${google-api-services-sheets-version}</version>
+      <type>javadoc</type>
+      <scope>provided</scope>
+    </dependency>
+
+    <!-- logging -->
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-api</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-core</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.logging.log4j</groupId>
+      <artifactId>log4j-slf4j-impl</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <!-- testing -->
+    <dependency>
+      <groupId>org.apache.camel</groupId>
+      <artifactId>camel-test</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <defaultGoal>install</defaultGoal>
+
+    <plugins>
+
+      <!-- generate Component source and test source -->
+      <plugin>
+        <groupId>org.apache.camel</groupId>
+        <artifactId>camel-api-component-maven-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>generate-test-component-classes</id>
+            <goals>
+              <goal>fromApis</goal>
+            </goals>
+            <configuration>
+              <apis>
+                <api>
+                  <apiName>spreadsheets</apiName>
+                  <proxyClass>com.google.api.services.sheets.v4.Sheets$Spreadsheets</proxyClass>
+                  <fromJavadoc />
+                </api>
+                <api>
+                  <apiName>data</apiName>
+                  <proxyClass>com.google.api.services.sheets.v4.Sheets$Spreadsheets$Values</proxyClass>
+                  <fromJavadoc />
+                </api>
+              </apis>
+              <substitutions>
+                <substitution>
+                  <method>^.+$</method>
+                  <argName>content</argName>
+                  <argType>com.google.api.services.sheets.v4.model.ValueRange</argType>
+                  <replacement>values</replacement>
+                </substitution>
+                <substitution>
+                  <method>^.+$</method>
+                  <argName>content</argName>
+                  <argType>com.google.api.services.sheets.v4.model.BatchUpdateSpreadsheetRequest</argType>
+                  <replacement>batchUpdateSpreadsheetRequest</replacement>
+                </substitution>
+                <substitution>
+                  <method>^.+$</method>
+                  <argName>content</argName>
+                  <argType>com.google.api.services.sheets.v4.model.GetSpreadsheetByDataFilterRequest</argType>
+                  <replacement>getSpreadsheetByDataFilterRequest</replacement>
+                </substitution>
+                <substitution>
+                  <method>^.+$</method>
+                  <argName>content</argName>
+                  <argType>com.google.api.services.sheets.v4.model.ClearValuesRequest</argType>
+                  <replacement>clearValuesRequest</replacement>
+                </substitution>
+                <substitution>
+                  <method>^.+$</method>
+                  <argName>content</argName>
+                  <argType>com.google.api.services.sheets.v4.model.BatchClearValuesRequest</argType>
+                  <replacement>batchClearValuesRequest</replacement>
+                </substitution>
+                <substitution>
+                  <method>^.+$</method>
+                  <argName>content</argName>
+                  <argType>com.google.api.services.sheets.v4.model.BatchUpdateValuesByDataFilterRequest</argType>
+                  <replacement>batchUpdateValuesByDataFilterRequest</replacement>
+                </substitution>
+                <substitution>
+                  <method>^.+$</method>
+                  <argName>content</argName>
+                  <argType>com.google.api.services.sheets.v4.model.BatchGetValuesByDataFilterRequest</argType>
+                  <replacement>batchGetValuesByDataFilterRequest</replacement>
+                </substitution>
+                <substitution>
+                  <method>^.+$</method>
+                  <argName>content</argName>
+                  <argType>com.google.api.services.sheets.v4.model.BatchUpdateValuesRequest</argType>
+                  <replacement>batchUpdateValuesRequest</replacement>
+                </substitution>
+              </substitutions>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
+      <!-- add generated source and test source to build -->
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
+        <version>1.8</version>
+        <executions>
+          <execution>
+            <id>add-generated-sources</id>
+            <goals>
+              <goal>add-source</goal>
+            </goals>
+            <configuration>
+              <sources>
+                <source>${project.build.directory}/generated-sources/camel-component</source>
+              </sources>
+            </configuration>
+          </execution>
+          <execution>
+            <id>add-generated-test-sources</id>
+            <goals>
+              <goal>add-test-source</goal>
+            </goals>
+            <configuration>
+              <sources>
+                <source>${project.build.directory}/generated-test-sources/camel-component</source>
+              </sources>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
+    </plugins>
+
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.camel</groupId>
+          <artifactId>camel-api-component-maven-plugin</artifactId>
+          <version>${project.version}</version>
+          <configuration>
+            <scheme>${schemeName}</scheme>
+            <componentName>${componentName}</componentName>
+            <componentPackage>${componentPackage}</componentPackage>
+            <outPackage>${outPackage}</outPackage>
+          </configuration>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+
+  </build>
+
+  <reporting>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.camel</groupId>
+        <artifactId>camel-api-component-maven-plugin</artifactId>
+        <version>${project.version}</version>
+        <configuration>
+          <scheme>${schemeName}</scheme>
+          <componentName>${componentName}</componentName>
+          <componentPackage>${componentPackage}</componentPackage>
+          <outPackage>${outPackage}</outPackage>
+        </configuration>
+      </plugin>
+    </plugins>
+  </reporting>
+
+  <profiles>
+    <profile>
+      <id>google-sheets-test</id>
+      <build>
+        <plugins>
+          <plugin>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+              <childDelegation>false</childDelegation>
+              <useFile>true</useFile>
+              <forkCount>1</forkCount>
+              <reuseForks>true</reuseForks>
+              <forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds>
+              <excludes>
+                <exclude>**/*XXXTest.java</exclude>
+              </excludes>
+              <includes>
+                <include>**/*Test.java</include>
+              </includes>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+
+</project>
diff --git a/components/camel-google-sheets/src/main/docs/google-sheets-component.adoc b/components/camel-google-sheets/src/main/docs/google-sheets-component.adoc
new file mode 100644
index 0000000000000..0cba9c99b51ca
--- /dev/null
+++ b/components/camel-google-sheets/src/main/docs/google-sheets-component.adoc
@@ -0,0 +1,180 @@
+[[google-sheets-component]]
+== Google Sheets Component
+
+*Available as of Camel version 2.23*
+
+The Google Sheets component provides access
+to http://google.com/sheets[Google Sheets] via
+the https://developers.google.com/sheets/api/reference/rest/[Google
+Sheets Web APIs].
+
+Google Sheets uses
+the https://developers.google.com/accounts/docs/OAuth2[OAuth 2.0
+protocol] for authenticating a Google account and authorizing access to
+user data. Before you can use this component, you will need
+to https://developers.google.com/google-apps/sheets/auth[create an
+account and generate OAuth credentials]. Credentials comprise of a
+clientId, clientSecret, and a refreshToken. A handy resource for
+generating a long-lived refreshToken is
+the https://developers.google.com/oauthplayground[OAuth playground].
+
+Maven users will need to add the following dependency to their pom.xml
+for this component:
+
+----------------------------------------------------------
+    <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-google-sheets</artifactId>
+            <version>2.23.0</version>
+    </dependency>
+
+----------------------------------------------------------
+
+### URI Format
+
+The GoogleSheets Component uses the following URI format:
+
+------------------------------------------------------------
+        google-sheets://endpoint-prefix/endpoint?[options]
+
+------------------------------------------------------------
+
+Endpoint prefix can be one of:
+
+* spreadsheets
+* data
+
+### GoogleSheetsComponent
+
+
+
+
+
+// component options: START
+The Google Sheets component supports 3 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 |  | GoogleSheets Configuration
+| *clientFactory* (advanced) | To use the GoogleSheetsClientFactory as factory for creating the client. Will by default use BatchGoogleSheetsClientFactory |  | GoogleSheetsClient Factory
+| *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 Google Sheets endpoint is configured using URI syntax:
+
+----
+google-sheets:apiName/methodName
+----
+
+with the following path and query parameters:
+
+==== Path Parameters (2 parameters):
+
+
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *apiName* | *Required* What kind of operation to perform |  | GoogleSheetsApiName
+| *methodName* | *Required* What sub operation to use for the selected operation |  | String
+|===
+
+
+==== Query Parameters (10 parameters):
+
+
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *accessToken* (common) | OAuth 2 access token. This typically expires after an hour so refreshToken is recommended for long term usage. |  | String
+| *applicationName* (common) | Google Sheets application name. Example would be camel-google-sheets/1.0 |  | String
+| *clientId* (common) | Client ID of the sheets application |  | String
+| *clientSecret* (common) | Client secret of the sheets application |  | String
+| *inBody* (common) | Sets the name of a parameter to be passed in the exchange In Body |  | String
+| *refreshToken* (common) | OAuth 2 refresh token. Using this, the Google Sheets component can obtain a new accessToken whenever the current one expires - a necessity if the application is long-lived. |  | 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 option 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
+// spring-boot-auto-configure options: START
+=== Spring Boot Auto-Configuration
+
+
+The component supports 10 options, which are listed below.
+
+
+
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *camel.component.google-sheets.client-factory* | To use the GoogleSheetsClientFactory as factory for creating the client. Will by default use BatchGoogleSheetsClientFactory. The option is a org.apache.camel.component.google.sheets.GoogleSheetsClientFactory type. |  | String
+| *camel.component.google-sheets.configuration.access-token* | OAuth 2 access token. This typically expires after an hour so refreshToken is recommended for long term usage. |  | String
+| *camel.component.google-sheets.configuration.api-name* | What kind of operation to perform |  | GoogleSheetsApiName
+| *camel.component.google-sheets.configuration.application-name* | Google Sheets application name. Example would be camel-google-sheets/1.0 |  | String
+| *camel.component.google-sheets.configuration.client-id* | Client ID of the sheets application |  | String
+| *camel.component.google-sheets.configuration.client-secret* | Client secret of the sheets application |  | String
+| *camel.component.google-sheets.configuration.method-name* | What sub operation to use for the selected operation |  | String
+| *camel.component.google-sheets.configuration.refresh-token* | OAuth 2 refresh token. Using this, the Google Sheets component can obtain a new accessToken whenever the current one expires - a necessity if the application is long-lived. |  | String
+| *camel.component.google-sheets.enabled* | Whether to enable auto configuration of the google-sheets component. This is enabled by default. |  | Boolean
+| *camel.component.google-sheets.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
+|===
+// spring-boot-auto-configure options: END
+
+
+
+
+### Producer Endpoints
+
+Producer endpoints can use endpoint prefixes followed by endpoint names
+and associated options described next. A shorthand alias can be used for
+some endpoints. The endpoint URI MUST contain a prefix.
+
+Endpoint options that are not mandatory are denoted by []. When there
+are no mandatory options for an endpoint, one of the set of [] options
+MUST be provided. Producer endpoints can also use a special option
+*`inBody`* that in turn should contain the name of the endpoint option
+whose value will be contained in the Camel Exchange In message.
+
+Any of the endpoint options can be provided in either the endpoint URI,
+or dynamically in a message header. The message header name must be of
+the format `CamelGoogleSheets.<option>`. Note that the `inBody` option
+overrides message header, i.e. the endpoint option `inBody=option` would
+override a `CamelGoogleSheets.option` header.
+
+For more information on the endpoints and options see API documentation
+at: https://developers.google.com/sheets/api/reference/rest/[https://developers.google.com/sheets/api/reference/rest/]
+
+### Consumer Endpoints
+
+Any of the producer endpoints can be used as a consumer endpoint.
+Consumer endpoints can use
+http://camel.apache.org/polling-consumer.html#PollingConsumer-ScheduledPollConsumerOptions[Scheduled
+Poll Consumer Options] with a `consumer.` prefix to schedule endpoint
+invocation. Consumer endpoints that return an array or collection will
+generate one exchange per element, and their routes will be executed
+once for each exchange.
+
+### Message Headers
+
+Any URI option can be provided in a message header for producer
+endpoints with a `CamelGoogleSheets.` prefix.
+
+### Message Body
+
+All result message bodies utilize objects provided by the underlying
+APIs used by the GoogleSheetsComponent. Producer endpoints can specify
+the option name for incoming message body in the `inBody` endpoint URI
+parameter. For endpoints that return an array or collection, a consumer
+endpoint will map every element to distinct messages.     
diff --git a/components/camel-google-sheets/src/main/docs/google-sheets-stream-component.adoc b/components/camel-google-sheets/src/main/docs/google-sheets-stream-component.adoc
new file mode 100644
index 0000000000000..63555c90bfeca
--- /dev/null
+++ b/components/camel-google-sheets/src/main/docs/google-sheets-stream-component.adoc
@@ -0,0 +1,164 @@
+[[google-sheets-stream-component]]
+== Google Sheets Stream Component
+
+*Available as of Camel version 2.23*
+
+The Google Sheets component provides access
+to https://sheets.google.com/[Sheets] via
+the https://developers.google.com/sheets/api/reference/rest/[Google Sheets
+Web APIs].
+
+Google Sheets uses
+the https://developers.google.com/accounts/docs/OAuth2[OAuth 2.0
+protocol] for authenticating a Google account and authorizing access to
+user data. Before you can use this component, you will need
+to https://developers.google.com/google-apps/sheets/auth[create an
+account and generate OAuth credentials]. Credentials comprise of a
+clientId, clientSecret, and a refreshToken. A handy resource for
+generating a long-lived refreshToken is
+the https://developers.google.com/oauthplayground[OAuth playground].
+
+Maven users will need to add the following dependency to their pom.xml
+for this component:
+
+------------------------------------------------------
+    <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-google-sheets</artifactId>
+            <version>2.23.0</version>
+    </dependency>
+
+------------------------------------------------------
+
+### URI Format
+
+The Google Sheets Component uses the following URI format:
+
+--------------------------------------------------------
+        google-sheets-stream://apiName?[options]
+
+--------------------------------------------------------
+
+### GoogleSheetsStreamComponent
+
+
+// component options: START
+The Google Sheets Stream component supports 3 options, which are listed below.
+
+
+
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *configuration* (consumer) | To use the shared configuration |  | GoogleSheetsStream Configuration
+| *clientFactory* (advanced) | To use the GoogleSheetsClientFactory as factory for creating the client. Will by default use BatchGoogleSheetsClientFactory |  | GoogleSheetsClient Factory
+| *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 Google Sheets Stream endpoint is configured using URI syntax:
+
+----
+google-sheets-stream:apiName
+----
+
+with the following path and query parameters:
+
+==== Path Parameters (1 parameters):
+
+
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *apiName* | Sets the apiName. |  | String
+|===
+
+
+==== Query Parameters (31 parameters):
+
+
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *accessToken* (consumer) | OAuth 2 access token. This typically expires after an hour so refreshToken is recommended for long term usage. |  | String
+| *applicationName* (consumer) | Google sheets application name. Example would be camel-google-sheets/1.0 |  | 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
+| *clientId* (consumer) | Client ID of the sheets application |  | String
+| *clientSecret* (consumer) | Client secret of the sheets application |  | String
+| *includeGridData* (consumer) | True if grid data should be returned. | false | boolean
+| *majorDimension* (consumer) | Specifies the major dimension that results should use.. | ROWS | String
+| *maxResults* (consumer) | Specify the maximum number of returned results. This will limit the number of rows in a returned value range data set or the number of returned value ranges in a batch request. | 10 | int
+| *range* (consumer) | Specifies the range of rows and columns in a sheet to get data from. |  | String
+| *refreshToken* (consumer) | OAuth 2 refresh token. Using this, the Google Calendar component can obtain a new accessToken whenever the current one expires - a necessity if the application is long-lived. |  | String
+| *scopes* (consumer) | Specifies the level of permissions you want a sheets application to have to a user account. See https://developers.google.com/identity/protocols/googlescopes for more info. |  | List
+| *sendEmptyMessageWhenIdle* (consumer) | If the polling consumer did not poll any files, you can enable this option to send an empty message (no body) instead. | false | boolean
+| *spreadsheetId* (consumer) | Specifies the spreadsheet identifier that is used to identify the target to obtain. |  | String
+| *valueRenderOption* (consumer) | Determines how values should be rendered in the output. | FORMATTED_VALUE | String
+| *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option 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
+| *pollStrategy* (consumer) | A pluggable org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your custom implementation to control error handling usually occurred during the poll operation before an Exchange have been created and being routed in Camel. |  | PollingConsumerPoll Strategy
+| *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
+| *backoffMultiplier* (scheduler) | To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured. |  | int
+| *delay* (scheduler) | Milliseconds before the next poll. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 500 | long
+| *greedy* (scheduler) | If greedy is enabled, then the ScheduledPollConsumer will run immediately again, if the previous run polled 1 or more messages. | false | boolean
+| *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
+| *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. | TRACE | LoggingLevel
+| *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. |  | ScheduledExecutor Service
+| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz2 component | none | ScheduledPollConsumer Scheduler
+| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz2, Spring based scheduler. |  | Map
+| *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
+| *timeUnit* (scheduler) | Time unit for initialDelay and delay options. | MILLISECONDS | TimeUnit
+| *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
+|===
+// endpoint options: END
+// spring-boot-auto-configure options: START
+=== Spring Boot Auto-Configuration
+
+
+The component supports 16 options, which are listed below.
+
+
+
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *camel.component.google-sheets-stream.client-factory* | To use the GoogleSheetsClientFactory as factory for creating the client. Will by default use BatchGoogleSheetsClientFactory. The option is a org.apache.camel.component.google.sheets.GoogleSheetsClientFactory type. |  | String
+| *camel.component.google-sheets-stream.configuration.access-token* | OAuth 2 access token. This typically expires after an hour so refreshToken is recommended for long term usage. |  | String
+| *camel.component.google-sheets-stream.configuration.api-name* | Sets the apiName. |  | String
+| *camel.component.google-sheets-stream.configuration.application-name* | Google sheets application name. Example would be camel-google-sheets/1.0 |  | String
+| *camel.component.google-sheets-stream.configuration.client-id* | Client ID of the sheets application |  | String
+| *camel.component.google-sheets-stream.configuration.client-secret* | Client secret of the sheets application |  | String
+| *camel.component.google-sheets-stream.configuration.include-grid-data* | True if grid data should be returned. | false | Boolean
+| *camel.component.google-sheets-stream.configuration.major-dimension* | Specifies the major dimension that results should use.. | ROWS | String
+| *camel.component.google-sheets-stream.configuration.max-results* | Specify the maximum number of returned results. This will limit the number of rows in a returned value range data set or the number of returned value ranges in a batch request. | 10 | Integer
+| *camel.component.google-sheets-stream.configuration.range* | Specifies the range of rows and columns in a sheet to get data from. |  | String
+| *camel.component.google-sheets-stream.configuration.refresh-token* | OAuth 2 refresh token. Using this, the Google Calendar component can obtain a new accessToken whenever the current one expires - a necessity if the application is long-lived. |  | String
+| *camel.component.google-sheets-stream.configuration.scopes* | Specifies the level of permissions you want a sheets application to have to a user account. See https://developers.google.com/identity/protocols/googlescopes for more info. |  | List
+| *camel.component.google-sheets-stream.configuration.spreadsheet-id* | Specifies the spreadsheet identifier that is used to identify the target to obtain. |  | String
+| *camel.component.google-sheets-stream.configuration.value-render-option* | Determines how values should be rendered in the output. | FORMATTED_VALUE | String
+| *camel.component.google-sheets-stream.enabled* | Whether to enable auto configuration of the google-sheets-stream component. This is enabled by default. |  | Boolean
+| *camel.component.google-sheets-stream.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
+|===
+// spring-boot-auto-configure options: END
+
+
+### Consumer
+
+The consumer will poll by default with maxResults equals to 5.
+
+For example
+
+[source,java]
+---------------------------------------------------------
+from("google-sheets-stream://data?range=A:B&delay=5000&maxResults=5").to("mock:result");
+---------------------------------------------------------
+
+This route will consume the next ten events starting from the date of polling.
+
+   
diff --git a/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/BatchGoogleSheetsClientFactory.java b/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/BatchGoogleSheetsClientFactory.java
new file mode 100644
index 0000000000000..1c5a91a582ba5
--- /dev/null
+++ b/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/BatchGoogleSheetsClientFactory.java
@@ -0,0 +1,66 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.google.sheets;
+
+import com.google.api.client.auth.oauth2.Credential;
+import com.google.api.client.googleapis.auth.oauth2.GoogleCredential;
+import com.google.api.client.http.javanet.NetHttpTransport;
+import com.google.api.client.json.jackson2.JacksonFactory;
+import com.google.api.services.sheets.v4.Sheets;
+import org.apache.camel.RuntimeCamelException;
+
+public class BatchGoogleSheetsClientFactory implements GoogleSheetsClientFactory {
+
+    private final NetHttpTransport transport;
+    private final JacksonFactory jsonFactory;
+
+    public BatchGoogleSheetsClientFactory() {
+        this.transport = new NetHttpTransport();
+        this.jsonFactory = new JacksonFactory();
+    }
+
+    @Override
+    public Sheets makeClient(String clientId, String clientSecret, String applicationName, String refreshToken, String accessToken) {
+        if (clientId == null || clientSecret == null) {
+            throw new IllegalArgumentException("clientId and clientSecret are required to create Google Sheets client.");
+        }
+        try {
+            Credential credential = authorize(clientId, clientSecret);
+
+            if (refreshToken != null && !"".equals(refreshToken)) {
+                credential.setRefreshToken(refreshToken);
+            }
+            if (accessToken != null && !"".equals(accessToken)) {
+                credential.setAccessToken(accessToken);
+            }
+            return new Sheets.Builder(transport, jsonFactory, credential)
+                                .setApplicationName(applicationName)
+                                .build();
+        } catch (Exception e) {
+            throw new RuntimeCamelException("Could not create Google Sheets client.", e);
+        }
+    }
+
+    // Authorizes the installed application to access user's protected data.
+    private Credential authorize(String clientId, String clientSecret) {
+        // authorize
+        return new GoogleCredential.Builder()
+                        .setJsonFactory(jsonFactory)
+                        .setTransport(transport)
+                        .setClientSecrets(clientId, clientSecret).build();
+    }
+}
diff --git a/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsClientFactory.java b/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsClientFactory.java
new file mode 100644
index 0000000000000..78b4e9790be8e
--- /dev/null
+++ b/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsClientFactory.java
@@ -0,0 +1,25 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.google.sheets;
+
+import com.google.api.services.sheets.v4.Sheets;
+
+public interface GoogleSheetsClientFactory {
+
+    Sheets makeClient(String clientId, String clientSecret, String applicationName, String refreshToken, String accessToken);
+
+}
diff --git a/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsComponent.java b/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsComponent.java
new file mode 100644
index 0000000000000..f5764b1689967
--- /dev/null
+++ b/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsComponent.java
@@ -0,0 +1,102 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.google.sheets;
+
+import com.google.api.services.sheets.v4.Sheets;
+import org.apache.camel.CamelContext;
+import org.apache.camel.Endpoint;
+import org.apache.camel.component.google.sheets.internal.GoogleSheetsApiCollection;
+import org.apache.camel.component.google.sheets.internal.GoogleSheetsApiName;
+import org.apache.camel.spi.Metadata;
+import org.apache.camel.util.component.AbstractApiComponent;
+
+/**
+ * Represents the component that manages {@link GoogleSheetsEndpoint}.
+ */
+@Metadata(label = "verifiers", enums = "parameters,connectivity")
+public class GoogleSheetsComponent extends AbstractApiComponent<GoogleSheetsApiName, GoogleSheetsConfiguration, GoogleSheetsApiCollection> {
+
+    @Metadata(label = "advanced")
+    private Sheets client;
+    @Metadata(label = "advanced")
+    private GoogleSheetsClientFactory clientFactory;
+
+    public GoogleSheetsComponent() {
+        super(GoogleSheetsEndpoint.class, GoogleSheetsApiName.class, GoogleSheetsApiCollection.getCollection());
+        registerExtension(new GoogleSheetsVerifierExtension("google-sheets"));
+    }
+
+    public GoogleSheetsComponent(CamelContext context) {
+        super(context, GoogleSheetsEndpoint.class, GoogleSheetsApiName.class, GoogleSheetsApiCollection.getCollection());
+        registerExtension(new GoogleSheetsVerifierExtension("google-sheets", context));
+    }
+
+    @Override
+    protected GoogleSheetsApiName getApiName(String apiNameStr) throws IllegalArgumentException {
+        return GoogleSheetsApiName.fromValue(apiNameStr);
+    }
+
+    public Sheets getClient(GoogleSheetsConfiguration config) {
+        if (client == null) {
+            client = getClientFactory().makeClient(config.getClientId(),
+                    config.getClientSecret(),
+                    config.getApplicationName(),
+                    config.getRefreshToken(),
+                    config.getAccessToken());
+        }
+        return client;
+    }
+
+    public GoogleSheetsClientFactory getClientFactory() {
+        if (clientFactory == null) {
+            clientFactory = new BatchGoogleSheetsClientFactory();
+        }
+        return clientFactory;
+    }
+
+    /**
+     * To use the shared configuration
+     */
+    @Override
+    public void setConfiguration(GoogleSheetsConfiguration configuration) {
+        super.setConfiguration(configuration);
+    }
+
+    @Override
+    public GoogleSheetsConfiguration getConfiguration() {
+        if (configuration == null) {
+            configuration = new GoogleSheetsConfiguration();
+        }
+        return super.getConfiguration();
+    }
+
+    /**
+     * To use the GoogleSheetsClientFactory as factory for creating the client.
+     * Will by default use {@link BatchGoogleSheetsClientFactory}
+     */
+    public void setClientFactory(GoogleSheetsClientFactory clientFactory) {
+        this.clientFactory = clientFactory;
+    }
+
+    @Override
+    protected Endpoint createEndpoint(String uri, String methodName, GoogleSheetsApiName apiName,
+                                      GoogleSheetsConfiguration endpointConfiguration) {
+        endpointConfiguration.setApiName(apiName);
+        endpointConfiguration.setMethodName(methodName);
+        return new GoogleSheetsEndpoint(uri, this, apiName, methodName, endpointConfiguration);
+    }
+}
diff --git a/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsConfiguration.java b/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsConfiguration.java
new file mode 100644
index 0000000000000..3492c59581d0d
--- /dev/null
+++ b/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsConfiguration.java
@@ -0,0 +1,130 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.google.sheets;
+
+import org.apache.camel.component.google.sheets.internal.GoogleSheetsApiName;
+import org.apache.camel.spi.Metadata;
+import org.apache.camel.spi.UriParam;
+import org.apache.camel.spi.UriParams;
+import org.apache.camel.spi.UriPath;
+
+/**
+ * Component configuration for GoogleSheets component.
+ */
+@UriParams
+public class GoogleSheetsConfiguration {
+
+    @UriPath
+    @Metadata(required = "true")
+    private GoogleSheetsApiName apiName;
+
+    @UriPath(enums = "create,get,update,append,batchUpdate,clear")
+    @Metadata(required = "true")
+    private String methodName;
+
+    @UriParam
+    private String clientId;
+
+    @UriParam
+    private String clientSecret;
+
+    @UriParam
+    private String accessToken;
+
+    @UriParam
+    private String refreshToken;
+
+    @UriParam
+    private String applicationName;
+
+    public GoogleSheetsApiName getApiName() {
+        return apiName;
+    }
+
+    /**
+     * What kind of operation to perform
+     */
+    public void setApiName(GoogleSheetsApiName apiName) {
+        this.apiName = apiName;
+    }
+
+    public String getMethodName() {
+        return methodName;
+    }
+
+    /**
+     * What sub operation to use for the selected operation
+     */
+    public void setMethodName(String methodName) {
+        this.methodName = methodName;
+    }
+
+    public String getClientId() {
+        return clientId;
+    }
+
+    /**
+     * Client ID of the sheets application
+     */
+    public void setClientId(String clientId) {
+        this.clientId = clientId;
+    }
+
+    public String getClientSecret() {
+        return clientSecret;
+    }
+
+    /**
+     * Client secret of the sheets application
+     */
+    public void setClientSecret(String clientSecret) {
+        this.clientSecret = clientSecret;
+    }
+
+    public String getAccessToken() {
+        return accessToken;
+    }
+
+    /**
+     * OAuth 2 access token. This typically expires after an hour so refreshToken is recommended for long term usage.
+     */
+    public void setAccessToken(String accessToken) {
+        this.accessToken = accessToken;
+    }
+
+    public String getRefreshToken() {
+        return refreshToken;
+    }
+
+    /**
+     * OAuth 2 refresh token. Using this, the Google Sheets component can obtain a new accessToken whenever the current one expires - a necessity if the application is long-lived.
+     */
+    public void setRefreshToken(String refreshToken) {
+        this.refreshToken = refreshToken;
+    }
+
+    public String getApplicationName() {
+        return applicationName;
+    }
+
+    /**
+     * Google Sheets application name. Example would be "camel-google-sheets/1.0"
+     */
+    public void setApplicationName(String applicationName) {
+        this.applicationName = applicationName;
+    }
+}
diff --git a/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsConsumer.java b/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsConsumer.java
new file mode 100644
index 0000000000000..70255e7817609
--- /dev/null
+++ b/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsConsumer.java
@@ -0,0 +1,52 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.google.sheets;
+
+import com.google.api.client.googleapis.services.AbstractGoogleClientRequest;
+import org.apache.camel.Processor;
+import org.apache.camel.RuntimeCamelException;
+import org.apache.camel.TypeConverter;
+import org.apache.camel.component.google.sheets.internal.GoogleSheetsApiName;
+import org.apache.camel.util.IntrospectionSupport;
+import org.apache.camel.util.component.AbstractApiConsumer;
+
+import java.util.Map;
+import java.util.Map.Entry;
+
+/**
+ * The GoogleSheets consumer.
+ */
+public class GoogleSheetsConsumer extends AbstractApiConsumer<GoogleSheetsApiName, GoogleSheetsConfiguration> {
+
+    public GoogleSheetsConsumer(GoogleSheetsEndpoint endpoint, Processor processor) {
+        super(endpoint, processor);
+    }
+
+    @Override
+    protected Object doInvokeMethod(Map<String, Object> properties) throws RuntimeCamelException {
+        AbstractGoogleClientRequest<?> request = (AbstractGoogleClientRequest) super.doInvokeMethod(properties);
+        try {
+            TypeConverter typeConverter = getEndpoint().getCamelContext().getTypeConverter();
+            for (Entry<String, Object> p : properties.entrySet()) {
+                IntrospectionSupport.setProperty(typeConverter, request, p.getKey(), p.getValue());
+            }
+            return request.execute();
+        } catch (Exception e) {
+            throw new RuntimeCamelException(e);
+        }
+    }
+}
diff --git a/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsEndpoint.java b/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsEndpoint.java
new file mode 100644
index 0000000000000..ac2161746905f
--- /dev/null
+++ b/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsEndpoint.java
@@ -0,0 +1,115 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.google.sheets;
+
+import com.google.api.services.sheets.v4.Sheets;
+import org.apache.camel.Consumer;
+import org.apache.camel.Processor;
+import org.apache.camel.Producer;
+import org.apache.camel.component.google.sheets.internal.GoogleSheetsApiCollection;
+import org.apache.camel.component.google.sheets.internal.GoogleSheetsApiName;
+import org.apache.camel.component.google.sheets.internal.GoogleSheetsConstants;
+import org.apache.camel.component.google.sheets.internal.GoogleSheetsPropertiesHelper;
+import org.apache.camel.spi.UriEndpoint;
+import org.apache.camel.spi.UriParam;
+import org.apache.camel.util.component.AbstractApiEndpoint;
+import org.apache.camel.util.component.ApiMethod;
+import org.apache.camel.util.component.ApiMethodPropertiesHelper;
+
+import java.util.Map;
+
+/**
+ * The google-sheets component provides access to Google Sheets.
+ */
+@UriEndpoint(firstVersion = "2.23.0",
+        scheme = "google-sheets",
+        title = "Google Sheets",
+        syntax = "google-sheets:apiName/methodName",
+        consumerClass = GoogleSheetsConsumer.class,
+        consumerPrefix = "consumer",
+        label = "api,cloud,sheets")
+public class GoogleSheetsEndpoint extends AbstractApiEndpoint<GoogleSheetsApiName, GoogleSheetsConfiguration> {
+
+    @UriParam
+    private GoogleSheetsConfiguration configuration;
+
+    private Object apiProxy;
+
+    public GoogleSheetsEndpoint(String uri, GoogleSheetsComponent component,
+                                GoogleSheetsApiName apiName, String methodName, GoogleSheetsConfiguration endpointConfiguration) {
+        super(uri, component, apiName, methodName, GoogleSheetsApiCollection.getCollection().getHelper(apiName), endpointConfiguration);
+        this.configuration = endpointConfiguration;
+    }
+
+    @Override
+    public Producer createProducer() throws Exception {
+        return new org.apache.camel.component.google.sheets.GoogleSheetsProducer(this);
+    }
+
+    @Override
+    public Consumer createConsumer(Processor processor) throws Exception {
+        // make sure inBody is not set for consumers
+        if (inBody != null) {
+            throw new IllegalArgumentException("Option inBody is not supported for consumer endpoint");
+        }
+        final GoogleSheetsConsumer consumer = new GoogleSheetsConsumer(this, processor);
+        // also set consumer.* properties
+        configureConsumer(consumer);
+        return consumer;
+    }
+
+    @Override
+    protected ApiMethodPropertiesHelper<GoogleSheetsConfiguration> getPropertiesHelper() {
+        return GoogleSheetsPropertiesHelper.getHelper();
+    }
+
+    @Override
+    protected String getThreadProfileName() {
+        return GoogleSheetsConstants.THREAD_PROFILE_NAME;
+    }
+
+    @Override
+    protected void afterConfigureProperties() {
+        switch (apiName) {
+            case SPREADSHEETS:
+                apiProxy = getClient().spreadsheets();
+                break;
+            case DATA:
+                apiProxy = getClient().spreadsheets().values();
+                break;
+            default:
+                throw new IllegalArgumentException("Invalid API name " + apiName);
+        }
+    }
+
+    public Sheets getClient() {
+        return ((GoogleSheetsComponent)getComponent()).getClient(configuration);
+    }
+
+    @Override
+    public Object getApiProxy(ApiMethod method, Map<String, Object> args) {
+        return apiProxy;
+    }
+
+    public GoogleSheetsClientFactory getClientFactory() {
+        return ((GoogleSheetsComponent)getComponent()).getClientFactory();
+    }
+
+    public void setClientFactory(GoogleSheetsClientFactory clientFactory) {
+        ((GoogleSheetsComponent)getComponent()).setClientFactory(clientFactory);
+    }
+}
diff --git a/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsProducer.java b/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsProducer.java
new file mode 100644
index 0000000000000..7fec2fc225016
--- /dev/null
+++ b/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsProducer.java
@@ -0,0 +1,54 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.google.sheets;
+
+import com.google.api.client.googleapis.services.AbstractGoogleClientRequest;
+import org.apache.camel.RuntimeCamelException;
+import org.apache.camel.TypeConverter;
+import org.apache.camel.component.google.sheets.internal.GoogleSheetsApiName;
+import org.apache.camel.component.google.sheets.internal.GoogleSheetsPropertiesHelper;
+import org.apache.camel.util.IntrospectionSupport;
+import org.apache.camel.util.component.AbstractApiProducer;
+import org.apache.camel.util.component.ApiMethod;
+
+import java.util.Map;
+import java.util.Map.Entry;
+
+/**
+ * The GoogleSheets producer.
+ */
+public class GoogleSheetsProducer extends AbstractApiProducer<GoogleSheetsApiName, GoogleSheetsConfiguration> {
+
+    public GoogleSheetsProducer(GoogleSheetsEndpoint endpoint) {
+        super(endpoint, GoogleSheetsPropertiesHelper.getHelper());
+    }
+
+    @Override
+    protected Object doInvokeMethod(ApiMethod method, Map<String, Object> properties) throws RuntimeCamelException {
+        AbstractGoogleClientRequest<?> request = (AbstractGoogleClientRequest) super.doInvokeMethod(method, properties);
+        try {
+            TypeConverter typeConverter = getEndpoint().getCamelContext().getTypeConverter();
+            for (Entry<String, Object> p : properties.entrySet()) {
+                IntrospectionSupport.setProperty(typeConverter, request, p.getKey(), p.getValue());
+            }
+            return request.execute();
+        } catch (Exception e) {
+            throw new RuntimeCamelException(e);
+        }
+    }
+
+}
diff --git a/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsVerifierExtension.java b/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsVerifierExtension.java
new file mode 100644
index 0000000000000..a531908271e25
--- /dev/null
+++ b/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsVerifierExtension.java
@@ -0,0 +1,80 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.google.sheets;
+
+import com.google.api.services.sheets.v4.Sheets;
+import org.apache.camel.CamelContext;
+import org.apache.camel.component.extension.verifier.DefaultComponentVerifierExtension;
+import org.apache.camel.component.extension.verifier.ResultBuilder;
+import org.apache.camel.component.extension.verifier.ResultErrorBuilder;
+import org.apache.camel.component.extension.verifier.ResultErrorHelper;
+
+import java.util.Map;
+import java.util.Optional;
+import java.util.UUID;
+
+public class GoogleSheetsVerifierExtension extends DefaultComponentVerifierExtension {
+
+    public GoogleSheetsVerifierExtension(String defaultScheme) {
+        super(defaultScheme);
+    }
+
+    public GoogleSheetsVerifierExtension(String defaultScheme, CamelContext context) {
+        super(defaultScheme, context);
+    }
+
+    // *********************************
+    // Parameters validation
+    // *********************************
+
+    @Override
+    protected Result verifyParameters(Map<String, Object> parameters) {
+        ResultBuilder builder = ResultBuilder.withStatusAndScope(Result.Status.OK, Scope.PARAMETERS).error(ResultErrorHelper.requiresOption("applicationName", parameters))
+            .error(ResultErrorHelper.requiresOption("clientId", parameters)).error(ResultErrorHelper.requiresOption("clientSecret", parameters));
+
+        return builder.build();
+    }
+
+    // *********************************
+    // Connectivity validation
+    // *********************************
+
+    @Override
+    @SuppressWarnings("PMD.AvoidCatchingGenericException")
+    protected Result verifyConnectivity(Map<String, Object> parameters) {
+        ResultBuilder builder = ResultBuilder.withStatusAndScope(Result.Status.OK, Scope.CONNECTIVITY);
+
+        try {
+            GoogleSheetsConfiguration configuration = setProperties(new GoogleSheetsConfiguration(), parameters);
+            GoogleSheetsClientFactory clientFactory = new BatchGoogleSheetsClientFactory();
+            Sheets client = clientFactory.makeClient(configuration.getClientId(), configuration.getClientSecret(),
+                    configuration.getApplicationName(),
+                    configuration.getRefreshToken(), configuration.getAccessToken());
+            client.spreadsheets().get(Optional.ofNullable(parameters.get("spreadsheetId"))
+                                              .map(Object::toString)
+                                              .orElse(UUID.randomUUID().toString())).execute();
+        } catch (Exception e) {
+            ResultErrorBuilder errorBuilder = ResultErrorBuilder.withCodeAndDescription(VerificationError.StandardCode.AUTHENTICATION, e.getMessage())
+                .detail("google_sheets_exception_message", e.getMessage()).detail(VerificationError.ExceptionAttribute.EXCEPTION_CLASS, e.getClass().getName())
+                .detail(VerificationError.ExceptionAttribute.EXCEPTION_INSTANCE, e);
+
+            builder.error(errorBuilder.build());
+        }
+
+        return builder.build();
+    }
+}
diff --git a/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/internal/GoogleSheetsConstants.java b/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/internal/GoogleSheetsConstants.java
new file mode 100644
index 0000000000000..a14a251b3e836
--- /dev/null
+++ b/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/internal/GoogleSheetsConstants.java
@@ -0,0 +1,33 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.google.sheets.internal;
+
+/**
+ * Constants for Camel Google Sheets component.
+ */
+public final class GoogleSheetsConstants {
+
+    // suffix for parameters when passed as exchange header properties
+    public static final String PROPERTY_PREFIX = "CamelGoogleSheets.";
+    // thread profile name for this component
+    public static final String THREAD_PROFILE_NAME = "CamelGoogleSheets";
+
+    /**
+     * Prevent instantiation.
+     */
+    private GoogleSheetsConstants() {}
+}
diff --git a/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/internal/GoogleSheetsPropertiesHelper.java b/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/internal/GoogleSheetsPropertiesHelper.java
new file mode 100644
index 0000000000000..48c345e7efe08
--- /dev/null
+++ b/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/internal/GoogleSheetsPropertiesHelper.java
@@ -0,0 +1,39 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.google.sheets.internal;
+
+import org.apache.camel.component.google.sheets.GoogleSheetsConfiguration;
+import org.apache.camel.util.component.ApiMethodPropertiesHelper;
+
+/**
+ * Singleton {@link ApiMethodPropertiesHelper} for GoogleSheets component.
+ */
+public final class GoogleSheetsPropertiesHelper extends ApiMethodPropertiesHelper<GoogleSheetsConfiguration> {
+
+    private static GoogleSheetsPropertiesHelper helper;
+
+    private GoogleSheetsPropertiesHelper() {
+        super(GoogleSheetsConfiguration.class, GoogleSheetsConstants.PROPERTY_PREFIX);
+    }
+
+    public static synchronized GoogleSheetsPropertiesHelper getHelper() {
+        if (helper == null) {
+            helper = new GoogleSheetsPropertiesHelper();
+        }
+        return helper;
+    }
+}
diff --git a/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamComponent.java b/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamComponent.java
new file mode 100644
index 0000000000000..693d64a5dae39
--- /dev/null
+++ b/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamComponent.java
@@ -0,0 +1,96 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.google.sheets.stream;
+
+import com.google.api.services.sheets.v4.Sheets;
+import org.apache.camel.CamelContext;
+import org.apache.camel.Endpoint;
+import org.apache.camel.component.google.sheets.BatchGoogleSheetsClientFactory;
+import org.apache.camel.component.google.sheets.GoogleSheetsClientFactory;
+import org.apache.camel.component.google.sheets.GoogleSheetsVerifierExtension;
+import org.apache.camel.impl.DefaultComponent;
+import org.apache.camel.spi.Metadata;
+
+import java.util.Map;
+
+/**
+ * Represents the component that manages {@link GoogleSheetsStreamEndpoint}.
+ */
+@Metadata(label = "verifiers", enums = "parameters,connectivity")
+public class GoogleSheetsStreamComponent extends DefaultComponent {
+
+    @Metadata(label = "advanced")
+    private Sheets client;
+    @Metadata(label = "advanced")
+    private GoogleSheetsClientFactory clientFactory;
+    @Metadata
+    private GoogleSheetsStreamConfiguration configuration;
+
+    public GoogleSheetsStreamComponent() {
+        this(null);
+    }
+
+    public GoogleSheetsStreamComponent(CamelContext context) {
+        super(context);
+        registerExtension(new GoogleSheetsVerifierExtension("google-sheets-stream", context));
+        this.configuration = new GoogleSheetsStreamConfiguration();
+    }
+
+    public Sheets getClient(GoogleSheetsStreamConfiguration endpointConfiguration) {
+        if (client == null) {
+            client = getClientFactory().makeClient(endpointConfiguration.getClientId(), endpointConfiguration.getClientSecret(),
+                                                    endpointConfiguration.getApplicationName(), endpointConfiguration.getRefreshToken(),
+                                                    endpointConfiguration.getAccessToken());
+        }
+        return client;
+    }
+
+    public GoogleSheetsClientFactory getClientFactory() {
+        if (clientFactory == null) {
+            clientFactory = new BatchGoogleSheetsClientFactory();
+        }
+        return clientFactory;
+    }
+
+    public GoogleSheetsStreamConfiguration getConfiguration() {
+        return configuration;
+    }
+
+    /**
+     * To use the shared configuration
+     */
+    public void setConfiguration(GoogleSheetsStreamConfiguration configuration) {
+        this.configuration = configuration;
+    }
+
+    /**
+     * To use the GoogleSheetsClientFactory as factory for creating the client.
+     * Will by default use {@link BatchGoogleSheetsClientFactory}
+     */
+    public void setClientFactory(GoogleSheetsClientFactory clientFactory) {
+        this.clientFactory = clientFactory;
+    }
+
+    @Override
+    protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
+        final GoogleSheetsStreamConfiguration configuration = this.configuration.copy();
+        setProperties(configuration, parameters);
+        GoogleSheetsStreamEndpoint endpoint = new GoogleSheetsStreamEndpoint(uri, this, configuration);
+        setProperties(endpoint, parameters);
+        return endpoint;
+    }
+}
diff --git a/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamConfiguration.java b/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamConfiguration.java
new file mode 100644
index 0000000000000..3a88ffbba92ba
--- /dev/null
+++ b/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamConfiguration.java
@@ -0,0 +1,255 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.google.sheets.stream;
+
+import com.google.api.services.sheets.v4.SheetsScopes;
+import org.apache.camel.RuntimeCamelException;
+import org.apache.camel.spi.UriParam;
+import org.apache.camel.spi.UriParams;
+import org.apache.camel.spi.UriPath;
+
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * Component configuration for GoogleSheets stream component.
+ */
+@UriParams
+public class GoogleSheetsStreamConfiguration implements Cloneable {
+
+    private static final List<String> DEFAULT_SCOPES = Collections.singletonList(SheetsScopes.SPREADSHEETS);
+
+    @UriPath
+    private String apiName;
+
+    @UriParam
+    private List<String> scopes = DEFAULT_SCOPES;
+
+    @UriParam
+    private String clientId;
+
+    @UriParam
+    private String clientSecret;
+
+    @UriParam
+    private String accessToken;
+
+    @UriParam
+    private String refreshToken;
+
+    @UriParam
+    private String applicationName;
+
+    @UriParam
+    private String spreadsheetId;
+
+    @UriParam(defaultValue = "10")
+    private int maxResults = 10;
+
+    @UriParam
+    private String range;
+
+    @UriParam
+    private boolean includeGridData;
+
+    @UriParam(enums = "ROWS,COLUMNS,DIMENSION_UNSPECIFIED", defaultValue = "ROWS")
+    private String majorDimension = "ROWS";
+
+    @UriParam(enums = "FORMATTED_VALUE,UNFORMATTED_VALUE,FORMULA", defaultValue = "FORMATTED_VALUE")
+    private String valueRenderOption = "FORMATTED_VALUE";
+
+    public String getClientId() {
+        return clientId;
+    }
+
+    /**
+     * Client ID of the sheets application
+     */
+    public void setClientId(String clientId) {
+        this.clientId = clientId;
+    }
+
+    public String getClientSecret() {
+        return clientSecret;
+    }
+
+    /**
+     * Client secret of the sheets application
+     */
+    public void setClientSecret(String clientSecret) {
+        this.clientSecret = clientSecret;
+    }
+
+    public String getAccessToken() {
+        return accessToken;
+    }
+
+    /**
+     * OAuth 2 access token. This typically expires after an hour so
+     * refreshToken is recommended for long term usage.
+     */
+    public void setAccessToken(String accessToken) {
+        this.accessToken = accessToken;
+    }
+
+    public String getRefreshToken() {
+        return refreshToken;
+    }
+
+    /**
+     * OAuth 2 refresh token. Using this, the Google Calendar component can
+     * obtain a new accessToken whenever the current one expires - a necessity
+     * if the application is long-lived.
+     */
+    public void setRefreshToken(String refreshToken) {
+        this.refreshToken = refreshToken;
+    }
+
+    public String getApplicationName() {
+        return applicationName;
+    }
+
+    /**
+     * Google sheets application name. Example would be "camel-google-sheets/1.0"
+     */
+    public void setApplicationName(String applicationName) {
+        this.applicationName = applicationName;
+    }
+
+    public List<String> getScopes() {
+        return scopes;
+    }
+
+    /**
+     * Specifies the level of permissions you want a sheets application to have to
+     * a user account. See https://developers.google.com/identity/protocols/googlescopes
+     * for more info.
+     */
+    public void setScopes(List<String> scopes) {
+        this.scopes = scopes;
+    }
+
+    /**
+     * Gets the apiName.
+     *
+     * @return
+     */
+    public String getApiName() {
+        return apiName;
+    }
+
+    /**
+     * Sets the apiName.
+     *
+     * @param apiName
+     */
+    public void setApiName(String apiName) {
+        this.apiName = apiName;
+    }
+
+    public String getSpreadsheetId() {
+        return spreadsheetId;
+    }
+
+    /**
+     * Specifies the spreadsheet identifier that is used to identify the target to obtain.
+     *
+     * @param spreadsheetId
+     */
+    public void setSpreadsheetId(String spreadsheetId) {
+        this.spreadsheetId = spreadsheetId;
+    }
+
+    public int getMaxResults() {
+        return maxResults;
+    }
+
+    /**
+     * Specify the maximum number of returned results. This will limit the number of rows in a returned value range
+     * data set or the number of returned value ranges in a batch request.
+     *
+     * @param maxResults
+     */
+    public void setMaxResults(int maxResults) {
+        this.maxResults = maxResults;
+    }
+
+    public String getRange() {
+        return range;
+    }
+
+    /**
+     * Specifies the range of rows and columns in a sheet to get data from.
+     *
+     * @param range
+     */
+    public void setRange(String range) {
+        this.range = range;
+    }
+
+    public String getMajorDimension() {
+        return majorDimension;
+    }
+
+    /**
+     * Specifies the major dimension that results should use..
+     *
+     * @param majorDimension
+     */
+    public void setMajorDimension(String majorDimension) {
+        this.majorDimension = majorDimension;
+    }
+
+    public String getValueRenderOption() {
+        return valueRenderOption;
+    }
+
+    /**
+     * Determines how values should be rendered in the output.
+     *
+     * @param valueRenderOption
+     */
+    public void setValueRenderOption(String valueRenderOption) {
+        this.valueRenderOption = valueRenderOption;
+    }
+
+    public boolean isIncludeGridData() {
+        return includeGridData;
+    }
+
+    /**
+     * True if grid data should be returned.
+     *
+     * @param includeGridData
+     */
+    public void setIncludeGridData(boolean includeGridData) {
+        this.includeGridData = includeGridData;
+    }
+
+    // *************************************************
+    //
+    // *************************************************
+
+    public GoogleSheetsStreamConfiguration copy() {
+        try {
+            return (GoogleSheetsStreamConfiguration)super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new RuntimeCamelException(e);
+        }
+    }
+
+}
diff --git a/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamConstants.java b/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamConstants.java
new file mode 100644
index 0000000000000..d7215854862bb
--- /dev/null
+++ b/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamConstants.java
@@ -0,0 +1,37 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.google.sheets.stream;
+
+/**
+ * Constants used in Camel Google Sheets Stream
+ */
+public final class GoogleSheetsStreamConstants {
+
+    private static final String PROPERTY_PREFIX = "CamelGoogleSheets";
+
+    public static final String SPREADSHEET_ID =  PROPERTY_PREFIX + "SpreadsheetId";
+    public static final String SPREADSHEET_URL =  PROPERTY_PREFIX + "SpreadsheetUrl";
+    public static final String MAJOR_DIMENSION = PROPERTY_PREFIX + "MajorDimension";
+    public static final String RANGE = PROPERTY_PREFIX + "Range";
+
+    /**
+     * Prevent instantiation.
+     */
+    private GoogleSheetsStreamConstants() {
+        super();
+    }
+}
diff --git a/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamConsumer.java b/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamConsumer.java
new file mode 100644
index 0000000000000..a22b3e59bf381
--- /dev/null
+++ b/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamConsumer.java
@@ -0,0 +1,120 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.google.sheets.stream;
+
+import com.google.api.services.sheets.v4.Sheets;
+import com.google.api.services.sheets.v4.model.BatchGetValuesResponse;
+import com.google.api.services.sheets.v4.model.Spreadsheet;
+import org.apache.camel.Endpoint;
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
+import org.apache.camel.impl.ScheduledBatchPollingConsumer;
+import org.apache.camel.util.CastUtils;
+import org.apache.camel.util.ObjectHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.ArrayDeque;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Queue;
+import java.util.stream.Collectors;
+
+/**
+ * The GoogleSheets consumer.
+ */
+public class GoogleSheetsStreamConsumer extends ScheduledBatchPollingConsumer {
+
+    private static final Logger LOG = LoggerFactory.getLogger(GoogleSheetsStreamConsumer.class);
+
+    public GoogleSheetsStreamConsumer(Endpoint endpoint, Processor processor) {
+        super(endpoint, processor);
+    }
+
+    protected GoogleSheetsStreamConfiguration getConfiguration() {
+        return getEndpoint().getConfiguration();
+    }
+
+    protected Sheets getClient() {
+        return getEndpoint().getClient();
+    }
+
+    @Override
+    public GoogleSheetsStreamEndpoint getEndpoint() {
+        return (GoogleSheetsStreamEndpoint)super.getEndpoint();
+    }
+
+    @Override
+    protected int poll() throws Exception {
+        Queue<Exchange> answer = new ArrayDeque<>();
+
+        if (ObjectHelper.isNotEmpty(getConfiguration().getRange())) {
+            Sheets.Spreadsheets.Values.BatchGet request = getClient().spreadsheets().values().batchGet(getConfiguration().getSpreadsheetId());
+
+            request.setMajorDimension(getConfiguration().getMajorDimension());
+            request.setValueRenderOption(getConfiguration().getValueRenderOption());
+
+            if (getConfiguration().getRange().contains(",")) {
+                request.setRanges(Arrays.stream(getConfiguration().getRange().split(","))
+                                        .map(String::trim)
+                                        .collect(Collectors.toList()));
+            } else {
+                request.setRanges(Collections.singletonList(getConfiguration().getRange()));
+            }
+
+            BatchGetValuesResponse response = request.execute();
+
+            if (response.getValueRanges() != null) {
+                response.getValueRanges()
+                        .stream()
+                        .limit(getConfiguration().getMaxResults())
+                        .map(valueRange -> getEndpoint().createExchange(valueRange))
+                        .forEach(answer::add);
+            }
+        } else {
+            Sheets.Spreadsheets.Get request = getClient().spreadsheets().get(getConfiguration().getSpreadsheetId());
+
+            request.setIncludeGridData(getConfiguration().isIncludeGridData());
+
+            Spreadsheet spreadsheet = request.execute();
+            answer.add(getEndpoint().createExchange(spreadsheet));
+        }
+
+        return processBatch(CastUtils.cast(answer));
+    }
+
+    @Override
+    public int processBatch(Queue<Object> exchanges) throws Exception {
+        int total = exchanges.size();
+
+        for (int index = 0; index < total && isBatchAllowed(); index++) {
+            // only loop if we are started (allowed to run)
+            final Exchange exchange = ObjectHelper.cast(Exchange.class, exchanges.poll());
+            // add current index and total as properties
+            exchange.setProperty(Exchange.BATCH_INDEX, index);
+            exchange.setProperty(Exchange.BATCH_SIZE, total);
+            exchange.setProperty(Exchange.BATCH_COMPLETE, index == total - 1);
+
+            // update pending number of exchanges
+            pendingExchanges = total - index - 1;
+
+            getAsyncProcessor().process(exchange, doneSync -> LOG.trace("Processing exchange done"));
+        }
+
+        return total;
+    }
+}
diff --git a/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamEndpoint.java b/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamEndpoint.java
new file mode 100644
index 0000000000000..648be83958906
--- /dev/null
+++ b/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamEndpoint.java
@@ -0,0 +1,99 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.google.sheets.stream;
+
+import com.google.api.services.sheets.v4.Sheets;
+import com.google.api.services.sheets.v4.model.Spreadsheet;
+import com.google.api.services.sheets.v4.model.ValueRange;
+import org.apache.camel.*;
+import org.apache.camel.component.google.sheets.GoogleSheetsClientFactory;
+import org.apache.camel.impl.ScheduledPollEndpoint;
+import org.apache.camel.spi.UriEndpoint;
+import org.apache.camel.spi.UriParam;
+
+/**
+ * The google-sheets component provides access to Google Sheets.
+ */
+@UriEndpoint(firstVersion = "2.23.0",
+             scheme = "google-sheets-stream",
+             title = "Google Sheets Stream",
+             syntax = "google-sheets-stream:apiName",
+             consumerClass = GoogleSheetsStreamConsumer.class,
+             consumerOnly = true,
+             label = "api,cloud,sheets")
+public class GoogleSheetsStreamEndpoint extends ScheduledPollEndpoint {
+
+    @UriParam
+    private GoogleSheetsStreamConfiguration configuration;
+
+    public GoogleSheetsStreamEndpoint(String uri, GoogleSheetsStreamComponent component, GoogleSheetsStreamConfiguration endpointConfiguration) {
+        super(uri, component);
+        this.configuration = endpointConfiguration;
+    }
+
+    @Override
+    public Producer createProducer() throws Exception {
+        throw new UnsupportedOperationException("The camel google sheets stream component doesn't support producer");
+    }
+
+    @Override
+    public Consumer createConsumer(Processor processor) throws Exception {
+        final GoogleSheetsStreamConsumer consumer = new GoogleSheetsStreamConsumer(this, processor);
+        configureConsumer(consumer);
+        return consumer;
+    }
+
+    public Sheets getClient() {
+        return ((GoogleSheetsStreamComponent)getComponent()).getClient(configuration);
+    }
+
+    public GoogleSheetsClientFactory getClientFactory() {
+        return ((GoogleSheetsStreamComponent)getComponent()).getClientFactory();
+    }
+
+    public void setClientFactory(GoogleSheetsClientFactory clientFactory) {
+        ((GoogleSheetsStreamComponent)getComponent()).setClientFactory(clientFactory);
+    }
+
+    public GoogleSheetsStreamConfiguration getConfiguration() {
+        return configuration;
+    }
+
+    @Override
+    public boolean isSingleton() {
+        return true;
+    }
+
+    public Exchange createExchange(ValueRange valueRange) {
+        Exchange exchange = super.createExchange(getExchangePattern());
+        Message message = exchange.getIn();
+        exchange.getIn().setHeader(GoogleSheetsStreamConstants.SPREADSHEET_ID, configuration.getSpreadsheetId());
+        exchange.getIn().setHeader(GoogleSheetsStreamConstants.RANGE, valueRange.getRange());
+        exchange.getIn().setHeader(GoogleSheetsStreamConstants.MAJOR_DIMENSION, valueRange.getMajorDimension());
+        message.setBody(valueRange);
+        return exchange;
+    }
+
+    public Exchange createExchange(Spreadsheet spreadsheet) {
+        Exchange exchange = super.createExchange(getExchangePattern());
+        Message message = exchange.getIn();
+        exchange.getIn().setHeader(GoogleSheetsStreamConstants.SPREADSHEET_ID, spreadsheet.getSpreadsheetId());
+        exchange.getIn().setHeader(GoogleSheetsStreamConstants.SPREADSHEET_URL, spreadsheet.getSpreadsheetUrl());
+        message.setBody(spreadsheet);
+        return exchange;
+    }
+}
diff --git a/components/camel-google-sheets/src/main/resources/META-INF/LICENSE.txt b/components/camel-google-sheets/src/main/resources/META-INF/LICENSE.txt
new file mode 100644
index 0000000000000..6b0b1270ff0ca
--- /dev/null
+++ b/components/camel-google-sheets/src/main/resources/META-INF/LICENSE.txt
@@ -0,0 +1,203 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed 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.
+
diff --git a/components/camel-google-sheets/src/main/resources/META-INF/NOTICE.txt b/components/camel-google-sheets/src/main/resources/META-INF/NOTICE.txt
new file mode 100644
index 0000000000000..2e215bf2e6b1f
--- /dev/null
+++ b/components/camel-google-sheets/src/main/resources/META-INF/NOTICE.txt
@@ -0,0 +1,11 @@
+   =========================================================================
+   ==  NOTICE file corresponding to the section 4 d of                    ==
+   ==  the Apache License, Version 2.0,                                   ==
+   ==  in this case for the Apache Camel distribution.                    ==
+   =========================================================================
+
+   This product includes software developed by
+   The Apache Software Foundation (http://www.apache.org/).
+
+   Please read the different LICENSE files present in the licenses directory of
+   this distribution.
diff --git a/components/camel-google-sheets/src/main/resources/META-INF/services/org/apache/camel/component/google-sheets b/components/camel-google-sheets/src/main/resources/META-INF/services/org/apache/camel/component/google-sheets
new file mode 100644
index 0000000000000..a3e7e26500259
--- /dev/null
+++ b/components/camel-google-sheets/src/main/resources/META-INF/services/org/apache/camel/component/google-sheets
@@ -0,0 +1,17 @@
+#
+# 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.
+#
+class=org.apache.camel.component.google.sheets.GoogleSheetsComponent
diff --git a/components/camel-google-sheets/src/main/resources/META-INF/services/org/apache/camel/component/google-sheets-stream b/components/camel-google-sheets/src/main/resources/META-INF/services/org/apache/camel/component/google-sheets-stream
new file mode 100644
index 0000000000000..0ac26794364d8
--- /dev/null
+++ b/components/camel-google-sheets/src/main/resources/META-INF/services/org/apache/camel/component/google-sheets-stream
@@ -0,0 +1,17 @@
+#
+# 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.
+#
+class=org.apache.camel.component.google.sheets.stream.GoogleSheetsStreamComponent
diff --git a/components/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/AbstractGoogleSheetsTestSupport.java b/components/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/AbstractGoogleSheetsTestSupport.java
new file mode 100644
index 0000000000000..afb01a712a774
--- /dev/null
+++ b/components/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/AbstractGoogleSheetsTestSupport.java
@@ -0,0 +1,164 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.google.sheets;
+
+import com.google.api.services.sheets.v4.model.Sheet;
+import com.google.api.services.sheets.v4.model.SheetProperties;
+import com.google.api.services.sheets.v4.model.Spreadsheet;
+import com.google.api.services.sheets.v4.model.SpreadsheetProperties;
+import com.google.api.services.sheets.v4.model.ValueRange;
+import org.apache.camel.CamelContext;
+import org.apache.camel.CamelExecutionException;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.util.IntrospectionSupport;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Random;
+
+/**
+ * Abstract base class for GoogleSheets Integration tests generated by Camel
+ * API component maven plugin.
+ */
+public class AbstractGoogleSheetsTestSupport extends CamelTestSupport {
+
+    protected static final String TEST_SHEET = "TestData";
+    private static final String TEST_OPTIONS_PROPERTIES = "/test-options.properties";
+
+    private Spreadsheet spreadsheet;
+
+    /**
+     * Create test spreadsheet that is used throughout all tests.
+     */
+    private void createTestSpreadsheet() {
+        Spreadsheet spreadsheet = new Spreadsheet();
+        SpreadsheetProperties spreadsheetProperties = new SpreadsheetProperties();
+        spreadsheetProperties.setTitle("camel-sheets-" + Math.abs(new Random().nextInt()));
+
+        spreadsheet.setProperties(spreadsheetProperties);
+
+        Sheet sheet = new Sheet();
+        SheetProperties sheetProperties = new SheetProperties();
+        sheetProperties.setTitle(TEST_SHEET);
+        sheet.setProperties(sheetProperties);
+
+        spreadsheet.setSheets(Collections.singletonList(sheet));
+
+        this.spreadsheet = requestBody("google-sheets://spreadsheets/create?inBody=content", spreadsheet);
+    }
+
+    /**
+     * Add some initial test data to test spreadsheet.
+     */
+    private void createTestData() {
+        if (spreadsheet == null) {
+            createTestSpreadsheet();
+        }
+
+        ValueRange valueRange = new ValueRange();
+        valueRange.setValues(Arrays.asList(Arrays.asList("a1", "b1"), Arrays.asList("a2", "b2")));
+
+        final Map<String, Object> headers = new HashMap<>();
+        // parameter type is String
+        headers.put("CamelGoogleSheets.spreadsheetId", spreadsheet.getSpreadsheetId());
+        // parameter type is String
+        headers.put("CamelGoogleSheets.range", TEST_SHEET + "!A1:B2");
+
+        // parameter type is String
+        headers.put("CamelGoogleSheets.valueInputOption", "USER_ENTERED");
+
+        requestBodyAndHeaders("google-sheets://data/update?inBody=values", valueRange, headers);
+    }
+
+    @Override
+    protected CamelContext createCamelContext() throws Exception {
+
+        final CamelContext context = super.createCamelContext();
+
+        final GoogleSheetsConfiguration configuration = new GoogleSheetsConfiguration();
+        IntrospectionSupport.setProperties(configuration, getTestOptions());
+
+        // add GoogleSheetsComponent to Camel context
+        final GoogleSheetsComponent component = new GoogleSheetsComponent(context);
+        component.setConfiguration(configuration);
+        context.addComponent("google-sheets", component);
+
+        return context;
+    }
+
+    /**
+     * Read component configuration from TEST_OPTIONS_PROPERTIES.
+     * @return Map of component options.
+     * @throws IOException when TEST_OPTIONS_PROPERTIES could not be loaded.
+     */
+    protected Map<String, Object> getTestOptions() throws IOException {
+        final Properties properties = new Properties();
+        try {
+            properties.load(getClass().getResourceAsStream(TEST_OPTIONS_PROPERTIES));
+        } catch (Exception e) {
+            throw new IOException(String.format("%s could not be loaded: %s", TEST_OPTIONS_PROPERTIES, e.getMessage()), e);
+        }
+
+        Map<String, Object> options = new HashMap<>();
+        for (Map.Entry<Object, Object> entry : properties.entrySet()) {
+            options.put(entry.getKey().toString(), entry.getValue());
+        }
+
+        return options;
+    }
+
+    @Override
+    public boolean isCreateCamelContextPerClass() {
+        // only create the context once for this class
+        return true;
+    }
+
+    @SuppressWarnings("unchecked")
+    protected <T> T requestBodyAndHeaders(String endpointUri, Object body, Map<String, Object> headers) throws CamelExecutionException {
+        return (T) template().requestBodyAndHeaders(endpointUri, body, headers);
+    }
+
+    @SuppressWarnings("unchecked")
+    protected <T> T requestBody(String endpoint, Object body) throws CamelExecutionException {
+        return (T) template().requestBody(endpoint, body);
+    }
+
+    public Spreadsheet getSpreadsheet() {
+        if (spreadsheet == null) {
+            createTestSpreadsheet();
+        }
+        return spreadsheet;
+    }
+
+    public Spreadsheet getSpreadsheetWithTestData() {
+        if (spreadsheet == null) {
+            createTestSpreadsheet();
+        }
+
+        createTestData();
+
+        return spreadsheet;
+    }
+
+    public void setSpreadsheet(Spreadsheet sheet) {
+        this.spreadsheet = sheet;
+    }
+}
diff --git a/components/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/GoogleSheetsVerifierExtensionTest.java b/components/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/GoogleSheetsVerifierExtensionTest.java
new file mode 100644
index 0000000000000..a4504a8f6755d
--- /dev/null
+++ b/components/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/GoogleSheetsVerifierExtensionTest.java
@@ -0,0 +1,68 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.google.sheets;
+
+import org.apache.camel.Component;
+import org.apache.camel.component.extension.ComponentVerifierExtension;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
+public class GoogleSheetsVerifierExtensionTest extends CamelTestSupport {
+
+    @Override
+    public boolean isUseRouteBuilder() {
+        return false;
+    }
+
+    @Test
+    public void testVerifyParameters() {
+        Component component = context().getComponent("google-sheets");
+
+        ComponentVerifierExtension verifier = component.getExtension(ComponentVerifierExtension.class)
+                                                       .orElseThrow(IllegalStateException::new);
+
+        Map<String, Object> parameters = new HashMap<>();
+        parameters.put("clientId", "l");
+        parameters.put("clientSecret", "k");
+        parameters.put("applicationName", "test");
+
+        ComponentVerifierExtension.Result result = verifier.verify(ComponentVerifierExtension.Scope.PARAMETERS, parameters);
+        Assert.assertEquals(ComponentVerifierExtension.Result.Status.OK, result.getStatus());
+    }
+
+    @Test
+    public void testVerifyConnectivity() {
+        Component component = context().getComponent("google-sheets");
+        ComponentVerifierExtension verifier = component.getExtension(ComponentVerifierExtension.class)
+                                                       .orElseThrow(IllegalStateException::new);
+
+        Map<String, Object> parameters = new HashMap<>();
+        parameters.put("clientId", "l");
+        parameters.put("clientSecret", "k");
+        parameters.put("applicationName", "test");
+        parameters.put("spreadsheetId", UUID.randomUUID().toString());
+
+        ComponentVerifierExtension.Result result = verifier.verify(ComponentVerifierExtension.Scope.CONNECTIVITY, parameters);
+        Assert.assertEquals(ComponentVerifierExtension.Result.Status.ERROR, result.getStatus());
+    }
+
+}
diff --git a/components/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/SheetsConfigurationTest.java b/components/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/SheetsConfigurationTest.java
new file mode 100644
index 0000000000000..298ffaf61e297
--- /dev/null
+++ b/components/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/SheetsConfigurationTest.java
@@ -0,0 +1,64 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.google.sheets;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.google.sheets.internal.GoogleSheetsApiCollection;
+import org.apache.camel.component.google.sheets.internal.SheetsSpreadsheetsApiMethod;
+import org.apache.camel.impl.DefaultCamelContext;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
+
+public class SheetsConfigurationTest extends CamelTestSupport {
+
+    private static final String PATH_PREFIX = GoogleSheetsApiCollection.getCollection().getApiName(SheetsSpreadsheetsApiMethod.class).getName();
+    private static final String TEST_URI = "google-sheets://" + PATH_PREFIX + "/create?clientId=a&clientSecret=b&applicationName=c&accessToken=d&refreshToken=e";
+
+    @Override
+    protected CamelContext createCamelContext() throws Exception {
+        final CamelContext context = new DefaultCamelContext(createRegistry());
+
+        // add GoogleSheetsComponent to Camel context but don't set up configuration
+        final GoogleSheetsComponent component = new GoogleSheetsComponent(context);
+        context.addComponent("google-sheets", component);
+
+        return context;
+    }
+
+    @Test
+    public void testConfiguration() throws Exception {
+        GoogleSheetsEndpoint endpoint = getMandatoryEndpoint(TEST_URI, GoogleSheetsEndpoint.class);
+        GoogleSheetsConfiguration configuration = endpoint.getConfiguration();
+        assertNotNull(configuration);
+        assertEquals("a", configuration.getClientId());
+        assertEquals("b", configuration.getClientSecret());
+        assertEquals("c", configuration.getApplicationName());
+        assertEquals("d", configuration.getAccessToken());
+        assertEquals("e", configuration.getRefreshToken());
+    }
+
+    @Override
+    protected RouteBuilder createRouteBuilder() throws Exception {
+        return new RouteBuilder() {
+            @Override
+            public void configure() {
+                from("direct://CREATE").to(TEST_URI);
+            }
+        };
+    }
+}
diff --git a/components/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/SheetsSpreadsheetsIntegrationTest.java b/components/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/SheetsSpreadsheetsIntegrationTest.java
new file mode 100644
index 0000000000000..680c08c860b2d
--- /dev/null
+++ b/components/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/SheetsSpreadsheetsIntegrationTest.java
@@ -0,0 +1,114 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.google.sheets;
+
+import com.google.api.services.sheets.v4.model.*;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.google.sheets.internal.GoogleSheetsApiCollection;
+import org.apache.camel.component.google.sheets.internal.SheetsSpreadsheetsApiMethod;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Random;
+
+/**
+ * Test class for {@link com.google.api.services.sheets.v4.Sheets.Spreadsheets} APIs.
+ */
+public class SheetsSpreadsheetsIntegrationTest extends AbstractGoogleSheetsTestSupport {
+
+    private static final Logger LOG = LoggerFactory.getLogger(SheetsSpreadsheetsIntegrationTest.class);
+    private static final String PATH_PREFIX = GoogleSheetsApiCollection.getCollection().getApiName(SheetsSpreadsheetsApiMethod.class).getName();
+
+    @Test
+    public void testCreate() throws Exception {
+        String title = "camel-sheets-" + Math.abs(new Random().nextInt());
+        Spreadsheet sheetToCreate = new Spreadsheet();
+        SpreadsheetProperties sheetProperties = new SpreadsheetProperties();
+        sheetProperties.setTitle(title);
+
+        sheetToCreate.setProperties(sheetProperties);
+
+        // using com.google.api.services.sheets.v4.model.Spreadsheet message body for single parameter "content"
+        final Spreadsheet result = requestBody("direct://CREATE", sheetToCreate);
+
+        assertNotNull("create result is null", result);
+        assertEquals(title, result.getProperties().getTitle());
+
+        LOG.debug("create: " + result);
+    }
+
+    @Test
+    public void testGet() throws Exception {
+        Spreadsheet testSheet = getSpreadsheet();
+
+        // using String message body for single parameter "spreadsheetId"
+        final Spreadsheet result = requestBody("direct://GET", testSheet.getSpreadsheetId());
+
+        assertNotNull("get result is null", result);
+        assertEquals(testSheet.getSpreadsheetId(), result.getSpreadsheetId());
+
+        LOG.debug("get: " + result);
+    }
+
+    @Test
+    public void testBatchUpdate() throws Exception {
+        Spreadsheet testSheet = getSpreadsheet();
+        String updateTitle = "updated-" + testSheet.getProperties().getTitle();
+
+        final Map<String, Object> headers = new HashMap<>();
+        // parameter type is String
+        headers.put("CamelGoogleSheets.spreadsheetId", testSheet.getSpreadsheetId());
+        // parameter type is com.google.api.services.sheets.v4.model.BatchUpdateSpreadsheetRequest
+        headers.put("CamelGoogleSheets.batchUpdateSpreadsheetRequest", new BatchUpdateSpreadsheetRequest()
+                                                                            .setIncludeSpreadsheetInResponse(true)
+                                                                            .setRequests(Collections.singletonList(new Request().setUpdateSpreadsheetProperties(new UpdateSpreadsheetPropertiesRequest()
+                                                                                    .setProperties(new SpreadsheetProperties().setTitle(updateTitle))
+                                                                                    .setFields("title")))));
+
+        final BatchUpdateSpreadsheetResponse result = requestBodyAndHeaders("direct://BATCHUPDATE", null, headers);
+
+        assertNotNull("batchUpdate result in null", result);
+        assertEquals(updateTitle, result.getUpdatedSpreadsheet().getProperties().getTitle());
+
+        LOG.debug("batchUpdate: " + result);
+    }
+
+    @Override
+    protected RouteBuilder createRouteBuilder() throws Exception {
+        return new RouteBuilder() {
+            @Override
+            public void configure() {
+                // test route for batchUpdate
+                from("direct://BATCHUPDATE")
+                        .to("google-sheets://" + PATH_PREFIX + "/batchUpdate");
+
+                // test route for create
+                from("direct://CREATE")
+                        .to("google-sheets://" + PATH_PREFIX + "/create?inBody=content");
+
+                // test route for get
+                from("direct://GET")
+                        .to("google-sheets://" + PATH_PREFIX + "/get?inBody=spreadsheetId");
+
+            }
+        };
+    }
+}
diff --git a/components/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/SheetsSpreadsheetsValuesIntegrationTest.java b/components/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/SheetsSpreadsheetsValuesIntegrationTest.java
new file mode 100644
index 0000000000000..0e00a0ce831b2
--- /dev/null
+++ b/components/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/SheetsSpreadsheetsValuesIntegrationTest.java
@@ -0,0 +1,159 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.google.sheets;
+
+import com.google.api.services.sheets.v4.model.*;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.google.sheets.internal.GoogleSheetsApiCollection;
+import org.apache.camel.component.google.sheets.internal.SheetsSpreadsheetsValuesApiMethod;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.*;
+
+/**
+ * Test class for {@link com.google.api.services.sheets.v4.Sheets.Spreadsheets.Values} APIs.
+ */
+public class SheetsSpreadsheetsValuesIntegrationTest extends AbstractGoogleSheetsTestSupport {
+
+    private static final Logger LOG = LoggerFactory.getLogger(SheetsSpreadsheetsValuesIntegrationTest.class);
+    private static final String PATH_PREFIX = GoogleSheetsApiCollection.getCollection().getApiName(SheetsSpreadsheetsValuesApiMethod.class).getName();
+
+    @Test
+    public void testGet() throws Exception {
+        Spreadsheet testSheet = getSpreadsheet();
+
+        final Map<String, Object> headers = new HashMap<>();
+        // parameter type is String
+        headers.put("CamelGoogleSheets.spreadsheetId", testSheet.getSpreadsheetId());
+        // parameter type is String
+        headers.put("CamelGoogleSheets.range", TEST_SHEET + "!A1:B2");
+
+        final ValueRange result = requestBodyAndHeaders("direct://GET", null, headers);
+
+        assertNotNull("get result is null", result);
+        assertEquals(TEST_SHEET + "!A1:B2", result.getRange());
+        assertNull("expected empty value range but found entries", result.getValues());
+
+        LOG.debug("get: " + result);
+    }
+
+    @Test
+    public void testUpdate() throws Exception {
+        Spreadsheet testSheet = getSpreadsheet();
+
+        List<List<Object>> data = Arrays.asList(
+                Arrays.asList("A1", "B1"),
+                Arrays.asList("A2", "B2")
+        );
+        ValueRange values = new ValueRange();
+        values.setValues(data);
+
+        final Map<String, Object> headers = new HashMap<>();
+        // parameter type is String
+        headers.put("CamelGoogleSheets.spreadsheetId", testSheet.getSpreadsheetId());
+        // parameter type is String
+        headers.put("CamelGoogleSheets.range", TEST_SHEET + "!A1:B2");
+        // parameter type is com.google.api.services.sheets.v4.model.ValueRange
+        headers.put("CamelGoogleSheets.values", values);
+
+        // parameter type is String
+        headers.put("CamelGoogleSheets.valueInputOption", "USER_ENTERED");
+
+        final UpdateValuesResponse result = requestBodyAndHeaders("direct://UPDATE", null, headers);
+
+        assertNotNull("update result is null", result);
+        assertEquals(testSheet.getSpreadsheetId(), result.getSpreadsheetId());
+        assertEquals(TEST_SHEET + "!A1:B2", result.getUpdatedRange());
+        assertEquals(Integer.valueOf(2), result.getUpdatedRows());
+        assertEquals(Integer.valueOf(4), result.getUpdatedCells());
+
+        LOG.debug("update: " + result);
+    }
+
+    @Test
+    public void testAppend() throws Exception {
+        Spreadsheet testSheet = getSpreadsheet();
+
+        final Map<String, Object> headers = new HashMap<>();
+        // parameter type is String
+        headers.put("CamelGoogleSheets.spreadsheetId", testSheet.getSpreadsheetId());
+        // parameter type is String
+        headers.put("CamelGoogleSheets.range", TEST_SHEET + "!A10");
+        // parameter type is com.google.api.services.sheets.v4.model.ValueRange
+        headers.put("CamelGoogleSheets.values", new ValueRange().setValues(Collections.singletonList(Arrays.asList("A10", "B10", "C10"))));
+
+        // parameter type is String
+        headers.put("CamelGoogleSheets.valueInputOption", "USER_ENTERED");
+
+        final AppendValuesResponse result = requestBodyAndHeaders("direct://APPEND", null, headers);
+
+        assertNotNull("append result is null", result);
+        assertEquals(testSheet.getSpreadsheetId(), result.getSpreadsheetId());
+        assertEquals(TEST_SHEET + "!A10:C10", result.getUpdates().getUpdatedRange());
+        assertEquals(Integer.valueOf(1), result.getUpdates().getUpdatedRows());
+        assertEquals(Integer.valueOf(3), result.getUpdates().getUpdatedCells());
+
+        LOG.debug("append: " + result);
+    }
+
+    @Test
+    public void testClear() throws Exception {
+        Spreadsheet testSheet = getSpreadsheetWithTestData();
+
+        final Map<String, Object> headers = new HashMap<>();
+        // parameter type is String
+        headers.put("CamelGoogleSheets.spreadsheetId", testSheet.getSpreadsheetId());
+        // parameter type is String
+        headers.put("CamelGoogleSheets.range", TEST_SHEET + "!A1:B2");
+        // parameter type is com.google.api.services.sheets.v4.model.ClearValuesRequest
+        headers.put("CamelGoogleSheets.clearValuesRequest", new ClearValuesRequest());
+
+        final ClearValuesResponse result = requestBodyAndHeaders("direct://CLEAR", null, headers);
+
+        assertNotNull("clear result is null", result);
+        assertEquals(testSheet.getSpreadsheetId(), result.getSpreadsheetId());
+        assertEquals(TEST_SHEET + "!A1:B2", result.getClearedRange());
+
+        LOG.debug("clear: " + result);
+    }
+
+    @Override
+    protected RouteBuilder createRouteBuilder() throws Exception {
+        return new RouteBuilder() {
+            @Override
+            public void configure() {
+                // test route for append
+                from("direct://APPEND")
+                        .to("google-sheets://" + PATH_PREFIX + "/append");
+
+                // test route for clear
+                from("direct://CLEAR")
+                        .to("google-sheets://" + PATH_PREFIX + "/clear");
+
+                // test route for get
+                from("direct://GET")
+                        .to("google-sheets://" + PATH_PREFIX + "/get");
+
+                // test route for update
+                from("direct://UPDATE")
+                        .to("google-sheets://" + PATH_PREFIX + "/update");
+            }
+        };
+    }
+}
diff --git a/components/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/stream/AbstractGoogleSheetsStreamTestSupport.java b/components/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/stream/AbstractGoogleSheetsStreamTestSupport.java
new file mode 100644
index 0000000000000..4767a0cbd126e
--- /dev/null
+++ b/components/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/stream/AbstractGoogleSheetsStreamTestSupport.java
@@ -0,0 +1,44 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.google.sheets.stream;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.component.google.sheets.AbstractGoogleSheetsTestSupport;
+import org.apache.camel.util.IntrospectionSupport;
+
+/**
+ * Abstract base class for GoogleSheets Integration tests generated by Camel API
+ * component maven plugin.
+ */
+public class AbstractGoogleSheetsStreamTestSupport extends AbstractGoogleSheetsTestSupport {
+
+    @Override
+    protected CamelContext createCamelContext() throws Exception {
+
+        final CamelContext context = super.createCamelContext();
+
+        final GoogleSheetsStreamConfiguration configuration = new GoogleSheetsStreamConfiguration();
+        IntrospectionSupport.setProperties(configuration, getTestOptions());
+
+        // add GoogleSheetsComponent to Camel context
+        final GoogleSheetsStreamComponent component = new GoogleSheetsStreamComponent(context);
+        component.setConfiguration(configuration);
+        context.addComponent("google-sheets-stream", component);
+
+        return context;
+    }
+}
diff --git a/components/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/stream/SheetsStreamConsumerIntegrationTest.java b/components/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/stream/SheetsStreamConsumerIntegrationTest.java
new file mode 100644
index 0000000000000..aa7c284c55c1d
--- /dev/null
+++ b/components/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/stream/SheetsStreamConsumerIntegrationTest.java
@@ -0,0 +1,70 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.google.sheets.stream;
+
+import com.google.api.services.sheets.v4.model.Spreadsheet;
+import com.google.api.services.sheets.v4.model.ValueRange;
+import org.apache.camel.Exchange;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.Assert;
+import org.junit.Test;
+
+import static org.apache.camel.component.google.sheets.stream.GoogleSheetsStreamConstants.MAJOR_DIMENSION;
+import static org.apache.camel.component.google.sheets.stream.GoogleSheetsStreamConstants.RANGE;
+import static org.apache.camel.component.google.sheets.stream.GoogleSheetsStreamConstants.SPREADSHEET_ID;
+
+public class SheetsStreamConsumerIntegrationTest extends AbstractGoogleSheetsStreamTestSupport {
+
+    private String range = "A1:B2";
+
+    @Test
+    public void testConsumeValueRange() throws Exception {
+        Spreadsheet testSheet = getSpreadsheetWithTestData();
+
+        context().addRoutes(createGoogleStreamRouteBuilder(testSheet.getSpreadsheetId()));
+        context().startRoute("google-stream-test");
+
+        MockEndpoint mock = getMockEndpoint("mock:result");
+        mock.expectedMinimumMessageCount(1);
+        assertMockEndpointsSatisfied();
+
+        Exchange exchange = mock.getReceivedExchanges().get(0);
+        Assert.assertTrue(exchange.getIn().getHeaders().containsKey(SPREADSHEET_ID));
+        Assert.assertTrue(exchange.getIn().getHeaders().containsKey(RANGE));
+        Assert.assertTrue(exchange.getIn().getHeaders().containsKey(MAJOR_DIMENSION));
+        Assert.assertEquals(testSheet.getSpreadsheetId(), exchange.getIn().getHeaders().get(SPREADSHEET_ID));
+        Assert.assertEquals(TEST_SHEET + "!" + range, exchange.getIn().getHeaders().get(RANGE));
+        Assert.assertEquals("ROWS", exchange.getIn().getHeaders().get(MAJOR_DIMENSION));
+
+        ValueRange values = (ValueRange) exchange.getIn().getBody();
+        Assert.assertEquals(2L, values.getValues().size());
+        Assert.assertEquals("a1", values.getValues().get(0).get(0));
+        Assert.assertEquals("b1", values.getValues().get(0).get(1));
+        Assert.assertEquals("a2", values.getValues().get(1).get(0));
+        Assert.assertEquals("b2", values.getValues().get(1).get(1));
+    }
+
+    private RouteBuilder createGoogleStreamRouteBuilder(String spreadsheetId) throws Exception {
+        return new RouteBuilder() {
+            @Override
+            public void configure() {
+                from("google-sheets-stream://data?spreadsheetId=" + spreadsheetId + "&range=" + range + "&delay=2000&maxResults=5").routeId("google-stream-test").to("mock:result");
+            }
+        };
+    }
+}
diff --git a/components/camel-google-sheets/src/test/resources/log4j2.properties b/components/camel-google-sheets/src/test/resources/log4j2.properties
new file mode 100644
index 0000000000000..17088a953b344
--- /dev/null
+++ b/components/camel-google-sheets/src/test/resources/log4j2.properties
@@ -0,0 +1,28 @@
+## ---------------------------------------------------------------------------
+## 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.
+## ---------------------------------------------------------------------------
+
+appender.file.type = File
+appender.file.name = file
+appender.file.fileName = target/camel-google-sheets-test.log
+appender.file.layout.type = PatternLayout
+appender.file.layout.pattern = %d [%-15.15t] %-5p %-30.30c{1} - %m%n
+appender.out.type = Console
+appender.out.name = out
+appender.out.layout.type = PatternLayout
+appender.out.layout.pattern = %d [%-15.15t] %-5p %-30.30c{1} - %m%n
+rootLogger.level = DEBUG
+rootLogger.appenderRef.file.ref = file
diff --git a/components/camel-google-sheets/src/test/resources/test-options.properties b/components/camel-google-sheets/src/test/resources/test-options.properties
new file mode 100644
index 0000000000000..b21908cff5733
--- /dev/null
+++ b/components/camel-google-sheets/src/test/resources/test-options.properties
@@ -0,0 +1,26 @@
+## ---------------------------------------------------------------------------
+## 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.
+## ---------------------------------------------------------------------------
+
+#####################################
+## Login properties for Google Sheets Component
+#####################################
+## Application client id and secret
+clientId=
+clientSecret=
+applicationName=camel-google-sheets/1.0
+accessToken=
+refreshToken=
diff --git a/components/pom.xml b/components/pom.xml
index a280e252942be..e77582a3edbe6 100644
--- a/components/pom.xml
+++ b/components/pom.xml
@@ -144,6 +144,7 @@
     <module>camel-git</module>
     <module>camel-github</module>
     <module>camel-google-calendar</module>
+    <module>camel-google-sheets</module>
     <module>camel-google-drive</module>
     <module>camel-google-mail</module>
     <module>camel-google-bigquery</module>
@@ -396,7 +397,7 @@
     <profile>
       <id>validate</id>
       <build>
-        <plugins>           
+        <plugins>
           <!-- to validate Camel endpoints: mvn camel:validate -Pvalidate -->
           <plugin>
             <groupId>org.apache.camel</groupId>
diff --git a/components/readme.adoc b/components/readme.adoc
index 163b1837c278a..45d0f161dbef7 100644
--- a/components/readme.adoc
+++ b/components/readme.adoc
@@ -2,7 +2,7 @@ Components
 ^^^^^^^^^^
 
 // components: START
-Number of Components: 304 in 206 JAR artifacts (22 deprecated)
+Number of Components: 305 in 206 JAR artifacts (22 deprecated)
 
 [width="100%",cols="4,1,5",options="header"]
 |===
@@ -314,6 +314,12 @@ Number of Components: 304 in 206 JAR artifacts (22 deprecated)
 | link:camel-google-pubsub/src/main/docs/google-pubsub-component.adoc[Google Pubsub] (camel-google-pubsub) +
 `google-pubsub:projectId:destinationName` | 2.19 | Messaging client for Google Cloud Platform PubSub Service
 
+| link:camel-google-sheets/src/main/docs/google-sheets-component.adoc[Google Sheets] (camel-google-sheets) +
+`google-sheets:apiName/methodName` | 2.23 | The google-sheets component provides access to Google Sheets.
+
+| link:camel-google-sheets/src/main/docs/google-sheets-stream-component.adoc[Google Sheets Stream] (camel-google-sheets) +
+`google-sheets-stream:apiName` | 2.23 | The google-sheets component provides access to Google Sheets.
+
 | link:camel-gora/src/main/docs/gora-component.adoc[Gora] (camel-gora) +
 `gora:name` | 2.14 | The gora component allows you to work with NoSQL databases using the Apache Gora framework.
 
diff --git a/docs/user-manual/en/SUMMARY.md b/docs/user-manual/en/SUMMARY.md
index 21fbd478ac290..73d935f265305 100644
--- a/docs/user-manual/en/SUMMARY.md
+++ b/docs/user-manual/en/SUMMARY.md
@@ -260,6 +260,8 @@
 	* [Google Mail](google-mail-component.adoc)
 	* [Google Mail Stream](google-mail-stream-component.adoc)
 	* [Google Pubsub](google-pubsub-component.adoc)
+	* [Google Sheets](google-sheets-component.adoc)
+	* [Google Sheets Stream](google-sheets-stream-component.adoc)
 	* [Gora](gora-component.adoc)
 	* [Grape](grape-component.adoc)
 	* [gRPC](grpc-component.adoc)
diff --git a/parent/pom.xml b/parent/pom.xml
index e7dca50dfc903..f823a0fa27fa4 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -260,6 +260,7 @@
     <google-api-client-version>1.22.0</google-api-client-version>
     <google-api-services-drive-version>v2-rev297-1.22.0</google-api-services-drive-version>
     <google-api-services-calendar-version>v3-rev291-1.22.0</google-api-services-calendar-version>
+    <google-api-services-sheets-version>v4-rev551-1.22.0</google-api-services-sheets-version>
     <google-api-services-mail-version>v1-rev81-1.22.0</google-api-services-mail-version>
     <google-api-services-bigquery-version>v2-rev352-1.22.0</google-api-services-bigquery-version>
     <google-api-services-pubsub-version>v1-rev12-1.22.0</google-api-services-pubsub-version>
@@ -1229,12 +1230,17 @@
         <artifactId>camel-github</artifactId>
         <version>${project.version}</version>
       </dependency>
-       <dependency>
+      <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-google-calendar</artifactId>
         <version>${project.version}</version>
       </dependency>
-       <dependency>
+      <dependency>
+        <groupId>org.apache.camel</groupId>
+        <artifactId>camel-google-sheets</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-google-drive</artifactId>
         <version>${project.version}</version>
@@ -2773,6 +2779,11 @@
         <artifactId>camel-google-calendar-starter</artifactId>
         <version>${project.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.camel</groupId>
+        <artifactId>camel-google-sheets-starter</artifactId>
+        <version>${project.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-google-drive-starter</artifactId>
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index 2e07d63199fc8..0b1b71a79a6b6 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -771,6 +771,20 @@
     <bundle dependency='true'>wrap:mvn:com.google.oauth-client/google-oauth-client-jetty/${google-api-client-version}</bundle>
     <bundle>mvn:org.apache.camel/camel-google-calendar/${project.version}</bundle>
   </feature>
+  <feature name='camel-google-sheets' version='${project.version}' resolver='(obr)' start-level='50'>
+    <feature version='${project.version}'>camel-core</feature>
+    <bundle dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle>
+    <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle>
+    <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-httpclient/${commons-httpclient-bundle-version}</bundle>
+    <bundle dependency='true'>wrap:mvn:com.google.api-client/google-api-client/${google-api-client-version}</bundle>
+    <bundle dependency='true'>wrap:mvn:com.google.apis/google-api-services-sheets/${google-api-services-sheets-version}</bundle>
+    <bundle dependency='true'>wrap:mvn:com.google.http-client/google-http-client/${google-api-client-version}</bundle>
+    <bundle dependency='true'>wrap:mvn:com.google.http-client/google-http-client-jackson2/${google-api-client-version}</bundle>
+    <bundle dependency='true'>wrap:mvn:com.google.oauth-client/google-oauth-client/${google-api-client-version}</bundle>
+    <bundle dependency='true'>wrap:mvn:com.google.oauth-client/google-oauth-client-java6/${google-api-client-version}</bundle>
+    <bundle dependency='true'>wrap:mvn:com.google.oauth-client/google-oauth-client-jetty/${google-api-client-version}</bundle>
+    <bundle>mvn:org.apache.camel/camel-google-sheets/${project.version}</bundle>
+  </feature>
   <feature name='camel-google-drive' version='${project.version}' resolver='(obr)' start-level='50'>
     <feature version='${project.version}'>camel-core</feature>
     <bundle dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle>
@@ -1158,17 +1172,17 @@
     <bundle dependency='true'>mvn:org.kie.soup/kie-soup-project-datamodel-commons/${jbpm-version}</bundle>
     <bundle dependency='true'>mvn:org.kie.soup/kie-soup-commons/${jbpm-version}</bundle>
     <bundle dependency='true'>mvn:org.kie/kie-api/${jbpm-version}</bundle>
-    <bundle dependency='true'>mvn:org.kie/kie-internal/${jbpm-version}</bundle>    
+    <bundle dependency='true'>mvn:org.kie/kie-internal/${jbpm-version}</bundle>
     <bundle dependency='true'>mvn:org.drools/drools-core/${jbpm-version}</bundle>
     <bundle dependency='true'>mvn:org.drools/drools-compiler/${jbpm-version}</bundle>
-    <bundle dependency='true'>mvn:org.mvel/mvel2/${mvel-version}</bundle>    
+    <bundle dependency='true'>mvn:org.mvel/mvel2/${mvel-version}</bundle>
     <bundle dependency='true'>mvn:org.kie/kie-dmn-model/${jbpm-version}</bundle>
-    <bundle dependency='true'>mvn:org.kie/kie-dmn-api/${jbpm-version}</bundle>   
+    <bundle dependency='true'>mvn:org.kie/kie-dmn-api/${jbpm-version}</bundle>
     <bundle dependency='true'>mvn:org.optaplanner/optaplanner-core/${jbpm-version}</bundle>
-    <bundle dependency='true'>mvn:org.optaplanner/optaplanner-persistence-common/${jbpm-version}</bundle>  
+    <bundle dependency='true'>mvn:org.optaplanner/optaplanner-persistence-common/${jbpm-version}</bundle>
     <bundle dependency='true'>mvn:org.optaplanner/optaplanner-persistence-jaxb/${jbpm-version}</bundle>
     <bundle dependency='true'>mvn:org.optaplanner/optaplanner-persistence-jackson/${jbpm-version}</bundle>
-    <bundle dependency='true'>mvn:org.optaplanner/optaplanner-persistence-xstream/${jbpm-version}</bundle>  
+    <bundle dependency='true'>mvn:org.optaplanner/optaplanner-persistence-xstream/${jbpm-version}</bundle>
     <bundle dependency='true'>mvn:com.google.protobuf/protobuf-java/${protobuf-version}</bundle>
     <bundle dependency='true'>mvn:com.google.guava/guava/${google-guava-version}</bundle>
     <bundle dependency='true'>mvn:org.apache.commons/commons-math3/${commons-math3-version}</bundle>
@@ -1177,13 +1191,13 @@
     <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson2-version}</bundle>
     <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle>
     <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-version}</bundle>
-    <bundle dependency='true'>mvn:com.fasterxml.jackson.module/jackson-module-jaxb-annotations/${jackson2-version}</bundle>    
+    <bundle dependency='true'>mvn:com.fasterxml.jackson.module/jackson-module-jaxb-annotations/${jackson2-version}</bundle>
     <bundle dependency='true'>mvn:org.apache.servicemix.specs/org.apache.servicemix.specs.jaxws-api-2.2/${servicemix-specs-version}</bundle>
     <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xstream-java8/${xstream-bundle-version}</bundle>
-    <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xpp3/${xpp3-bundle-version}</bundle>    
+    <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xpp3/${xpp3-bundle-version}</bundle>
     <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.reflections/${reflections-bundle-version}</bundle>
-    <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-xjc/${jaxb-bundle-version}</bundle>    
-    <bundle>mvn:org.apache.camel/camel-jbpm/${project.version}</bundle> 
+    <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jaxb-xjc/${jaxb-bundle-version}</bundle>
+    <bundle>mvn:org.apache.camel/camel-jbpm/${project.version}</bundle>
   </feature>
   <feature name='camel-jcache' version='${project.version}' resolver='(obr)' start-level='50'>
     <feature version='${project.version}'>camel-core</feature>
@@ -1731,10 +1745,10 @@
     <bundle dependency='true'>mvn:commons-io/commons-io/${commons-io-version}</bundle>
     <bundle dependency='true'>mvn:commons-collections/commons-collections/${commons-collections-version}</bundle>
     <bundle dependency='true'>mvn:org.optaplanner/optaplanner-core/${optaplanner-version}</bundle>
-    <bundle dependency='true'>mvn:org.optaplanner/optaplanner-persistence-common/${optaplanner-version}</bundle>  
+    <bundle dependency='true'>mvn:org.optaplanner/optaplanner-persistence-common/${optaplanner-version}</bundle>
     <bundle dependency='true'>mvn:org.optaplanner/optaplanner-persistence-jaxb/${optaplanner-version}</bundle>
     <bundle dependency='true'>mvn:org.optaplanner/optaplanner-persistence-jackson/${optaplanner-version}</bundle>
-    <bundle dependency='true'>mvn:org.optaplanner/optaplanner-persistence-xstream/${optaplanner-version}</bundle> 
+    <bundle dependency='true'>mvn:org.optaplanner/optaplanner-persistence-xstream/${optaplanner-version}</bundle>
     <bundle dependency='true'>mvn:org.kie.soup/kie-soup-maven-support/${kie-version}</bundle>
     <bundle dependency='true'>mvn:org.kie.soup/kie-soup-project-datamodel-api/${kie-version}</bundle>
     <bundle dependency='true'>mvn:org.kie.soup/kie-soup-project-datamodel-commons/${kie-version}</bundle>
@@ -1750,7 +1764,7 @@
     <bundle dependency='true'>mvn:com.google.protobuf/protobuf-java/${protobuf-version}</bundle>
     <bundle dependency='true'>mvn:com.google.guava/guava/${google-guava-version}</bundle>
     <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.javax-inject/${javax-inject-bundle-version}</bundle>
-    <bundle>mvn:org.apache.camel/camel-optaplanner/${project.version}</bundle>    
+    <bundle>mvn:org.apache.camel/camel-optaplanner/${project.version}</bundle>
   </feature>
   <feature name='camel-openstack' version='${project.version}' resolver='(obr)' start-level='50'>
     <feature version='${project.version}'>camel-core</feature>
diff --git a/platforms/spring-boot/components-starter/camel-google-sheets-starter/pom.xml b/platforms/spring-boot/components-starter/camel-google-sheets-starter/pom.xml
new file mode 100644
index 0000000000000..be435029d5db1
--- /dev/null
+++ b/platforms/spring-boot/components-starter/camel-google-sheets-starter/pom.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    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.
+
+-->
+<project xmlns="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">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.camel</groupId>
+    <artifactId>components-starter</artifactId>
+    <version>2.23.0-SNAPSHOT</version>
+  </parent>
+  <artifactId>camel-google-sheets-starter</artifactId>
+  <packaging>jar</packaging>
+  <name>Spring-Boot Starter :: Camel :: GoogleSheets</name>
+  <description>Spring-Boot Starter for Camel Component for GoogleSheets</description>
+  <dependencies>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter</artifactId>
+      <version>${spring-boot-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.camel</groupId>
+      <artifactId>camel-google-sheets</artifactId>
+      <version>${project.version}</version>
+      <!--START OF GENERATED CODE-->
+      <exclusions>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
+      </exclusions>
+      <!--END OF GENERATED CODE-->
+    </dependency>
+    <!--START OF GENERATED CODE-->
+    <dependency>
+      <groupId>org.apache.camel</groupId>
+      <artifactId>camel-core-starter</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.camel</groupId>
+      <artifactId>camel-spring-boot-starter</artifactId>
+    </dependency>
+    <!--END OF GENERATED CODE-->
+  </dependencies>
+</project>
diff --git a/platforms/spring-boot/components-starter/camel-google-sheets-starter/src/main/java/org/apache/camel/component/google/sheets/springboot/GoogleSheetsComponentAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-google-sheets-starter/src/main/java/org/apache/camel/component/google/sheets/springboot/GoogleSheetsComponentAutoConfiguration.java
new file mode 100644
index 0000000000000..0f6f12ffe09ff
--- /dev/null
+++ b/platforms/spring-boot/components-starter/camel-google-sheets-starter/src/main/java/org/apache/camel/component/google/sheets/springboot/GoogleSheetsComponentAutoConfiguration.java
@@ -0,0 +1,129 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.google.sheets.springboot;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import javax.annotation.Generated;
+import org.apache.camel.CamelContext;
+import org.apache.camel.component.google.sheets.GoogleSheetsComponent;
+import org.apache.camel.spi.ComponentCustomizer;
+import org.apache.camel.spi.HasId;
+import org.apache.camel.spring.boot.CamelAutoConfiguration;
+import org.apache.camel.spring.boot.ComponentConfigurationProperties;
+import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
+import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
+import org.apache.camel.spring.boot.util.GroupCondition;
+import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
+import org.apache.camel.util.IntrospectionSupport;
+import org.apache.camel.util.ObjectHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Conditional;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Lazy;
+
+/**
+ * Generated by camel-package-maven-plugin - do not edit this file!
+ */
+@Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo")
+@Configuration
+@Conditional({ConditionalOnCamelContextAndAutoConfigurationBeans.class,
+        GoogleSheetsComponentAutoConfiguration.GroupConditions.class})
+@AutoConfigureAfter(CamelAutoConfiguration.class)
+@EnableConfigurationProperties({ComponentConfigurationProperties.class,
+        GoogleSheetsComponentConfiguration.class})
+public class GoogleSheetsComponentAutoConfiguration {
+
+    private static final Logger LOGGER = LoggerFactory
+            .getLogger(GoogleSheetsComponentAutoConfiguration.class);
+    @Autowired
+    private ApplicationContext applicationContext;
+    @Autowired
+    private CamelContext camelContext;
+    @Autowired
+    private GoogleSheetsComponentConfiguration configuration;
+    @Autowired(required = false)
+    private List<ComponentCustomizer<GoogleSheetsComponent>> customizers;
+
+    static class GroupConditions extends GroupCondition {
+        public GroupConditions() {
+            super("camel.component", "camel.component.google-sheets");
+        }
+    }
+
+    @Lazy
+    @Bean(name = "google-sheets-component")
+    @ConditionalOnMissingBean(GoogleSheetsComponent.class)
+    public GoogleSheetsComponent configureGoogleSheetsComponent()
+            throws Exception {
+        GoogleSheetsComponent component = new GoogleSheetsComponent();
+        component.setCamelContext(camelContext);
+        Map<String, Object> parameters = new HashMap<>();
+        IntrospectionSupport.getProperties(configuration, parameters, null,
+                false);
+        for (Map.Entry<String, Object> entry : parameters.entrySet()) {
+            Object value = entry.getValue();
+            Class<?> paramClass = value.getClass();
+            if (paramClass.getName().endsWith("NestedConfiguration")) {
+                Class nestedClass = null;
+                try {
+                    nestedClass = (Class) paramClass.getDeclaredField(
+                            "CAMEL_NESTED_CLASS").get(null);
+                    HashMap<String, Object> nestedParameters = new HashMap<>();
+                    IntrospectionSupport.getProperties(value, nestedParameters,
+                            null, false);
+                    Object nestedProperty = nestedClass.newInstance();
+                    CamelPropertiesHelper.setCamelProperties(camelContext,
+                            nestedProperty, nestedParameters, false);
+                    entry.setValue(nestedProperty);
+                } catch (NoSuchFieldException e) {
+                }
+            }
+        }
+        CamelPropertiesHelper.setCamelProperties(camelContext, component,
+                parameters, false);
+        if (ObjectHelper.isNotEmpty(customizers)) {
+            for (ComponentCustomizer<GoogleSheetsComponent> customizer : customizers) {
+                boolean useCustomizer = (customizer instanceof HasId)
+                        ? HierarchicalPropertiesEvaluator.evaluate(
+                                applicationContext.getEnvironment(),
+                                "camel.component.customizer",
+                                "camel.component.google-sheets.customizer",
+                                ((HasId) customizer).getId())
+                        : HierarchicalPropertiesEvaluator.evaluate(
+                                applicationContext.getEnvironment(),
+                                "camel.component.customizer",
+                                "camel.component.google-sheets.customizer");
+                if (useCustomizer) {
+                    LOGGER.debug("Configure component {}, with customizer {}",
+                            component, customizer);
+                    customizer.customize(component);
+                }
+            }
+        }
+        return component;
+    }
+}
\ No newline at end of file
diff --git a/platforms/spring-boot/components-starter/camel-google-sheets-starter/src/main/java/org/apache/camel/component/google/sheets/springboot/GoogleSheetsComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-google-sheets-starter/src/main/java/org/apache/camel/component/google/sheets/springboot/GoogleSheetsComponentConfiguration.java
new file mode 100644
index 0000000000000..5af2202321294
--- /dev/null
+++ b/platforms/spring-boot/components-starter/camel-google-sheets-starter/src/main/java/org/apache/camel/component/google/sheets/springboot/GoogleSheetsComponentConfiguration.java
@@ -0,0 +1,174 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.google.sheets.springboot;
+
+import javax.annotation.Generated;
+import org.apache.camel.component.google.sheets.internal.GoogleSheetsApiName;
+import org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+/**
+ * The google-sheets component provides access to Google Sheets.
+ *
+ * Generated by camel-package-maven-plugin - do not edit this file!
+ */
+@Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo")
+@ConfigurationProperties(prefix = "camel.component.google-sheets")
+public class GoogleSheetsComponentConfiguration
+        extends
+            ComponentConfigurationPropertiesCommon {
+
+    /**
+     * Whether to enable auto configuration of the google-sheets component. This
+     * is enabled by default.
+     */
+    private Boolean enabled;
+    /**
+     * To use the shared configuration
+     */
+    private GoogleSheetsConfigurationNestedConfiguration configuration;
+    /**
+     * To use the GoogleSheetsClientFactory as factory for creating the client.
+     * Will by default use BatchGoogleSheetsClientFactory. The option is a
+     * org.apache.camel.component.google.sheets.GoogleSheetsClientFactory type.
+     */
+    private String clientFactory;
+    /**
+     * Whether the component should resolve property placeholders on itself when
+     * starting. Only properties which are of String type can use property
+     * placeholders.
+     */
+    private Boolean resolvePropertyPlaceholders = true;
+
+    public GoogleSheetsConfigurationNestedConfiguration getConfiguration() {
+        return configuration;
+    }
+
+    public void setConfiguration(
+            GoogleSheetsConfigurationNestedConfiguration configuration) {
+        this.configuration = configuration;
+    }
+
+    public String getClientFactory() {
+        return clientFactory;
+    }
+
+    public void setClientFactory(String clientFactory) {
+        this.clientFactory = clientFactory;
+    }
+
+    public Boolean getResolvePropertyPlaceholders() {
+        return resolvePropertyPlaceholders;
+    }
+
+    public void setResolvePropertyPlaceholders(
+            Boolean resolvePropertyPlaceholders) {
+        this.resolvePropertyPlaceholders = resolvePropertyPlaceholders;
+    }
+
+    public static class GoogleSheetsConfigurationNestedConfiguration {
+        public static final Class CAMEL_NESTED_CLASS = org.apache.camel.component.google.sheets.GoogleSheetsConfiguration.class;
+        /**
+         * What kind of operation to perform
+         */
+        private GoogleSheetsApiName apiName;
+        /**
+         * What sub operation to use for the selected operation
+         */
+        private String methodName;
+        /**
+         * Client ID of the sheets application
+         */
+        private String clientId;
+        /**
+         * Client secret of the sheets application
+         */
+        private String clientSecret;
+        /**
+         * OAuth 2 access token. This typically expires after an hour so
+         * refreshToken is recommended for long term usage.
+         */
+        private String accessToken;
+        /**
+         * OAuth 2 refresh token. Using this, the Google Sheets component can
+         * obtain a new accessToken whenever the current one expires - a
+         * necessity if the application is long-lived.
+         */
+        private String refreshToken;
+        /**
+         * Google Sheets application name. Example would be
+         * camel-google-sheets/1.0
+         */
+        private String applicationName;
+
+        public GoogleSheetsApiName getApiName() {
+            return apiName;
+        }
+
+        public void setApiName(GoogleSheetsApiName apiName) {
+            this.apiName = apiName;
+        }
+
+        public String getMethodName() {
+            return methodName;
+        }
+
+        public void setMethodName(String methodName) {
+            this.methodName = methodName;
+        }
+
+        public String getClientId() {
+            return clientId;
+        }
+
+        public void setClientId(String clientId) {
+            this.clientId = clientId;
+        }
+
+        public String getClientSecret() {
+            return clientSecret;
+        }
+
+        public void setClientSecret(String clientSecret) {
+            this.clientSecret = clientSecret;
+        }
+
+        public String getAccessToken() {
+            return accessToken;
+        }
+
+        public void setAccessToken(String accessToken) {
+            this.accessToken = accessToken;
+        }
+
+        public String getRefreshToken() {
+            return refreshToken;
+        }
+
+        public void setRefreshToken(String refreshToken) {
+            this.refreshToken = refreshToken;
+        }
+
+        public String getApplicationName() {
+            return applicationName;
+        }
+
+        public void setApplicationName(String applicationName) {
+            this.applicationName = applicationName;
+        }
+    }
+}
\ No newline at end of file
diff --git a/platforms/spring-boot/components-starter/camel-google-sheets-starter/src/main/java/org/apache/camel/component/google/sheets/stream/springboot/GoogleSheetsStreamComponentAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-google-sheets-starter/src/main/java/org/apache/camel/component/google/sheets/stream/springboot/GoogleSheetsStreamComponentAutoConfiguration.java
new file mode 100644
index 0000000000000..35fed67882642
--- /dev/null
+++ b/platforms/spring-boot/components-starter/camel-google-sheets-starter/src/main/java/org/apache/camel/component/google/sheets/stream/springboot/GoogleSheetsStreamComponentAutoConfiguration.java
@@ -0,0 +1,130 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.google.sheets.stream.springboot;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import javax.annotation.Generated;
+import org.apache.camel.CamelContext;
+import org.apache.camel.component.google.sheets.stream.GoogleSheetsStreamComponent;
+import org.apache.camel.spi.ComponentCustomizer;
+import org.apache.camel.spi.HasId;
+import org.apache.camel.spring.boot.CamelAutoConfiguration;
+import org.apache.camel.spring.boot.ComponentConfigurationProperties;
+import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
+import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
+import org.apache.camel.spring.boot.util.GroupCondition;
+import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
+import org.apache.camel.util.IntrospectionSupport;
+import org.apache.camel.util.ObjectHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Conditional;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Lazy;
+
+/**
+ * Generated by camel-package-maven-plugin - do not edit this file!
+ */
+@Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo")
+@Configuration
+@Conditional({ConditionalOnCamelContextAndAutoConfigurationBeans.class,
+        GoogleSheetsStreamComponentAutoConfiguration.GroupConditions.class})
+@AutoConfigureAfter(CamelAutoConfiguration.class)
+@EnableConfigurationProperties({ComponentConfigurationProperties.class,
+        GoogleSheetsStreamComponentConfiguration.class})
+public class GoogleSheetsStreamComponentAutoConfiguration {
+
+    private static final Logger LOGGER = LoggerFactory
+            .getLogger(GoogleSheetsStreamComponentAutoConfiguration.class);
+    @Autowired
+    private ApplicationContext applicationContext;
+    @Autowired
+    private CamelContext camelContext;
+    @Autowired
+    private GoogleSheetsStreamComponentConfiguration configuration;
+    @Autowired(required = false)
+    private List<ComponentCustomizer<GoogleSheetsStreamComponent>> customizers;
+
+    static class GroupConditions extends GroupCondition {
+        public GroupConditions() {
+            super("camel.component", "camel.component.google-sheets-stream");
+        }
+    }
+
+    @Lazy
+    @Bean(name = "google-sheets-stream-component")
+    @ConditionalOnMissingBean(GoogleSheetsStreamComponent.class)
+    public GoogleSheetsStreamComponent configureGoogleSheetsStreamComponent()
+            throws Exception {
+        GoogleSheetsStreamComponent component = new GoogleSheetsStreamComponent();
+        component.setCamelContext(camelContext);
+        Map<String, Object> parameters = new HashMap<>();
+        IntrospectionSupport.getProperties(configuration, parameters, null,
+                false);
+        for (Map.Entry<String, Object> entry : parameters.entrySet()) {
+            Object value = entry.getValue();
+            Class<?> paramClass = value.getClass();
+            if (paramClass.getName().endsWith("NestedConfiguration")) {
+                Class nestedClass = null;
+                try {
+                    nestedClass = (Class) paramClass.getDeclaredField(
+                            "CAMEL_NESTED_CLASS").get(null);
+                    HashMap<String, Object> nestedParameters = new HashMap<>();
+                    IntrospectionSupport.getProperties(value, nestedParameters,
+                            null, false);
+                    Object nestedProperty = nestedClass.newInstance();
+                    CamelPropertiesHelper.setCamelProperties(camelContext,
+                            nestedProperty, nestedParameters, false);
+                    entry.setValue(nestedProperty);
+                } catch (NoSuchFieldException e) {
+                }
+            }
+        }
+        CamelPropertiesHelper.setCamelProperties(camelContext, component,
+                parameters, false);
+        if (ObjectHelper.isNotEmpty(customizers)) {
+            for (ComponentCustomizer<GoogleSheetsStreamComponent> customizer : customizers) {
+                boolean useCustomizer = (customizer instanceof HasId)
+                        ? HierarchicalPropertiesEvaluator
+                                .evaluate(
+                                        applicationContext.getEnvironment(),
+                                        "camel.component.customizer",
+                                        "camel.component.google-sheets-stream.customizer",
+                                        ((HasId) customizer).getId())
+                        : HierarchicalPropertiesEvaluator
+                                .evaluate(applicationContext.getEnvironment(),
+                                        "camel.component.customizer",
+                                        "camel.component.google-sheets-stream.customizer");
+                if (useCustomizer) {
+                    LOGGER.debug("Configure component {}, with customizer {}",
+                            component, customizer);
+                    customizer.customize(component);
+                }
+            }
+        }
+        return component;
+    }
+}
\ No newline at end of file
diff --git a/platforms/spring-boot/components-starter/camel-google-sheets-starter/src/main/java/org/apache/camel/component/google/sheets/stream/springboot/GoogleSheetsStreamComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-google-sheets-starter/src/main/java/org/apache/camel/component/google/sheets/stream/springboot/GoogleSheetsStreamComponentConfiguration.java
new file mode 100644
index 0000000000000..8d0f1f1a22cc3
--- /dev/null
+++ b/platforms/spring-boot/components-starter/camel-google-sheets-starter/src/main/java/org/apache/camel/component/google/sheets/stream/springboot/GoogleSheetsStreamComponentConfiguration.java
@@ -0,0 +1,252 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.google.sheets.stream.springboot;
+
+import java.util.List;
+import javax.annotation.Generated;
+import org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+/**
+ * The google-sheets component provides access to Google Sheets.
+ *
+ * Generated by camel-package-maven-plugin - do not edit this file!
+ */
+@Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo")
+@ConfigurationProperties(prefix = "camel.component.google-sheets-stream")
+public class GoogleSheetsStreamComponentConfiguration
+        extends
+            ComponentConfigurationPropertiesCommon {
+
+    /**
+     * Whether to enable auto configuration of the google-sheets-stream
+     * component. This is enabled by default.
+     */
+    private Boolean enabled;
+    /**
+     * To use the shared configuration
+     */
+    private GoogleSheetsStreamConfigurationNestedConfiguration configuration;
+    /**
+     * To use the GoogleSheetsClientFactory as factory for creating the client.
+     * Will by default use BatchGoogleSheetsClientFactory. The option is a
+     * org.apache.camel.component.google.sheets.GoogleSheetsClientFactory type.
+     */
+    private String clientFactory;
+    /**
+     * Whether the component should resolve property placeholders on itself when
+     * starting. Only properties which are of String type can use property
+     * placeholders.
+     */
+    private Boolean resolvePropertyPlaceholders = true;
+
+    public GoogleSheetsStreamConfigurationNestedConfiguration getConfiguration() {
+        return configuration;
+    }
+
+    public void setConfiguration(
+            GoogleSheetsStreamConfigurationNestedConfiguration configuration) {
+        this.configuration = configuration;
+    }
+
+    public String getClientFactory() {
+        return clientFactory;
+    }
+
+    public void setClientFactory(String clientFactory) {
+        this.clientFactory = clientFactory;
+    }
+
+    public Boolean getResolvePropertyPlaceholders() {
+        return resolvePropertyPlaceholders;
+    }
+
+    public void setResolvePropertyPlaceholders(
+            Boolean resolvePropertyPlaceholders) {
+        this.resolvePropertyPlaceholders = resolvePropertyPlaceholders;
+    }
+
+    public static class GoogleSheetsStreamConfigurationNestedConfiguration {
+        public static final Class CAMEL_NESTED_CLASS = org.apache.camel.component.google.sheets.stream.GoogleSheetsStreamConfiguration.class;
+        /**
+         * Client ID of the sheets application
+         */
+        private String clientId;
+        /**
+         * Client secret of the sheets application
+         */
+        private String clientSecret;
+        /**
+         * OAuth 2 access token. This typically expires after an hour so
+         * refreshToken is recommended for long term usage.
+         */
+        private String accessToken;
+        /**
+         * OAuth 2 refresh token. Using this, the Google Calendar component can
+         * obtain a new accessToken whenever the current one expires - a
+         * necessity if the application is long-lived.
+         */
+        private String refreshToken;
+        /**
+         * Google sheets application name. Example would be
+         * camel-google-sheets/1.0
+         */
+        private String applicationName;
+        /**
+         * Specifies the level of permissions you want a sheets application to
+         * have to a user account. See
+         * https://developers.google.com/identity/protocols/googlescopes for
+         * more info.
+         */
+        private List scopes;
+        /**
+         * Sets the apiName.
+         */
+        private String apiName;
+        /**
+         * Specifies the spreadsheet identifier that is used to identify the
+         * target to obtain.
+         */
+        private String spreadsheetId;
+        /**
+         * Specify the maximum number of returned results. This will limit the
+         * number of rows in a returned value range data set or the number of
+         * returned value ranges in a batch request.
+         */
+        private Integer maxResults = 10;
+        /**
+         * Specifies the range of rows and columns in a sheet to get data from.
+         */
+        private String range;
+        /**
+         * Specifies the major dimension that results should use..
+         */
+        private String majorDimension = "ROWS";
+        /**
+         * Determines how values should be rendered in the output.
+         */
+        private String valueRenderOption = "FORMATTED_VALUE";
+        /**
+         * True if grid data should be returned.
+         */
+        private Boolean includeGridData = false;
+
+        public String getClientId() {
+            return clientId;
+        }
+
+        public void setClientId(String clientId) {
+            this.clientId = clientId;
+        }
+
+        public String getClientSecret() {
+            return clientSecret;
+        }
+
+        public void setClientSecret(String clientSecret) {
+            this.clientSecret = clientSecret;
+        }
+
+        public String getAccessToken() {
+            return accessToken;
+        }
+
+        public void setAccessToken(String accessToken) {
+            this.accessToken = accessToken;
+        }
+
+        public String getRefreshToken() {
+            return refreshToken;
+        }
+
+        public void setRefreshToken(String refreshToken) {
+            this.refreshToken = refreshToken;
+        }
+
+        public String getApplicationName() {
+            return applicationName;
+        }
+
+        public void setApplicationName(String applicationName) {
+            this.applicationName = applicationName;
+        }
+
+        public List getScopes() {
+            return scopes;
+        }
+
+        public void setScopes(List scopes) {
+            this.scopes = scopes;
+        }
+
+        public String getApiName() {
+            return apiName;
+        }
+
+        public void setApiName(String apiName) {
+            this.apiName = apiName;
+        }
+
+        public String getSpreadsheetId() {
+            return spreadsheetId;
+        }
+
+        public void setSpreadsheetId(String spreadsheetId) {
+            this.spreadsheetId = spreadsheetId;
+        }
+
+        public Integer getMaxResults() {
+            return maxResults;
+        }
+
+        public void setMaxResults(Integer maxResults) {
+            this.maxResults = maxResults;
+        }
+
+        public String getRange() {
+            return range;
+        }
+
+        public void setRange(String range) {
+            this.range = range;
+        }
+
+        public String getMajorDimension() {
+            return majorDimension;
+        }
+
+        public void setMajorDimension(String majorDimension) {
+            this.majorDimension = majorDimension;
+        }
+
+        public String getValueRenderOption() {
+            return valueRenderOption;
+        }
+
+        public void setValueRenderOption(String valueRenderOption) {
+            this.valueRenderOption = valueRenderOption;
+        }
+
+        public Boolean getIncludeGridData() {
+            return includeGridData;
+        }
+
+        public void setIncludeGridData(Boolean includeGridData) {
+            this.includeGridData = includeGridData;
+        }
+    }
+}
\ No newline at end of file
diff --git a/platforms/spring-boot/components-starter/camel-google-sheets-starter/src/main/resources/META-INF/LICENSE.txt b/platforms/spring-boot/components-starter/camel-google-sheets-starter/src/main/resources/META-INF/LICENSE.txt
new file mode 100644
index 0000000000000..6b0b1270ff0ca
--- /dev/null
+++ b/platforms/spring-boot/components-starter/camel-google-sheets-starter/src/main/resources/META-INF/LICENSE.txt
@@ -0,0 +1,203 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed 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.
+
diff --git a/platforms/spring-boot/components-starter/camel-google-sheets-starter/src/main/resources/META-INF/NOTICE.txt b/platforms/spring-boot/components-starter/camel-google-sheets-starter/src/main/resources/META-INF/NOTICE.txt
new file mode 100644
index 0000000000000..2e215bf2e6b1f
--- /dev/null
+++ b/platforms/spring-boot/components-starter/camel-google-sheets-starter/src/main/resources/META-INF/NOTICE.txt
@@ -0,0 +1,11 @@
+   =========================================================================
+   ==  NOTICE file corresponding to the section 4 d of                    ==
+   ==  the Apache License, Version 2.0,                                   ==
+   ==  in this case for the Apache Camel distribution.                    ==
+   =========================================================================
+
+   This product includes software developed by
+   The Apache Software Foundation (http://www.apache.org/).
+
+   Please read the different LICENSE files present in the licenses directory of
+   this distribution.
diff --git a/platforms/spring-boot/components-starter/camel-google-sheets-starter/src/main/resources/META-INF/spring.factories b/platforms/spring-boot/components-starter/camel-google-sheets-starter/src/main/resources/META-INF/spring.factories
new file mode 100644
index 0000000000000..7a23c23cf1b1d
--- /dev/null
+++ b/platforms/spring-boot/components-starter/camel-google-sheets-starter/src/main/resources/META-INF/spring.factories
@@ -0,0 +1,21 @@
+## ---------------------------------------------------------------------------
+## 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.
+## ---------------------------------------------------------------------------
+
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+org.apache.camel.component.google.sheets.springboot.GoogleSheetsComponentAutoConfiguration,\
+org.apache.camel.component.google.sheets.stream.springboot.GoogleSheetsStreamComponentAutoConfiguration
+
diff --git a/platforms/spring-boot/components-starter/camel-google-sheets-starter/src/main/resources/META-INF/spring.provides b/platforms/spring-boot/components-starter/camel-google-sheets-starter/src/main/resources/META-INF/spring.provides
new file mode 100644
index 0000000000000..ec60fe4b9dc78
--- /dev/null
+++ b/platforms/spring-boot/components-starter/camel-google-sheets-starter/src/main/resources/META-INF/spring.provides
@@ -0,0 +1,17 @@
+## ---------------------------------------------------------------------------
+## 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.
+## ---------------------------------------------------------------------------
+provides: camel-google-sheets
diff --git a/platforms/spring-boot/components-starter/pom.xml b/platforms/spring-boot/components-starter/pom.xml
index d8d57c4a00ecd..8e8db9aef2f62 100644
--- a/platforms/spring-boot/components-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/pom.xml
@@ -179,6 +179,7 @@
     <module>camel-google-drive-starter</module>
     <module>camel-google-mail-starter</module>
     <module>camel-google-pubsub-starter</module>
+    <module>camel-google-sheets-starter</module>
     <module>camel-gora-starter</module>
     <module>camel-grape-starter</module>
     <module>camel-groovy-starter</module>
diff --git a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
index f0ef8f43e3e25..22ab5196f4824 100644
--- a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
+++ b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
@@ -1134,6 +1134,16 @@
         <artifactId>camel-google-pubsub-starter</artifactId>
         <version>${project.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.camel</groupId>
+        <artifactId>camel-google-sheets</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.camel</groupId>
+        <artifactId>camel-google-sheets-starter</artifactId>
+        <version>${project.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-gora</artifactId>
diff --git a/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGoogleSheetsTest.java b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGoogleSheetsTest.java
new file mode 100644
index 0000000000000..682697c51e070
--- /dev/null
+++ b/tests/camel-itest-karaf/src/test/java/org/apache/camel/itest/karaf/CamelGoogleSheetsTest.java
@@ -0,0 +1,33 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.itest.karaf;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.ops4j.pax.exam.junit.PaxExam;
+
+@RunWith(PaxExam.class)
+public class CamelGoogleSheetsTest extends BaseKarafTest {
+
+    public static final String COMPONENT = extractName(CamelGoogleSheetsTest.class);
+
+    @Test
+    public void test() throws Exception {
+        testComponent(COMPONENT);
+    }
+
+}

From 7ac296bdc588d979f008c11a3c1cca9b61f488a3 Mon Sep 17 00:00:00 2001
From: Andrea Cosentino <ancosen@gmail.com>
Date: Thu, 22 Nov 2018 13:27:24 +0100
Subject: [PATCH 071/125] CAMEL-12950 - Fixed CS

---
 .../google/sheets/GoogleSheetsConsumer.java   |  8 +++--
 .../google/sheets/GoogleSheetsEndpoint.java   | 32 ++++++++-----------
 .../google/sheets/GoogleSheetsProducer.java   |  8 ++---
 .../sheets/GoogleSheetsVerifierExtension.java | 17 ++++------
 .../internal/GoogleSheetsConstants.java       |  2 +-
 .../stream/GoogleSheetsStreamComponent.java   |  4 +--
 .../GoogleSheetsStreamConfiguration.java      |  6 ++--
 .../stream/GoogleSheetsStreamConsumer.java    | 12 +++----
 .../stream/GoogleSheetsStreamEndpoint.java    |  7 +++-
 .../AbstractGoogleSheetsTestSupport.java      | 16 +++++-----
 .../GoogleSheetsVerifierExtensionTest.java    |  8 ++---
 .../SheetsSpreadsheetsIntegrationTest.java    | 18 +++++++----
 ...eetsSpreadsheetsValuesIntegrationTest.java | 16 ++++++++--
 .../GoogleSheetsComponentConfiguration.java   |  2 +-
 ...gleSheetsStreamComponentConfiguration.java |  2 +-
 15 files changed, 86 insertions(+), 72 deletions(-)

diff --git a/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsConsumer.java b/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsConsumer.java
index 70255e7817609..526c679f5de3d 100644
--- a/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsConsumer.java
+++ b/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsConsumer.java
@@ -16,6 +16,11 @@
  */
 package org.apache.camel.component.google.sheets;
 
+
+import java.util.Map;
+import java.util.Map.Entry;
+
+
 import com.google.api.client.googleapis.services.AbstractGoogleClientRequest;
 import org.apache.camel.Processor;
 import org.apache.camel.RuntimeCamelException;
@@ -24,9 +29,6 @@
 import org.apache.camel.util.IntrospectionSupport;
 import org.apache.camel.util.component.AbstractApiConsumer;
 
-import java.util.Map;
-import java.util.Map.Entry;
-
 /**
  * The GoogleSheets consumer.
  */
diff --git a/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsEndpoint.java b/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsEndpoint.java
index ac2161746905f..a6d176840c6bc 100644
--- a/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsEndpoint.java
+++ b/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsEndpoint.java
@@ -16,6 +16,8 @@
  */
 package org.apache.camel.component.google.sheets;
 
+import java.util.Map;
+
 import com.google.api.services.sheets.v4.Sheets;
 import org.apache.camel.Consumer;
 import org.apache.camel.Processor;
@@ -30,18 +32,11 @@
 import org.apache.camel.util.component.ApiMethod;
 import org.apache.camel.util.component.ApiMethodPropertiesHelper;
 
-import java.util.Map;
-
 /**
  * The google-sheets component provides access to Google Sheets.
  */
-@UriEndpoint(firstVersion = "2.23.0",
-        scheme = "google-sheets",
-        title = "Google Sheets",
-        syntax = "google-sheets:apiName/methodName",
-        consumerClass = GoogleSheetsConsumer.class,
-        consumerPrefix = "consumer",
-        label = "api,cloud,sheets")
+@UriEndpoint(firstVersion = "2.23.0", scheme = "google-sheets", title = "Google Sheets", 
+             syntax = "google-sheets:apiName/methodName", consumerClass = GoogleSheetsConsumer.class, consumerPrefix = "consumer", label = "api,cloud,sheets")
 public class GoogleSheetsEndpoint extends AbstractApiEndpoint<GoogleSheetsApiName, GoogleSheetsConfiguration> {
 
     @UriParam
@@ -49,8 +44,7 @@ public class GoogleSheetsEndpoint extends AbstractApiEndpoint<GoogleSheetsApiNam
 
     private Object apiProxy;
 
-    public GoogleSheetsEndpoint(String uri, GoogleSheetsComponent component,
-                                GoogleSheetsApiName apiName, String methodName, GoogleSheetsConfiguration endpointConfiguration) {
+    public GoogleSheetsEndpoint(String uri, GoogleSheetsComponent component, GoogleSheetsApiName apiName, String methodName, GoogleSheetsConfiguration endpointConfiguration) {
         super(uri, component, apiName, methodName, GoogleSheetsApiCollection.getCollection().getHelper(apiName), endpointConfiguration);
         this.configuration = endpointConfiguration;
     }
@@ -85,14 +79,14 @@ protected String getThreadProfileName() {
     @Override
     protected void afterConfigureProperties() {
         switch (apiName) {
-            case SPREADSHEETS:
-                apiProxy = getClient().spreadsheets();
-                break;
-            case DATA:
-                apiProxy = getClient().spreadsheets().values();
-                break;
-            default:
-                throw new IllegalArgumentException("Invalid API name " + apiName);
+        case SPREADSHEETS:
+            apiProxy = getClient().spreadsheets();
+            break;
+        case DATA:
+            apiProxy = getClient().spreadsheets().values();
+            break;
+        default:
+            throw new IllegalArgumentException("Invalid API name " + apiName);
         }
     }
 
diff --git a/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsProducer.java b/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsProducer.java
index 7fec2fc225016..abc4060899499 100644
--- a/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsProducer.java
+++ b/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsProducer.java
@@ -16,6 +16,9 @@
  */
 package org.apache.camel.component.google.sheets;
 
+import java.util.Map;
+import java.util.Map.Entry;
+
 import com.google.api.client.googleapis.services.AbstractGoogleClientRequest;
 import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.TypeConverter;
@@ -25,9 +28,6 @@
 import org.apache.camel.util.component.AbstractApiProducer;
 import org.apache.camel.util.component.ApiMethod;
 
-import java.util.Map;
-import java.util.Map.Entry;
-
 /**
  * The GoogleSheets producer.
  */
@@ -39,7 +39,7 @@ public GoogleSheetsProducer(GoogleSheetsEndpoint endpoint) {
 
     @Override
     protected Object doInvokeMethod(ApiMethod method, Map<String, Object> properties) throws RuntimeCamelException {
-        AbstractGoogleClientRequest<?> request = (AbstractGoogleClientRequest) super.doInvokeMethod(method, properties);
+        AbstractGoogleClientRequest<?> request = (AbstractGoogleClientRequest)super.doInvokeMethod(method, properties);
         try {
             TypeConverter typeConverter = getEndpoint().getCamelContext().getTypeConverter();
             for (Entry<String, Object> p : properties.entrySet()) {
diff --git a/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsVerifierExtension.java b/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsVerifierExtension.java
index a531908271e25..26100cfd8d6a8 100644
--- a/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsVerifierExtension.java
+++ b/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/GoogleSheetsVerifierExtension.java
@@ -16,6 +16,10 @@
  */
 package org.apache.camel.component.google.sheets;
 
+import java.util.Map;
+import java.util.Optional;
+import java.util.UUID;
+
 import com.google.api.services.sheets.v4.Sheets;
 import org.apache.camel.CamelContext;
 import org.apache.camel.component.extension.verifier.DefaultComponentVerifierExtension;
@@ -23,10 +27,6 @@
 import org.apache.camel.component.extension.verifier.ResultErrorBuilder;
 import org.apache.camel.component.extension.verifier.ResultErrorHelper;
 
-import java.util.Map;
-import java.util.Optional;
-import java.util.UUID;
-
 public class GoogleSheetsVerifierExtension extends DefaultComponentVerifierExtension {
 
     public GoogleSheetsVerifierExtension(String defaultScheme) {
@@ -61,12 +61,9 @@ protected Result verifyConnectivity(Map<String, Object> parameters) {
         try {
             GoogleSheetsConfiguration configuration = setProperties(new GoogleSheetsConfiguration(), parameters);
             GoogleSheetsClientFactory clientFactory = new BatchGoogleSheetsClientFactory();
-            Sheets client = clientFactory.makeClient(configuration.getClientId(), configuration.getClientSecret(),
-                    configuration.getApplicationName(),
-                    configuration.getRefreshToken(), configuration.getAccessToken());
-            client.spreadsheets().get(Optional.ofNullable(parameters.get("spreadsheetId"))
-                                              .map(Object::toString)
-                                              .orElse(UUID.randomUUID().toString())).execute();
+            Sheets client = clientFactory.makeClient(configuration.getClientId(), configuration.getClientSecret(), configuration.getApplicationName(),
+                                                     configuration.getRefreshToken(), configuration.getAccessToken());
+            client.spreadsheets().get(Optional.ofNullable(parameters.get("spreadsheetId")).map(Object::toString).orElse(UUID.randomUUID().toString())).execute();
         } catch (Exception e) {
             ResultErrorBuilder errorBuilder = ResultErrorBuilder.withCodeAndDescription(VerificationError.StandardCode.AUTHENTICATION, e.getMessage())
                 .detail("google_sheets_exception_message", e.getMessage()).detail(VerificationError.ExceptionAttribute.EXCEPTION_CLASS, e.getClass().getName())
diff --git a/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/internal/GoogleSheetsConstants.java b/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/internal/GoogleSheetsConstants.java
index a14a251b3e836..feb9141955861 100644
--- a/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/internal/GoogleSheetsConstants.java
+++ b/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/internal/GoogleSheetsConstants.java
@@ -29,5 +29,5 @@ public final class GoogleSheetsConstants {
     /**
      * Prevent instantiation.
      */
-    private GoogleSheetsConstants() {}
+    private GoogleSheetsConstants() { }
 }
diff --git a/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamComponent.java b/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamComponent.java
index 693d64a5dae39..d4610371b3918 100644
--- a/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamComponent.java
+++ b/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamComponent.java
@@ -16,6 +16,8 @@
  */
 package org.apache.camel.component.google.sheets.stream;
 
+import java.util.Map;
+
 import com.google.api.services.sheets.v4.Sheets;
 import org.apache.camel.CamelContext;
 import org.apache.camel.Endpoint;
@@ -25,8 +27,6 @@
 import org.apache.camel.impl.DefaultComponent;
 import org.apache.camel.spi.Metadata;
 
-import java.util.Map;
-
 /**
  * Represents the component that manages {@link GoogleSheetsStreamEndpoint}.
  */
diff --git a/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamConfiguration.java b/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamConfiguration.java
index 3a88ffbba92ba..e72446ca6de32 100644
--- a/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamConfiguration.java
+++ b/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamConfiguration.java
@@ -16,15 +16,15 @@
  */
 package org.apache.camel.component.google.sheets.stream;
 
+import java.util.Collections;
+import java.util.List;
+
 import com.google.api.services.sheets.v4.SheetsScopes;
 import org.apache.camel.RuntimeCamelException;
 import org.apache.camel.spi.UriParam;
 import org.apache.camel.spi.UriParams;
 import org.apache.camel.spi.UriPath;
 
-import java.util.Collections;
-import java.util.List;
-
 /**
  * Component configuration for GoogleSheets stream component.
  */
diff --git a/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamConsumer.java b/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamConsumer.java
index a22b3e59bf381..539dcaf42752d 100644
--- a/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamConsumer.java
+++ b/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamConsumer.java
@@ -16,6 +16,12 @@
  */
 package org.apache.camel.component.google.sheets.stream;
 
+import java.util.ArrayDeque;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Queue;
+import java.util.stream.Collectors;
+
 import com.google.api.services.sheets.v4.Sheets;
 import com.google.api.services.sheets.v4.model.BatchGetValuesResponse;
 import com.google.api.services.sheets.v4.model.Spreadsheet;
@@ -28,12 +34,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.ArrayDeque;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Queue;
-import java.util.stream.Collectors;
-
 /**
  * The GoogleSheets consumer.
  */
diff --git a/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamEndpoint.java b/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamEndpoint.java
index 648be83958906..8ae9f896b73f6 100644
--- a/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamEndpoint.java
+++ b/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamEndpoint.java
@@ -19,7 +19,12 @@
 import com.google.api.services.sheets.v4.Sheets;
 import com.google.api.services.sheets.v4.model.Spreadsheet;
 import com.google.api.services.sheets.v4.model.ValueRange;
-import org.apache.camel.*;
+
+import org.apache.camel.Consumer;
+import org.apache.camel.Exchange;
+import org.apache.camel.Message;
+import org.apache.camel.Processor;
+import org.apache.camel.Producer;
 import org.apache.camel.component.google.sheets.GoogleSheetsClientFactory;
 import org.apache.camel.impl.ScheduledPollEndpoint;
 import org.apache.camel.spi.UriEndpoint;
diff --git a/components/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/AbstractGoogleSheetsTestSupport.java b/components/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/AbstractGoogleSheetsTestSupport.java
index afb01a712a774..d52905c8f10fd 100644
--- a/components/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/AbstractGoogleSheetsTestSupport.java
+++ b/components/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/AbstractGoogleSheetsTestSupport.java
@@ -16,6 +16,14 @@
  */
 package org.apache.camel.component.google.sheets;
 
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Random;
+
 import com.google.api.services.sheets.v4.model.Sheet;
 import com.google.api.services.sheets.v4.model.SheetProperties;
 import com.google.api.services.sheets.v4.model.Spreadsheet;
@@ -26,14 +34,6 @@
 import org.apache.camel.test.junit4.CamelTestSupport;
 import org.apache.camel.util.IntrospectionSupport;
 
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Random;
-
 /**
  * Abstract base class for GoogleSheets Integration tests generated by Camel
  * API component maven plugin.
diff --git a/components/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/GoogleSheetsVerifierExtensionTest.java b/components/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/GoogleSheetsVerifierExtensionTest.java
index a4504a8f6755d..9af19c73eaa63 100644
--- a/components/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/GoogleSheetsVerifierExtensionTest.java
+++ b/components/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/GoogleSheetsVerifierExtensionTest.java
@@ -16,16 +16,16 @@
  */
 package org.apache.camel.component.google.sheets;
 
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
 import org.apache.camel.Component;
 import org.apache.camel.component.extension.ComponentVerifierExtension;
 import org.apache.camel.test.junit4.CamelTestSupport;
 import org.junit.Assert;
 import org.junit.Test;
 
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-
 public class GoogleSheetsVerifierExtensionTest extends CamelTestSupport {
 
     @Override
diff --git a/components/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/SheetsSpreadsheetsIntegrationTest.java b/components/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/SheetsSpreadsheetsIntegrationTest.java
index 680c08c860b2d..800d0234426c3 100644
--- a/components/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/SheetsSpreadsheetsIntegrationTest.java
+++ b/components/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/SheetsSpreadsheetsIntegrationTest.java
@@ -16,7 +16,18 @@
  */
 package org.apache.camel.component.google.sheets;
 
-import com.google.api.services.sheets.v4.model.*;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Random;
+
+import com.google.api.services.sheets.v4.model.BatchUpdateSpreadsheetRequest;
+import com.google.api.services.sheets.v4.model.BatchUpdateSpreadsheetResponse;
+import com.google.api.services.sheets.v4.model.Request;
+import com.google.api.services.sheets.v4.model.Spreadsheet;
+import com.google.api.services.sheets.v4.model.SpreadsheetProperties;
+import com.google.api.services.sheets.v4.model.UpdateSpreadsheetPropertiesRequest;
+
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.google.sheets.internal.GoogleSheetsApiCollection;
 import org.apache.camel.component.google.sheets.internal.SheetsSpreadsheetsApiMethod;
@@ -24,11 +35,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Random;
-
 /**
  * Test class for {@link com.google.api.services.sheets.v4.Sheets.Spreadsheets} APIs.
  */
diff --git a/components/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/SheetsSpreadsheetsValuesIntegrationTest.java b/components/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/SheetsSpreadsheetsValuesIntegrationTest.java
index 0e00a0ce831b2..0075f7a3d648e 100644
--- a/components/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/SheetsSpreadsheetsValuesIntegrationTest.java
+++ b/components/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/SheetsSpreadsheetsValuesIntegrationTest.java
@@ -16,7 +16,19 @@
  */
 package org.apache.camel.component.google.sheets;
 
-import com.google.api.services.sheets.v4.model.*;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.google.api.services.sheets.v4.model.AppendValuesResponse;
+import com.google.api.services.sheets.v4.model.ClearValuesRequest;
+import com.google.api.services.sheets.v4.model.ClearValuesResponse;
+import com.google.api.services.sheets.v4.model.Spreadsheet;
+import com.google.api.services.sheets.v4.model.UpdateValuesResponse;
+import com.google.api.services.sheets.v4.model.ValueRange;
+
 import org.apache.camel.builder.RouteBuilder;
 import org.apache.camel.component.google.sheets.internal.GoogleSheetsApiCollection;
 import org.apache.camel.component.google.sheets.internal.SheetsSpreadsheetsValuesApiMethod;
@@ -24,8 +36,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.*;
-
 /**
  * Test class for {@link com.google.api.services.sheets.v4.Sheets.Spreadsheets.Values} APIs.
  */
diff --git a/platforms/spring-boot/components-starter/camel-google-sheets-starter/src/main/java/org/apache/camel/component/google/sheets/springboot/GoogleSheetsComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-google-sheets-starter/src/main/java/org/apache/camel/component/google/sheets/springboot/GoogleSheetsComponentConfiguration.java
index 5af2202321294..2f19c56114f42 100644
--- a/platforms/spring-boot/components-starter/camel-google-sheets-starter/src/main/java/org/apache/camel/component/google/sheets/springboot/GoogleSheetsComponentConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-google-sheets-starter/src/main/java/org/apache/camel/component/google/sheets/springboot/GoogleSheetsComponentConfiguration.java
@@ -23,7 +23,7 @@
 
 /**
  * The google-sheets component provides access to Google Sheets.
- *
+ * 
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
 @Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo")
diff --git a/platforms/spring-boot/components-starter/camel-google-sheets-starter/src/main/java/org/apache/camel/component/google/sheets/stream/springboot/GoogleSheetsStreamComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-google-sheets-starter/src/main/java/org/apache/camel/component/google/sheets/stream/springboot/GoogleSheetsStreamComponentConfiguration.java
index 8d0f1f1a22cc3..3dbff38d96966 100644
--- a/platforms/spring-boot/components-starter/camel-google-sheets-starter/src/main/java/org/apache/camel/component/google/sheets/stream/springboot/GoogleSheetsStreamComponentConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-google-sheets-starter/src/main/java/org/apache/camel/component/google/sheets/stream/springboot/GoogleSheetsStreamComponentConfiguration.java
@@ -23,7 +23,7 @@
 
 /**
  * The google-sheets component provides access to Google Sheets.
- *
+ * 
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
 @Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo")

From 2f4a334f3441696de67e5eda57845c4aecb0d7a6 Mon Sep 17 00:00:00 2001
From: Andrea Cosentino <ancosen@gmail.com>
Date: Thu, 22 Nov 2018 14:11:04 +0100
Subject: [PATCH 072/125] CAMEL-12950 - Regen

---
 components/readme.adoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/readme.adoc b/components/readme.adoc
index 45d0f161dbef7..a62c893fc3e99 100644
--- a/components/readme.adoc
+++ b/components/readme.adoc
@@ -2,7 +2,7 @@ Components
 ^^^^^^^^^^
 
 // components: START
-Number of Components: 305 in 206 JAR artifacts (22 deprecated)
+Number of Components: 306 in 207 JAR artifacts (22 deprecated)
 
 [width="100%",cols="4,1,5",options="header"]
 |===

From edfe92da016ea89e4e1f12fc918c37ef7ed35b4a Mon Sep 17 00:00:00 2001
From: Andrea Cosentino <ancosen@gmail.com>
Date: Fri, 23 Nov 2018 08:58:11 +0100
Subject: [PATCH 073/125] Upgrade Reactor to version 3.2.3.RELEASE

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

diff --git a/parent/pom.xml b/parent/pom.xml
index f823a0fa27fa4..6c7fef858dd1d 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -579,7 +579,7 @@
     <quickfixj-version>2.1.0</quickfixj-version>
     <rabbitmq-amqp-client-version>5.5.0</rabbitmq-amqp-client-version>
     <reactive-streams-version>1.0.2</reactive-streams-version>
-    <reactor-version>3.2.2.RELEASE</reactor-version>
+    <reactor-version>3.2.3.RELEASE</reactor-version>
     <reflections-version>0.9.11</reflections-version>
     <reflections-bundle-version>0.9.11_1</reflections-bundle-version>
     <regexp-bundle-version>1.4_1</regexp-bundle-version>

From f0d65514b168aed69f296738ab4e7b6c33ea53e1 Mon Sep 17 00:00:00 2001
From: Andrea Cosentino <ancosen@gmail.com>
Date: Fri, 23 Nov 2018 09:09:59 +0100
Subject: [PATCH 074/125] CAMEL-12950 - Added camel-google-sheets Spring Boot
 Integration test

---
 .../springboot/CamelGoogleSheetsTest.java     | 50 +++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelGoogleSheetsTest.java

diff --git a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelGoogleSheetsTest.java b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelGoogleSheetsTest.java
new file mode 100644
index 0000000000000..61c4d4cf09fbe
--- /dev/null
+++ b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelGoogleSheetsTest.java
@@ -0,0 +1,50 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.itest.springboot;
+
+import org.apache.camel.itest.springboot.util.ArquillianPackager;
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.shrinkwrap.api.Archive;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+
+@RunWith(Arquillian.class)
+public class CamelGoogleSheetsTest extends AbstractSpringBootTestSupport {
+
+    @Deployment
+    public static Archive<?> createSpringBootPackage() throws Exception {
+        return ArquillianPackager.springBootPackage(createTestConfig());
+    }
+
+    public static ITestConfig createTestConfig() {
+        return new ITestConfigBuilder()
+                .module(inferModuleName(CamelGoogleSheetsTest.class))
+                .unitTestExpectedNumber(0)
+                .build();
+    }
+
+    @Test
+    public void componentTests() throws Exception {
+        this.runComponentTest(config, "google-sheets");
+        this.runComponentTest(config, "google-sheets-stream");
+        this.runModuleUnitTestsIfEnabled(config);
+    }
+
+
+}

From 43d7721aa6a299a26b57fb2c4e8b51e63080c362 Mon Sep 17 00:00:00 2001
From: Andrea Cosentino <ancosen@gmail.com>
Date: Fri, 23 Nov 2018 10:38:07 +0100
Subject: [PATCH 075/125] Upgrade Json Schema Validator to version 0.1.24

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

diff --git a/parent/pom.xml b/parent/pom.xml
index 6c7fef858dd1d..1f6a30618993b 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -522,7 +522,7 @@
     <netty3-version>3.10.6.Final</netty3-version>
     <netty-version>4.1.31.Final</netty-version>
     <netty40-version>4.0.56.Final</netty40-version>
-    <networknt-json-schema-validator-version>0.1.23</networknt-json-schema-validator-version>
+    <networknt-json-schema-validator-version>0.1.24</networknt-json-schema-validator-version>
     <noggit-bundle-version>0.5_1</noggit-bundle-version>
     <objenesis-version>2.6</objenesis-version>
     <!-- should be in-sync with deltaspike -->

From f1ff22dbd9ed0e2f011a5dbca77ae964b4f18980 Mon Sep 17 00:00:00 2001
From: Andrea Cosentino <ancosen@gmail.com>
Date: Fri, 23 Nov 2018 12:01:53 +0100
Subject: [PATCH 076/125] Camel-NSQ: Fixed the NSQ component description and
 first version

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

diff --git a/components/camel-nsq/src/main/java/org/apache/camel/component/nsq/NsqEndpoint.java b/components/camel-nsq/src/main/java/org/apache/camel/component/nsq/NsqEndpoint.java
index 63cf654efc791..d9e324189e48e 100644
--- a/components/camel-nsq/src/main/java/org/apache/camel/component/nsq/NsqEndpoint.java
+++ b/components/camel-nsq/src/main/java/org/apache/camel/component/nsq/NsqEndpoint.java
@@ -37,7 +37,7 @@
 /**
  * Represents a nsq endpoint.
  */
-@UriEndpoint(firstVersion = "2.22.0", scheme = "nsq", title = "nsq", syntax = "nsq:lookupServer", consumerClass = NsqConsumer.class, label = "messaging")
+@UriEndpoint(firstVersion = "2.23.0", scheme = "nsq", title = "NSQ", syntax = "nsq:lookupServer", consumerClass = NsqConsumer.class, label = "messaging")
 public class NsqEndpoint extends DefaultEndpoint {
 
     @UriParam

From 46ff5c77812582976069869392faf6d18539a694 Mon Sep 17 00:00:00 2001
From: Andrea Cosentino <ancosen@gmail.com>
Date: Fri, 23 Nov 2018 12:46:05 +0100
Subject: [PATCH 077/125] Regen

---
 components/camel-nsq/src/main/docs/nsq-component.adoc | 10 +++++-----
 components/readme.adoc                                |  4 ++--
 docs/user-manual/en/SUMMARY.md                        |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/components/camel-nsq/src/main/docs/nsq-component.adoc b/components/camel-nsq/src/main/docs/nsq-component.adoc
index c8f4be4dfb992..7f81b7b8616fb 100644
--- a/components/camel-nsq/src/main/docs/nsq-component.adoc
+++ b/components/camel-nsq/src/main/docs/nsq-component.adoc
@@ -1,7 +1,8 @@
-[[nsq-component]]
-== nsq Component
+== NSQ Component
 
 *Available as of Camel version 2.22*
+*Available as of Camel version 2.23*
+
 
 
 http://nsq.io/[NSQ] is a realtime distributed messaging platform.
@@ -32,7 +33,7 @@ Where *servers* represents the list of NSQ servers - nsqlookupd servers in the
 
 
 // component options: START
-The nsq component supports 2 options, which are listed below.
+The NSQ component supports 2 options, which are listed below.
 
 
 
@@ -49,7 +50,7 @@ The nsq component supports 2 options, which are listed below.
 
 
 // endpoint options: START
-The nsq endpoint is configured using URI syntax:
+The NSQ endpoint is configured using URI syntax:
 
 ----
 nsq:lookupServer
@@ -107,4 +108,3 @@ The component supports 3 options, which are listed below.
 | *camel.component.nsq.use-global-ssl-context-parameters* | Enable usage of global SSL context parameters. | false | Boolean
 |===
 // spring-boot-auto-configure options: END
-
diff --git a/components/readme.adoc b/components/readme.adoc
index a62c893fc3e99..e6460b52f2499 100644
--- a/components/readme.adoc
+++ b/components/readme.adoc
@@ -623,8 +623,8 @@ Number of Components: 306 in 207 JAR artifacts (22 deprecated)
 | link:camel-netty4-http/src/main/docs/netty4-http-component.adoc[Netty4 HTTP] (camel-netty4-http) +
 `netty4-http:protocol:host:port/path` | 2.14 | Netty HTTP server and client using the Netty 4.x library.
 
-| link:camel-nsq/src/main/docs/nsq-component.adoc[nsq] (camel-nsq) +
-`nsq:lookupServer` | 2.22 | Represents a nsq endpoint.
+| link:camel-nsq/src/main/docs/nsq-component.adoc[NSQ] (camel-nsq) +
+`nsq:lookupServer` | 2.23 | Represents a nsq endpoint.
 
 | link:camel-olingo2/camel-olingo2-component/src/main/docs/olingo2-component.adoc[Olingo2] (camel-olingo2) +
 `olingo2:apiName/methodName` | 2.14 | Communicates with OData 2.0 services using Apache Olingo.
diff --git a/docs/user-manual/en/SUMMARY.md b/docs/user-manual/en/SUMMARY.md
index 73d935f265305..7a0c3ef7f4dd5 100644
--- a/docs/user-manual/en/SUMMARY.md
+++ b/docs/user-manual/en/SUMMARY.md
@@ -360,7 +360,7 @@
 	* [Netty HTTP](netty-http-component.adoc)
 	* [Netty4](netty4-component.adoc)
 	* [Netty4 HTTP](netty4-http-component.adoc)
-	* [nsq](nsq-component.adoc)
+	* [NSQ](nsq-component.adoc)
 	* [Olingo2](olingo2-component.adoc)
 	* [Olingo4](olingo4-component.adoc)
 	* [OPC UA Client](milo-client-component.adoc)

From 95ea9d3c21d7caac4032492d49ae9da7e16dde70 Mon Sep 17 00:00:00 2001
From: Andrea Cosentino <ancosen@gmail.com>
Date: Fri, 23 Nov 2018 13:28:21 +0100
Subject: [PATCH 078/125] Upgrade Owasp Dependency Check Maven Plugin to
 version 4.0.0

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

diff --git a/parent/pom.xml b/parent/pom.xml
index 1f6a30618993b..55035855e11a4 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -475,7 +475,7 @@
     <maven-bundle-plugin-version>3.5.1</maven-bundle-plugin-version>
     <maven-checkstyle-plugin-version>3.0.0</maven-checkstyle-plugin-version>
     <maven-checkstyle-version>7.6.1</maven-checkstyle-version>
-    <maven-owasp-plugin-version>3.3.4</maven-owasp-plugin-version>
+    <maven-owasp-plugin-version>4.0.0</maven-owasp-plugin-version>
     <maven-eclipse-plugin-version>2.10</maven-eclipse-plugin-version>
     <maven-jar-plugin-version>3.0.2</maven-jar-plugin-version>
     <maven-javadoc-plugin-version>3.0.1</maven-javadoc-plugin-version>

From e886f8c3cfa8f07b2d07bbc55e847dac8b840f45 Mon Sep 17 00:00:00 2001
From: Andrea Cosentino <ancosen@gmail.com>
Date: Fri, 23 Nov 2018 14:54:54 +0100
Subject: [PATCH 079/125] Upgrade Brave to version 5.5.1

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

diff --git a/parent/pom.xml b/parent/pom.xml
index 55035855e11a4..c8cdf2cef8b98 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -98,7 +98,7 @@
     <boxjavalibv2.version>3.2.1</boxjavalibv2.version>
     <box-java-sdk-version>2.10.0</box-java-sdk-version>
     <braintree-gateway-version>2.87.0</braintree-gateway-version>
-    <brave-zipkin-version>5.5.0</brave-zipkin-version>
+    <brave-zipkin-version>5.5.1</brave-zipkin-version>
     <build-helper-maven-plugin-version>1.12</build-helper-maven-plugin-version>
     <c3p0-version>0.9.5.2</c3p0-version>
     <c3p0-bundle-version>0.9.5.2_2</c3p0-bundle-version>

From d6df2f6051d3032c2b4658573e34c113b4ad1c1b Mon Sep 17 00:00:00 2001
From: Romain Manni-Bucau <rmannibucau@gmail.com>
Date: Fri, 23 Nov 2018 15:20:20 +0100
Subject: [PATCH 080/125] Probably a typo, the builder was configured but
 always resetted by a new one (#2632)

---
 .../org/apache/camel/component/johnzon/JohnzonDataFormat.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/camel-johnzon/src/main/java/org/apache/camel/component/johnzon/JohnzonDataFormat.java b/components/camel-johnzon/src/main/java/org/apache/camel/component/johnzon/JohnzonDataFormat.java
index cdaaa277028e2..1e51162c3df70 100644
--- a/components/camel-johnzon/src/main/java/org/apache/camel/component/johnzon/JohnzonDataFormat.java
+++ b/components/camel-johnzon/src/main/java/org/apache/camel/component/johnzon/JohnzonDataFormat.java
@@ -209,7 +209,7 @@ protected void doStart() throws Exception {
             if (ObjectHelper.isNotEmpty(attributeOrder)) {
                 builder.setAttributeOrder(attributeOrder);
             }
-            objectMapper = new MapperBuilder().build();
+            objectMapper = builder.build();
         }
     }
 

From f9f170dfb72ab9737cffe1bad7df3b26f4558353 Mon Sep 17 00:00:00 2001
From: Romain Manni-Bucau <rmannibucau@gmail.com>
Date: Fri, 23 Nov 2018 16:23:29 +0100
Subject: [PATCH 081/125] upgrading johnzon to 1.1.10

---
 parent/pom.xml                                           | 4 ++--
 platforms/karaf/features/src/main/resources/features.xml | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index c8cdf2cef8b98..d1ef25ef51d97 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -57,7 +57,7 @@
     <aries-blueprint-core-version>1.10.0</aries-blueprint-core-version>
     <aries-blueprint-proxy-version>1.1.1</aries-blueprint-proxy-version>
     <aries-blueprint-proxy-impl-version>1.1.1</aries-blueprint-proxy-impl-version>
-    <aries-spifly-version>1.0.8</aries-spifly-version>
+    <aries-spifly-version>1.0.14</aries-spifly-version>
     <aries-util-version>1.1.3</aries-util-version>
     <arquillian-container-se-managed-version>1.0.2.Final</arquillian-container-se-managed-version>
     <arquillian-version>1.4.0.Final</arquillian-version>
@@ -402,7 +402,7 @@
     <jolt-version>0.1.1</jolt-version>
     <jolt-bundle-version>0.1.1_1</jolt-bundle-version>
     <jool-version>0.9.12</jool-version>
-    <johnzon-version>1.1.0</johnzon-version>
+    <johnzon-version>1.1.10</johnzon-version>
     <jose4j-version>0.6.4</jose4j-version>
     <josql-bundle-version>1.5_5</josql-bundle-version>
     <josql-version>1.5</josql-version>
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index 0b1b71a79a6b6..722a630ca5352 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1277,6 +1277,10 @@
   </feature>
   <feature name='camel-johnzon' version='${project.version}' resolver='(obr)' start-level='50'>
     <feature version='${project.version}'>camel-core</feature>
+    <bundle dependency='true'>mvn:org.ow2.asm/asm/${asm-version}</bundle>
+    <bundle dependency='true'>mvn:org.ow2.asm/asm-commons/${asm-version}</bundle>
+    <bundle dependency='true'>mvn:org.ow2.asm/asm-tree/${asm-version}</bundle>
+    <bundle dependency='true'>mvn:org.apache.aries.spifly/org.apache.aries.spifly.dynamic.bundle/${aries-spifly-version}</bundle>
     <bundle dependency='true'>mvn:org.apache.johnzon/johnzon-core/${johnzon-version}</bundle>
     <bundle dependency='true'>mvn:org.apache.johnzon/johnzon-mapper/${johnzon-version}</bundle>
     <bundle dependency='true'>mvn:org.apache.geronimo.specs/geronimo-json_1.1_spec/${geronimo-json-spec-version}</bundle>

From 7a1530a2fe0bed77edb299f84939db03faa026d0 Mon Sep 17 00:00:00 2001
From: Romain Manni-Bucau <rmannibucau@gmail.com>
Date: Fri, 23 Nov 2018 16:25:19 +0100
Subject: [PATCH 082/125] dropping asm to prepare coming spifly upgrade

---
 platforms/karaf/features/src/main/resources/features.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index 722a630ca5352..cd6fe58869d65 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1277,9 +1277,6 @@
   </feature>
   <feature name='camel-johnzon' version='${project.version}' resolver='(obr)' start-level='50'>
     <feature version='${project.version}'>camel-core</feature>
-    <bundle dependency='true'>mvn:org.ow2.asm/asm/${asm-version}</bundle>
-    <bundle dependency='true'>mvn:org.ow2.asm/asm-commons/${asm-version}</bundle>
-    <bundle dependency='true'>mvn:org.ow2.asm/asm-tree/${asm-version}</bundle>
     <bundle dependency='true'>mvn:org.apache.aries.spifly/org.apache.aries.spifly.dynamic.bundle/${aries-spifly-version}</bundle>
     <bundle dependency='true'>mvn:org.apache.johnzon/johnzon-core/${johnzon-version}</bundle>
     <bundle dependency='true'>mvn:org.apache.johnzon/johnzon-mapper/${johnzon-version}</bundle>

From 6370c535f5e26feace8879af8dee2a0d507035c4 Mon Sep 17 00:00:00 2001
From: Colm O hEigeartaigh <coheigea@apache.org>
Date: Fri, 23 Nov 2018 16:41:24 +0000
Subject: [PATCH 083/125] Updating CXF

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

diff --git a/parent/pom.xml b/parent/pom.xml
index d1ef25ef51d97..9dcf5169ed843 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -168,7 +168,7 @@
     <couchbase-client-version>1.4.13</couchbase-client-version>
     <couchbase-client-bundle-version>1.4.13_1</couchbase-client-bundle-version>
     <curator-version>2.12.0</curator-version>
-    <cxf-version>3.2.6</cxf-version>
+    <cxf-version>3.2.7</cxf-version>
     <cxf-version-range>[3.1,4.0)</cxf-version-range>
     <cxf-xjc-plugin-version>3.2.0</cxf-xjc-plugin-version>
     <cxf-xjc-utils-version>3.2.0</cxf-xjc-utils-version>

From 07da9c3e04d3ae344317eff78e5cac30345c22b1 Mon Sep 17 00:00:00 2001
From: Gregor Zurowski <gregor@zurowski.org>
Date: Fri, 23 Nov 2018 19:01:40 +0100
Subject: [PATCH 084/125] Exclude data files of FHIR examples from license
 check

Signed-off-by: Gregor Zurowski <gregor@zurowski.org>
---
 pom.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pom.xml b/pom.xml
index 5d37e86f6252c..d20f641485602 100644
--- a/pom.xml
+++ b/pom.xml
@@ -276,6 +276,8 @@
                 <exclude>**/fabric8/*.yaml</exclude>
                 <exclude>**/src/main/resources/consul/services.json</exclude>
                 <exclude>**/src/main/resources/data/*.json</exclude>
+                <exclude>examples/camel-example-fhir*/src/main/data/*.patient</exclude>
+                <exclude>examples/camel-example-fhir*/src/main/data/*.csv</exclude>
                 <!-- generated files -->
                 <exclude>**/target/**/*</exclude>
                 <exclude>**/eclipse-classes/**/*</exclude>

From 15a7de2ba4f756c4cbd3aa256538506ca057137d Mon Sep 17 00:00:00 2001
From: Gregor Zurowski <gregor@zurowski.org>
Date: Fri, 23 Nov 2018 19:10:50 +0100
Subject: [PATCH 085/125] Add missing license information

Signed-off-by: Gregor Zurowski <gregor@zurowski.org>
---
 components/camel-nsq/pom.xml | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/components/camel-nsq/pom.xml b/components/camel-nsq/pom.xml
index 0953f5df89ee6..45840a28b39ab 100644
--- a/components/camel-nsq/pom.xml
+++ b/components/camel-nsq/pom.xml
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    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.
+
+-->
 <project xmlns="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/xsd/maven-4.0.0.xsd">

From bed98e78c89387948c4704afa92062b052164d90 Mon Sep 17 00:00:00 2001
From: Gregor Zurowski <gregor@zurowski.org>
Date: Fri, 23 Nov 2018 19:14:05 +0100
Subject: [PATCH 086/125] Ignore mvel file for license check

Signed-off-by: Gregor Zurowski <gregor@zurowski.org>
---
 pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pom.xml b/pom.xml
index d20f641485602..6a7e6c594c5b7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -253,6 +253,7 @@
                 <exclude>**/readme-examples.mvel</exclude>
                 <exclude>**/readme-languages.mvel</exclude>
                 <exclude>**/readme-others.mvel</exclude>
+                <exclude>**/spring-boot-auto-configure-options.mvel</exclude>
                 <exclude>**/spring-boot-starter-NOTICE.txt</exclude>
                 <!-- cxf does not handle comments here -->
                 <exclude>**/src/main/resources/META-INF/cxf/cxf.extension</exclude>

From 205570bb86cfc83b0677484e17db28feb31885a0 Mon Sep 17 00:00:00 2001
From: Gregor Zurowski <gregor@zurowski.org>
Date: Fri, 23 Nov 2018 19:19:35 +0100
Subject: [PATCH 087/125] Ignore KieServerExtension file in license check

Signed-off-by: Gregor Zurowski <gregor@zurowski.org>
---
 pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pom.xml b/pom.xml
index 6a7e6c594c5b7..0698f31a6e739 100644
--- a/pom.xml
+++ b/pom.xml
@@ -301,6 +301,7 @@
                 <exclude>**/additional-spring-configuration-metadata.json</exclude>
 		<exclude>**/*.proto</exclude>
 		<exclude>**/src/revapi/ignore.json</exclude>
+                <exclude>components/camel-jbpm/src/main/resources/META-INF/services/org.kie.server.services.api.KieServerExtension</exclude>
                 <!-- Maven Wrapper -->
                 <exclude>.mvn/**/*</exclude>
               </excludes>

From 742ca48a89c0da0fe16e4931f855f1ea30ee5ec3 Mon Sep 17 00:00:00 2001
From: Gregor Zurowski <gregor@zurowski.org>
Date: Fri, 23 Nov 2018 19:43:49 +0100
Subject: [PATCH 088/125] Fix license check excludes

Signed-off-by: Gregor Zurowski <gregor@zurowski.org>
---
 pom.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 0698f31a6e739..a7e7584b70c47 100644
--- a/pom.xml
+++ b/pom.xml
@@ -277,8 +277,8 @@
                 <exclude>**/fabric8/*.yaml</exclude>
                 <exclude>**/src/main/resources/consul/services.json</exclude>
                 <exclude>**/src/main/resources/data/*.json</exclude>
-                <exclude>examples/camel-example-fhir*/src/main/data/*.patient</exclude>
-                <exclude>examples/camel-example-fhir*/src/main/data/*.csv</exclude>
+                <exclude>**/src/main/data/*.patient</exclude>
+                <exclude>**/src/main/data/*.csv</exclude>
                 <!-- generated files -->
                 <exclude>**/target/**/*</exclude>
                 <exclude>**/eclipse-classes/**/*</exclude>
@@ -301,7 +301,7 @@
                 <exclude>**/additional-spring-configuration-metadata.json</exclude>
 		<exclude>**/*.proto</exclude>
 		<exclude>**/src/revapi/ignore.json</exclude>
-                <exclude>components/camel-jbpm/src/main/resources/META-INF/services/org.kie.server.services.api.KieServerExtension</exclude>
+                <exclude>**/src/main/resources/META-INF/services/org.kie.server.services.api.KieServerExtension</exclude>
                 <!-- Maven Wrapper -->
                 <exclude>.mvn/**/*</exclude>
               </excludes>

From fa2ab6184190d193e27296c6fe3028c995286be6 Mon Sep 17 00:00:00 2001
From: Claus Ibsen <claus.ibsen@gmail.com>
Date: Sat, 24 Nov 2018 16:26:35 +0100
Subject: [PATCH 089/125] Regen

---
 .../src/main/docs/nsq-component.adoc          |  6 +-
 .../camel-spring-boot-dependencies/pom.xml    | 56 +++++++++----------
 2 files changed, 32 insertions(+), 30 deletions(-)

diff --git a/components/camel-nsq/src/main/docs/nsq-component.adoc b/components/camel-nsq/src/main/docs/nsq-component.adoc
index 7f81b7b8616fb..ef4336b4a32e4 100644
--- a/components/camel-nsq/src/main/docs/nsq-component.adoc
+++ b/components/camel-nsq/src/main/docs/nsq-component.adoc
@@ -1,6 +1,8 @@
+[[nsq-component]]
 == NSQ Component
 
-*Available as of Camel version 2.22*
+*Available as of Camel version 2.23*
+
 *Available as of Camel version 2.23*
 
 
@@ -107,4 +109,4 @@ The component supports 3 options, which are listed below.
 | *camel.component.nsq.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
 | *camel.component.nsq.use-global-ssl-context-parameters* | Enable usage of global SSL context parameters. | false | Boolean
 |===
-// spring-boot-auto-configure options: END
+// spring-boot-auto-configure options: END
\ No newline at end of file
diff --git a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
index 22ab5196f4824..4af88555ba751 100644
--- a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
+++ b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
@@ -3177,142 +3177,142 @@
       <dependency>
         <groupId>org.apache.cxf.services.sts</groupId>
         <artifactId>cxf-services-sts-core</artifactId>
-        <version>3.2.6</version>
+        <version>3.2.7</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cxf.services.ws-discovery</groupId>
         <artifactId>cxf-services-ws-discovery-api</artifactId>
-        <version>3.2.6</version>
+        <version>3.2.7</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-core</artifactId>
-        <version>3.2.6</version>
+        <version>3.2.7</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-rt-bindings-soap</artifactId>
-        <version>3.2.6</version>
+        <version>3.2.7</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-rt-bindings-xml</artifactId>
-        <version>3.2.6</version>
+        <version>3.2.7</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-rt-databinding-jaxb</artifactId>
-        <version>3.2.6</version>
+        <version>3.2.7</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-rt-features-clustering</artifactId>
-        <version>3.2.6</version>
+        <version>3.2.7</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-rt-features-logging</artifactId>
-        <version>3.2.6</version>
+        <version>3.2.7</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-rt-frontend-jaxrs</artifactId>
-        <version>3.2.6</version>
+        <version>3.2.7</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-rt-frontend-jaxws</artifactId>
-        <version>3.2.6</version>
+        <version>3.2.7</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-rt-frontend-simple</artifactId>
-        <version>3.2.6</version>
+        <version>3.2.7</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-rt-management</artifactId>
-        <version>3.2.6</version>
+        <version>3.2.7</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-rt-rs-client</artifactId>
-        <version>3.2.6</version>
+        <version>3.2.7</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-rt-rs-extension-providers</artifactId>
-        <version>3.2.6</version>
+        <version>3.2.7</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-rt-rs-security-oauth2</artifactId>
-        <version>3.2.6</version>
+        <version>3.2.7</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-rt-rs-service-description-swagger</artifactId>
-        <version>3.2.6</version>
+        <version>3.2.7</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-rt-transports-http</artifactId>
-        <version>3.2.6</version>
+        <version>3.2.7</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-rt-transports-http-jetty</artifactId>
-        <version>3.2.6</version>
+        <version>3.2.7</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-rt-transports-jms</artifactId>
-        <version>3.2.6</version>
+        <version>3.2.7</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-rt-transports-local</artifactId>
-        <version>3.2.6</version>
+        <version>3.2.7</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-rt-ws-addr</artifactId>
-        <version>3.2.6</version>
+        <version>3.2.7</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-rt-ws-mex</artifactId>
-        <version>3.2.6</version>
+        <version>3.2.7</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-rt-ws-policy</artifactId>
-        <version>3.2.6</version>
+        <version>3.2.7</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-rt-ws-rm</artifactId>
-        <version>3.2.6</version>
+        <version>3.2.7</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-rt-ws-security</artifactId>
-        <version>3.2.6</version>
+        <version>3.2.7</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-rt-ws-security-oauth2</artifactId>
-        <version>3.2.6</version>
+        <version>3.2.7</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-rt-wsdl</artifactId>
-        <version>3.2.6</version>
+        <version>3.2.7</version>
       </dependency>
       <dependency>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-testutils</artifactId>
-        <version>3.2.6</version>
+        <version>3.2.7</version>
       </dependency>
       <dependency>
         <groupId>org.apache.ftpserver</groupId>

From 8a1dcfbb04c2dc0d8fe352ae5ac2d14fee859d5a Mon Sep 17 00:00:00 2001
From: Bilgin Ibryam <bibryam@gmail.com>
Date: Tue, 27 Nov 2018 10:16:58 +0000
Subject: [PATCH 090/125] Added a Camel connector for R3's Corda blockchain
 platform using corda-rpc module

---
 .../src/main/descriptors/common-bin.xml       |   2 +
 bom/camel-bom/pom.xml                         |  10 +
 components/camel-corda/.gitignore             |   6 +
 components/camel-corda/README.md              |   3 +
 components/camel-corda/pom.xml                |  84 +++
 .../src/main/docs/corda-component.adoc        | 141 +++++
 .../camel/component/corda/CordaComponent.java |  54 ++
 .../component/corda/CordaConfiguration.java   | 168 ++++++
 .../camel/component/corda/CordaConstants.java |  69 +++
 .../camel/component/corda/CordaConsumer.java  | 267 ++++++++++
 .../camel/component/corda/CordaEndpoint.java  | 101 ++++
 .../camel/component/corda/CordaProducer.java  | 240 +++++++++
 .../src/main/resources/META-INF/LICENSE.txt   | 203 +++++++
 .../src/main/resources/META-INF/NOTICE.txt    |  11 +
 .../services/org/apache/camel/component/corda |  18 +
 .../camel/component/corda/CamelFlow.java      |  32 ++
 .../CordaConsumerNetworkMapFeedTest.java      |  49 ++
 ...daConsumerStartTrackedFlowDynamicTest.java |  54 ++
 .../CordaConsumerStateMachineFeedTest.java    |  49 ++
 .../corda/CordaConsumerTestSupport.java       |  62 +++
 .../CordaConsumerTransactionMapFeedTest.java  |  49 ++
 ...CordaConsumerVaultTrackByCriteriaTest.java |  51 ++
 .../corda/CordaConsumerVaultTrackByTest.java  |  53 ++
 ...onsumerVaultTrackByWithPagingSpecTest.java |  52 ++
 ...daConsumerVaultTrackByWithSortingTest.java |  52 ++
 .../corda/CordaConsumerVaultTrackTest.java    |  49 ++
 .../component/corda/CordaProducerTest.java    | 498 ++++++++++++++++++
 .../component/corda/CordaTestSupport.java     |  74 +++
 .../component/corda/IntegrationWhiteList.java |  35 ++
 ....core.serialization.SerializationWhitelist |   1 +
 .../src/test/resources/log4j2.properties      |  34 ++
 .../org.mockito.plugins.MockMaker             |   1 +
 components/pom.xml                            |   1 +
 components/readme.adoc                        |   5 +-
 docs/user-manual/en/SUMMARY.md                |   1 +
 parent/pom.xml                                |  25 +
 .../features/src/main/resources/features.xml  |   5 +
 .../camel-corda-starter/pom.xml               |  65 +++
 .../CordaComponentAutoConfiguration.java      | 128 +++++
 .../CordaComponentConfiguration.java          | 182 +++++++
 .../src/main/resources/META-INF/LICENSE.txt   | 203 +++++++
 .../src/main/resources/META-INF/NOTICE.txt    |  11 +
 ...itional-spring-configuration-metadata.json |  10 +
 .../main/resources/META-INF/spring.factories  |  19 +
 .../main/resources/META-INF/spring.provides   |  17 +
 .../spring-boot/components-starter/pom.xml    |   1 +
 .../camel-spring-boot-dependencies/pom.xml    |  24 +
 47 files changed, 3268 insertions(+), 1 deletion(-)
 create mode 100644 components/camel-corda/.gitignore
 create mode 100644 components/camel-corda/README.md
 create mode 100644 components/camel-corda/pom.xml
 create mode 100644 components/camel-corda/src/main/docs/corda-component.adoc
 create mode 100644 components/camel-corda/src/main/java/org/apache/camel/component/corda/CordaComponent.java
 create mode 100644 components/camel-corda/src/main/java/org/apache/camel/component/corda/CordaConfiguration.java
 create mode 100644 components/camel-corda/src/main/java/org/apache/camel/component/corda/CordaConstants.java
 create mode 100644 components/camel-corda/src/main/java/org/apache/camel/component/corda/CordaConsumer.java
 create mode 100644 components/camel-corda/src/main/java/org/apache/camel/component/corda/CordaEndpoint.java
 create mode 100644 components/camel-corda/src/main/java/org/apache/camel/component/corda/CordaProducer.java
 create mode 100755 components/camel-corda/src/main/resources/META-INF/LICENSE.txt
 create mode 100755 components/camel-corda/src/main/resources/META-INF/NOTICE.txt
 create mode 100755 components/camel-corda/src/main/resources/META-INF/services/org/apache/camel/component/corda
 create mode 100644 components/camel-corda/src/test/java/org/apache/camel/component/corda/CamelFlow.java
 create mode 100644 components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerNetworkMapFeedTest.java
 create mode 100644 components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerStartTrackedFlowDynamicTest.java
 create mode 100644 components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerStateMachineFeedTest.java
 create mode 100644 components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerTestSupport.java
 create mode 100644 components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerTransactionMapFeedTest.java
 create mode 100644 components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerVaultTrackByCriteriaTest.java
 create mode 100644 components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerVaultTrackByTest.java
 create mode 100644 components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerVaultTrackByWithPagingSpecTest.java
 create mode 100644 components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerVaultTrackByWithSortingTest.java
 create mode 100644 components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerVaultTrackTest.java
 create mode 100644 components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaProducerTest.java
 create mode 100755 components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaTestSupport.java
 create mode 100644 components/camel-corda/src/test/java/org/apache/camel/component/corda/IntegrationWhiteList.java
 create mode 100644 components/camel-corda/src/test/resources/META-INF/services/net.corda.core.serialization.SerializationWhitelist
 create mode 100644 components/camel-corda/src/test/resources/log4j2.properties
 create mode 100644 components/camel-corda/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
 create mode 100644 platforms/spring-boot/components-starter/camel-corda-starter/pom.xml
 create mode 100644 platforms/spring-boot/components-starter/camel-corda-starter/src/main/java/org/apache/camel/component/corda/springboot/CordaComponentAutoConfiguration.java
 create mode 100644 platforms/spring-boot/components-starter/camel-corda-starter/src/main/java/org/apache/camel/component/corda/springboot/CordaComponentConfiguration.java
 create mode 100644 platforms/spring-boot/components-starter/camel-corda-starter/src/main/resources/META-INF/LICENSE.txt
 create mode 100644 platforms/spring-boot/components-starter/camel-corda-starter/src/main/resources/META-INF/NOTICE.txt
 create mode 100644 platforms/spring-boot/components-starter/camel-corda-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
 create mode 100644 platforms/spring-boot/components-starter/camel-corda-starter/src/main/resources/META-INF/spring.factories
 create mode 100644 platforms/spring-boot/components-starter/camel-corda-starter/src/main/resources/META-INF/spring.provides

diff --git a/apache-camel/src/main/descriptors/common-bin.xml b/apache-camel/src/main/descriptors/common-bin.xml
index 22c929a667001..10fe745729ae8 100644
--- a/apache-camel/src/main/descriptors/common-bin.xml
+++ b/apache-camel/src/main/descriptors/common-bin.xml
@@ -68,6 +68,7 @@
         <include>org.apache.camel:camel-connector</include>
         <include>org.apache.camel:camel-consul</include>
         <include>org.apache.camel:camel-context</include>
+        <include>org.apache.camel:camel-corda</include>
         <include>org.apache.camel:camel-couchdb</include>
         <include>org.apache.camel:camel-couchbase</include>
         <include>org.apache.camel:camel-crypto</include>
@@ -394,6 +395,7 @@
         <include>org.apache.camel:camel-cometd-starter</include>
         <include>org.apache.camel:camel-consul-starter</include>
         <include>org.apache.camel:camel-context-starter</include>
+        <include>org.apache.camel:camel-corda-starter</include>
         <include>org.apache.camel:camel-core-starter</include>
         <include>org.apache.camel:camel-couchdb-starter</include>
         <include>org.apache.camel:camel-couchbase-starter</include>
diff --git a/bom/camel-bom/pom.xml b/bom/camel-bom/pom.xml
index fc9cacf8a5399..f63ca96eca81d 100644
--- a/bom/camel-bom/pom.xml
+++ b/bom/camel-bom/pom.xml
@@ -491,6 +491,16 @@
         <artifactId>camel-context-starter</artifactId>
         <version>${project.version}</version>
       </dependency>
+      <dependency>
+         <groupId>org.apache.camel</groupId>
+         <artifactId>camel-corda</artifactId>
+          <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.camel</groupId>
+        <artifactId>camel-corda-starter</artifactId>
+        <version>${project.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-core</artifactId>
diff --git a/components/camel-corda/.gitignore b/components/camel-corda/.gitignore
new file mode 100644
index 0000000000000..f1ea348215c3a
--- /dev/null
+++ b/components/camel-corda/.gitignore
@@ -0,0 +1,6 @@
+**/.DS_Store
+.DS_Store
+target
+.idea
+*.iml
+*.log
diff --git a/components/camel-corda/README.md b/components/camel-corda/README.md
new file mode 100644
index 0000000000000..1431dd21d0299
--- /dev/null
+++ b/components/camel-corda/README.md
@@ -0,0 +1,3 @@
+# camel-corda
+
+[Apache Camel](http://camel.apache.org/) connector for R's [Corda](https://www.corda.net/) blockchain platform using corda-rpc library. 
diff --git a/components/camel-corda/pom.xml b/components/camel-corda/pom.xml
new file mode 100644
index 0000000000000..b7969a0d126ce
--- /dev/null
+++ b/components/camel-corda/pom.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    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.
+
+-->
+<project xmlns="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">
+    <modelVersion>4.0.0</modelVersion>
+
+      <parent>
+        <groupId>org.apache.camel</groupId>
+        <artifactId>components</artifactId>
+        <version>2.23.0-SNAPSHOT</version>
+      </parent>
+
+      <artifactId>camel-corda</artifactId>
+      <packaging>jar</packaging>
+
+      <name>Camel :: Corda</name>
+      <description>Camel Corda which is based on corda-rpc support</description>
+
+    <properties>
+        <camel.osgi.export.pkg>org.apache.camel.component.corda.*</camel.osgi.export.pkg>
+        <camel.osgi.export.service>org.apache.camel.spi.ComponentResolver;component=corda</camel.osgi.export.service>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>net.corda</groupId>
+            <artifactId>corda-rpc</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.osgi</groupId>
+            <artifactId>org.osgi.core</artifactId>
+            <scope>provided</scope>
+            <optional>true</optional>
+        </dependency>
+
+        <!-- for testing -->
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-slf4j-impl</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+</project>
diff --git a/components/camel-corda/src/main/docs/corda-component.adoc b/components/camel-corda/src/main/docs/corda-component.adoc
new file mode 100644
index 0000000000000..eb454ae84e68b
--- /dev/null
+++ b/components/camel-corda/src/main/docs/corda-component.adoc
@@ -0,0 +1,141 @@
+[[corda-component]]
+== corda Component
+
+*Available as of Camel version 2.23*
+
+*Available as of Camel version 2.23*
+
+
+The *Corda* blockchain component uses the https://www.corda.net/[corda] rpc client
+
+Maven users will need to add the following dependency to their `pom.xml`
+for this component:
+
+[source,xml]
+------------------------------------------------------------
+<dependency>
+    <groupId>org.apache.camel</groupId>
+    <artifactId>camel-corda</artifactId>
+    <version>x.x.x</version>
+    <!-- use the same version as your Camel core version -->
+</dependency>
+------------------------------------------------------------
+
+=== URI Format
+
+[source,text]
+----
+corda://<host:port>[?options]
+----
+
+=== Corda Options
+
+
+// component options: START
+The corda component supports 2 options, which are listed below.
+
+
+
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *configuration* (common) | Default configuration |  | CordaConfiguration
+| *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 corda endpoint is configured using URI syntax:
+
+----
+corda:url
+----
+
+with the following path and query parameters:
+
+==== Path Parameters (1 parameters):
+
+
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *configuration* | *Required* URL to the corda node |  | CordaConfiguration
+|===
+
+
+==== Query Parameters (4 parameters):
+
+
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *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 option 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
+// spring-boot-auto-configure options: START
+=== Spring Boot Auto-Configuration
+
+
+The component supports 14 options, which are listed below.
+
+
+
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *camel.component.corda.configuration.arguments* |  |  | Object[]
+| *camel.component.corda.configuration.contract-state-class* |  |  | Class
+| *camel.component.corda.configuration.flow-loci-class* |  |  | Class
+| *camel.component.corda.configuration.host* |  |  | String
+| *camel.component.corda.configuration.operation* |  |  | String
+| *camel.component.corda.configuration.page-specification* |  |  | PageSpecification
+| *camel.component.corda.configuration.password* |  |  | String
+| *camel.component.corda.configuration.port* |  |  | Integer
+| *camel.component.corda.configuration.process-snapshot* |  |  | Boolean
+| *camel.component.corda.configuration.query-criteria* |  |  | QueryCriteria
+| *camel.component.corda.configuration.sort* |  |  | Sort
+| *camel.component.corda.configuration.username* |  |  | String
+| *camel.component.corda.enabled* | Enable corda component | true | Boolean
+| *camel.component.corda.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
+|===
+// spring-boot-auto-configure options: END
+
+
+
+You can append query options to the URI in the following format,
+?options=value&option2=value&...
+
+
+### Message Headers
+
+[width="100%",cols="10%,90%",options="header",]
+|=======================================================================
+|Header |Description
+
+|`All URI options` |All URI options can also be set as exchange headers.
+
+|=======================================================================
+
+
+
+### Samples
+
+Subscribe for new vault state changes:
+
+[source,java]
+---------------------------------------------------------------------------------------------
+from("corda://localhost:10006?username=user1&password=test?operation=VAULT_TRACK&contractStateClass=#contractStateClass")
+    .to("jms:queue:vault");
+---------------------------------------------------------------------------------------------
+
+Read the node information:
+
+[source,java]
+--------------------------------------------------------
+from("direct:start")
+    .to("corda://localhost:10006?username=user1&password=test?operation=NODE_INFO");
+--------------------------------------------------------
diff --git a/components/camel-corda/src/main/java/org/apache/camel/component/corda/CordaComponent.java b/components/camel-corda/src/main/java/org/apache/camel/component/corda/CordaComponent.java
new file mode 100644
index 0000000000000..04cf6d547d872
--- /dev/null
+++ b/components/camel-corda/src/main/java/org/apache/camel/component/corda/CordaComponent.java
@@ -0,0 +1,54 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.corda;
+
+import java.util.Map;
+import org.apache.camel.CamelContext;
+import org.apache.camel.Endpoint;
+import org.apache.camel.impl.DefaultComponent;
+import org.apache.camel.spi.Metadata;
+
+/**
+ * Represents the component that manages {@link CordaComponent}.
+ */
+public class CordaComponent extends DefaultComponent {
+
+    @Metadata(description = "Default configuration")
+    private CordaConfiguration configuration;
+
+    public CordaComponent() {
+    }
+
+    public CordaComponent(CamelContext camelContext) {
+        super(camelContext);
+    }
+
+    public CordaConfiguration getConfiguration() {
+        return configuration;
+    }
+
+    public void setConfiguration(CordaConfiguration configuration) {
+        this.configuration = configuration;
+    }
+
+    protected Endpoint createEndpoint(String uri, final String remaining, final Map<String, Object> parameters) throws Exception {
+        CordaConfiguration conf =  configuration != null ? configuration.copy() : new CordaConfiguration();
+        setProperties(conf, parameters);
+        return new CordaEndpoint(uri, remaining, this, conf);
+    }
+
+}
diff --git a/components/camel-corda/src/main/java/org/apache/camel/component/corda/CordaConfiguration.java b/components/camel-corda/src/main/java/org/apache/camel/component/corda/CordaConfiguration.java
new file mode 100644
index 0000000000000..4d932ba75db3a
--- /dev/null
+++ b/components/camel-corda/src/main/java/org/apache/camel/component/corda/CordaConfiguration.java
@@ -0,0 +1,168 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.corda;
+
+import net.corda.core.contracts.ContractState;
+import net.corda.core.flows.FlowLogic;
+import net.corda.core.node.services.vault.PageSpecification;
+import net.corda.core.node.services.vault.QueryCriteria;
+import net.corda.core.node.services.vault.Sort;
+import org.apache.camel.RuntimeCamelException;
+import org.apache.camel.spi.Metadata;
+import org.apache.camel.spi.UriParam;
+import org.apache.camel.spi.UriParams;
+
+@UriParams
+public class CordaConfiguration implements Cloneable {
+    @UriParam
+    @Metadata(required = "true")
+    private String operation;
+
+    @UriParam
+    @Metadata(required = "true", secret = true)
+    private String username;
+
+    @UriParam
+    @Metadata(required = "true", secret = true)
+    private String password;
+
+    @Metadata(required = "true")
+    private String host;
+
+    @Metadata(required = "true")
+    private int port;
+
+    @Metadata(required = "false", defaultValue = "true")
+    private boolean processSnapshot = true;
+
+    private Class<FlowLogic<?>> flowLociClass;
+
+    private Object [] arguments;
+
+    private Class<ContractState> contractStateClass;
+
+    private QueryCriteria queryCriteria;
+
+    private PageSpecification pageSpecification;
+
+    private Sort sort;
+
+    public String getOperation() {
+        return operation;
+    }
+
+    public void setOperation(String operation) {
+        this.operation = operation;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public void setPassword(String password) {
+        this.password = password;
+    }
+
+    public String getHost() {
+        return host;
+    }
+
+    public void setHost(String host) {
+        this.host = host;
+    }
+
+    public int getPort() {
+        return port;
+    }
+
+    public void setPort(int port) {
+        this.port = port;
+    }
+
+    public boolean isProcessSnapshot() {
+        return processSnapshot;
+    }
+
+    public void setProcessSnapshot(boolean processSnapshot) {
+        this.processSnapshot = processSnapshot;
+    }
+
+    public Class<FlowLogic<?>> getFlowLociClass() {
+        return flowLociClass;
+    }
+
+    public void setFlowLociClass(Class<FlowLogic<?>> flowLociClass) {
+        this.flowLociClass = flowLociClass;
+    }
+
+    public Object[] getArguments() {
+        return arguments;
+    }
+
+    public void setArguments(Object[] arguments) {
+        this.arguments = arguments;
+    }
+
+    public Class<ContractState> getContractStateClass() {
+        return contractStateClass;
+    }
+
+    public void setContractStateClass(Class<ContractState> contractStateClass) {
+        this.contractStateClass = contractStateClass;
+    }
+
+    public QueryCriteria getQueryCriteria() {
+        return queryCriteria;
+    }
+
+    public void setQueryCriteria(QueryCriteria queryCriteria) {
+        this.queryCriteria = queryCriteria;
+    }
+
+    public PageSpecification getPageSpecification() {
+        return pageSpecification;
+    }
+
+    public void setPageSpecification(PageSpecification pageSpecification) {
+        this.pageSpecification = pageSpecification;
+    }
+
+    public Sort getSort() {
+        return sort;
+    }
+
+    public void setSort(Sort sort) {
+        this.sort = sort;
+    }
+
+    public CordaConfiguration copy() {
+        try {
+            return (CordaConfiguration)super.clone();
+        } catch (CloneNotSupportedException e) {
+            throw new RuntimeCamelException(e);
+        }
+    }
+
+}
diff --git a/components/camel-corda/src/main/java/org/apache/camel/component/corda/CordaConstants.java b/components/camel-corda/src/main/java/org/apache/camel/component/corda/CordaConstants.java
new file mode 100644
index 0000000000000..f7c29be062748
--- /dev/null
+++ b/components/camel-corda/src/main/java/org/apache/camel/component/corda/CordaConstants.java
@@ -0,0 +1,69 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.corda;
+
+public interface CordaConstants {
+    String OPERATION = "OPERATION";
+    String NODE_INFO = "NODE_INFO";
+    String CURRENT_NODE_TIME = "CURRENT_NODE_TIME";
+    String GET_PROTOCOL_VERSION = "GET_PROTOCOL_VERSION";
+    String NETWORK_MAP_SNAPSHOT = "NETWORK_MAP_SNAPSHOT";
+    String REGISTERED_FLOWS = "REGISTERED_FLOWS";
+    String CLEAR_NETWORK_MAP_CACHE = "CLEAR_NETWORK_MAP_CACHE";
+    String IS_FLOWS_DRAINING_MODE_ENABLED = "IS_FLOWS_DRAINING_MODE_ENABLED";
+    String ADD_VAULT_TRANSACTION_NOTE = "ADD_VAULT_TRANSACTION_NOTE";
+    String NOTARY_IDENTITIES = "NOTARY_IDENTITIES";
+    String SET_FLOWS_DRAINING_MODE_ENABLED = "SET_FLOWS_DRAINING_MODE_ENABLED";
+    String GET_VAULT_TRANSACTION_NOTES = "GET_VAULT_TRANSACTION_NOTES";
+    String UPLOAD_ATTACHMENT = "UPLOAD_ATTACHMENT";
+    String ATTACHMENT_EXISTS = "ATTACHMENT_EXISTS";
+    String OPEN_ATTACHMENT = "OPEN_ATTACHMENT";
+    String QUERY_ATTACHMENTS = "QUERY_ATTACHMENTS";
+    String NODE_INFO_FROM_PARTY = "NODE_INFO_FROM_PARTY";
+    String NOTARY_PARTY_FROM_X500_NAME = "NOTARY_PARTY_FROM_X500_NAME";
+    String PARTIES_FROM_NAME = "PARTIES_FROM_NAME";
+    String PARTIES_FROM_KEY = "PARTIES_FROM_KEY";
+    String START_FLOW_DYNAMIC = "START_FLOW_DYNAMIC";
+    String STATE_MACHINE_SNAPSHOT = "STATE_MACHINE_SNAPSHOT";
+    String STATE_MACHINE_RECORDED_TRANSACTION_MAPPING_SNAPSHOT = "STATE_MACHINE_RECORDED_TRANSACTION_MAPPING_SNAPSHOT";
+    String WELL_KNOWN_PARTY_FROM_X500_NAME = "WELL_KNOWN_PARTY_FROM_X500_NAME";
+    String WELL_KNOWN_PARTY_FROM_ANONYMOUS = "WELL_KNOWN_PARTY_FROM_ANONYMOUS";
+    String VAULT_QUERY = "VAULT_QUERY";
+    String VAULT_QUERY_BY = "VAULT_QUERY_BY";
+    String VAULT_QUERY_BY_CRITERIA = "VAULT_QUERY_BY_CRITERIA";
+    String VAULT_QUERY_BY_WITH_PAGING_SPEC = "VAULT_QUERY_BY_WITH_PAGING_SPEC";
+    String VAULT_QUERY_BY_WITH_SORTING = "VAULT_QUERY_BY_WITH_SORTING";
+
+    String VAULT_TRACK = "VAULT_TRACK";
+    String VAULT_TRACK_BY = "VAULT_TRACK_BY";
+    String VAULT_TRACK_BY_CRITERIA = "VAULT_TRACK_BY_CRITERIA";
+    String VAULT_TRACK_BY_WITH_PAGING_SPEC = "VAULT_TRACK_BY_WITH_PAGING_SPEC";
+    String VAULT_TRACK_BY_WITH_SORTING = "VAULT_TRACK_BY_WITH_SORTING";
+    String STATE_MACHINE_FEED = "STATE_MACHINE_FEED";
+    String NETWORK_MAP_FEED = "NETWORK_MAP_FEED";
+    String STATE_MACHINE_RECORDED_TRANSACTION_MAPPING_FEED = "STATE_MACHINE_RECORDED_TRANSACTION_MAPPING_FEED";
+    String START_TRACKED_FLOW_DYNAMIC = "START_TRACKED_FLOW_DYNAMIC";
+
+    String ATTACHMENT_QUERY_CRITERIA = "ATTACHMENT_QUERY_CRITERIA";
+    String SORT = "SORT";
+    String EXACT_MATCH = "EXACT_MATCH";
+    String ARGUMENTS = "ARGUMENTS";
+    String DRAINING_MODE = "DRAINING_MODE";
+    String SECURE_HASH = "SECURE_HASH";
+    String QUERY_CRITERIA = "QUERY_CRITERIA";
+    String PAGE_SPECIFICATION = "PAGE_SPECIFICATION";
+}
diff --git a/components/camel-corda/src/main/java/org/apache/camel/component/corda/CordaConsumer.java b/components/camel-corda/src/main/java/org/apache/camel/component/corda/CordaConsumer.java
new file mode 100644
index 0000000000000..3c1f6175bd927
--- /dev/null
+++ b/components/camel-corda/src/main/java/org/apache/camel/component/corda/CordaConsumer.java
@@ -0,0 +1,267 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.corda;
+
+import java.util.List;
+import net.corda.core.contracts.ContractState;
+import net.corda.core.messaging.CordaRPCOps;
+import net.corda.core.messaging.DataFeed;
+import net.corda.core.messaging.FlowProgressHandle;
+import net.corda.core.messaging.StateMachineInfo;
+import net.corda.core.messaging.StateMachineTransactionMapping;
+import net.corda.core.messaging.StateMachineUpdate;
+import net.corda.core.node.NodeInfo;
+import net.corda.core.node.services.NetworkMapCache;
+import net.corda.core.node.services.Vault;
+import net.corda.core.node.services.vault.PageSpecification;
+import net.corda.core.node.services.vault.QueryCriteria;
+import net.corda.core.node.services.vault.Sort;
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
+import org.apache.camel.impl.DefaultConsumer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import rx.Observable;
+import rx.Subscription;
+
+import static org.apache.camel.component.corda.CordaConstants.NETWORK_MAP_FEED;
+import static org.apache.camel.component.corda.CordaConstants.START_TRACKED_FLOW_DYNAMIC;
+import static org.apache.camel.component.corda.CordaConstants.STATE_MACHINE_FEED;
+import static org.apache.camel.component.corda.CordaConstants.STATE_MACHINE_RECORDED_TRANSACTION_MAPPING_FEED;
+import static org.apache.camel.component.corda.CordaConstants.VAULT_TRACK;
+import static org.apache.camel.component.corda.CordaConstants.VAULT_TRACK_BY;
+import static org.apache.camel.component.corda.CordaConstants.VAULT_TRACK_BY_CRITERIA;
+import static org.apache.camel.component.corda.CordaConstants.VAULT_TRACK_BY_WITH_PAGING_SPEC;
+import static org.apache.camel.component.corda.CordaConstants.VAULT_TRACK_BY_WITH_SORTING;
+
+/**
+ * The corda consumer.
+ */
+public class CordaConsumer extends DefaultConsumer {
+    private static final Logger LOG = LoggerFactory.getLogger(CordaConsumer.class);
+    private final CordaConfiguration configuration;
+    private CordaRPCOps cordaRPCOps;
+    private Subscription subscription;
+
+    public CordaConsumer(CordaEndpoint endpoint, Processor processor, CordaConfiguration configuration, CordaRPCOps cordaRPCOps) {
+        super(endpoint, processor);
+        this.configuration = configuration;
+        this.cordaRPCOps = cordaRPCOps;
+    }
+
+    @Override
+    public CordaEndpoint getEndpoint() {
+        return (CordaEndpoint) super.getEndpoint();
+    }
+
+    @Override
+    protected void doStart() throws Exception {
+        super.doStart();
+        Exchange exchange = this.getEndpoint().createExchange();
+        Class<ContractState> contractStateClass = configuration.getContractStateClass();
+        QueryCriteria criteria = configuration.getQueryCriteria();
+        PageSpecification pageSpec = configuration.getPageSpecification();
+        Sort sorting = configuration.getSort();
+
+        DataFeed<Vault.Page<ContractState>, Vault.Update<ContractState>> pageUpdateDataFeed = null;
+        switch (configuration.getOperation()) {
+
+        case VAULT_TRACK:
+            LOG.debug("subscribing for operation: " + VAULT_TRACK);
+            pageUpdateDataFeed = cordaRPCOps.vaultTrack(contractStateClass);
+            processSnapshot(exchange, pageUpdateDataFeed.getSnapshot());
+            subscription = pageUpdateDataFeed.getUpdates().subscribe(
+                x -> processContractStateUpdate(x),
+                t -> processError(t, CordaConstants.VAULT_TRACK),
+                () -> processDone(CordaConstants.VAULT_TRACK)
+            );
+            break;
+
+        case VAULT_TRACK_BY:
+            LOG.debug("subscribing for operation: " + VAULT_TRACK_BY);
+            pageUpdateDataFeed = cordaRPCOps.vaultTrackBy(criteria, pageSpec, sorting, contractStateClass);
+            processSnapshot(exchange, pageUpdateDataFeed.getSnapshot());
+            subscription = pageUpdateDataFeed.getUpdates().subscribe(
+                x -> processContractStateUpdate(x),
+                t -> processError(t, CordaConstants.VAULT_TRACK_BY),
+                () -> processDone(CordaConstants.VAULT_TRACK_BY)
+            );
+            break;
+
+        case VAULT_TRACK_BY_CRITERIA:
+            LOG.debug("subscribing for operation: " + VAULT_TRACK_BY_CRITERIA);
+            pageUpdateDataFeed = cordaRPCOps.vaultTrackByCriteria(contractStateClass, criteria);
+            processSnapshot(exchange, pageUpdateDataFeed.getSnapshot());
+            subscription = pageUpdateDataFeed.getUpdates().subscribe(
+                x -> processContractStateUpdate(x),
+                t -> processError(t, CordaConstants.VAULT_TRACK_BY_CRITERIA),
+                () -> processDone(CordaConstants.VAULT_TRACK_BY_CRITERIA)
+            );
+            break;
+
+        case VAULT_TRACK_BY_WITH_PAGING_SPEC:
+            LOG.debug("subscribing for operation: " + VAULT_TRACK_BY_WITH_PAGING_SPEC);
+            pageUpdateDataFeed = cordaRPCOps.vaultTrackByWithPagingSpec(contractStateClass, criteria, pageSpec);
+            processSnapshot(exchange, pageUpdateDataFeed.getSnapshot());
+            subscription = pageUpdateDataFeed.getUpdates().subscribe(
+                x -> processContractStateUpdate(x),
+                t -> processError(t, CordaConstants.VAULT_TRACK_BY_WITH_PAGING_SPEC),
+                () -> processDone(CordaConstants.VAULT_TRACK_BY_WITH_PAGING_SPEC)
+            );
+            break;
+
+        case VAULT_TRACK_BY_WITH_SORTING:
+            LOG.debug("subscribing for operation: " + VAULT_TRACK_BY_WITH_SORTING);
+            pageUpdateDataFeed = cordaRPCOps.vaultTrackByWithSorting(contractStateClass, criteria, sorting);
+            processSnapshot(exchange, pageUpdateDataFeed.getSnapshot());
+            subscription = pageUpdateDataFeed.getUpdates().subscribe(
+                x -> processContractStateUpdate(x),
+                t -> processError(t, CordaConstants.VAULT_TRACK_BY_WITH_SORTING),
+                () -> processDone(CordaConstants.VAULT_TRACK_BY_WITH_SORTING)
+            );
+            break;
+
+        case STATE_MACHINE_FEED:
+            LOG.debug("subscribing for operation: " + STATE_MACHINE_FEED);
+            DataFeed<List<StateMachineInfo>, StateMachineUpdate> stateFeed = cordaRPCOps.stateMachinesFeed();
+            processSnapshot(exchange, stateFeed.getSnapshot());
+            subscription = stateFeed.getUpdates().subscribe(
+                x -> processStateMachineUpdate(x),
+                t -> processError(t, CordaConstants.STATE_MACHINE_FEED),
+                () -> processDone(CordaConstants.STATE_MACHINE_FEED)
+            );
+            break;
+
+        case NETWORK_MAP_FEED:
+            LOG.debug("subscribing for operation: " + NETWORK_MAP_FEED);
+
+            DataFeed<List<NodeInfo>, NetworkMapCache.MapChange> networkMapFeed = cordaRPCOps.networkMapFeed();
+            processSnapshot(exchange, networkMapFeed.getSnapshot());
+            subscription = networkMapFeed.getUpdates().subscribe(
+                x -> proceedNetworkMapFeed(x),
+                t -> processError(t, CordaConstants.NETWORK_MAP_FEED),
+                () -> processDone(CordaConstants.NETWORK_MAP_FEED)
+            );
+            break;
+
+        case STATE_MACHINE_RECORDED_TRANSACTION_MAPPING_FEED:
+            LOG.debug("subscribing for operation: " + STATE_MACHINE_RECORDED_TRANSACTION_MAPPING_FEED);
+
+            DataFeed<List<StateMachineTransactionMapping>, StateMachineTransactionMapping> transactionFeed = cordaRPCOps.stateMachineRecordedTransactionMappingFeed();
+            processSnapshot(exchange, transactionFeed.getSnapshot());
+            subscription = transactionFeed.getUpdates().subscribe(
+                x -> processTransactionMappingFeed(x),
+                t -> processError(t, CordaConstants.STATE_MACHINE_RECORDED_TRANSACTION_MAPPING_FEED),
+                () -> processDone(CordaConstants.STATE_MACHINE_RECORDED_TRANSACTION_MAPPING_FEED)
+            );
+            break;
+
+        case START_TRACKED_FLOW_DYNAMIC:
+            LOG.debug("subscribing for operation: " + START_TRACKED_FLOW_DYNAMIC);
+
+            FlowProgressHandle<Object> objectFlowProgressHandle = cordaRPCOps.startTrackedFlowDynamic(configuration.getFlowLociClass(), configuration.getArguments());
+            Object result = objectFlowProgressHandle.getReturnValue().get();
+            Observable<String> progress = objectFlowProgressHandle.getProgress();
+            processSnapshot(exchange, result);
+            subscription = progress.subscribe(
+                x -> processFlowProcess(x),
+                t -> processError(t, CordaConstants.START_TRACKED_FLOW_DYNAMIC),
+                () -> processDone(CordaConstants.START_TRACKED_FLOW_DYNAMIC)
+            );
+            break;
+
+        default:
+            throw new IllegalArgumentException("Unsupported operation " + configuration.getOperation());
+        }
+
+        LOG.info("Subscribed: {}", this.configuration);
+    }
+
+    private void processSnapshot(Exchange exchange, Object page) {
+        if (configuration.isProcessSnapshot()) {
+            try {
+                exchange.getIn().setBody(page);
+                getProcessor().process(exchange);
+            } catch (Exception e) {
+                LOG.error("Error processing snapshot", e);
+            }
+        }
+    }
+
+    private void processFlowProcess(String x) {
+        LOG.debug("processFlowProcess {}", x);
+        Exchange exchange = this.getEndpoint().createExchange();
+        exchange.getIn().setBody(x);
+        processEvent(exchange);
+    }
+
+    private void processTransactionMappingFeed(StateMachineTransactionMapping x) {
+        LOG.debug("processTransactionMappingFeed {}", x);
+        Exchange exchange = this.getEndpoint().createExchange();
+        exchange.getIn().setBody(x);
+        processEvent(exchange);
+    }
+
+    private void proceedNetworkMapFeed(NetworkMapCache.MapChange x) {
+        LOG.debug("proceedNetworkMapFeed {}", x);
+        Exchange exchange = this.getEndpoint().createExchange();
+        exchange.getIn().setBody(x);
+        processEvent(exchange);
+    }
+
+    private void processStateMachineUpdate(StateMachineUpdate x) {
+        LOG.debug("processStateMachineUpdate {}", x);
+        Exchange exchange = this.getEndpoint().createExchange();
+        exchange.getIn().setBody(x);
+        processEvent(exchange);
+    }
+
+    private void processContractStateUpdate(Vault.Update<ContractState> x) {
+        LOG.debug("processContractStateUpdate {}", x);
+        Exchange exchange = this.getEndpoint().createExchange();
+        exchange.getIn().setBody(x);
+        processEvent(exchange);
+    }
+
+    private void processError(Throwable throwable, String operation) {
+        LOG.debug("processError for operation: " + operation + " " + throwable);
+        Exchange exchange = this.getEndpoint().createExchange();
+        exchange.setException(throwable);
+        processEvent(exchange);
+    }
+
+    public void processEvent(Exchange exchange) {
+        LOG.debug("processEvent {}", exchange);
+        try {
+            getProcessor().process(exchange);
+        } catch (Exception e) {
+            LOG.error("Error processing event ", e);
+        }
+    }
+
+    private void processDone(String operation) {
+        LOG.debug("processDone for operation: {}", operation);
+    }
+
+    @Override
+    protected void doStop() throws Exception {
+        if (subscription != null) {
+            subscription.unsubscribe();
+        }
+        super.doStop();
+    }
+}
diff --git a/components/camel-corda/src/main/java/org/apache/camel/component/corda/CordaEndpoint.java b/components/camel-corda/src/main/java/org/apache/camel/component/corda/CordaEndpoint.java
new file mode 100644
index 0000000000000..4ba221a50fdb6
--- /dev/null
+++ b/components/camel-corda/src/main/java/org/apache/camel/component/corda/CordaEndpoint.java
@@ -0,0 +1,101 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.corda;
+
+import java.net.URI;
+import java.net.URISyntaxException;
+import net.corda.client.rpc.CordaRPCClient;
+import net.corda.client.rpc.CordaRPCConnection;
+import net.corda.core.messaging.CordaRPCOps;
+import net.corda.core.utilities.NetworkHostAndPort;
+import org.apache.camel.Consumer;
+import org.apache.camel.Processor;
+import org.apache.camel.Producer;
+import org.apache.camel.impl.DefaultEndpoint;
+import org.apache.camel.spi.Metadata;
+import org.apache.camel.spi.UriEndpoint;
+import org.apache.camel.spi.UriPath;
+
+/**
+ * The corda component uses the corda-rpc to interact with corda nodes.
+ */
+@UriEndpoint(firstVersion = "2.23.0", scheme = "corda", title = "corda", syntax = "corda:url", consumerClass = CordaConsumer.class, label = "corda,blockchain")
+public class CordaEndpoint extends DefaultEndpoint {
+
+    @UriPath(description = "URL to the corda node")
+    @Metadata(required = "true")
+    private CordaConfiguration configuration;
+    private CordaRPCConnection rpcConnection;
+    private CordaRPCOps proxy;
+
+    public CordaEndpoint(String uri, String remaining, CordaComponent component, CordaConfiguration configuration) {
+        super(uri, component);
+        this.configuration = configuration;
+
+        try {
+            URI nodeURI = new URI(uri);
+            configuration.setHost(nodeURI.getHost());
+            configuration.setPort(nodeURI.getPort());
+
+            if (nodeURI.getUserInfo() != null) {
+                String[] creds = nodeURI.getUserInfo().split(":");
+                if (configuration.getUsername() == null) {
+                    configuration.setUsername(creds[0]);
+                }
+                if (configuration.getPassword() == null) {
+                    configuration.setPassword(creds.length > 1 ? creds[1] : "");
+                }
+            }
+        } catch (URISyntaxException e) {
+            throw new IllegalArgumentException("Invalid URI: " + remaining, e);
+        }
+    }
+
+    @Override
+    public Producer createProducer() throws Exception {
+        return new CordaProducer(this, configuration, proxy);
+    }
+
+    @Override
+    public Consumer createConsumer(Processor processor) throws Exception {
+        CordaConsumer consumer = new CordaConsumer(this, processor, configuration, proxy);
+        configureConsumer(consumer);
+        return consumer;
+    }
+
+    @Override
+    protected void doStart() throws Exception {
+        NetworkHostAndPort rpcAddress = new NetworkHostAndPort(configuration.getHost(), configuration.getPort());
+        CordaRPCClient rpcClient = new CordaRPCClient(rpcAddress);
+        rpcConnection = rpcClient.start(this.configuration.getUsername(), this.configuration.getPassword());
+        proxy = rpcConnection.getProxy();
+        super.doStart();
+    }
+
+    @Override
+    protected void doStop() throws Exception {
+        if (rpcConnection != null) {
+            rpcConnection.notifyServerAndClose();
+        }
+        super.doStop();
+    }
+
+    public boolean isSingleton() {
+        return true;
+    }
+
+}
diff --git a/components/camel-corda/src/main/java/org/apache/camel/component/corda/CordaProducer.java b/components/camel-corda/src/main/java/org/apache/camel/component/corda/CordaProducer.java
new file mode 100644
index 0000000000000..ea9fe7bf9c52a
--- /dev/null
+++ b/components/camel-corda/src/main/java/org/apache/camel/component/corda/CordaProducer.java
@@ -0,0 +1,240 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.corda;
+
+import java.io.InputStream;
+import java.security.PublicKey;
+import net.corda.core.contracts.ContractState;
+import net.corda.core.crypto.SecureHash;
+import net.corda.core.flows.FlowLogic;
+import net.corda.core.identity.AbstractParty;
+import net.corda.core.identity.CordaX500Name;
+import net.corda.core.messaging.CordaRPCOps;
+import net.corda.core.node.services.vault.AttachmentQueryCriteria;
+import net.corda.core.node.services.vault.AttachmentSort;
+import net.corda.core.node.services.vault.PageSpecification;
+import net.corda.core.node.services.vault.QueryCriteria;
+import net.corda.core.node.services.vault.Sort;
+import org.apache.camel.InvokeOnHeader;
+import org.apache.camel.Message;
+import org.apache.camel.impl.HeaderSelectorProducer;
+
+import static org.apache.camel.component.corda.CordaConstants.ARGUMENTS;
+import static org.apache.camel.component.corda.CordaConstants.ATTACHMENT_QUERY_CRITERIA;
+import static org.apache.camel.component.corda.CordaConstants.DRAINING_MODE;
+import static org.apache.camel.component.corda.CordaConstants.EXACT_MATCH;
+import static org.apache.camel.component.corda.CordaConstants.PAGE_SPECIFICATION;
+import static org.apache.camel.component.corda.CordaConstants.QUERY_CRITERIA;
+import static org.apache.camel.component.corda.CordaConstants.SECURE_HASH;
+import static org.apache.camel.component.corda.CordaConstants.SORT;
+
+/**
+ * The corda producer.
+ */
+
+public class CordaProducer extends HeaderSelectorProducer {
+    private CordaConfiguration configuration;
+    private CordaRPCOps cordaRPCOps;
+
+    public CordaProducer(CordaEndpoint endpoint, final CordaConfiguration configuration, CordaRPCOps cordaRPCOps) {
+        super(endpoint, CordaConstants.OPERATION, () -> configuration.getOperation(), false);
+        this.configuration = configuration;
+        this.cordaRPCOps = cordaRPCOps;
+    }
+
+    @Override
+    public CordaEndpoint getEndpoint() {
+        return (CordaEndpoint) super.getEndpoint();
+    }
+
+    @InvokeOnHeader(CordaConstants.CURRENT_NODE_TIME)
+    void currentNodeTime(Message message) throws Exception {
+        message.setBody(cordaRPCOps.currentNodeTime());
+    }
+
+    @InvokeOnHeader(CordaConstants.GET_PROTOCOL_VERSION)
+    void getProtocolVersion(Message message) throws Exception {
+        message.setBody(cordaRPCOps.getProtocolVersion());
+    }
+
+    @InvokeOnHeader(CordaConstants.NETWORK_MAP_SNAPSHOT)
+    void networkMapSnapshot(Message message) throws Exception {
+        message.setBody(cordaRPCOps.networkMapSnapshot());
+    }
+
+    @InvokeOnHeader(CordaConstants.STATE_MACHINE_SNAPSHOT)
+    void stateMachinesSnapshot(Message message) throws Exception {
+        message.setBody(cordaRPCOps.stateMachinesSnapshot());
+    }
+
+    @InvokeOnHeader(CordaConstants.STATE_MACHINE_RECORDED_TRANSACTION_MAPPING_SNAPSHOT)
+    void stateMachineRecordedTransactionMappingSnapshot(Message message) throws Exception {
+        message.setBody(cordaRPCOps.stateMachineRecordedTransactionMappingSnapshot());
+    }
+
+    @InvokeOnHeader(CordaConstants.REGISTERED_FLOWS)
+    void registeredFlows(Message message) throws Exception {
+        message.setBody(cordaRPCOps.registeredFlows());
+    }
+
+    @InvokeOnHeader(CordaConstants.CLEAR_NETWORK_MAP_CACHE)
+    void clearNetworkMapCache(Message message) throws Exception {
+        cordaRPCOps.clearNetworkMapCache();
+    }
+
+    @InvokeOnHeader(CordaConstants.IS_FLOWS_DRAINING_MODE_ENABLED)
+    void isFlowsDrainingModeEnabled(Message message) throws Exception {
+        message.setBody(cordaRPCOps.isFlowsDrainingModeEnabled());
+    }
+
+    @InvokeOnHeader(CordaConstants.SET_FLOWS_DRAINING_MODE_ENABLED)
+    void setFlowsDrainingModeEnabled(Message message) throws Exception {
+        Boolean mode = message.getHeader(DRAINING_MODE, Boolean.class);
+        cordaRPCOps.setFlowsDrainingModeEnabled(mode);
+    }
+
+    @InvokeOnHeader(CordaConstants.NOTARY_IDENTITIES)
+    void notaryIdentities(Message message) throws Exception {
+        message.setBody(cordaRPCOps.notaryIdentities());
+    }
+
+    @InvokeOnHeader(CordaConstants.NODE_INFO)
+    void nodeInfo(Message message) throws Exception {
+        message.setBody(cordaRPCOps.nodeInfo());
+    }
+
+    @InvokeOnHeader(CordaConstants.ADD_VAULT_TRANSACTION_NOTE)
+    void addVaultTransactionNote(Message message) throws Exception {
+        SecureHash secureHash = message.getHeader(SECURE_HASH, SecureHash.class);
+        String note = message.getBody(String.class);
+        cordaRPCOps.addVaultTransactionNote(secureHash, note);
+    }
+
+    @InvokeOnHeader(CordaConstants.GET_VAULT_TRANSACTION_NOTES)
+    void getVaultTransactionNotes(Message message) throws Exception {
+        SecureHash secureHash = message.getHeader(SECURE_HASH, SecureHash.class);
+        message.setBody(cordaRPCOps.getVaultTransactionNotes(secureHash));
+    }
+
+    @InvokeOnHeader(CordaConstants.UPLOAD_ATTACHMENT)
+    void uploadAttachment(Message message) throws Exception {
+        InputStream inputStream = message.getBody(InputStream.class);
+        SecureHash secureHash = cordaRPCOps.uploadAttachment(inputStream);
+        message.setHeader(SECURE_HASH, secureHash);
+    }
+
+    @InvokeOnHeader(CordaConstants.ATTACHMENT_EXISTS)
+    void attachmentExists(Message message) throws Exception {
+        SecureHash secureHash = message.getHeader(SECURE_HASH, SecureHash.class);
+        message.setBody(cordaRPCOps.attachmentExists(secureHash));
+    }
+
+    @InvokeOnHeader(CordaConstants.OPEN_ATTACHMENT)
+    void openAttachment(Message message) throws Exception {
+        SecureHash secureHash = message.getHeader(SECURE_HASH, SecureHash.class);
+        message.setBody(cordaRPCOps.openAttachment(secureHash));
+    }
+
+    @InvokeOnHeader(CordaConstants.QUERY_ATTACHMENTS)
+    void queryAttachments(Message message) throws Exception {
+        AttachmentQueryCriteria queryCriteria = message.getHeader(ATTACHMENT_QUERY_CRITERIA, AttachmentQueryCriteria.class);
+        AttachmentSort attachmentSort = message.getHeader(SORT, AttachmentSort.class);
+        message.setBody(cordaRPCOps.queryAttachments(queryCriteria, attachmentSort));
+    }
+
+    @InvokeOnHeader(CordaConstants.NODE_INFO_FROM_PARTY)
+    void nodeInfoFromParty(Message message) throws Exception {
+        AbstractParty party = message.getBody(AbstractParty.class);
+        message.setBody(cordaRPCOps.nodeInfoFromParty(party));
+    }
+
+    @InvokeOnHeader(CordaConstants.NOTARY_PARTY_FROM_X500_NAME)
+    void notaryPartyFromX500Name(Message message) throws Exception {
+        CordaX500Name x500Name = message.getBody(CordaX500Name.class);
+        message.setBody(cordaRPCOps.notaryPartyFromX500Name(x500Name));
+    }
+
+    @InvokeOnHeader(CordaConstants.PARTIES_FROM_NAME)
+    void partiesFromName(Message message) throws Exception {
+        String query = message.getBody(String.class);
+        Boolean exactMatch = message.getHeader(EXACT_MATCH, Boolean.class);
+        message.setBody(cordaRPCOps.partiesFromName(query, exactMatch));
+    }
+
+    @InvokeOnHeader(CordaConstants.PARTIES_FROM_KEY)
+    void partyFromKey(Message message) throws Exception {
+        PublicKey key = message.getBody(PublicKey.class);
+        message.setBody(cordaRPCOps.partyFromKey(key));
+    }
+
+    @InvokeOnHeader(CordaConstants.WELL_KNOWN_PARTY_FROM_X500_NAME)
+    void wellKnownPartyFromX500Name(Message message) throws Exception {
+        CordaX500Name x500Name = message.getBody(CordaX500Name.class);
+        message.setBody(cordaRPCOps.wellKnownPartyFromX500Name(x500Name));
+    }
+
+    @InvokeOnHeader(CordaConstants.WELL_KNOWN_PARTY_FROM_ANONYMOUS)
+    void wellKnownPartyFromAnonymous(Message message) throws Exception {
+        AbstractParty party = message.getBody(AbstractParty.class);
+        message.setBody(cordaRPCOps.wellKnownPartyFromAnonymous(party));
+    }
+
+    @InvokeOnHeader(CordaConstants.START_FLOW_DYNAMIC)
+    void startFlowDynamic(Message message) throws Exception {
+        Object [] args = message.getHeader(ARGUMENTS, Object [].class);
+        Class<FlowLogic<?>> aClass = message.getBody(Class.class);
+        message.setBody(cordaRPCOps.startFlowDynamic(aClass, args).getReturnValue().get());
+    }
+
+    @InvokeOnHeader(CordaConstants.VAULT_QUERY)
+    void vaultQuery(Message message) throws Exception {
+        Class<ContractState> contractStateClass = (Class<ContractState>) message.getBody(Class.class);
+        message.setBody(cordaRPCOps.vaultQuery(contractStateClass));
+    }
+
+    @InvokeOnHeader(CordaConstants.VAULT_QUERY_BY)
+    void vaultQueryBy(Message message) throws Exception {
+        Class<ContractState> contractStateClass = (Class<ContractState>) message.getBody(Class.class);
+        QueryCriteria criteria = message.getHeader(QUERY_CRITERIA, QueryCriteria.class);
+        PageSpecification pageSpec = message.getHeader(PAGE_SPECIFICATION, PageSpecification.class);
+        Sort sorting = message.getHeader(SORT, Sort.class);
+        message.setBody(cordaRPCOps.vaultQueryBy(criteria, pageSpec, sorting, contractStateClass));
+    }
+
+    @InvokeOnHeader(CordaConstants.VAULT_QUERY_BY_CRITERIA)
+    void vaultQueryByCriteria(Message message) throws Exception {
+        Class<ContractState> contractStateClass = (Class<ContractState>) message.getBody(Class.class);
+        QueryCriteria criteria = message.getHeader(QUERY_CRITERIA, QueryCriteria.class);
+        message.setBody(cordaRPCOps.vaultQueryByCriteria(criteria, contractStateClass));
+    }
+
+    @InvokeOnHeader(CordaConstants.VAULT_QUERY_BY_WITH_PAGING_SPEC)
+    void vaultQueryByWithPagingSpec(Message message) throws Exception {
+        Class<ContractState> contractStateClass = (Class<ContractState>) message.getBody(Class.class);
+        QueryCriteria criteria = message.getHeader(QUERY_CRITERIA, QueryCriteria.class);
+        PageSpecification pageSpec = message.getHeader(PAGE_SPECIFICATION, PageSpecification.class);
+        message.setBody(cordaRPCOps.vaultQueryByWithPagingSpec(contractStateClass, criteria, pageSpec));
+    }
+
+    @InvokeOnHeader(CordaConstants.VAULT_QUERY_BY_WITH_SORTING)
+    void vaultQueryByWithSorting(Message message) throws Exception {
+        Class<ContractState> contractStateClass = (Class<ContractState>) message.getBody(Class.class);
+        QueryCriteria criteria = message.getHeader(QUERY_CRITERIA, QueryCriteria.class);
+        Sort sorting = message.getHeader(SORT, Sort.class);
+        message.setBody(cordaRPCOps.vaultQueryByWithSorting(contractStateClass, criteria, sorting));
+    }
+}
diff --git a/components/camel-corda/src/main/resources/META-INF/LICENSE.txt b/components/camel-corda/src/main/resources/META-INF/LICENSE.txt
new file mode 100755
index 0000000000000..6b0b1270ff0ca
--- /dev/null
+++ b/components/camel-corda/src/main/resources/META-INF/LICENSE.txt
@@ -0,0 +1,203 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed 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.
+
diff --git a/components/camel-corda/src/main/resources/META-INF/NOTICE.txt b/components/camel-corda/src/main/resources/META-INF/NOTICE.txt
new file mode 100755
index 0000000000000..2e215bf2e6b1f
--- /dev/null
+++ b/components/camel-corda/src/main/resources/META-INF/NOTICE.txt
@@ -0,0 +1,11 @@
+   =========================================================================
+   ==  NOTICE file corresponding to the section 4 d of                    ==
+   ==  the Apache License, Version 2.0,                                   ==
+   ==  in this case for the Apache Camel distribution.                    ==
+   =========================================================================
+
+   This product includes software developed by
+   The Apache Software Foundation (http://www.apache.org/).
+
+   Please read the different LICENSE files present in the licenses directory of
+   this distribution.
diff --git a/components/camel-corda/src/main/resources/META-INF/services/org/apache/camel/component/corda b/components/camel-corda/src/main/resources/META-INF/services/org/apache/camel/component/corda
new file mode 100755
index 0000000000000..b7423d9f97411
--- /dev/null
+++ b/components/camel-corda/src/main/resources/META-INF/services/org/apache/camel/component/corda
@@ -0,0 +1,18 @@
+#
+# 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.
+#
+
+class=org.apache.camel.component.corda.CordaComponent
diff --git a/components/camel-corda/src/test/java/org/apache/camel/component/corda/CamelFlow.java b/components/camel-corda/src/test/java/org/apache/camel/component/corda/CamelFlow.java
new file mode 100644
index 0000000000000..fc3a001212179
--- /dev/null
+++ b/components/camel-corda/src/test/java/org/apache/camel/component/corda/CamelFlow.java
@@ -0,0 +1,32 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.corda;
+
+import net.corda.core.flows.FlowLogic;
+
+public class CamelFlow extends FlowLogic<String> {
+    private String in;
+
+    public CamelFlow(String in) {
+        this.in = in;
+    }
+
+    @Override
+    public String call() {
+        return in + " world!";
+    }
+}
diff --git a/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerNetworkMapFeedTest.java b/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerNetworkMapFeedTest.java
new file mode 100644
index 0000000000000..a08c90a553106
--- /dev/null
+++ b/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerNetworkMapFeedTest.java
@@ -0,0 +1,49 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.corda;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import static org.apache.camel.component.corda.CordaConstants.NETWORK_MAP_FEED;
+import static org.apache.camel.component.corda.CordaConstants.OPERATION;
+import static org.apache.camel.component.corda.CordaConstants.STATE_MACHINE_FEED;
+
+@Ignore("This integration test requires a locally running corda node such cordapp-template-java")
+public class CordaConsumerNetworkMapFeedTest extends CordaConsumerTestSupport {
+
+    @Test
+    public void networkMapFeedTest() throws Exception {
+        mockResult.expectedMinimumMessageCount(1);
+        mockError.expectedMessageCount(0);
+        MockEndpoint.assertIsSatisfied(context);
+    }
+
+    @Override
+    protected RouteBuilder createRouteBuilder() throws Exception {
+        return new RouteBuilder() {
+            public void configure() {
+                errorHandler(deadLetterChannel("mock:error"));
+
+                from(getUrl() + "&" + OPERATION.toLowerCase() + "=" + NETWORK_MAP_FEED)
+                        .to("mock:result");
+            }
+        };
+    }
+}
diff --git a/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerStartTrackedFlowDynamicTest.java b/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerStartTrackedFlowDynamicTest.java
new file mode 100644
index 0000000000000..96a01825000c5
--- /dev/null
+++ b/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerStartTrackedFlowDynamicTest.java
@@ -0,0 +1,54 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.corda;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import static org.apache.camel.component.corda.CordaConstants.OPERATION;
+import static org.apache.camel.component.corda.CordaConstants.START_TRACKED_FLOW_DYNAMIC;
+import static org.apache.camel.component.corda.CordaConstants.VAULT_TRACK_BY;
+
+@Ignore("This integration test requires a locally running corda node such cordapp-template-java")
+public class CordaConsumerStartTrackedFlowDynamicTest extends CordaConsumerTestSupport {
+
+
+    @Test
+    public void startTrackedFlowDynamicTest() throws Exception {
+        //Expects CamelFlow is deployed on the node
+        mockResult.expectedMinimumMessageCount(1);
+        mockError.expectedMessageCount(0);
+        MockEndpoint.assertIsSatisfied(context);
+        assertEquals("Hello world!", mockResult.getExchanges().get(0).getIn().getBody());
+    }
+
+    @Override
+    protected RouteBuilder createRouteBuilder() throws Exception {
+        return new RouteBuilder() {
+            public void configure() {
+                errorHandler(deadLetterChannel("mock:error"));
+
+                from(getUrl() + "&" + OPERATION.toLowerCase() + "=" + START_TRACKED_FLOW_DYNAMIC
+                    + "&flowLociClass=#flowLociClass"
+                    + "&arguments=#arguments")
+                        .to("mock:result");
+            }
+        };
+    }
+}
diff --git a/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerStateMachineFeedTest.java b/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerStateMachineFeedTest.java
new file mode 100644
index 0000000000000..eefc988857ded
--- /dev/null
+++ b/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerStateMachineFeedTest.java
@@ -0,0 +1,49 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.corda;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import static org.apache.camel.component.corda.CordaConstants.OPERATION;
+import static org.apache.camel.component.corda.CordaConstants.STATE_MACHINE_FEED;
+import static org.apache.camel.component.corda.CordaConstants.VAULT_TRACK_BY;
+
+@Ignore("This integration test requires a locally running corda node such cordapp-template-java")
+public class CordaConsumerStateMachineFeedTest extends CordaConsumerTestSupport {
+
+    @Test
+    public void stateMachineFeedTest() throws Exception {
+        mockResult.expectedMinimumMessageCount(1);
+        mockError.expectedMessageCount(0);
+        MockEndpoint.assertIsSatisfied(context);
+    }
+
+    @Override
+    protected RouteBuilder createRouteBuilder() throws Exception {
+        return new RouteBuilder() {
+            public void configure() {
+                errorHandler(deadLetterChannel("mock:error"));
+
+                from(getUrl() + "&" + OPERATION.toLowerCase() + "=" + STATE_MACHINE_FEED)
+                        .to("mock:result");
+            }
+        };
+    }
+}
diff --git a/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerTestSupport.java b/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerTestSupport.java
new file mode 100644
index 0000000000000..c27dd12c408ad
--- /dev/null
+++ b/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerTestSupport.java
@@ -0,0 +1,62 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.corda;
+
+import com.google.common.collect.ImmutableSet;
+import net.corda.core.contracts.OwnableState;
+import net.corda.core.flows.FlowLogic;
+import net.corda.core.node.services.Vault;
+import net.corda.core.node.services.vault.PageSpecification;
+import net.corda.core.node.services.vault.QueryCriteria;
+import net.corda.core.node.services.vault.Sort;
+import net.corda.core.node.services.vault.SortAttribute;
+import org.apache.camel.impl.JndiRegistry;
+import org.junit.Ignore;
+
+import static net.corda.core.node.services.vault.QueryCriteriaUtils.DEFAULT_PAGE_NUM;
+import static net.corda.core.node.services.vault.QueryCriteriaUtils.MAX_PAGE_SIZE;
+
+@Ignore("This integration test requires a locally running corda node such cordapp-template-java")
+public class CordaConsumerTestSupport extends CordaTestSupport {
+
+    @Override
+    public boolean isUseAdviceWith() {
+        return false;
+    }
+
+    @Override
+    protected JndiRegistry createRegistry() throws Exception {
+        JndiRegistry registry = super.createRegistry();
+
+        String [] args = new String[] {"Hello"};
+        Class<FlowLogic<String>> flowLociClass = (Class<FlowLogic<String>>) Class.forName("org.apache.camel.component.corda.CamelFlow");
+
+        QueryCriteria.VaultQueryCriteria criteria = new QueryCriteria.VaultQueryCriteria(Vault.StateStatus.CONSUMED);
+        PageSpecification pageSpec = new PageSpecification(DEFAULT_PAGE_NUM, MAX_PAGE_SIZE);
+        Sort.SortColumn sortByUid = new Sort.SortColumn(new SortAttribute.Standard(Sort.LinearStateAttribute.UUID), Sort.Direction.DESC);
+        Sort sort = new Sort(ImmutableSet.of(sortByUid));
+
+        registry.bind("contractStateClass", OwnableState.class);
+        registry.bind("queryCriteria", criteria);
+        registry.bind("pageSpecification", pageSpec);
+        registry.bind("sort", sort);
+        registry.bind("flowLociClass", flowLociClass);
+        registry.bind("arguments", args);
+        return registry;
+    }
+
+}
diff --git a/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerTransactionMapFeedTest.java b/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerTransactionMapFeedTest.java
new file mode 100644
index 0000000000000..2e6c3005bfda6
--- /dev/null
+++ b/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerTransactionMapFeedTest.java
@@ -0,0 +1,49 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.corda;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import static org.apache.camel.component.corda.CordaConstants.NETWORK_MAP_FEED;
+import static org.apache.camel.component.corda.CordaConstants.OPERATION;
+import static org.apache.camel.component.corda.CordaConstants.STATE_MACHINE_RECORDED_TRANSACTION_MAPPING_FEED;
+
+@Ignore("This integration test requires a locally running corda node such cordapp-template-java")
+public class CordaConsumerTransactionMapFeedTest extends CordaConsumerTestSupport {
+
+    @Test
+    public void transactionMapFeedTest() throws Exception {
+        mockResult.expectedMinimumMessageCount(1);
+        mockError.expectedMessageCount(0);
+        MockEndpoint.assertIsSatisfied(context);
+    }
+
+    @Override
+    protected RouteBuilder createRouteBuilder() throws Exception {
+        return new RouteBuilder() {
+            public void configure() {
+                errorHandler(deadLetterChannel("mock:error"));
+
+                from(getUrl() + "&" + OPERATION.toLowerCase() + "=" + STATE_MACHINE_RECORDED_TRANSACTION_MAPPING_FEED)
+                        .to("mock:result");
+            }
+        };
+    }
+}
diff --git a/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerVaultTrackByCriteriaTest.java b/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerVaultTrackByCriteriaTest.java
new file mode 100644
index 0000000000000..d7048f0357cf8
--- /dev/null
+++ b/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerVaultTrackByCriteriaTest.java
@@ -0,0 +1,51 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.corda;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import static org.apache.camel.component.corda.CordaConstants.OPERATION;
+import static org.apache.camel.component.corda.CordaConstants.VAULT_TRACK_BY;
+import static org.apache.camel.component.corda.CordaConstants.VAULT_TRACK_BY_CRITERIA;
+
+@Ignore("This integration test requires a locally running corda node such cordapp-template-java")
+public class CordaConsumerVaultTrackByCriteriaTest extends CordaConsumerTestSupport {
+
+    @Test
+    public void vaultTrackByCriteriaTest() throws Exception {
+        mockResult.expectedMinimumMessageCount(1);
+        mockError.expectedMessageCount(0);
+        MockEndpoint.assertIsSatisfied(context);
+    }
+
+    @Override
+    protected RouteBuilder createRouteBuilder() throws Exception {
+        return new RouteBuilder() {
+            public void configure() {
+                errorHandler(deadLetterChannel("mock:error"));
+
+                from(getUrl() + "&" + OPERATION.toLowerCase() + "=" + VAULT_TRACK_BY_CRITERIA
+                        + "&contractStateClass=#contractStateClass"
+                        + "&queryCriteria=#queryCriteria")
+                        .to("mock:result");
+            }
+        };
+    }
+}
diff --git a/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerVaultTrackByTest.java b/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerVaultTrackByTest.java
new file mode 100644
index 0000000000000..cbef3beb5d77e
--- /dev/null
+++ b/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerVaultTrackByTest.java
@@ -0,0 +1,53 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.corda;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import static org.apache.camel.component.corda.CordaConstants.OPERATION;
+import static org.apache.camel.component.corda.CordaConstants.VAULT_TRACK;
+import static org.apache.camel.component.corda.CordaConstants.VAULT_TRACK_BY;
+
+@Ignore("This integration test requires a locally running corda node such cordapp-template-java")
+public class CordaConsumerVaultTrackByTest extends CordaConsumerTestSupport {
+
+    @Test
+    public void vaultTrackByTest() throws Exception {
+        mockResult.expectedMinimumMessageCount(1);
+        mockError.expectedMessageCount(0);
+        MockEndpoint.assertIsSatisfied(context);
+    }
+
+    @Override
+    protected RouteBuilder createRouteBuilder() throws Exception {
+        return new RouteBuilder() {
+            public void configure() {
+                errorHandler(deadLetterChannel("mock:error"));
+
+                from(getUrl() + "&" + OPERATION.toLowerCase() + "=" + VAULT_TRACK_BY
+                        + "&contractStateClass=#contractStateClass"
+                        + "&queryCriteria=#queryCriteria"
+                        + "&pageSpecification=#pageSpecification"
+                        + "&sort=#sort")
+                        .to("mock:result");
+            }
+        };
+    }
+}
diff --git a/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerVaultTrackByWithPagingSpecTest.java b/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerVaultTrackByWithPagingSpecTest.java
new file mode 100644
index 0000000000000..b2fefac4d0508
--- /dev/null
+++ b/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerVaultTrackByWithPagingSpecTest.java
@@ -0,0 +1,52 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.corda;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import static org.apache.camel.component.corda.CordaConstants.OPERATION;
+import static org.apache.camel.component.corda.CordaConstants.VAULT_TRACK_BY;
+import static org.apache.camel.component.corda.CordaConstants.VAULT_TRACK_BY_WITH_PAGING_SPEC;
+
+@Ignore("This integration test requires a locally running corda node such cordapp-template-java")
+public class CordaConsumerVaultTrackByWithPagingSpecTest extends CordaConsumerTestSupport {
+
+    @Test
+    public void vaultTrackByWithPagingSpecTest() throws Exception {
+        mockResult.expectedMinimumMessageCount(1);
+        mockError.expectedMessageCount(0);
+        MockEndpoint.assertIsSatisfied(context);
+    }
+
+    @Override
+    protected RouteBuilder createRouteBuilder() throws Exception {
+        return new RouteBuilder() {
+            public void configure() {
+                errorHandler(deadLetterChannel("mock:error"));
+
+                from(getUrl() + "&" + OPERATION.toLowerCase() + "=" + VAULT_TRACK_BY_WITH_PAGING_SPEC
+                        + "&contractStateClass=#contractStateClass"
+                        + "&queryCriteria=#queryCriteria"
+                        + "&pageSpecification=#pageSpecification")
+                        .to("mock:result");
+            }
+        };
+    }
+}
diff --git a/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerVaultTrackByWithSortingTest.java b/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerVaultTrackByWithSortingTest.java
new file mode 100644
index 0000000000000..4835ee0a1ab6e
--- /dev/null
+++ b/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerVaultTrackByWithSortingTest.java
@@ -0,0 +1,52 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.corda;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import static org.apache.camel.component.corda.CordaConstants.OPERATION;
+import static org.apache.camel.component.corda.CordaConstants.VAULT_TRACK_BY;
+import static org.apache.camel.component.corda.CordaConstants.VAULT_TRACK_BY_WITH_SORTING;
+
+@Ignore("This integration test requires a locally running corda node such cordapp-template-java")
+public class CordaConsumerVaultTrackByWithSortingTest extends CordaConsumerTestSupport {
+
+    @Test
+    public void vaultTrackByWithSortingTest() throws Exception {
+        mockResult.expectedMinimumMessageCount(1);
+        mockError.expectedMessageCount(0);
+        MockEndpoint.assertIsSatisfied(context);
+    }
+
+    @Override
+    protected RouteBuilder createRouteBuilder() throws Exception {
+        return new RouteBuilder() {
+            public void configure() {
+                errorHandler(deadLetterChannel("mock:error"));
+
+                from(getUrl() + "&" + OPERATION.toLowerCase() + "=" + VAULT_TRACK_BY_WITH_SORTING
+                        + "&contractStateClass=#contractStateClass"
+                        + "&queryCriteria=#queryCriteria"
+                        + "&sort=#sort")
+                        .to("mock:result");
+            }
+        };
+    }
+}
diff --git a/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerVaultTrackTest.java b/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerVaultTrackTest.java
new file mode 100644
index 0000000000000..b5ffa4304153c
--- /dev/null
+++ b/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaConsumerVaultTrackTest.java
@@ -0,0 +1,49 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.corda;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import static org.apache.camel.component.corda.CordaConstants.OPERATION;
+import static org.apache.camel.component.corda.CordaConstants.VAULT_TRACK;
+
+@Ignore("This integration test requires a locally running corda node such cordapp-template-java")
+public class CordaConsumerVaultTrackTest extends CordaConsumerTestSupport {
+
+    @Test
+    public void vaultTrackTest() throws Exception {
+        mockResult.expectedMinimumMessageCount(1);
+        mockError.expectedMessageCount(0);
+        MockEndpoint.assertIsSatisfied(context);
+    }
+
+    @Override
+    protected RouteBuilder createRouteBuilder() throws Exception {
+        return new RouteBuilder() {
+            public void configure() {
+                errorHandler(deadLetterChannel("mock:error"));
+
+                from(getUrl() + "&" + OPERATION.toLowerCase() + "=" + VAULT_TRACK
+                        + "&contractStateClass=#contractStateClass")
+                        .to("mock:result");
+            }
+        };
+    }
+}
diff --git a/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaProducerTest.java b/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaProducerTest.java
new file mode 100644
index 0000000000000..c76a663a4a677
--- /dev/null
+++ b/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaProducerTest.java
@@ -0,0 +1,498 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.corda;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.security.KeyPair;
+import java.security.KeyPairGenerator;
+import java.security.NoSuchAlgorithmException;
+import java.security.PublicKey;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipOutputStream;
+import com.google.common.collect.ImmutableSet;
+import net.corda.core.contracts.OwnableState;
+import net.corda.core.crypto.SecureHash;
+import net.corda.core.flows.FlowLogic;
+import net.corda.core.identity.AbstractParty;
+import net.corda.core.identity.AnonymousParty;
+import net.corda.core.identity.CordaX500Name;
+import net.corda.core.identity.Party;
+import net.corda.core.node.services.Vault;
+import net.corda.core.node.services.vault.AttachmentQueryCriteria;
+import net.corda.core.node.services.vault.AttachmentSort;
+import net.corda.core.node.services.vault.ColumnPredicate;
+import net.corda.core.node.services.vault.EqualityComparisonOperator;
+import net.corda.core.node.services.vault.PageSpecification;
+import net.corda.core.node.services.vault.QueryCriteria;
+import net.corda.core.node.services.vault.Sort;
+import net.corda.core.node.services.vault.SortAttribute;
+import org.apache.camel.Exchange;
+import org.apache.camel.Produce;
+import org.apache.camel.ProducerTemplate;
+import org.apache.camel.builder.RouteBuilder;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import static net.corda.core.node.services.vault.QueryCriteriaUtils.DEFAULT_PAGE_NUM;
+import static net.corda.core.node.services.vault.QueryCriteriaUtils.MAX_PAGE_SIZE;
+import static org.apache.camel.component.corda.CordaConstants.ADD_VAULT_TRANSACTION_NOTE;
+import static org.apache.camel.component.corda.CordaConstants.ARGUMENTS;
+import static org.apache.camel.component.corda.CordaConstants.ATTACHMENT_EXISTS;
+import static org.apache.camel.component.corda.CordaConstants.ATTACHMENT_QUERY_CRITERIA;
+import static org.apache.camel.component.corda.CordaConstants.CLEAR_NETWORK_MAP_CACHE;
+import static org.apache.camel.component.corda.CordaConstants.CURRENT_NODE_TIME;
+import static org.apache.camel.component.corda.CordaConstants.DRAINING_MODE;
+import static org.apache.camel.component.corda.CordaConstants.EXACT_MATCH;
+import static org.apache.camel.component.corda.CordaConstants.GET_PROTOCOL_VERSION;
+import static org.apache.camel.component.corda.CordaConstants.GET_VAULT_TRANSACTION_NOTES;
+import static org.apache.camel.component.corda.CordaConstants.IS_FLOWS_DRAINING_MODE_ENABLED;
+import static org.apache.camel.component.corda.CordaConstants.NETWORK_MAP_SNAPSHOT;
+import static org.apache.camel.component.corda.CordaConstants.NODE_INFO;
+import static org.apache.camel.component.corda.CordaConstants.NODE_INFO_FROM_PARTY;
+import static org.apache.camel.component.corda.CordaConstants.NOTARY_IDENTITIES;
+import static org.apache.camel.component.corda.CordaConstants.NOTARY_PARTY_FROM_X500_NAME;
+import static org.apache.camel.component.corda.CordaConstants.OPEN_ATTACHMENT;
+import static org.apache.camel.component.corda.CordaConstants.OPERATION;
+import static org.apache.camel.component.corda.CordaConstants.PAGE_SPECIFICATION;
+import static org.apache.camel.component.corda.CordaConstants.PARTIES_FROM_KEY;
+import static org.apache.camel.component.corda.CordaConstants.PARTIES_FROM_NAME;
+import static org.apache.camel.component.corda.CordaConstants.QUERY_ATTACHMENTS;
+import static org.apache.camel.component.corda.CordaConstants.QUERY_CRITERIA;
+import static org.apache.camel.component.corda.CordaConstants.REGISTERED_FLOWS;
+import static org.apache.camel.component.corda.CordaConstants.SECURE_HASH;
+import static org.apache.camel.component.corda.CordaConstants.SET_FLOWS_DRAINING_MODE_ENABLED;
+import static org.apache.camel.component.corda.CordaConstants.SORT;
+import static org.apache.camel.component.corda.CordaConstants.START_FLOW_DYNAMIC;
+import static org.apache.camel.component.corda.CordaConstants.STATE_MACHINE_RECORDED_TRANSACTION_MAPPING_SNAPSHOT;
+import static org.apache.camel.component.corda.CordaConstants.STATE_MACHINE_SNAPSHOT;
+import static org.apache.camel.component.corda.CordaConstants.UPLOAD_ATTACHMENT;
+import static org.apache.camel.component.corda.CordaConstants.VAULT_QUERY;
+import static org.apache.camel.component.corda.CordaConstants.VAULT_QUERY_BY;
+import static org.apache.camel.component.corda.CordaConstants.VAULT_QUERY_BY_CRITERIA;
+import static org.apache.camel.component.corda.CordaConstants.VAULT_QUERY_BY_WITH_PAGING_SPEC;
+import static org.apache.camel.component.corda.CordaConstants.VAULT_QUERY_BY_WITH_SORTING;
+import static org.apache.camel.component.corda.CordaConstants.WELL_KNOWN_PARTY_FROM_ANONYMOUS;
+import static org.apache.camel.component.corda.CordaConstants.WELL_KNOWN_PARTY_FROM_X500_NAME;
+
+@Ignore("This integration test requires a locally running corda node such cordapp-template-java")
+public class CordaProducerTest extends CordaTestSupport {
+    private static final SecureHash.SHA256 TEST_SHA_256 = SecureHash.parse("6D1687C143DF792A011A1E80670A4E4E0C25D0D87A39514409B1ABFC2043581F");
+
+    @Produce(uri = "direct:start")
+    protected ProducerTemplate template;
+
+    @Override
+    public boolean isUseAdviceWith() {
+        return false;
+    }
+
+    @Test
+    public void currentNodeTimeTest() throws Exception {
+        Exchange exchange = createExchangeWithBodyAndHeader(null, OPERATION, CURRENT_NODE_TIME);
+        template.send(exchange);
+        Object body = exchange.getIn().getBody();
+        assertNotNull(body);
+        Object exception = exchange.getException();
+        assertNull(exception);
+    }
+
+    @Test
+    public void getProtocolVersionTest() throws Exception {
+        Exchange exchange = createExchangeWithBodyAndHeader(null, OPERATION, GET_PROTOCOL_VERSION);
+        template.send(exchange);
+        Object body = exchange.getIn().getBody();
+        assertNotNull(body);
+        Object exception = exchange.getException();
+        assertNull(exception);
+    }
+
+    @Test
+    public void networkMapSnapshotTest() throws Exception {
+        Exchange exchange = createExchangeWithBodyAndHeader(null, OPERATION, NETWORK_MAP_SNAPSHOT);
+        template.send(exchange);
+        Object body = exchange.getIn().getBody();
+        assertNotNull(body);
+        Object exception = exchange.getException();
+        assertNull(exception);
+    }
+
+    @Test
+    public void stateMachinesSnapshotTest() throws Exception {
+        Exchange exchange = createExchangeWithBodyAndHeader(null, OPERATION, STATE_MACHINE_SNAPSHOT);
+        template.send(exchange);
+        Object body = exchange.getIn().getBody();
+        assertNotNull(body);
+        Object exception = exchange.getException();
+        assertNull(exception);
+    }
+
+    @Test
+    public void stateMachineRecordedTransactionMappingSnapshotTest() throws Exception {
+        Exchange exchange = createExchangeWithBodyAndHeader(null, OPERATION, STATE_MACHINE_RECORDED_TRANSACTION_MAPPING_SNAPSHOT);
+        template.send(exchange);
+        Object body = exchange.getIn().getBody();
+        assertNotNull(body);
+        Object exception = exchange.getException();
+        assertNull(exception);
+    }
+
+    @Test
+    public void registeredFlowsTest() throws Exception {
+        Exchange exchange = createExchangeWithBodyAndHeader(null, OPERATION, REGISTERED_FLOWS);
+        template.send(exchange);
+        Object body = exchange.getIn().getBody();
+        assertNotNull(body);
+        Object exception = exchange.getException();
+        assertNull(exception);
+    }
+
+    @Test
+    public void clearNetworkMapCacheTest() throws Exception {
+        Exchange exchange = createExchangeWithBodyAndHeader(null, OPERATION, CLEAR_NETWORK_MAP_CACHE);
+        template.send(exchange);
+        Object body = exchange.getException();
+        assertNull(body);
+        Object exception = exchange.getException();
+        assertNull(exception);
+    }
+
+    @Test
+    public void isFlowsDrainingModeEnabledTest() throws Exception {
+        Exchange exchange = createExchangeWithBodyAndHeader(null, OPERATION, IS_FLOWS_DRAINING_MODE_ENABLED);
+        template.send(exchange);
+        Object body = exchange.getIn().getBody();
+        assertNotNull(body);
+        Object exception = exchange.getException();
+        assertNull(exception);
+    }
+
+    @Test
+    public void setFlowsDrainingModeEnabledTest() throws Exception {
+        Exchange exchange = createExchangeWithBodyAndHeader(null, OPERATION, SET_FLOWS_DRAINING_MODE_ENABLED);
+        exchange.getIn().setHeader(DRAINING_MODE, false);
+        template.send(exchange);
+        Object exception = exchange.getException();
+        assertNull(exception);
+    }
+
+    @Test
+    public void notaryIdentitiesTest() throws Exception {
+        Exchange exchange = createExchangeWithBodyAndHeader(null, OPERATION, NOTARY_IDENTITIES);
+        template.send(exchange);
+        Object body = exchange.getIn().getBody();
+        assertNotNull(body);
+        Object exception = exchange.getException();
+        assertNull(exception);
+    }
+
+    @Test
+    public void nodeInfoTest() throws Exception {
+        Exchange exchange = createExchangeWithBodyAndHeader(null, OPERATION, NODE_INFO);
+        template.send(exchange);
+        Object body = exchange.getIn().getBody();
+        assertNotNull(body);
+        Object exception = exchange.getException();
+        assertNull(exception);
+    }
+
+    @Test
+    public void addVaultTransactionNoteTest() throws Exception {
+        Exchange exchange = createExchangeWithBodyAndHeader("Some note", OPERATION, ADD_VAULT_TRANSACTION_NOTE);
+
+        exchange.getIn().setHeader(SECURE_HASH, TEST_SHA_256);
+        template.send(exchange);
+        Object exception = exchange.getException();
+        assertNull(exception);
+    }
+
+    @Test
+    public void getVaultTransactionNotesTest() throws Exception {
+        Exchange exchange = createExchangeWithBodyAndHeader(null, OPERATION, GET_VAULT_TRANSACTION_NOTES);
+
+        exchange.getIn().setHeader(SECURE_HASH, TEST_SHA_256);
+        template.send(exchange);
+        Object body = exchange.getIn().getBody();
+        assertNotNull(body);
+        Object exception = exchange.getException();
+        assertNull(exception);
+    }
+
+    @Test
+    public void uploadAttachmentTest() throws Exception {
+        Exchange exchange = createExchangeWithBodyAndHeader(null, OPERATION, UPLOAD_ATTACHMENT);
+        exchange.getIn().setBody(zipIt("HELLO" + System.nanoTime(), "test1.txt"));
+        template.send(exchange);
+
+        Object body = exchange.getIn().getHeader(SECURE_HASH);
+        assertNotNull(body);
+        Object exception = exchange.getException();
+        assertNull(exception);
+    }
+
+    @Test
+    public void attachmentExistsTest() throws Exception {
+        Exchange exchange = createExchangeWithBodyAndHeader(null, OPERATION, ATTACHMENT_EXISTS);
+        exchange.getIn().setHeader(SECURE_HASH, TEST_SHA_256);
+
+        template.send(exchange);
+
+        Boolean body = exchange.getIn().getBody(Boolean.class);
+        assertNotNull(body);
+        Object exception = exchange.getException();
+        assertNull(exception);
+    }
+
+    @Test
+    public void openAttachmentTest() throws Exception {
+        //Setup node with attachment
+        Exchange uploadExchange = createExchangeWithBodyAndHeader(null, OPERATION, UPLOAD_ATTACHMENT);
+        uploadExchange.getIn().setBody(zipIt("HELLO" + System.nanoTime(), "test2.txt"));
+        template.send(uploadExchange);
+
+        Object hash = uploadExchange.getIn().getHeader(SECURE_HASH);
+        Exchange exchange = createExchangeWithBodyAndHeader(null, OPERATION, OPEN_ATTACHMENT);
+        exchange.getIn().setHeader(SECURE_HASH, hash);
+
+        template.send(exchange);
+
+        InputStream body = exchange.getIn().getBody(InputStream.class);
+        assertNotNull(body);
+        Object exception = exchange.getException();
+        assertNull(exception);
+    }
+
+    @Test
+    public void queryAttachmentsTest() throws Exception {
+        Exchange exchange = createExchangeWithBodyAndHeader(null, OPERATION, QUERY_ATTACHMENTS);
+        AttachmentQueryCriteria.AttachmentsQueryCriteria queryCriteria =
+                new AttachmentQueryCriteria.AttachmentsQueryCriteria(
+                        new ColumnPredicate.EqualityComparison(EqualityComparisonOperator.EQUAL, "Daredevil"));
+        AttachmentSort attachmentSort = null;
+
+        exchange.getIn().setHeader(ATTACHMENT_QUERY_CRITERIA, queryCriteria);
+        exchange.getIn().setHeader(SORT, attachmentSort);
+
+        template.send(exchange);
+        Object body = exchange.getIn().getBody();
+        assertNotNull(body);
+        Object exception = exchange.getException();
+        assertNull(exception);
+    }
+
+    @Test
+    public void nodeInfoFromPartyTest() throws Exception {
+        //Expects IntegrationWhiteList is deployed on the node
+        Exchange exchange = createExchangeWithBodyAndHeader(null, OPERATION, NODE_INFO_FROM_PARTY);
+        PublicKey pub = generatePublicKey();
+        CordaX500Name cordaX500Name1 = new CordaX500Name("PartyA", "London", "GB");
+        Party party = new Party(cordaX500Name1, pub);
+        exchange.getIn().setBody(party);
+
+        template.send(exchange);
+        Object exception = exchange.getException();
+        assertNull(exception);
+    }
+
+    @Test
+    public void notaryPartyFromX500NameTest() throws Exception {
+        Exchange exchange = createExchangeWithBodyAndHeader(null, OPERATION, NOTARY_PARTY_FROM_X500_NAME);
+        CordaX500Name cordaX500Name = new CordaX500Name("Notary", "London", "GB");
+        exchange.getIn().setBody(cordaX500Name);
+
+        template.send(exchange);
+        Object body = exchange.getIn().getBody();
+        assertNotNull(body);
+        Object exception = exchange.getException();
+        assertNull(exception);
+    }
+
+    @Test
+    public void partiesFromNameTest() throws Exception {
+        Exchange exchange = createExchangeWithBodyAndHeader("A", OPERATION, PARTIES_FROM_NAME);
+        exchange.getIn().setHeader(EXACT_MATCH, false);
+
+        template.send(exchange);
+        Object body = exchange.getIn().getBody();
+        assertNotNull(body);
+        Object exception = exchange.getException();
+        assertNull(exception);
+    }
+
+    @Test
+    public void partyFromKeyTest() throws Exception {
+        //Expects IntegrationWhiteList is deployed on the node
+        Exchange exchange = createExchangeWithBodyAndHeader(null, OPERATION, PARTIES_FROM_KEY);
+        PublicKey pub = generatePublicKey();
+        exchange.getIn().setBody(pub);
+
+        template.send(exchange);
+        Object exception = exchange.getException();
+        assertNull(exception);
+    }
+
+    @Test
+    public void wellKnownPartyFromX500NameTest() throws Exception {
+        Exchange exchange = createExchangeWithBodyAndHeader(null, OPERATION, WELL_KNOWN_PARTY_FROM_X500_NAME);
+        CordaX500Name cordaX500Name1 = new CordaX500Name("PartyA", "London", "GB");
+        exchange.getIn().setBody(cordaX500Name1);
+
+        template.send(exchange);
+        Object body = exchange.getIn().getBody();
+        assertNotNull(body);
+        Object exception = exchange.getException();
+        assertNull(exception);
+    }
+
+    @Test
+    public void wellKnownPartyFromAnonymousTest() throws Exception {
+        //Expects IntegrationWhiteList is deployed on the node
+        Exchange exchange = createExchangeWithBodyAndHeader(null, OPERATION, WELL_KNOWN_PARTY_FROM_ANONYMOUS);
+        PublicKey pub = generatePublicKey();
+
+        AbstractParty party = new AnonymousParty(pub);
+        exchange.getIn().setBody(party);
+
+        template.send(exchange);
+        Object exception = exchange.getException();
+        assertNull(exception);
+    }
+
+    @Test
+    public void startFlowDynamicTest() throws Exception {
+        //Expects CamelFlow is deployed on the node
+        Exchange exchange = createExchangeWithBodyAndHeader(null, OPERATION, START_FLOW_DYNAMIC);
+        String [] args = new String[] {"Hello"};
+        Class<FlowLogic<String>> aClass = (Class<FlowLogic<String>>) Class.forName("org.apache.camel.component.corda.CamelFlow");
+        exchange.getIn().setBody(aClass);
+        exchange.getIn().setHeader(ARGUMENTS, args);
+
+        template.send(exchange);
+        Object body = exchange.getIn().getBody();
+        assertNotNull(body);
+        assertEquals("Hello world!", body.toString());
+        Object exception = exchange.getException();
+        assertNull(exception);
+    }
+
+    @Test
+    public void vaultQueryTest() throws Exception {
+        Exchange exchange = createExchangeWithBodyAndHeader(OwnableState.class, OPERATION, VAULT_QUERY);
+
+        template.send(exchange);
+        Object body = exchange.getIn().getBody();
+        assertNotNull(body);
+        Object exception = exchange.getException();
+        assertNull(exception);
+    }
+
+    @Test
+    public void vaultQueryByTest() throws Exception {
+        Exchange exchange = createExchangeWithBodyAndHeader(OwnableState.class, OPERATION, VAULT_QUERY_BY);
+        QueryCriteria.VaultQueryCriteria criteria = new QueryCriteria.VaultQueryCriteria(Vault.StateStatus.CONSUMED);
+        PageSpecification pageSpec = new PageSpecification(DEFAULT_PAGE_NUM, MAX_PAGE_SIZE);
+        Sort.SortColumn sortByUid = new Sort.SortColumn(new SortAttribute.Standard(Sort.LinearStateAttribute.UUID), Sort.Direction.DESC);
+        Sort sorting = new Sort(ImmutableSet.of(sortByUid));
+        exchange.getIn().setHeader(QUERY_CRITERIA, criteria);
+        exchange.getIn().setHeader(PAGE_SPECIFICATION, pageSpec);
+        exchange.getIn().setHeader(SORT, sorting);
+
+        template.send(exchange);
+        Object body = exchange.getIn().getBody();
+        assertNotNull(body);
+        Object exception = exchange.getException();
+        assertNull(exception);
+    }
+
+    @Test
+    public void vaultQueryByCriteriaTest() throws Exception {
+        Exchange exchange = createExchangeWithBodyAndHeader(OwnableState.class, OPERATION, VAULT_QUERY_BY_CRITERIA);
+        QueryCriteria.VaultQueryCriteria criteria = new QueryCriteria.VaultQueryCriteria(Vault.StateStatus.CONSUMED);
+        exchange.getIn().setHeader(QUERY_CRITERIA, criteria);
+
+        template.send(exchange);
+        Object body = exchange.getIn().getBody();
+        assertNotNull(body);
+        Object exception = exchange.getException();
+        assertNull(exception);
+    }
+
+    @Test
+    public void vaultQueryByWithPagingSpecTest() throws Exception {
+        Exchange exchange = createExchangeWithBodyAndHeader(OwnableState.class, OPERATION, VAULT_QUERY_BY_WITH_PAGING_SPEC);
+        QueryCriteria.VaultQueryCriteria criteria = new QueryCriteria.VaultQueryCriteria(Vault.StateStatus.CONSUMED);
+        PageSpecification pageSpec = new PageSpecification(DEFAULT_PAGE_NUM, MAX_PAGE_SIZE);
+        exchange.getIn().setHeader(QUERY_CRITERIA, criteria);
+        exchange.getIn().setHeader(PAGE_SPECIFICATION, pageSpec);
+
+        template.send(exchange);
+        Object body = exchange.getIn().getBody();
+        assertNotNull(body);
+        Object exception = exchange.getException();
+        assertNull(exception);
+    }
+
+    @Test
+    public void vaultQueryByWithSortingTest() throws Exception {
+        Exchange exchange = createExchangeWithBodyAndHeader(OwnableState.class, OPERATION, VAULT_QUERY_BY_WITH_SORTING);
+        QueryCriteria.VaultQueryCriteria criteria = new QueryCriteria.VaultQueryCriteria(Vault.StateStatus.CONSUMED);
+        Sort.SortColumn sortByUid = new Sort.SortColumn(new SortAttribute.Standard(Sort.LinearStateAttribute.UUID), Sort.Direction.DESC);
+        Sort sorting = new Sort(ImmutableSet.of(sortByUid));
+        exchange.getIn().setHeader(QUERY_CRITERIA, criteria);
+        exchange.getIn().setHeader(SORT, sorting);
+
+        template.send(exchange);
+        Object body = exchange.getIn().getBody();
+        assertNotNull(body);
+        Object exception = exchange.getException();
+        assertNull(exception);
+    }
+
+    private ByteArrayInputStream zipIt(String in, String name) {
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        try {
+            ZipOutputStream zos = new ZipOutputStream(baos);
+            ZipEntry entry = new ZipEntry(name);
+            zos.putNextEntry(entry);
+            zos.write(in.getBytes());
+            zos.closeEntry();
+        } catch (IOException ioe) {
+            ioe.printStackTrace();
+        }
+
+        return new ByteArrayInputStream(baos.toByteArray());
+    }
+
+    private PublicKey generatePublicKey() throws NoSuchAlgorithmException {
+        KeyPairGenerator kpg = KeyPairGenerator.getInstance("RSA");
+        kpg.initialize(2048);
+        KeyPair kp = kpg.generateKeyPair();
+        return kp.getPublic();
+    }
+
+    @Override
+    protected RouteBuilder createRouteBuilder() throws Exception {
+        return new RouteBuilder() {
+            public void configure() {
+                from("direct:start")
+                        .to(getUrl());
+            }
+        };
+    }
+}
diff --git a/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaTestSupport.java b/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaTestSupport.java
new file mode 100755
index 0000000000000..7586e3fd56b34
--- /dev/null
+++ b/components/camel-corda/src/test/java/org/apache/camel/component/corda/CordaTestSupport.java
@@ -0,0 +1,74 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.corda;
+
+import org.apache.camel.EndpointInject;
+import org.apache.camel.Exchange;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.impl.DefaultExchange;
+import org.apache.camel.impl.JndiRegistry;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.mockito.MockitoAnnotations;
+
+public class CordaTestSupport extends CamelTestSupport {
+
+    @EndpointInject(uri = "mock:result")
+    protected MockEndpoint mockResult;
+
+    @EndpointInject(uri = "mock:error")
+    protected MockEndpoint mockError;
+
+    @Override
+    public boolean isUseAdviceWith() {
+        return true;
+    }
+
+    @Override
+    protected JndiRegistry createRegistry() throws Exception {
+        JndiRegistry registry = super.createRegistry();
+        return registry;
+    }
+
+    protected String getUrl() {
+        return "corda://localhost:10006?username=user1&password=test";
+    }
+
+    protected Exchange createExchangeWithBodyAndHeader(Object body, String key, Object value) {
+        DefaultExchange exchange = new DefaultExchange(context);
+        exchange.getIn().setBody(body);
+        exchange.getIn().setHeader(key, value);
+        return exchange;
+    }
+
+    @BeforeClass
+    public static void startServer() throws Exception {
+    }
+
+    @AfterClass
+    public static void stopServer() throws Exception {
+    }
+
+    @Override
+    @Before
+    public void setUp() throws Exception {
+        MockitoAnnotations.initMocks(this);
+        super.setUp();
+    }
+}
diff --git a/components/camel-corda/src/test/java/org/apache/camel/component/corda/IntegrationWhiteList.java b/components/camel-corda/src/test/java/org/apache/camel/component/corda/IntegrationWhiteList.java
new file mode 100644
index 0000000000000..cdee2859f8ab3
--- /dev/null
+++ b/components/camel-corda/src/test/java/org/apache/camel/component/corda/IntegrationWhiteList.java
@@ -0,0 +1,35 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.corda;
+
+import java.util.ArrayList;
+import java.util.List;
+import net.corda.core.serialization.SerializationWhitelist;
+
+public class IntegrationWhiteList implements SerializationWhitelist {
+
+    @Override
+    public List<Class<?>> getWhitelist() {
+        List list = new ArrayList();
+//        list.add(RSAPublicKeyImpl.class);
+//        list.add(AlgorithmId.class);
+//        list.add(ObjectIdentifier.class);
+//        list.add(BitArray.class);
+//        list.add(BigInteger.class);
+        return list;
+    }
+}
diff --git a/components/camel-corda/src/test/resources/META-INF/services/net.corda.core.serialization.SerializationWhitelist b/components/camel-corda/src/test/resources/META-INF/services/net.corda.core.serialization.SerializationWhitelist
new file mode 100644
index 0000000000000..8c42a02ebee23
--- /dev/null
+++ b/components/camel-corda/src/test/resources/META-INF/services/net.corda.core.serialization.SerializationWhitelist
@@ -0,0 +1 @@
+org.apache.camel.component.corda.IntegrationWhiteList
diff --git a/components/camel-corda/src/test/resources/log4j2.properties b/components/camel-corda/src/test/resources/log4j2.properties
new file mode 100644
index 0000000000000..952c0fb47967c
--- /dev/null
+++ b/components/camel-corda/src/test/resources/log4j2.properties
@@ -0,0 +1,34 @@
+## ---------------------------------------------------------------------------
+## 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.
+## ---------------------------------------------------------------------------
+rootLogger.level = DEBUG
+rootLogger.appenderRef.file.ref = file
+
+appender.file.type = File
+appender.file.name = file
+appender.file.fileName = target/camel-corda-test.log
+appender.file.layout.type = PatternLayout
+appender.file.layout.pattern = %d [%-15.15t] %-5p %-30.30c{1} - %m%n
+
+appender.out.type = Console
+appender.out.name = out
+appender.out.layout.type = PatternLayout
+appender.out.layout.pattern = %d [%-15.15t] %-5p %-30.30c{1} - %m%n
+
+#rootLogger.org.fabric=DEBUG
+#rootLogger.org.apache.http=DEBUG
+
+
diff --git a/components/camel-corda/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/components/camel-corda/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
new file mode 100644
index 0000000000000..ca6ee9cea8ec1
--- /dev/null
+++ b/components/camel-corda/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
@@ -0,0 +1 @@
+mock-maker-inline
\ No newline at end of file
diff --git a/components/pom.xml b/components/pom.xml
index e77582a3edbe6..fc8e6c92f53a9 100644
--- a/components/pom.xml
+++ b/components/pom.xml
@@ -108,6 +108,7 @@
     <module>camel-cometd</module>
     <module>camel-consul</module>
     <module>camel-context</module>
+    <module>camel-corda</module>
     <module>camel-couchbase</module>
     <module>camel-couchdb</module>
     <module>camel-crypto</module>
diff --git a/components/readme.adoc b/components/readme.adoc
index e6460b52f2499..17c953b768bd8 100644
--- a/components/readme.adoc
+++ b/components/readme.adoc
@@ -2,7 +2,7 @@ Components
 ^^^^^^^^^^
 
 // components: START
-Number of Components: 306 in 207 JAR artifacts (22 deprecated)
+Number of Components: 307 in 208 JAR artifacts (22 deprecated)
 
 [width="100%",cols="4,1,5",options="header"]
 |===
@@ -179,6 +179,9 @@ Number of Components: 306 in 207 JAR artifacts (22 deprecated)
 | link:../camel-core/src/main/docs/controlbus-component.adoc[Control Bus] (camel-core) +
 `controlbus:command:language` | 2.11 | The controlbus component provides easy management of Camel applications based on the Control Bus EIP pattern.
 
+| link:camel-corda/src/main/docs/corda-component.adoc[corda] (camel-corda) +
+`corda:url` | 2.23 | The corda component uses the corda-rpc to interact with corda nodes.
+
 | link:camel-couchbase/src/main/docs/couchbase-component.adoc[Couchbase] (camel-couchbase) +
 `couchbase:protocol:hostname:port` | 2.19 | Represents a Couchbase endpoint that can query Views with a Poll strategy and/or produce various type of operations.
 
diff --git a/docs/user-manual/en/SUMMARY.md b/docs/user-manual/en/SUMMARY.md
index 7a0c3ef7f4dd5..fb911d2d60c7a 100644
--- a/docs/user-manual/en/SUMMARY.md
+++ b/docs/user-manual/en/SUMMARY.md
@@ -220,6 +220,7 @@
 	* [CoAP](coap-component.adoc)
 	* [CometD](cometd-component.adoc)
 	* [Consul](consul-component.adoc)
+	* [Corda](corda-component.adoc)
 	* [Couchbase](couchbase-component.adoc)
 	* [CouchDB](couchdb-component.adoc)
 	* [Crypto (JCE)](crypto-component.adoc)
diff --git a/parent/pom.xml b/parent/pom.xml
index 9dcf5169ed843..1a39043f449b0 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -165,6 +165,7 @@
     <consul-client-version>1.2.5</consul-client-version>
     <consul-client-bundle-version>1.2.5_1</consul-client-bundle-version>
     <cobertura-maven-plugin-version>2.7</cobertura-maven-plugin-version>
+    <corda-version>3.3-corda</corda-version>
     <couchbase-client-version>1.4.13</couchbase-client-version>
     <couchbase-client-bundle-version>1.4.13_1</couchbase-client-bundle-version>
     <curator-version>2.12.0</curator-version>
@@ -1029,6 +1030,25 @@
         <artifactId>camel-context</artifactId>
         <version>${project.version}</version>
       </dependency>
+      <dependency>
+        <groupId>net.corda</groupId>
+        <artifactId>corda-rpc</artifactId>
+        <version>${corda-version}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>co.paralleluniverse</groupId>
+            <artifactId>quasar-core</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-core</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.hibernate.javax.persistence</groupId>
+            <artifactId>hibernate-jpa-2.1-api</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-core-xml</artifactId>
@@ -2594,6 +2614,11 @@
         <artifactId>camel-context-starter</artifactId>
         <version>${project.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.camel</groupId>
+        <artifactId>camel-corda-starter</artifactId>
+        <version>${project.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-core-starter</artifactId>
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index cd6fe58869d65..43d3c4aab3351 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -426,6 +426,11 @@
     <feature version='${project.version}'>camel-core</feature>
     <bundle>mvn:org.apache.camel/camel-context/${project.version}</bundle>
   </feature>
+  <feature name='camel-corda' version='${project.version}' resolver='(obr)' start-level='50'>
+    <feature version='${project.version}'>camel-core</feature>
+    <bundle dependency='true'>wrap:net.corda/corda-rpc/${corda-version}</bundle>
+    <bundle>mvn:org.apache.camel/camel-corda/${project.version}</bundle>
+  </feature>
   <feature name='camel-couchdb' version='${project.version}' resolver='(obr)' start-level='50'>
     <feature version='${project.version}'>camel-core</feature>
     <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.lightcouch/${lightcouch-bundle-version}</bundle>
diff --git a/platforms/spring-boot/components-starter/camel-corda-starter/pom.xml b/platforms/spring-boot/components-starter/camel-corda-starter/pom.xml
new file mode 100644
index 0000000000000..e1636b21fba52
--- /dev/null
+++ b/platforms/spring-boot/components-starter/camel-corda-starter/pom.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    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.
+
+-->
+<project xmlns="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">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.camel</groupId>
+    <artifactId>components-starter</artifactId>
+    <version>2.23.0-SNAPSHOT</version>
+  </parent>
+  <artifactId>camel-corda-starter</artifactId>
+  <packaging>jar</packaging>
+  <name>Spring-Boot Starter :: Camel :: Corda</name>
+  <description>Spring-Boot Starter for Camel Corda which is based on corda-rpc support</description>
+  <dependencies>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter</artifactId>
+      <version>${spring-boot-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.camel</groupId>
+      <artifactId>camel-corda</artifactId>
+      <version>${project.version}</version>
+      <!--START OF GENERATED CODE-->
+      <exclusions>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.apache.logging.log4j</groupId>
+          <artifactId>log4j-core</artifactId>
+        </exclusion>
+      </exclusions>
+      <!--END OF GENERATED CODE-->
+    </dependency>
+    <!--START OF GENERATED CODE-->
+    <dependency>
+      <groupId>org.apache.camel</groupId>
+      <artifactId>camel-core-starter</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.camel</groupId>
+      <artifactId>camel-spring-boot-starter</artifactId>
+    </dependency>
+    <!--END OF GENERATED CODE-->
+  </dependencies>
+</project>
diff --git a/platforms/spring-boot/components-starter/camel-corda-starter/src/main/java/org/apache/camel/component/corda/springboot/CordaComponentAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-corda-starter/src/main/java/org/apache/camel/component/corda/springboot/CordaComponentAutoConfiguration.java
new file mode 100644
index 0000000000000..a3ed689f689db
--- /dev/null
+++ b/platforms/spring-boot/components-starter/camel-corda-starter/src/main/java/org/apache/camel/component/corda/springboot/CordaComponentAutoConfiguration.java
@@ -0,0 +1,128 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.corda.springboot;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import javax.annotation.Generated;
+import org.apache.camel.CamelContext;
+import org.apache.camel.component.corda.CordaComponent;
+import org.apache.camel.spi.ComponentCustomizer;
+import org.apache.camel.spi.HasId;
+import org.apache.camel.spring.boot.CamelAutoConfiguration;
+import org.apache.camel.spring.boot.ComponentConfigurationProperties;
+import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
+import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
+import org.apache.camel.spring.boot.util.GroupCondition;
+import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
+import org.apache.camel.util.IntrospectionSupport;
+import org.apache.camel.util.ObjectHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Conditional;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Lazy;
+
+/**
+ * Generated by camel-package-maven-plugin - do not edit this file!
+ */
+@Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo")
+@Configuration
+@Conditional({ConditionalOnCamelContextAndAutoConfigurationBeans.class,
+        CordaComponentAutoConfiguration.GroupConditions.class})
+@AutoConfigureAfter(CamelAutoConfiguration.class)
+@EnableConfigurationProperties({ComponentConfigurationProperties.class,
+        CordaComponentConfiguration.class})
+public class CordaComponentAutoConfiguration {
+
+    private static final Logger LOGGER = LoggerFactory
+            .getLogger(CordaComponentAutoConfiguration.class);
+    @Autowired
+    private ApplicationContext applicationContext;
+    @Autowired
+    private CamelContext camelContext;
+    @Autowired
+    private CordaComponentConfiguration configuration;
+    @Autowired(required = false)
+    private List<ComponentCustomizer<CordaComponent>> customizers;
+
+    static class GroupConditions extends GroupCondition {
+        public GroupConditions() {
+            super("camel.component", "camel.component.corda");
+        }
+    }
+
+    @Lazy
+    @Bean(name = "corda-component")
+    @ConditionalOnMissingBean(CordaComponent.class)
+    public CordaComponent configureCordaComponent() throws Exception {
+        CordaComponent component = new CordaComponent();
+        component.setCamelContext(camelContext);
+        Map<String, Object> parameters = new HashMap<>();
+        IntrospectionSupport.getProperties(configuration, parameters, null,
+                false);
+        for (Map.Entry<String, Object> entry : parameters.entrySet()) {
+            Object value = entry.getValue();
+            Class<?> paramClass = value.getClass();
+            if (paramClass.getName().endsWith("NestedConfiguration")) {
+                Class nestedClass = null;
+                try {
+                    nestedClass = (Class) paramClass.getDeclaredField(
+                            "CAMEL_NESTED_CLASS").get(null);
+                    HashMap<String, Object> nestedParameters = new HashMap<>();
+                    IntrospectionSupport.getProperties(value, nestedParameters,
+                            null, false);
+                    Object nestedProperty = nestedClass.newInstance();
+                    CamelPropertiesHelper.setCamelProperties(camelContext,
+                            nestedProperty, nestedParameters, false);
+                    entry.setValue(nestedProperty);
+                } catch (NoSuchFieldException e) {
+                }
+            }
+        }
+        CamelPropertiesHelper.setCamelProperties(camelContext, component,
+                parameters, false);
+        if (ObjectHelper.isNotEmpty(customizers)) {
+            for (ComponentCustomizer<CordaComponent> customizer : customizers) {
+                boolean useCustomizer = (customizer instanceof HasId)
+                        ? HierarchicalPropertiesEvaluator.evaluate(
+                                applicationContext.getEnvironment(),
+                                "camel.component.customizer",
+                                "camel.component.corda.customizer",
+                                ((HasId) customizer).getId())
+                        : HierarchicalPropertiesEvaluator.evaluate(
+                                applicationContext.getEnvironment(),
+                                "camel.component.customizer",
+                                "camel.component.corda.customizer");
+                if (useCustomizer) {
+                    LOGGER.debug("Configure component {}, with customizer {}",
+                            component, customizer);
+                    customizer.customize(component);
+                }
+            }
+        }
+        return component;
+    }
+}
\ No newline at end of file
diff --git a/platforms/spring-boot/components-starter/camel-corda-starter/src/main/java/org/apache/camel/component/corda/springboot/CordaComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-corda-starter/src/main/java/org/apache/camel/component/corda/springboot/CordaComponentConfiguration.java
new file mode 100644
index 0000000000000..75e0b4de83239
--- /dev/null
+++ b/platforms/spring-boot/components-starter/camel-corda-starter/src/main/java/org/apache/camel/component/corda/springboot/CordaComponentConfiguration.java
@@ -0,0 +1,182 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.corda.springboot;
+
+import javax.annotation.Generated;
+import net.corda.core.node.services.vault.PageSpecification;
+import net.corda.core.node.services.vault.QueryCriteria;
+import net.corda.core.node.services.vault.Sort;
+import org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+/**
+ * The corda component uses the corda-rpc to interact with corda nodes.
+ * 
+ * Generated by camel-package-maven-plugin - do not edit this file!
+ */
+@Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo")
+@ConfigurationProperties(prefix = "camel.component.corda")
+public class CordaComponentConfiguration
+        extends
+            ComponentConfigurationPropertiesCommon {
+
+    /**
+     * Whether to enable auto configuration of the corda component. This is
+     * enabled by default.
+     */
+    private Boolean enabled;
+    /**
+     * Default configuration
+     */
+    private CordaConfigurationNestedConfiguration configuration;
+    /**
+     * Whether the component should resolve property placeholders on itself when
+     * starting. Only properties which are of String type can use property
+     * placeholders.
+     */
+    private Boolean resolvePropertyPlaceholders = true;
+
+    public CordaConfigurationNestedConfiguration getConfiguration() {
+        return configuration;
+    }
+
+    public void setConfiguration(
+            CordaConfigurationNestedConfiguration configuration) {
+        this.configuration = configuration;
+    }
+
+    public Boolean getResolvePropertyPlaceholders() {
+        return resolvePropertyPlaceholders;
+    }
+
+    public void setResolvePropertyPlaceholders(
+            Boolean resolvePropertyPlaceholders) {
+        this.resolvePropertyPlaceholders = resolvePropertyPlaceholders;
+    }
+
+    public static class CordaConfigurationNestedConfiguration {
+        public static final Class CAMEL_NESTED_CLASS = org.apache.camel.component.corda.CordaConfiguration.class;
+        private String operation;
+        private String username;
+        private String password;
+        private String host;
+        private Integer port;
+        private Boolean processSnapshot;
+        private Class flowLociClass;
+        private Object[] arguments;
+        private Class contractStateClass;
+        private QueryCriteria queryCriteria;
+        private PageSpecification pageSpecification;
+        private Sort sort;
+
+        public String getOperation() {
+            return operation;
+        }
+
+        public void setOperation(String operation) {
+            this.operation = operation;
+        }
+
+        public String getUsername() {
+            return username;
+        }
+
+        public void setUsername(String username) {
+            this.username = username;
+        }
+
+        public String getPassword() {
+            return password;
+        }
+
+        public void setPassword(String password) {
+            this.password = password;
+        }
+
+        public String getHost() {
+            return host;
+        }
+
+        public void setHost(String host) {
+            this.host = host;
+        }
+
+        public Integer getPort() {
+            return port;
+        }
+
+        public void setPort(Integer port) {
+            this.port = port;
+        }
+
+        public Boolean getProcessSnapshot() {
+            return processSnapshot;
+        }
+
+        public void setProcessSnapshot(Boolean processSnapshot) {
+            this.processSnapshot = processSnapshot;
+        }
+
+        public Class getFlowLociClass() {
+            return flowLociClass;
+        }
+
+        public void setFlowLociClass(Class flowLociClass) {
+            this.flowLociClass = flowLociClass;
+        }
+
+        public Object[] getArguments() {
+            return arguments;
+        }
+
+        public void setArguments(Object[] arguments) {
+            this.arguments = arguments;
+        }
+
+        public Class getContractStateClass() {
+            return contractStateClass;
+        }
+
+        public void setContractStateClass(Class contractStateClass) {
+            this.contractStateClass = contractStateClass;
+        }
+
+        public QueryCriteria getQueryCriteria() {
+            return queryCriteria;
+        }
+
+        public void setQueryCriteria(QueryCriteria queryCriteria) {
+            this.queryCriteria = queryCriteria;
+        }
+
+        public PageSpecification getPageSpecification() {
+            return pageSpecification;
+        }
+
+        public void setPageSpecification(PageSpecification pageSpecification) {
+            this.pageSpecification = pageSpecification;
+        }
+
+        public Sort getSort() {
+            return sort;
+        }
+
+        public void setSort(Sort sort) {
+            this.sort = sort;
+        }
+    }
+}
\ No newline at end of file
diff --git a/platforms/spring-boot/components-starter/camel-corda-starter/src/main/resources/META-INF/LICENSE.txt b/platforms/spring-boot/components-starter/camel-corda-starter/src/main/resources/META-INF/LICENSE.txt
new file mode 100644
index 0000000000000..6b0b1270ff0ca
--- /dev/null
+++ b/platforms/spring-boot/components-starter/camel-corda-starter/src/main/resources/META-INF/LICENSE.txt
@@ -0,0 +1,203 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed 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.
+
diff --git a/platforms/spring-boot/components-starter/camel-corda-starter/src/main/resources/META-INF/NOTICE.txt b/platforms/spring-boot/components-starter/camel-corda-starter/src/main/resources/META-INF/NOTICE.txt
new file mode 100644
index 0000000000000..2e215bf2e6b1f
--- /dev/null
+++ b/platforms/spring-boot/components-starter/camel-corda-starter/src/main/resources/META-INF/NOTICE.txt
@@ -0,0 +1,11 @@
+   =========================================================================
+   ==  NOTICE file corresponding to the section 4 d of                    ==
+   ==  the Apache License, Version 2.0,                                   ==
+   ==  in this case for the Apache Camel distribution.                    ==
+   =========================================================================
+
+   This product includes software developed by
+   The Apache Software Foundation (http://www.apache.org/).
+
+   Please read the different LICENSE files present in the licenses directory of
+   this distribution.
diff --git a/platforms/spring-boot/components-starter/camel-corda-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/platforms/spring-boot/components-starter/camel-corda-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
new file mode 100644
index 0000000000000..fbaf6a3dc6f6c
--- /dev/null
+++ b/platforms/spring-boot/components-starter/camel-corda-starter/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -0,0 +1,10 @@
+{
+  "properties": [
+    {
+      "defaultValue": true,
+      "name": "camel.component.corda.enabled",
+      "description": "Enable corda component",
+      "type": "java.lang.Boolean"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/platforms/spring-boot/components-starter/camel-corda-starter/src/main/resources/META-INF/spring.factories b/platforms/spring-boot/components-starter/camel-corda-starter/src/main/resources/META-INF/spring.factories
new file mode 100644
index 0000000000000..a79cfd852f64c
--- /dev/null
+++ b/platforms/spring-boot/components-starter/camel-corda-starter/src/main/resources/META-INF/spring.factories
@@ -0,0 +1,19 @@
+## ---------------------------------------------------------------------------
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements.  See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License.  You may obtain a copy of the License at
+##
+##      http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+## ---------------------------------------------------------------------------
+
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+org.apache.camel.component.corda.springboot.CordaComponentAutoConfiguration
diff --git a/platforms/spring-boot/components-starter/camel-corda-starter/src/main/resources/META-INF/spring.provides b/platforms/spring-boot/components-starter/camel-corda-starter/src/main/resources/META-INF/spring.provides
new file mode 100644
index 0000000000000..30c7acdfc58fa
--- /dev/null
+++ b/platforms/spring-boot/components-starter/camel-corda-starter/src/main/resources/META-INF/spring.provides
@@ -0,0 +1,17 @@
+## ---------------------------------------------------------------------------
+## 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.
+## ---------------------------------------------------------------------------
+provides: camel-corda
diff --git a/platforms/spring-boot/components-starter/pom.xml b/platforms/spring-boot/components-starter/pom.xml
index 8e8db9aef2f62..79f84bf8c6cd4 100644
--- a/platforms/spring-boot/components-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/pom.xml
@@ -139,6 +139,7 @@
     <module>camel-cometd-starter</module>
     <module>camel-consul-starter</module>
     <module>camel-context-starter</module>
+    <module>camel-corda-starter</module>
     <module>camel-core-starter</module>
     <module>camel-couchbase-starter</module>
     <module>camel-couchdb-starter</module>
diff --git a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
index 4af88555ba751..9e7e339d058f8 100644
--- a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
+++ b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
@@ -186,6 +186,25 @@
         <artifactId>log4j</artifactId>
         <version>1.2.17</version>
       </dependency>
+      <dependency>
+        <groupId>net.corda</groupId>
+        <artifactId>corda-rpc</artifactId>
+        <version>3.3-corda</version>
+        <exclusions>
+          <exclusion>
+            <groupId>co.paralleluniverse</groupId>
+            <artifactId>quasar-core</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-core</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.hibernate.javax.persistence</groupId>
+            <artifactId>hibernate-jpa-2.1-api</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
       <dependency>
         <groupId>net.sf.saxon</groupId>
         <artifactId>Saxon-HE</artifactId>
@@ -697,6 +716,11 @@
         <artifactId>camel-context-starter</artifactId>
         <version>${project.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.camel</groupId>
+        <artifactId>camel-corda-starter</artifactId>
+        <version>${project.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-core</artifactId>

From 45f10a292204445faa14b3750b6ca7d8b112fa8c Mon Sep 17 00:00:00 2001
From: Jukka Aalto <jukka.aalto@insta.fi>
Date: Mon, 26 Nov 2018 13:52:10 +0200
Subject: [PATCH 091/125] CAMEL-12952 Send pong frame as a response to ping
 frame

---
 .../java/org/apache/camel/component/ahc/ws/WsEndpoint.java    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/components/camel-ahc-ws/src/main/java/org/apache/camel/component/ahc/ws/WsEndpoint.java b/components/camel-ahc-ws/src/main/java/org/apache/camel/component/ahc/ws/WsEndpoint.java
index 9ce71a2d262d7..b3d2a42b65a3c 100644
--- a/components/camel-ahc-ws/src/main/java/org/apache/camel/component/ahc/ws/WsEndpoint.java
+++ b/components/camel-ahc-ws/src/main/java/org/apache/camel/component/ahc/ws/WsEndpoint.java
@@ -201,6 +201,10 @@ public void onTextFrame(String message, boolean finalFragment, int rsv) {
             }
         }
 
+        public void onPingFrame(byte[] payload) {
+            LOG.debug("Received ping --> {}", payload);
+            websocket.sendPongFrame(payload);
+        }
     }
 
 }

From 39e10760e8c100d088f49a69e50ecea3be1e7207 Mon Sep 17 00:00:00 2001
From: Jukka Aalto <jukka.aalto@insta.fi>
Date: Mon, 26 Nov 2018 13:54:52 +0200
Subject: [PATCH 092/125] CAMEL-12951 reconnect exception is passed to
 exception handler

---
 .../java/org/apache/camel/component/ahc/ws/WsEndpoint.java   | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/components/camel-ahc-ws/src/main/java/org/apache/camel/component/ahc/ws/WsEndpoint.java b/components/camel-ahc-ws/src/main/java/org/apache/camel/component/ahc/ws/WsEndpoint.java
index b3d2a42b65a3c..edc7d762cca49 100644
--- a/components/camel-ahc-ws/src/main/java/org/apache/camel/component/ahc/ws/WsEndpoint.java
+++ b/components/camel-ahc-ws/src/main/java/org/apache/camel/component/ahc/ws/WsEndpoint.java
@@ -23,6 +23,7 @@
 import org.apache.camel.Processor;
 import org.apache.camel.Producer;
 import org.apache.camel.component.ahc.AhcEndpoint;
+import org.apache.camel.spi.ExceptionHandler;
 import org.apache.camel.spi.UriEndpoint;
 import org.apache.camel.spi.UriParam;
 import org.asynchttpclient.AsyncHttpClient;
@@ -172,6 +173,10 @@ public void onClose(WebSocket websocket, int code, String reason) {
                 reConnect();
             } catch (Exception e) {
                 LOG.warn("Error re-connecting to websocket", e);
+                ExceptionHandler exceptionHandler = getExceptionHandler();
+                if(exceptionHandler != null) {
+                    exceptionHandler.handleException("Error re-connecting to websocket", e);
+                }
             }
         }
 

From ba022b4ce8be405d57d209055f830750b9042b01 Mon Sep 17 00:00:00 2001
From: Andrea Cosentino <ancosen@gmail.com>
Date: Tue, 27 Nov 2018 11:14:29 +0100
Subject: [PATCH 093/125] Camel-AHC WS - Fixed CS

---
 .../main/java/org/apache/camel/component/ahc/ws/WsEndpoint.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/camel-ahc-ws/src/main/java/org/apache/camel/component/ahc/ws/WsEndpoint.java b/components/camel-ahc-ws/src/main/java/org/apache/camel/component/ahc/ws/WsEndpoint.java
index edc7d762cca49..a5f24a2ce46dc 100644
--- a/components/camel-ahc-ws/src/main/java/org/apache/camel/component/ahc/ws/WsEndpoint.java
+++ b/components/camel-ahc-ws/src/main/java/org/apache/camel/component/ahc/ws/WsEndpoint.java
@@ -174,7 +174,7 @@ public void onClose(WebSocket websocket, int code, String reason) {
             } catch (Exception e) {
                 LOG.warn("Error re-connecting to websocket", e);
                 ExceptionHandler exceptionHandler = getExceptionHandler();
-                if(exceptionHandler != null) {
+                if (exceptionHandler != null) {
                     exceptionHandler.handleException("Error re-connecting to websocket", e);
                 }
             }

From 562ab251ca5ad6e9661506ffaebdfeb1e88d03b2 Mon Sep 17 00:00:00 2001
From: Maciej Swiderski <swiderski.maciej@gmail.com>
Date: Mon, 26 Nov 2018 13:42:48 +0100
Subject: [PATCH 094/125] CAMEL-12958 - Wrong camel context bound in service
 registry of jbpm/Kie Server

---
 .../camel/component/jbpm/server/CamelKieServerExtension.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/server/CamelKieServerExtension.java b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/server/CamelKieServerExtension.java
index fbc4448d59cac..0e297bece0f73 100644
--- a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/server/CamelKieServerExtension.java
+++ b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/server/CamelKieServerExtension.java
@@ -117,7 +117,7 @@ public void createContainer(String id, KieContainerInstance kieContainerInstance
                 context.start();
                 camelContexts.put(id, context);
 
-                ServiceRegistry.get().register(id + "_CamelService", this.camel);
+                ServiceRegistry.get().register(id + "_CamelService", context);
 
             }
         } catch (Exception e) {

From ccca4e4983ad8d2475f23ec3ff6ed68b0ff2d092 Mon Sep 17 00:00:00 2001
From: Andrea Cosentino <ancosen@gmail.com>
Date: Tue, 27 Nov 2018 12:43:00 +0100
Subject: [PATCH 095/125] Fix camel-corda stuff for kit

---
 apache-camel/pom.xml                                     | 9 +++++++++
 bom/camel-bom/pom.xml                                    | 6 +++---
 docs/user-manual/en/SUMMARY.md                           | 2 +-
 parent/pom.xml                                           | 5 +++++
 .../camel-spring-boot-dependencies/pom.xml               | 5 +++++
 5 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/apache-camel/pom.xml b/apache-camel/pom.xml
index 24ecbb2cb8d9e..1481b63f7c379 100644
--- a/apache-camel/pom.xml
+++ b/apache-camel/pom.xml
@@ -218,6 +218,10 @@
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-context</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.camel</groupId>
+      <artifactId>camel-corda</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-couchbase</artifactId>
@@ -1430,6 +1434,11 @@
       <artifactId>camel-core-starter</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.apache.camel</groupId>
+      <artifactId>camel-corda-starter</artifactId>
+      <version>${project.version}</version>
+    </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-couchdb-starter</artifactId>
diff --git a/bom/camel-bom/pom.xml b/bom/camel-bom/pom.xml
index f63ca96eca81d..1f13e640074d9 100644
--- a/bom/camel-bom/pom.xml
+++ b/bom/camel-bom/pom.xml
@@ -492,9 +492,9 @@
         <version>${project.version}</version>
       </dependency>
       <dependency>
-         <groupId>org.apache.camel</groupId>
-         <artifactId>camel-corda</artifactId>
-          <version>${project.version}</version>
+        <groupId>org.apache.camel</groupId>
+        <artifactId>camel-corda</artifactId>
+        <version>${project.version}</version>
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
diff --git a/docs/user-manual/en/SUMMARY.md b/docs/user-manual/en/SUMMARY.md
index fb911d2d60c7a..a1893cfee24f4 100644
--- a/docs/user-manual/en/SUMMARY.md
+++ b/docs/user-manual/en/SUMMARY.md
@@ -220,7 +220,7 @@
 	* [CoAP](coap-component.adoc)
 	* [CometD](cometd-component.adoc)
 	* [Consul](consul-component.adoc)
-	* [Corda](corda-component.adoc)
+	* [corda](corda-component.adoc)
 	* [Couchbase](couchbase-component.adoc)
 	* [CouchDB](couchdb-component.adoc)
 	* [Crypto (JCE)](crypto-component.adoc)
diff --git a/parent/pom.xml b/parent/pom.xml
index 1a39043f449b0..b5f32fbc10a8d 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1059,6 +1059,11 @@
         <artifactId>camel-couchbase</artifactId>
         <version>${project.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.camel</groupId>
+        <artifactId>camel-corda</artifactId>
+        <version>${project.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-couchdb</artifactId>
diff --git a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
index 9e7e339d058f8..880be45a6f5e3 100644
--- a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
+++ b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
@@ -716,6 +716,11 @@
         <artifactId>camel-context-starter</artifactId>
         <version>${project.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.apache.camel</groupId>
+        <artifactId>camel-corda</artifactId>
+        <version>${project.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-corda-starter</artifactId>

From bbe400f96d647d3d8991379e2bd785d642ee52c2 Mon Sep 17 00:00:00 2001
From: Colm O hEigeartaigh <coheigea@apache.org>
Date: Tue, 27 Nov 2018 13:46:24 +0000
Subject: [PATCH 096/125] Set the secure processing feature on various
 DocumentBuilderFactory, TransformerFactory, SAXParserFactory instances

---
 .../org/apache/camel/converter/jaxp/XmlConverter.java |  8 ++++++++
 .../management/mbean/RouteCoverageXmlParser.java      |  5 ++++-
 .../org/apache/camel/util/XmlLineNumberParser.java    |  3 +++
 .../camel/component/cm/CMSenderOneMessageImpl.java    |  6 +++++-
 .../camel/component/flatpack/FlatpackConverter.java   |  5 ++++-
 .../org/apache/camel/component/fop/FopProducer.java   |  7 +++++--
 .../processor/SchematronProcessorFactory.java         |  2 ++
 .../spring/ws/bean/CamelEndpointMapping.java          |  2 ++
 .../impl/HeaderTransformationMessageFilter.java       | 10 +++++++++-
 .../dataformat/tagsoup/TidyMarkupDataFormat.java      |  5 ++++-
 .../org/apache/camel/component/tika/TikaProducer.java |  2 ++
 .../camel/catalog/nexus/BaseNexusRepository.java      |  3 +++
 .../org/apache/camel/catalog/DefaultCamelCatalog.java |  7 ++++++-
 .../camel/parser/helper/XmlLineNumberParser.java      |  4 ++++
 .../camel/maven/bom/generator/BomGeneratorMojo.java   | 11 ++++++++---
 .../main/java/org/apache/camel/maven/XmlHelper.java   |  7 ++++++-
 .../maven/packaging/PrepareCatalogKarafMojo.java      |  3 +++
 .../camel/maven/packaging/SpringBootStarterMojo.java  | 10 ++++++++--
 18 files changed, 86 insertions(+), 14 deletions(-)

diff --git a/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java b/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java
index 4f3125f9bd07b..d366b5506c618 100644
--- a/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java
+++ b/camel-core/src/main/java/org/apache/camel/converter/jaxp/XmlConverter.java
@@ -33,6 +33,7 @@
 import java.util.Map;
 import java.util.Properties;
 
+import javax.xml.XMLConstants;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
@@ -1138,6 +1139,13 @@ public DocumentBuilderFactory createDocumentBuilderFactory() {
         factory.setNamespaceAware(true);
         factory.setIgnoringElementContentWhitespace(true);
         factory.setIgnoringComments(true);
+        try {
+            // Set secure processing
+            factory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, Boolean.TRUE);
+        } catch (ParserConfigurationException e) {
+            LOG.warn("DocumentBuilderFactory doesn't support the feature {} with value {}, due to {}.",
+                     new Object[]{XMLConstants.FEATURE_SECURE_PROCESSING, true, e});
+        }
         try {
             // Disable the external-general-entities by default
             factory.setFeature("http://xml.org/sax/features/external-general-entities", false);
diff --git a/camel-core/src/main/java/org/apache/camel/management/mbean/RouteCoverageXmlParser.java b/camel-core/src/main/java/org/apache/camel/management/mbean/RouteCoverageXmlParser.java
index 62bc64952462e..b9795b0a22ed3 100644
--- a/camel-core/src/main/java/org/apache/camel/management/mbean/RouteCoverageXmlParser.java
+++ b/camel-core/src/main/java/org/apache/camel/management/mbean/RouteCoverageXmlParser.java
@@ -19,6 +19,7 @@
 import java.io.InputStream;
 import java.util.Stack;
 
+import javax.xml.XMLConstants;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.SAXParser;
@@ -62,8 +63,10 @@ private RouteCoverageXmlParser() {
      */
     public static Document parseXml(final CamelContext camelContext, final InputStream is) throws Exception {
         final SAXParserFactory factory = SAXParserFactory.newInstance();
+        factory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, Boolean.TRUE);
         final SAXParser parser = factory.newSAXParser();
         final DocumentBuilderFactory docBuilderFactory = DocumentBuilderFactory.newInstance();
+        docBuilderFactory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, Boolean.TRUE);
         final DocumentBuilder docBuilder = docBuilderFactory.newDocumentBuilder();
         final Document doc = docBuilder.newDocument();
 
@@ -170,4 +173,4 @@ private void addTextIfNeeded() {
 
         return doc;
     }
-}
\ No newline at end of file
+}
diff --git a/camel-core/src/main/java/org/apache/camel/util/XmlLineNumberParser.java b/camel-core/src/main/java/org/apache/camel/util/XmlLineNumberParser.java
index d80cb45c9c8ce..7c01d8a0b21e3 100644
--- a/camel-core/src/main/java/org/apache/camel/util/XmlLineNumberParser.java
+++ b/camel-core/src/main/java/org/apache/camel/util/XmlLineNumberParser.java
@@ -21,6 +21,7 @@
 import java.io.StringReader;
 import java.util.Stack;
 
+import javax.xml.XMLConstants;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.SAXParser;
@@ -107,11 +108,13 @@ public static Document parseXml(final InputStream is, XmlTextTransformer xmlTran
         final Document doc;
         SAXParser parser;
         final SAXParserFactory factory = SAXParserFactory.newInstance();
+        factory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, Boolean.TRUE);
         parser = factory.newSAXParser();
         final DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
         // turn off validator and loading external dtd
         dbf.setValidating(false);
         dbf.setNamespaceAware(true);
+        dbf.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, Boolean.TRUE);
         dbf.setFeature("http://xml.org/sax/features/namespaces", false);
         dbf.setFeature("http://xml.org/sax/features/validation", false);
         dbf.setFeature("http://apache.org/xml/features/nonvalidating/load-dtd-grammar", false);
diff --git a/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/CMSenderOneMessageImpl.java b/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/CMSenderOneMessageImpl.java
index 07e0e14c5b32b..64bb92d1cceb4 100644
--- a/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/CMSenderOneMessageImpl.java
+++ b/components/camel-cm-sms/src/main/java/org/apache/camel/component/cm/CMSenderOneMessageImpl.java
@@ -23,6 +23,7 @@
 import java.nio.charset.Charset;
 import java.util.UUID;
 
+import javax.xml.XMLConstants;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
@@ -90,6 +91,7 @@ private String createXml(final CMMessage message) {
 
             final ByteArrayOutputStream xml = new ByteArrayOutputStream();
             final DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+            factory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, Boolean.TRUE);
             factory.setNamespaceAware(true);
 
             // Get the DocumentBuilder
@@ -158,7 +160,9 @@ private String createXml(final CMMessage message) {
             }
 
             // Creatate XML as String
-            final Transformer aTransformer = TransformerFactory.newInstance().newTransformer();
+            TransformerFactory transformerFactory = TransformerFactory.newInstance();
+            transformerFactory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, Boolean.TRUE);
+            final Transformer aTransformer = transformerFactory.newTransformer();
             aTransformer.setOutputProperty(OutputKeys.INDENT, "yes");
             final Source src = new DOMSource(doc);
             final Result dest = new StreamResult(xml);
diff --git a/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FlatpackConverter.java b/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FlatpackConverter.java
index e101acd51fe9f..335861b53080a 100644
--- a/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FlatpackConverter.java
+++ b/components/camel-flatpack/src/main/java/org/apache/camel/component/flatpack/FlatpackConverter.java
@@ -21,6 +21,7 @@
 import java.util.List;
 import java.util.Map;
 
+import javax.xml.XMLConstants;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
 
@@ -63,7 +64,9 @@ public static List<Map<String, Object>> toList(DataSet dataSet) {
 
     @Converter
     public static Document toDocument(DataSet dataSet) throws ParserConfigurationException {
-        Document doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument();
+        DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+        dbf.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, Boolean.TRUE);
+        Document doc = dbf.newDocumentBuilder().newDocument();
 
         if (dataSet.getIndex() == -1) {
             Element list = doc.createElement("Dataset");
diff --git a/components/camel-fop/src/main/java/org/apache/camel/component/fop/FopProducer.java b/components/camel-fop/src/main/java/org/apache/camel/component/fop/FopProducer.java
index dd77570aade70..5aa82641f1dcf 100644
--- a/components/camel-fop/src/main/java/org/apache/camel/component/fop/FopProducer.java
+++ b/components/camel-fop/src/main/java/org/apache/camel/component/fop/FopProducer.java
@@ -19,6 +19,8 @@
 import java.io.ByteArrayOutputStream;
 import java.io.OutputStream;
 import java.util.Map;
+
+import javax.xml.XMLConstants;
 import javax.xml.transform.Result;
 import javax.xml.transform.Source;
 import javax.xml.transform.Transformer;
@@ -85,8 +87,9 @@ private OutputStream transform(FOUserAgent userAgent, String outputFormat, Sourc
         throws FOPException, TransformerException {
         OutputStream out = new ByteArrayOutputStream();
         Fop fop = fopFactory.newFop(outputFormat, userAgent, out);
-        TransformerFactory factory = TransformerFactory.newInstance();
-        Transformer transformer = factory.newTransformer();
+        TransformerFactory transformerFactory = TransformerFactory.newInstance();
+        transformerFactory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, Boolean.TRUE);
+        Transformer transformer = transformerFactory.newTransformer();
 
         Result res = new SAXResult(fop.getDefaultHandler());
         transformer.transform(src, res);
diff --git a/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/processor/SchematronProcessorFactory.java b/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/processor/SchematronProcessorFactory.java
index c093b23ef41af..13f146e4d3a4c 100644
--- a/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/processor/SchematronProcessorFactory.java
+++ b/components/camel-schematron/src/main/java/org/apache/camel/component/schematron/processor/SchematronProcessorFactory.java
@@ -16,6 +16,7 @@
  */
 package org.apache.camel.component.schematron.processor;
 
+import javax.xml.XMLConstants;
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
@@ -68,6 +69,7 @@ public static SchematronProcessor newScehamtronEngine(final Templates rules) {
      */
     private static XMLReader getXMLReader() throws ParserConfigurationException, SAXException {
         final SAXParserFactory fac = SAXParserFactory.newInstance();
+        fac.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, Boolean.TRUE);
         fac.setValidating(false);
         final SAXParser parser = fac.newSAXParser();
         XMLReader reader = parser.getXMLReader();
diff --git a/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/bean/CamelEndpointMapping.java b/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/bean/CamelEndpointMapping.java
index 7b27a18e482fe..78b6e255821fe 100644
--- a/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/bean/CamelEndpointMapping.java
+++ b/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/bean/CamelEndpointMapping.java
@@ -21,6 +21,7 @@
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
+import javax.xml.XMLConstants;
 import javax.xml.namespace.QName;
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.stream.XMLStreamException;
@@ -248,6 +249,7 @@ public void afterPropertiesSet() throws Exception {
             xmlConverter.setTransformerFactory(transformerFactory);
         } else {
             transformerFactory = TransformerFactory.newInstance();
+            transformerFactory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, Boolean.TRUE);
         }
     }
 
diff --git a/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/filter/impl/HeaderTransformationMessageFilter.java b/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/filter/impl/HeaderTransformationMessageFilter.java
index 60b7b2af8202d..57ae41c85dc87 100644
--- a/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/filter/impl/HeaderTransformationMessageFilter.java
+++ b/components/camel-spring-ws/src/main/java/org/apache/camel/component/spring/ws/filter/impl/HeaderTransformationMessageFilter.java
@@ -18,9 +18,11 @@
 
 import java.util.Map;
 
+import javax.xml.XMLConstants;
 import javax.xml.transform.ErrorListener;
 import javax.xml.transform.Source;
 import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerConfigurationException;
 import javax.xml.transform.TransformerException;
 import javax.xml.transform.TransformerFactory;
 
@@ -130,6 +132,12 @@ private TransformerFactory getTransformerFactory(CamelContext context) {
             throw new IllegalStateException("Cannot resolve a transformer factory");
         }
 
+        try {
+            transformerFactory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, Boolean.TRUE);
+        } catch (TransformerConfigurationException ex) {
+            // ignore
+        }
+
         transformerFactory.setErrorListener(new ErrorListener() {
 
             @Override
@@ -191,4 +199,4 @@ public void setSaxon(boolean saxon) {
         this.saxon = saxon;
     }
 
-}
\ No newline at end of file
+}
diff --git a/components/camel-tagsoup/src/main/java/org/apache/camel/dataformat/tagsoup/TidyMarkupDataFormat.java b/components/camel-tagsoup/src/main/java/org/apache/camel/dataformat/tagsoup/TidyMarkupDataFormat.java
index cfad01cfe40e6..3ed7c10048b9f 100644
--- a/components/camel-tagsoup/src/main/java/org/apache/camel/dataformat/tagsoup/TidyMarkupDataFormat.java
+++ b/components/camel-tagsoup/src/main/java/org/apache/camel/dataformat/tagsoup/TidyMarkupDataFormat.java
@@ -23,6 +23,7 @@
 import java.util.Map;
 import java.util.Map.Entry;
 
+import javax.xml.XMLConstants;
 import javax.xml.transform.Transformer;
 import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.dom.DOMResult;
@@ -177,7 +178,9 @@ public Node asNodeTidyMarkup(InputStream inputStream) throws CamelException {
         parser.setContentHandler(createContentHandler(w));
 
         try {
-            Transformer transformer = TransformerFactory.newInstance().newTransformer();
+            TransformerFactory transformerFactory = TransformerFactory.newInstance();
+            transformerFactory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, Boolean.TRUE);
+            Transformer transformer = transformerFactory.newTransformer();
             DOMResult result = new DOMResult();
             transformer.transform(new SAXSource(parser, new InputSource(inputStream)), result);
             return result.getNode();
diff --git a/components/camel-tika/src/main/java/org/apache/camel/component/tika/TikaProducer.java b/components/camel-tika/src/main/java/org/apache/camel/component/tika/TikaProducer.java
index a504d1822672d..ced69a6e5b182 100644
--- a/components/camel-tika/src/main/java/org/apache/camel/component/tika/TikaProducer.java
+++ b/components/camel-tika/src/main/java/org/apache/camel/component/tika/TikaProducer.java
@@ -23,6 +23,7 @@
 import java.io.OutputStreamWriter;
 import java.io.UnsupportedEncodingException;
 
+import javax.xml.XMLConstants;
 import javax.xml.transform.OutputKeys;
 import javax.xml.transform.TransformerConfigurationException;
 import javax.xml.transform.TransformerFactory;
@@ -150,6 +151,7 @@ private ContentHandler getContentHandler(TikaConfiguration configuration, Output
     private TransformerHandler getTransformerHandler(OutputStream output, String method,
             boolean prettyPrint) throws TransformerConfigurationException, UnsupportedEncodingException {
         SAXTransformerFactory factory = (SAXTransformerFactory) TransformerFactory.newInstance();
+        factory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, Boolean.TRUE);
         TransformerHandler handler = factory.newTransformerHandler();
         handler.getTransformer().setOutputProperty(OutputKeys.METHOD, method);
         handler.getTransformer().setOutputProperty(OutputKeys.INDENT, prettyPrint ? "yes" : "no");
diff --git a/platforms/camel-catalog-nexus/src/main/java/org/apache/camel/catalog/nexus/BaseNexusRepository.java b/platforms/camel-catalog-nexus/src/main/java/org/apache/camel/catalog/nexus/BaseNexusRepository.java
index d46b304335500..38bdd6fa6b195 100644
--- a/platforms/camel-catalog-nexus/src/main/java/org/apache/camel/catalog/nexus/BaseNexusRepository.java
+++ b/platforms/camel-catalog-nexus/src/main/java/org/apache/camel/catalog/nexus/BaseNexusRepository.java
@@ -27,6 +27,8 @@
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
+
+import javax.xml.XMLConstants;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.xpath.XPath;
@@ -194,6 +196,7 @@ protected void indexNexus() throws Exception {
         factory.setNamespaceAware(true);
         factory.setIgnoringElementContentWhitespace(true);
         factory.setIgnoringComments(true);
+        factory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, Boolean.TRUE);
 
         DocumentBuilder documentBuilder = factory.newDocumentBuilder();
 
diff --git a/platforms/camel-catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java b/platforms/camel-catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
index 4fde3460e0f58..1c6057f8ef911 100644
--- a/platforms/camel-catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
+++ b/platforms/camel-catalog/src/main/java/org/apache/camel/catalog/DefaultCamelCatalog.java
@@ -29,6 +29,8 @@
 import java.util.SortedSet;
 import java.util.TreeSet;
 import java.util.regex.PatternSyntaxException;
+
+import javax.xml.XMLConstants;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.xpath.XPathConstants;
 import javax.xml.xpath.XPathFactory;
@@ -1379,7 +1381,10 @@ public String summaryAsJson() {
             int archetypes = 0;
             try {
                 String xml = archetypeCatalogAsXml();
-                Document dom = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(new ByteArrayInputStream(xml.getBytes()));
+
+                DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+                dbf.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, Boolean.TRUE);
+                Document dom = dbf.newDocumentBuilder().parse(new ByteArrayInputStream(xml.getBytes()));
                 Object val = XPathFactory.newInstance().newXPath().evaluate("count(/archetype-catalog/archetypes/archetype)", dom, XPathConstants.NUMBER);
                 double num = (double) val;
                 archetypes = (int) num;
diff --git a/tooling/camel-route-parser/src/main/java/org/apache/camel/parser/helper/XmlLineNumberParser.java b/tooling/camel-route-parser/src/main/java/org/apache/camel/parser/helper/XmlLineNumberParser.java
index a96fb8622927b..129740bc44462 100644
--- a/tooling/camel-route-parser/src/main/java/org/apache/camel/parser/helper/XmlLineNumberParser.java
+++ b/tooling/camel-route-parser/src/main/java/org/apache/camel/parser/helper/XmlLineNumberParser.java
@@ -25,6 +25,8 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Stack;
+
+import javax.xml.XMLConstants;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.SAXParser;
@@ -86,11 +88,13 @@ public static Document parseXml(final InputStream is, final String rootNames, fi
         final Document doc;
         SAXParser parser;
         final SAXParserFactory factory = SAXParserFactory.newInstance();
+        factory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, Boolean.TRUE);
         parser = factory.newSAXParser();
         final DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
         // turn off validator and loading external dtd
         dbf.setValidating(false);
         dbf.setNamespaceAware(true);
+        dbf.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, Boolean.TRUE);
         dbf.setFeature("http://xml.org/sax/features/namespaces", false);
         dbf.setFeature("http://xml.org/sax/features/validation", false);
         dbf.setFeature("http://apache.org/xml/features/nonvalidating/load-dtd-grammar", false);
diff --git a/tooling/maven/bom-generator-maven-plugin/src/main/java/org/apache/camel/maven/bom/generator/BomGeneratorMojo.java b/tooling/maven/bom-generator-maven-plugin/src/main/java/org/apache/camel/maven/bom/generator/BomGeneratorMojo.java
index 2a54e0d83a68a..8599c5b37cd66 100644
--- a/tooling/maven/bom-generator-maven-plugin/src/main/java/org/apache/camel/maven/bom/generator/BomGeneratorMojo.java
+++ b/tooling/maven/bom-generator-maven-plugin/src/main/java/org/apache/camel/maven/bom/generator/BomGeneratorMojo.java
@@ -28,6 +28,8 @@
 import java.util.List;
 import java.util.Set;
 import java.util.TreeSet;
+
+import javax.xml.XMLConstants;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.transform.OutputKeys;
@@ -204,7 +206,9 @@ private List<Dependency> filter(List<Dependency> dependencyList) {
     }
 
     private Document loadBasePom() throws Exception {
-        DocumentBuilder builder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
+        DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+        dbf.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, Boolean.TRUE);
+        DocumentBuilder builder = dbf.newDocumentBuilder();
         Document pom = builder.parse(sourcePom);
 
         XPath xpath = XPathFactory.newInstance().newXPath();
@@ -235,7 +239,9 @@ private void writePom(Document pom) throws Exception {
             emptyNode.getParentNode().removeChild(emptyNode);
         }
 
-        Transformer transformer = TransformerFactory.newInstance().newTransformer();
+        TransformerFactory transformerFactory = TransformerFactory.newInstance();
+        transformerFactory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, Boolean.TRUE);
+        Transformer transformer = transformerFactory.newTransformer();
         transformer.setOutputProperty(OutputKeys.INDENT, "yes");
         transformer.setOutputProperty(OutputKeys.METHOD, "xml");
         transformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "2");
@@ -284,7 +290,6 @@ private void writeFileIfChanged(String content, File file) throws IOException {
 
 
     private void overwriteDependencyManagement(Document pom, List<Dependency> dependencies) throws Exception {
-
         XPath xpath = XPathFactory.newInstance().newXPath();
         XPathExpression expr = xpath.compile("/project/dependencyManagement/dependencies");
 
diff --git a/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/main/java/org/apache/camel/maven/XmlHelper.java b/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/main/java/org/apache/camel/maven/XmlHelper.java
index af6b528d32210..863779a990f4b 100644
--- a/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/main/java/org/apache/camel/maven/XmlHelper.java
+++ b/tooling/maven/camel-eip-documentation-enricher-maven-plugin/src/main/java/org/apache/camel/maven/XmlHelper.java
@@ -18,6 +18,8 @@
 
 import java.io.File;
 import java.io.IOException;
+
+import javax.xml.XMLConstants;
 import javax.xml.namespace.NamespaceContext;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
@@ -38,11 +40,14 @@ private XmlHelper() { }
     public static Document buildNamespaceAwareDocument(File xml) throws SAXException, ParserConfigurationException, IOException {
         DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
         factory.setNamespaceAware(true);
+        factory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, Boolean.TRUE);
         return factory.newDocumentBuilder().parse(xml);
     }
 
     public static Transformer buildTransformer() throws TransformerConfigurationException {
-        Transformer transformer = TransformerFactory.newInstance().newTransformer();
+        TransformerFactory transformerFactory = TransformerFactory.newInstance();
+        transformerFactory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, Boolean.TRUE);
+        Transformer transformer = transformerFactory.newTransformer();
         transformer.setOutputProperty(OutputKeys.INDENT, "yes");
         transformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "2");
         return transformer;
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogKarafMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogKarafMojo.java
index 352952237d296..f2abc7bf5bcd2 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogKarafMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogKarafMojo.java
@@ -29,6 +29,8 @@
 import java.util.List;
 import java.util.Set;
 import java.util.TreeSet;
+
+import javax.xml.XMLConstants;
 import javax.xml.parsers.DocumentBuilderFactory;
 
 import org.w3c.dom.Document;
@@ -640,6 +642,7 @@ private Set<String> findKarafFeatures() throws MojoExecutionException, MojoFailu
             dbf.setNamespaceAware(false);
             dbf.setValidating(false);
             dbf.setXIncludeAware(false);
+            dbf.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, Boolean.TRUE);
             Document dom = dbf.newDocumentBuilder().parse(is);
 
             NodeList children = dom.getElementsByTagName("features");
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootStarterMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootStarterMojo.java
index 2bace64babda4..5f74954f33556 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootStarterMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/SpringBootStarterMojo.java
@@ -34,6 +34,8 @@
 import java.util.Set;
 import java.util.TreeSet;
 import java.util.stream.Collectors;
+
+import javax.xml.XMLConstants;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.transform.OutputKeys;
@@ -269,7 +271,9 @@ private void fixAdditionalDependencies(Document pom) throws Exception {
     private void fixAdditionalRepositories(Document pom) throws Exception {
 
         if (project.getFile() != null) {
-            DocumentBuilder builder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
+            DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
+            dbf.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, Boolean.TRUE);
+            DocumentBuilder builder = dbf.newDocumentBuilder();
             Document originalPom = builder.parse(project.getFile());
 
             XPath xpath = XPathFactory.newInstance().newXPath();
@@ -612,7 +616,9 @@ private void writeXmlFormatted(Document pom, File destination) throws Exception
 
         pom.setXmlStandalone(true);
 
-        Transformer transformer = TransformerFactory.newInstance().newTransformer();
+        TransformerFactory transformerFactory = TransformerFactory.newInstance();
+        transformerFactory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, Boolean.TRUE);
+        Transformer transformer = transformerFactory.newTransformer();
         transformer.setOutputProperty(OutputKeys.INDENT, "yes");
         transformer.setOutputProperty(OutputKeys.METHOD, "xml");
         transformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "2");

From 7bea19413d9c600dc085c7415d9c7110c6c76186 Mon Sep 17 00:00:00 2001
From: Andrea Cosentino <ancosen@gmail.com>
Date: Tue, 27 Nov 2018 16:10:50 +0100
Subject: [PATCH 097/125] Upgrade TestContainers to version 1.10.2

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

diff --git a/parent/pom.xml b/parent/pom.xml
index b5f32fbc10a8d..e7a49c04557ff 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -681,7 +681,7 @@
     <stringtemplate-version>4.0.8</stringtemplate-version>
     <tagsoup-bundle-version>1.2.1_1</tagsoup-bundle-version>
     <tagsoup-version>1.2.1</tagsoup-version>
-    <testcontainers-version>1.10.1</testcontainers-version>
+    <testcontainers-version>1.10.2</testcontainers-version>
     <testng-version>6.14.2</testng-version>
     <tinybundles-version>2.1.1</tinybundles-version>
     <tika-version>1.19.1</tika-version>

From f91591f0e6f09b93053a3c333181f0ce5e96fb85 Mon Sep 17 00:00:00 2001
From: Andrea Cosentino <ancosen@gmail.com>
Date: Tue, 27 Nov 2018 16:55:22 +0100
Subject: [PATCH 098/125] Upgrade Mongodb Java Driver to version 3.9.1

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

diff --git a/parent/pom.xml b/parent/pom.xml
index e7a49c04557ff..7d083f62b666d 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -505,7 +505,7 @@
     <mock-javamail-version>1.9</mock-javamail-version>
     <mockwebserver-version>0.0.17</mockwebserver-version>
     <mockito-version>2.23.0</mockito-version>
-    <mongo-java-driver-version>3.9.0</mongo-java-driver-version>
+    <mongo-java-driver-version>3.9.1</mongo-java-driver-version>
     <mongo-hadoop-version>1.5.0</mongo-hadoop-version>
     <mqtt-client-version>1.14</mqtt-client-version>
     <msv-version>2013.6.1</msv-version>

From def6de9d3079f80c78b1d4e5a19c0cf41978a336 Mon Sep 17 00:00:00 2001
From: William Collins <punkhornsw@gmail.com>
Date: Mon, 26 Nov 2018 16:03:27 -0500
Subject: [PATCH 099/125] [CAMEL-12605] Added support for compression

---
 ...licationPkcs7MimeCompressedDataEntity.java | 120 ++++++++++++++++++
 .../entity/ApplicationPkcs7MimeEntity.java    |   2 +-
 .../as2/api/entity/EntityParser.java          |  87 +++++++++----
 .../as2/api/entity/CompressedEntityTest.java  |  89 +++++++++++++
 4 files changed, 269 insertions(+), 29 deletions(-)
 create mode 100644 components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/entity/ApplicationPkcs7MimeCompressedDataEntity.java
 create mode 100644 components/camel-as2/camel-as2-api/src/test/java/org/apache/camel/component/as2/api/entity/CompressedEntityTest.java

diff --git a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/entity/ApplicationPkcs7MimeCompressedDataEntity.java b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/entity/ApplicationPkcs7MimeCompressedDataEntity.java
new file mode 100644
index 0000000000000..7a88761f3a38b
--- /dev/null
+++ b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/entity/ApplicationPkcs7MimeCompressedDataEntity.java
@@ -0,0 +1,120 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.as2.api.entity;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+
+import org.apache.camel.component.as2.api.AS2Charset;
+import org.apache.camel.component.as2.api.AS2Header;
+import org.apache.camel.component.as2.api.CanonicalOutputStream;
+import org.apache.camel.component.as2.api.util.EntityUtils;
+import org.apache.http.Header;
+import org.apache.http.HeaderIterator;
+import org.apache.http.HttpException;
+import org.apache.http.entity.ContentType;
+import org.apache.http.message.BasicNameValuePair;
+import org.apache.http.util.Args;
+import org.bouncycastle.cms.CMSCompressedData;
+import org.bouncycastle.cms.CMSCompressedDataGenerator;
+import org.bouncycastle.cms.CMSProcessableByteArray;
+import org.bouncycastle.cms.CMSTypedData;
+import org.bouncycastle.operator.InputExpanderProvider;
+import org.bouncycastle.operator.OutputCompressor;
+
+public class ApplicationPkcs7MimeCompressedDataEntity extends MimeEntity {
+    
+    private static final String CONTENT_DISPOSITION = "attachment; filename=\"smime.p7z\"";
+    
+    private byte[] compressedData;
+    
+    public ApplicationPkcs7MimeCompressedDataEntity(MimeEntity entity2Encrypt,
+                                                    CMSCompressedDataGenerator dataGenerator,
+                                                    OutputCompressor compressor,
+                                                    String compressedContentTransferEncoding,
+                                                    boolean isMainBody)
+            throws HttpException {
+        setContentType(ContentType.create("application/pkcs7-mime", new BasicNameValuePair("smime-type", "compressed-data"),
+                new BasicNameValuePair("name", "smime.p7z")));
+        setContentTransferEncoding(compressedContentTransferEncoding);
+        addHeader(AS2Header.CONTENT_DISPOSITION, CONTENT_DISPOSITION);
+        setMainBody(isMainBody);
+        try {
+            this.compressedData = createCompressedData(entity2Encrypt, dataGenerator, compressor);
+        } catch (Exception e) {
+            throw new HttpException("Failed to create encrypted data");
+        }
+    }
+    
+    public ApplicationPkcs7MimeCompressedDataEntity(byte[] compressedData, String compressedContentTransferEncoding, boolean isMainBody) {
+        this.compressedData = Args.notNull(compressedData, "encryptedData");
+        
+        setContentType(ContentType.create("application/pkcs7-mime", new BasicNameValuePair("smime-type", "compressed-datat"),
+                new BasicNameValuePair("name", "smime.p7z")));
+        setContentTransferEncoding(compressedContentTransferEncoding);
+        addHeader(AS2Header.CONTENT_DISPOSITION, CONTENT_DISPOSITION);
+        setMainBody(isMainBody);
+    }
+    
+    @Override
+    public void writeTo(OutputStream outstream) throws IOException {
+        NoCloseOutputStream ncos = new NoCloseOutputStream(outstream);
+
+        // Write out mime part headers if this is not the main body of message.
+        if (!isMainBody()) {
+            try (CanonicalOutputStream canonicalOutstream = new CanonicalOutputStream(ncos, AS2Charset.US_ASCII)) {
+
+                HeaderIterator it = headerIterator();
+                while (it.hasNext()) {
+                    Header header = it.nextHeader();
+                    canonicalOutstream.writeln(header.toString());
+                }
+                canonicalOutstream.writeln(); // ensure empty line between
+                                              // headers and body; RFC2046 -
+                                              // 5.1.1
+            }
+        }
+        
+        // Write out signed data.
+        String transferEncoding = getContentTransferEncoding() == null ? null : getContentTransferEncoding().getValue();
+        try (OutputStream transferEncodedStream = EntityUtils.encode(ncos, transferEncoding)) {
+
+            transferEncodedStream.write(compressedData);
+        } catch (Exception e) {
+            throw new IOException("Failed to write to output stream", e);
+        }
+    }
+    
+    public MimeEntity getCompressedEntity(InputExpanderProvider expanderProvider) throws HttpException {
+        return EntityParser.parseCompressedEntity(compressedData, expanderProvider);
+    }
+    
+    private byte[] createCompressedData(MimeEntity entity2Encrypt, CMSCompressedDataGenerator compressedDataGenerator, OutputCompressor compressor) throws Exception {
+        try (ByteArrayOutputStream bos = new ByteArrayOutputStream()) {
+            entity2Encrypt.writeTo(bos);
+            bos.flush();
+
+            CMSTypedData contentData = new CMSProcessableByteArray(bos.toByteArray());
+            CMSCompressedData  compressedData = compressedDataGenerator.generate(contentData, compressor);
+            return compressedData.getEncoded();
+        } catch (Exception e) {
+            throw new Exception("", e);
+        }
+    }
+
+}
diff --git a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/entity/ApplicationPkcs7MimeEntity.java b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/entity/ApplicationPkcs7MimeEntity.java
index c1d6952f41300..548705503f004 100644
--- a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/entity/ApplicationPkcs7MimeEntity.java
+++ b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/entity/ApplicationPkcs7MimeEntity.java
@@ -100,7 +100,7 @@ public void writeTo(OutputStream outstream) throws IOException {
         }
     }
     
-    public MimeEntity getEncryptedEntity(PrivateKey privateKey) {
+    public MimeEntity getEncryptedEntity(PrivateKey privateKey) throws HttpException {
         
         return EntityParser.parseEnvelopedEntity(encryptedData, privateKey);
         
diff --git a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/entity/EntityParser.java b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/entity/EntityParser.java
index aaf12e86c8a1d..4d8a2b2091307 100644
--- a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/entity/EntityParser.java
+++ b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/entity/EntityParser.java
@@ -51,11 +51,14 @@
 import org.apache.http.message.ParserCursor;
 import org.apache.http.util.Args;
 import org.apache.http.util.CharArrayBuffer;
+import org.bouncycastle.cms.CMSCompressedData;
 import org.bouncycastle.cms.CMSEnvelopedData;
+import org.bouncycastle.cms.CMSException;
 import org.bouncycastle.cms.Recipient;
 import org.bouncycastle.cms.RecipientInformation;
 import org.bouncycastle.cms.RecipientInformationStore;
 import org.bouncycastle.cms.jcajce.JceKeyTransEnvelopedRecipient;
+import org.bouncycastle.operator.InputExpanderProvider;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -177,12 +180,26 @@ public static void skipToBoundary(AS2SessionInputBuffer inbuffer, String boundar
 
     }
     
-    public static MimeEntity parseEnvelopedEntity(byte[] envelopedContent, PrivateKey privateKey) {
+    public static MimeEntity parseCompressedEntity(byte[] compressedData, InputExpanderProvider expanderProvider)
+            throws HttpException {
+
+        byte[] uncompressedContent = uncompressData(compressedData, expanderProvider);
+
+        return parseEntity(uncompressedContent);
+    }
+
+    public static MimeEntity parseEnvelopedEntity(byte[] envelopedContent, PrivateKey privateKey) throws HttpException {
+
+        byte[] decryptedContent = decryptData(envelopedContent, privateKey);
+
+        return parseEntity(decryptedContent);
+    }
+
+    public static MimeEntity parseEntity(byte[] content) throws HttpException {
         
         try {
-            byte[] decryptedContent = decryptData(envelopedContent, privateKey);
             
-            InputStream is = new ByteArrayInputStream(decryptedContent);
+            InputStream is = new ByteArrayInputStream(content);
             AS2SessionInputBuffer inbuffer = new AS2SessionInputBuffer(new HttpTransportMetricsImpl(), DEFAULT_BUFFER_SIZE);
             inbuffer.bind(is);
 
@@ -191,54 +208,68 @@ public static MimeEntity parseEnvelopedEntity(byte[] envelopedContent, PrivateKe
                     new ArrayList<CharArrayBuffer>());
 
             // Get Content-Type and Content-Transfer-Encoding
-            ContentType envelopedEntityContentType = null;
-            String envelopedEntityContentTransferEncoding = null;
+            ContentType entityContentType = null;
+            String entityContentTransferEncoding = null;
             for (Header header : headers) {
                 switch (header.getName()) {
                 case AS2Header.CONTENT_TYPE:
-                    envelopedEntityContentType = ContentType.parse(header.getValue());
+                    entityContentType = ContentType.parse(header.getValue());
                     break;
                 case AS2Header.CONTENT_TRANSFER_ENCODING:
-                    envelopedEntityContentTransferEncoding = header.getValue();
+                    entityContentTransferEncoding = header.getValue();
                     break;
                 default:
                     continue;
                 }
             }
-            if (envelopedEntityContentType == null) {
+            if (entityContentType == null) {
                 throw new HttpException("Failed to find Content-Type header in enveloped entity");
             }
 
-            MimeEntity entity = parseEntityBody(inbuffer, null, envelopedEntityContentType, envelopedEntityContentTransferEncoding, headers);
+            MimeEntity entity = parseEntityBody(inbuffer, null, entityContentType, entityContentTransferEncoding, headers);
             entity.removeAllHeaders();
             entity.setHeaders(headers);
             
             return entity;
         } catch (Exception e) {
-            return null;
+            throw new HttpException("Failed to parse entity", e);
         }
     }
 
-    public static byte[] decryptData(byte[] encryptedData, PrivateKey privateKey) throws Exception {
-        // Create enveloped data from encrypted data
-        CMSEnvelopedData cmsEnvelopedData = new CMSEnvelopedData(encryptedData);
-        
-        // Extract recipient information form enveloped data.
-        RecipientInformationStore recipientsInformationStore = cmsEnvelopedData.getRecipientInfos();
-        Collection<RecipientInformation> recipients = recipientsInformationStore.getRecipients();
-        Iterator<RecipientInformation> it = recipients.iterator();
-        
-        // Decrypt if enveloped data contains recipient information
-        if (it.hasNext()) {
-            // Create recipient from private key.
-            Recipient recipient = new JceKeyTransEnvelopedRecipient(privateKey);
-
-            // Extract decrypted data from recipient information
-            RecipientInformation recipientInfo = it.next();
-            return recipientInfo.getContent(recipient);
+    public static byte[] uncompressData(byte[] compressedData, InputExpanderProvider expanderProvider)
+            throws HttpException {
+        try {
+            CMSCompressedData cmsCompressedData = new CMSCompressedData(compressedData);
+            return cmsCompressedData.getContent(expanderProvider);
+        } catch (CMSException e) {
+            throw new HttpException("Failed to decompress data", e);
+        }
+    }
+
+    public static byte[] decryptData(byte[] encryptedData, PrivateKey privateKey) throws HttpException {
+        try {
+            // Create enveloped data from encrypted data
+            CMSEnvelopedData cmsEnvelopedData = new CMSEnvelopedData(encryptedData);
+            
+            // Extract recipient information form enveloped data.
+            RecipientInformationStore recipientsInformationStore = cmsEnvelopedData.getRecipientInfos();
+            Collection<RecipientInformation> recipients = recipientsInformationStore.getRecipients();
+            Iterator<RecipientInformation> it = recipients.iterator();
+            
+            // Decrypt if enveloped data contains recipient information
+            if (it.hasNext()) {
+                // Create recipient from private key.
+                Recipient recipient = new JceKeyTransEnvelopedRecipient(privateKey);
+
+                // Extract decrypted data from recipient information
+                RecipientInformation recipientInfo = it.next();
+                return recipientInfo.getContent(recipient);
+            }
+        } catch (CMSException e) {
+            throw new HttpException("Failed to decrypt data", e);
         }
         
-        return null;
+        throw new HttpException("Failed to decrypt data: bno recipeint information");
     }
     
     public static void parseMultipartSignedEntity(HttpMessage message)
diff --git a/components/camel-as2/camel-as2-api/src/test/java/org/apache/camel/component/as2/api/entity/CompressedEntityTest.java b/components/camel-as2/camel-as2-api/src/test/java/org/apache/camel/component/as2/api/entity/CompressedEntityTest.java
new file mode 100644
index 0000000000000..dc549e9bc8d12
--- /dev/null
+++ b/components/camel-as2/camel-as2-api/src/test/java/org/apache/camel/component/as2/api/entity/CompressedEntityTest.java
@@ -0,0 +1,89 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.as2.api.entity;
+
+import org.bouncycastle.cms.CMSCompressedDataGenerator;
+import org.bouncycastle.cms.jcajce.ZlibCompressor;
+import org.bouncycastle.cms.jcajce.ZlibExpanderProvider;
+import org.bouncycastle.operator.OutputCompressor;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+public class CompressedEntityTest {
+    
+    public static final String TEXT_PLAIN_CONTENT =
+            "MDN for -\r\n"
+            + " Message ID: <200207310834482A70BF63@\\\"~~foo~~\\\">\r\n"
+            + "  From: \"\\\"  as2Name  \\\"\"\r\n"
+            + "  To: \"0123456780000\""
+            + "  Received on: 2002-07-31 at 09:34:14 (EDT)\r\n"
+            + " Status: processed\r\n"
+            + " Comment: This is not a guarantee that the message has\r\n"
+            + "  been completely processed or &understood by the receiving\r\n"
+            + "  translator\r\n"
+            + "\r\n";
+
+    public static final String TEXT_PLAIN_CONTENT_CHARSET_NAME = "US-ASCII";
+
+    public static final String TEXT_PLAIN_CONTENT_TRANSFER_ENCODING = "7bit";
+
+    public static final String EXPECTED_TEXT_PLAIN_CONTENT =
+            "MDN for -\r\n"
+            + " Message ID: <200207310834482A70BF63@\\\"~~foo~~\\\">\r\n"
+            + "  From: \"\\\"  as2Name  \\\"\"\r\n"
+            + "  To: \"0123456780000\""
+            + "  Received on: 2002-07-31 at 09:34:14 (EDT)\r\n"
+            + " Status: processed\r\n"
+            + " Comment: This is not a guarantee that the message has\r\n"
+            + "  been completely processed or &understood by the receiving\r\n"
+            + "  translator\r\n"
+            + "\r\n";
+
+    
+    public static final String APPLICATION_PKCS7_MIME_COMPRESSED_TRANSFER_ENCODING = "base64";
+
+    @Before
+    public void setUp() throws Exception {
+    }
+
+    @After
+    public void tearDown() throws Exception {
+    }
+    
+    @Test
+    public void createCompressedEntityTest() throws Exception {
+        TextPlainEntity textPlainEntity = new TextPlainEntity(TEXT_PLAIN_CONTENT, TEXT_PLAIN_CONTENT_CHARSET_NAME,
+                TEXT_PLAIN_CONTENT_TRANSFER_ENCODING, false);
+
+        CMSCompressedDataGenerator cGen = new CMSCompressedDataGenerator();
+
+        OutputCompressor compressor = new ZlibCompressor();
+
+        ApplicationPkcs7MimeCompressedDataEntity compressedEntity = new ApplicationPkcs7MimeCompressedDataEntity(
+                textPlainEntity, cGen, compressor, APPLICATION_PKCS7_MIME_COMPRESSED_TRANSFER_ENCODING, false);
+
+        MimeEntity decompressedEntity = compressedEntity.getCompressedEntity(new ZlibExpanderProvider());
+        assertTrue("", decompressedEntity instanceof TextPlainEntity);
+        TextPlainEntity decompressedTextPlainEntity = (TextPlainEntity) decompressedEntity;
+        assertEquals("", EXPECTED_TEXT_PLAIN_CONTENT, decompressedTextPlainEntity.getText());
+    }
+
+}

From 83e1a4a025675ff9b5da2ccdd1cc329181b2def5 Mon Sep 17 00:00:00 2001
From: "Carlos R. B. Meneghette" <carlosrb@simepar.br>
Date: Wed, 28 Nov 2018 00:32:42 -0200
Subject: [PATCH 100/125] Added support for rabbitmq x-max-priority

---
 .../apache/camel/component/rabbitmq/RabbitMQConstants.java   | 1 +
 .../camel/component/rabbitmq/RabbitMQDeclareSupport.java     | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQConstants.java b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQConstants.java
index d796a58e1f8fa..446d39f5dfffc 100644
--- a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQConstants.java
+++ b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQConstants.java
@@ -46,6 +46,7 @@ public final class RabbitMQConstants {
     public static final String RABBITMQ_DIRECT_REPLY_EXCHANGE = "";
     public static final String RABBITMQ_DIRECT_REPLY_ROUTING_KEY = "amq.rabbitmq.reply-to";
     public static final String RABBITMQ_QUEUE_LENGTH_LIMIT_KEY = "x-max-length";
+    public static final String RABBITMQ_QUEUE_MAX_PRIORITY_KEY = "x-max-priority";
     public static final String RABBITMQ_QUEUE_MESSAGE_TTL_KEY = "x-message-ttl";
     public static final String RABBITMQ_QUEUE_TTL_KEY = "x-expires";
     
diff --git a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQDeclareSupport.java b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQDeclareSupport.java
index 766cf41a3c375..0fcce013e6dc6 100644
--- a/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQDeclareSupport.java
+++ b/components/camel-rabbitmq/src/main/java/org/apache/camel/component/rabbitmq/RabbitMQDeclareSupport.java
@@ -71,6 +71,11 @@ private void formatSpecialQueueArguments(Map<String, Object> queueArgs) {
         if (queueLengthLimit instanceof String) {
             queueArgs.put(RabbitMQConstants.RABBITMQ_QUEUE_LENGTH_LIMIT_KEY, Long.parseLong((String) queueLengthLimit));
         }
+        
+        Object queueMaxPriority = queueArgs.get(RabbitMQConstants.RABBITMQ_QUEUE_MAX_PRIORITY_KEY);
+        if (queueMaxPriority instanceof String) {
+            queueArgs.put(RabbitMQConstants.RABBITMQ_QUEUE_MAX_PRIORITY_KEY, Integer.parseInt((String) queueMaxPriority));
+        }
 
         Object queueMessageTtl = queueArgs.get(RabbitMQConstants.RABBITMQ_QUEUE_MESSAGE_TTL_KEY);
         if (queueMessageTtl instanceof String) {

From f804f31e4f7e109c6a9dce49c53ad2acfa2b5d78 Mon Sep 17 00:00:00 2001
From: Andrea Cosentino <ancosen@gmail.com>
Date: Wed, 28 Nov 2018 11:02:32 +0100
Subject: [PATCH 101/125] Upgrade Braintree Java to version 2.88.0

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

diff --git a/parent/pom.xml b/parent/pom.xml
index 7d083f62b666d..e5970d9f7caff 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -97,7 +97,7 @@
     <bouncycastle-version>1.60</bouncycastle-version>
     <boxjavalibv2.version>3.2.1</boxjavalibv2.version>
     <box-java-sdk-version>2.10.0</box-java-sdk-version>
-    <braintree-gateway-version>2.87.0</braintree-gateway-version>
+    <braintree-gateway-version>2.88.0</braintree-gateway-version>
     <brave-zipkin-version>5.5.1</brave-zipkin-version>
     <build-helper-maven-plugin-version>1.12</build-helper-maven-plugin-version>
     <c3p0-version>0.9.5.2</c3p0-version>

From 284fbfe56f3ae09a27af59d5560a9b839651db47 Mon Sep 17 00:00:00 2001
From: cherepnalkovski <cherepnalkovski@hotmail.com>
Date: Wed, 28 Nov 2018 11:35:29 +0100
Subject: [PATCH 102/125] Change download previous file version endpoint
 (#2642)

Shorthand Alias will remain nonfunctional until changes are made on backend mapping.

The real working endpoint is downloadPreviousFileVersion (singular form), on backend downloadVersion is mapped with downloadPreviousFileVersions (plural form) which not exists.
---
 .../camel-box-component/src/main/docs/box-component.adoc        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/components/camel-box/camel-box-component/src/main/docs/box-component.adoc b/components/camel-box/camel-box-component/src/main/docs/box-component.adoc
index a00d2e346772e..e04398ba49ac3 100644
--- a/components/camel-box/camel-box-component/src/main/docs/box-component.adoc
+++ b/components/camel-box/camel-box-component/src/main/docs/box-component.adoc
@@ -352,7 +352,7 @@ box:files/endpoint?[options]
 
 |getFileVersions |versions |fileId |java.util.Collection
 
-|downloadPreviousFileVersions |downloadVersion |fileId, version, output, [listener] |java.io.OutputStream
+|downloadPreviousFileVersion |downloadVersion |fileId, version, output, [listener] |java.io.OutputStream
 
 |deleteFileVersion |deleteVersion |fileId, version |
 

From ec635ad29be9facde3d1889251398d30bc808361 Mon Sep 17 00:00:00 2001
From: Claus Ibsen <claus.ibsen@gmail.com>
Date: Wed, 28 Nov 2018 11:16:24 +0000
Subject: [PATCH 103/125] Deprecate camel connectors

---
 connectors/camel-connector-maven-plugin/pom.xml | 2 +-
 connectors/camel-connector/pom.xml              | 2 +-
 connectors/examples/pom.xml                     | 2 +-
 connectors/pom.xml                              | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/connectors/camel-connector-maven-plugin/pom.xml b/connectors/camel-connector-maven-plugin/pom.xml
index a77590cfb2938..9bb1738330859 100644
--- a/connectors/camel-connector-maven-plugin/pom.xml
+++ b/connectors/camel-connector-maven-plugin/pom.xml
@@ -28,7 +28,7 @@
   </parent>
 
   <artifactId>camel-connector-maven-plugin</artifactId>
-  <name>Camel :: Connectors :: Camel Connector Maven Plugin</name>
+  <name>Camel :: Connectors :: Camel Connector Maven Plugin (deprecated)</name>
   <packaging>maven-plugin</packaging>
 
   <dependencies>
diff --git a/connectors/camel-connector/pom.xml b/connectors/camel-connector/pom.xml
index eb81645b3d0a5..e4c9fb84ae87a 100644
--- a/connectors/camel-connector/pom.xml
+++ b/connectors/camel-connector/pom.xml
@@ -29,7 +29,7 @@
 
   <artifactId>camel-connector</artifactId>
   <packaging>jar</packaging>
-  <name>Camel :: Connectors :: Camel Connector Component</name>
+  <name>Camel :: Connectors :: Camel Connector Component (deprecated)</name>
   <description>Camel Connector Component</description>
 
   <properties>
diff --git a/connectors/examples/pom.xml b/connectors/examples/pom.xml
index 100711972b21a..21622390682c4 100644
--- a/connectors/examples/pom.xml
+++ b/connectors/examples/pom.xml
@@ -29,7 +29,7 @@
   </parent>
 
   <artifactId>connectors-examples</artifactId>
-  <name>Camel :: Connectors :: Examples</name>
+  <name>Camel :: Connectors :: Examples (deprecated)</name>
   <description>Camel Connectors Examples</description>
   <packaging>pom</packaging>
 
diff --git a/connectors/pom.xml b/connectors/pom.xml
index 9d1c96605ee65..b62481c26e055 100644
--- a/connectors/pom.xml
+++ b/connectors/pom.xml
@@ -30,7 +30,7 @@
   </parent>
 
   <artifactId>connectors</artifactId>
-  <name>Camel :: Connectors</name>
+  <name>Camel :: Connectors (deprecated)</name>
   <description>Camel Connectors</description>
   <packaging>pom</packaging>
 

From 34513fea06888f8f1b0bcab74028a819576d998d Mon Sep 17 00:00:00 2001
From: Claus Ibsen <claus.ibsen@gmail.com>
Date: Wed, 28 Nov 2018 11:17:30 +0000
Subject: [PATCH 104/125] Deprecate camel connectors related in catalog

---
 archetypes/camel-archetype-connector/pom.xml | 2 +-
 platforms/camel-catalog-connector/pom.xml    | 2 +-
 platforms/camel-catalog-nexus/pom.xml        | 2 +-
 platforms/camel-catalog-rest-app/pom.xml     | 2 +-
 platforms/camel-catalog-rest/pom.xml         | 2 +-
 platforms/myfoo-connector/pom.xml            | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/archetypes/camel-archetype-connector/pom.xml b/archetypes/camel-archetype-connector/pom.xml
index 177d624c8adb8..2d794a1958e1d 100644
--- a/archetypes/camel-archetype-connector/pom.xml
+++ b/archetypes/camel-archetype-connector/pom.xml
@@ -29,7 +29,7 @@
 
   <groupId>org.apache.camel.archetypes</groupId>
   <artifactId>camel-archetype-connector</artifactId>
-  <name>Camel :: Archetypes :: Connector</name>
+  <name>Camel :: Archetypes :: Connector (deprecated)</name>
   <description>Creates a new Camel connector.</description>
   <packaging>maven-archetype</packaging>
 
diff --git a/platforms/camel-catalog-connector/pom.xml b/platforms/camel-catalog-connector/pom.xml
index 44dfd0ce21f82..988b4b19dcd56 100644
--- a/platforms/camel-catalog-connector/pom.xml
+++ b/platforms/camel-catalog-connector/pom.xml
@@ -29,7 +29,7 @@
 
   <artifactId>camel-catalog-connector</artifactId>
   <packaging>jar</packaging>
-  <name>Camel :: Platforms :: Camel Catalog :: Connector</name>
+  <name>Camel :: Platforms :: Camel Catalog :: Connector (deprecated)</name>
   <description>Camel Catalog Connector</description>
 
   <properties>
diff --git a/platforms/camel-catalog-nexus/pom.xml b/platforms/camel-catalog-nexus/pom.xml
index 10062f8a2a287..eb4ac954e86c5 100644
--- a/platforms/camel-catalog-nexus/pom.xml
+++ b/platforms/camel-catalog-nexus/pom.xml
@@ -30,7 +30,7 @@
 
   <artifactId>camel-catalog-nexus</artifactId>
   <packaging>jar</packaging>
-  <name>Camel :: Platforms :: Camel Catalog :: Nexus</name>
+  <name>Camel :: Platforms :: Camel Catalog :: Nexus (deprecated)</name>
   <description>Camel Catalog Nexus</description>
 
   <properties>
diff --git a/platforms/camel-catalog-rest-app/pom.xml b/platforms/camel-catalog-rest-app/pom.xml
index cfcecc02583a8..978a62c95a7c5 100644
--- a/platforms/camel-catalog-rest-app/pom.xml
+++ b/platforms/camel-catalog-rest-app/pom.xml
@@ -28,7 +28,7 @@
 
   <artifactId>camel-catalog-rest-app</artifactId>
   <packaging>jar</packaging>
-  <name>Camel :: Platforms :: Camel Catalog :: REST App</name>
+  <name>Camel :: Platforms :: Camel Catalog :: REST App (deprecated)</name>
   <description>Camel Catalog REST standalone application</description>
 
   <properties>
diff --git a/platforms/camel-catalog-rest/pom.xml b/platforms/camel-catalog-rest/pom.xml
index f9c4c3b2a6610..8c4528d014df3 100644
--- a/platforms/camel-catalog-rest/pom.xml
+++ b/platforms/camel-catalog-rest/pom.xml
@@ -29,7 +29,7 @@
 
   <artifactId>camel-catalog-rest</artifactId>
   <packaging>jar</packaging>
-  <name>Camel :: Platforms :: Camel Catalog :: REST</name>
+  <name>Camel :: Platforms :: Camel Catalog :: REST (deprecated)</name>
   <description>Camel Catalog REST</description>
 
   <properties>
diff --git a/platforms/myfoo-connector/pom.xml b/platforms/myfoo-connector/pom.xml
index d8637d8d9231a..4082cdc3509d0 100644
--- a/platforms/myfoo-connector/pom.xml
+++ b/platforms/myfoo-connector/pom.xml
@@ -29,7 +29,7 @@
   </parent>
 
   <artifactId>myfoo-connector</artifactId>
-  <name>Camel :: Platforms :: My Foo Connector</name>
+  <name>Camel :: Platforms :: My Foo Connector (deprecated)</name>
   <description>Camel My Foo Connector</description>
   <packaging>jar</packaging>
 

From 87b501575c882800f0b0e673c2ab3d45ca03810d Mon Sep 17 00:00:00 2001
From: Andrea Cosentino <ancosen@gmail.com>
Date: Wed, 28 Nov 2018 12:02:15 +0100
Subject: [PATCH 105/125] CAMEL-12930 - Ability to execute DML statements in
 Google Bigquery component, thanks to Roman Lusnikov for the patch

---
 .../docs/google-bigquery-sql-component.adoc   | 151 +++++++++++++++++
 .../bigquery/GoogleBigQueryConstants.java     |   1 +
 .../sql/GoogleBigQuerySQLComponent.java       |  81 +++++++++
 .../sql/GoogleBigQuerySQLConfiguration.java   |  76 +++++++++
 .../sql/GoogleBigQuerySQLEndpoint.java        |  80 +++++++++
 .../sql/GoogleBigQuerySQLProducer.java        | 159 ++++++++++++++++++
 .../google/bigquery/sql/SqlHelper.java        |  94 +++++++++++
 .../camel/component/google-bigquery-sql       |  18 ++
 .../sql/SqlQueryFromResourceTest.java         |  85 ++++++++++
 .../integration/sql/SqlQueryTest.java         |  85 ++++++++++
 .../sql/GoogleBigQuerySQLComponentTest.java   |  52 ++++++
 .../GoogleBigQuerySQLProducerBaseTest.java    |  44 +++++
 ...leBigQuerySQLProducerWithParamersTest.java |  91 ++++++++++
 ...gleBigQuerySQLProducerWithPatternTest.java |  69 ++++++++
 .../bigquery/unit/sql/SqlHelperTest.java      | 113 +++++++++++++
 .../src/test/resources/sql/delete.sql         |   1 +
 .../src/test/resources/sql/insert.sql         |   2 +
 17 files changed, 1202 insertions(+)
 create mode 100644 components/camel-google-bigquery/src/main/docs/google-bigquery-sql-component.adoc
 create mode 100644 components/camel-google-bigquery/src/main/java/org/apache/camel/component/google/bigquery/sql/GoogleBigQuerySQLComponent.java
 create mode 100644 components/camel-google-bigquery/src/main/java/org/apache/camel/component/google/bigquery/sql/GoogleBigQuerySQLConfiguration.java
 create mode 100644 components/camel-google-bigquery/src/main/java/org/apache/camel/component/google/bigquery/sql/GoogleBigQuerySQLEndpoint.java
 create mode 100644 components/camel-google-bigquery/src/main/java/org/apache/camel/component/google/bigquery/sql/GoogleBigQuerySQLProducer.java
 create mode 100644 components/camel-google-bigquery/src/main/java/org/apache/camel/component/google/bigquery/sql/SqlHelper.java
 create mode 100644 components/camel-google-bigquery/src/main/resources/META-INF/services/org/apache/camel/component/google-bigquery-sql
 create mode 100644 components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/integration/sql/SqlQueryFromResourceTest.java
 create mode 100644 components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/integration/sql/SqlQueryTest.java
 create mode 100644 components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/sql/GoogleBigQuerySQLComponentTest.java
 create mode 100644 components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/sql/GoogleBigQuerySQLProducerBaseTest.java
 create mode 100644 components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/sql/GoogleBigQuerySQLProducerWithParamersTest.java
 create mode 100644 components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/sql/GoogleBigQuerySQLProducerWithPatternTest.java
 create mode 100644 components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/sql/SqlHelperTest.java
 create mode 100644 components/camel-google-bigquery/src/test/resources/sql/delete.sql
 create mode 100644 components/camel-google-bigquery/src/test/resources/sql/insert.sql

diff --git a/components/camel-google-bigquery/src/main/docs/google-bigquery-sql-component.adoc b/components/camel-google-bigquery/src/main/docs/google-bigquery-sql-component.adoc
new file mode 100644
index 0000000000000..23f5df6d5bc1c
--- /dev/null
+++ b/components/camel-google-bigquery/src/main/docs/google-bigquery-sql-component.adoc
@@ -0,0 +1,151 @@
+[[google-bigquery-sql-component]]
+== Google BigQuery Standard SQL Component
+== Google BigQuery Component
+*Available as of Camel version 2.23*
+
+### Component Description
+
+The Google Bigquery SQL component provides access
+to https://cloud.google.com/bigquery/[Cloud BigQuery Infrastructure] via
+the https://developers.google.com/apis-explorer/#p/bigquery/v2/bigquery.jobs.query[Google Client Services API].
+
+The current implementation supports only standard SQL
+https://cloud.google.com/bigquery/docs/reference/standard-sql/dml-syntax[DML queries].
+
+Maven users will need to add the following dependency to their pom.xml
+for this component:
+
+[source,xml]
+------------------------------------------------------
+<dependency>
+    <groupId>org.apache.camel</groupId>
+    <artifactId>camel-google-bigquery</artifactId>
+    <version>x.x.x</version>
+    <!-- use the same version as your Camel core version -->
+</dependency>
+
+------------------------------------------------------
+
+[[GoogleBigQuery-AuthenticationConfiguration]]
+
+### Authentication Configuration
+
+Google BigQuery component authentication is targeted for use with the GCP Service Accounts.
+For more information please refer to https://cloud.google.com/docs/authentication[Google Cloud Platform Auth Guide]
+
+Google security credentials can be set explicitly via one of the two options:
+
+* Service Account Email and Service Account Key (PEM format)
+* GCP credentials file location
+
+If both are set, the Service Account Email/Key will take precedence.
+
+Or implicitly, where the connection factory falls back on
+https://developers.google.com/identity/protocols/application-default-credentials#howtheywork[Application Default Credentials].
+
+*OBS!* The location of the default credentials file is configurable - via GOOGLE_APPLICATION_CREDENTIALS environment variable.
+
+Service Account Email and Service Account Key can be found in the GCP JSON credentials file as client_email and private_key respectively.
+
+### URI Format
+
+[source,java]
+--------------------------------------------------------
+        google-bigquery-sql://project-id:query?[options]
+--------------------------------------------------------
+
+Examples:
+[source,java]
+--------------------------------------------------------
+        google-bigquery-sql://project-17248459:delete * from test.table where id=@myId
+        google-bigquery-sql://project-17248459:delete * from ${datasetId}.${tableId} where id=@myId
+--------------------------------------------------------
+where
+
+ * parameters in form ${name} are extracted from message headers and formed the translated query
+ * parameters in form @name are extracted from body or message headers and sent to Google Bigquery
+
+You can externalize your SQL queries to files in the classpath or file system as shown:
+[source,java]
+--------------------------------------------------------
+        google-bigquery-sql://project-17248459::classpath:delete.sql
+--------------------------------------------------------
+
+
+
+### Options
+
+// component options: START
+The Google BigQuery Standard SQL component supports 3 options, which are listed below.
+
+
+
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *projectId* (producer) | Google Cloud Project Id |  | String
+| *connectionFactory* (producer) | ConnectionFactory to obtain connection to Bigquery Service. If non provided the default one will be used |  | GoogleBigQuery ConnectionFactory
+| *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 Google BigQuery Standard SQL endpoint is configured using URI syntax:
+
+----
+google-bigquery-sql:query
+----
+
+with the following path and query parameters:
+
+==== Path Parameters (2 parameters):
+
+
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *projectId* | *Required* Google Cloud Project Id |  | String
+| *query* | *Required* BigQuery standard SQL query |  | String
+|===
+
+
+==== Query Parameters (2 parameters):
+
+
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *connectionFactory* (producer) | ConnectionFactory to obtain connection to Bigquery Service. If non provided the default will be used. |  | GoogleBigQuery ConnectionFactory
+| *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
+// spring-boot-auto-configure options: START
+=== Spring Boot Auto-Configuration
+
+
+The component supports 4 options, which are listed below.
+
+
+
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *camel.component.google-bigquery-sql.enabled* | Whether to enable auto configuration of the google-bigquery component. This is enabled by default. |  | Boolean
+| *camel.component.google-bigquery-sql.project-id* | Google Cloud Project Id |  | String
+//| *camel.component.google-bigquery.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
+|===
+// spring-boot-auto-configure options: END
+
+
+### Ouput Message Headers
+
+[width="100%",cols="10%,10%,80%",options="header",]
+|=======================================================================
+|Name |Type |Description
+|`CamelGoogleBigQueryTranslatedQuery` |`String` | Preprocessed query text
+|=======================================================================
+
+
+### Producer Endpoints
+
+Google BigQuery SQL endpoint expects the payload to be either empty or a map of query parameters.
\ No newline at end of file
diff --git a/components/camel-google-bigquery/src/main/java/org/apache/camel/component/google/bigquery/GoogleBigQueryConstants.java b/components/camel-google-bigquery/src/main/java/org/apache/camel/component/google/bigquery/GoogleBigQueryConstants.java
index cfd3c574df65d..945cde7551e46 100644
--- a/components/camel-google-bigquery/src/main/java/org/apache/camel/component/google/bigquery/GoogleBigQueryConstants.java
+++ b/components/camel-google-bigquery/src/main/java/org/apache/camel/component/google/bigquery/GoogleBigQueryConstants.java
@@ -21,6 +21,7 @@ public final class GoogleBigQueryConstants {
     public static final String TABLE_ID = "CamelGoogleBigQueryTableId";
     public static final String INSERT_ID = "CamelGoogleBigQueryInsertId";
     public static final String PARTITION_DECORATOR = "CamelGoogleBigQueryPartitionDecorator";
+    public static final String TRANSLATED_QUERY = "CamelGoogleBigQueryTranslatedQuery";
 
     /**
      * Prevent instantiation.
diff --git a/components/camel-google-bigquery/src/main/java/org/apache/camel/component/google/bigquery/sql/GoogleBigQuerySQLComponent.java b/components/camel-google-bigquery/src/main/java/org/apache/camel/component/google/bigquery/sql/GoogleBigQuerySQLComponent.java
new file mode 100644
index 0000000000000..fcbcf66cb2c7b
--- /dev/null
+++ b/components/camel-google-bigquery/src/main/java/org/apache/camel/component/google/bigquery/sql/GoogleBigQuerySQLComponent.java
@@ -0,0 +1,81 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.google.bigquery.sql;
+
+import java.util.Map;
+import org.apache.camel.CamelContext;
+import org.apache.camel.Endpoint;
+import org.apache.camel.component.google.bigquery.GoogleBigQueryConnectionFactory;
+import org.apache.camel.impl.DefaultComponent;
+
+public class GoogleBigQuerySQLComponent extends DefaultComponent {
+    private String projectId;
+    private GoogleBigQueryConnectionFactory connectionFactory;
+
+    public GoogleBigQuerySQLComponent() {
+        super();
+    }
+
+    public GoogleBigQuerySQLComponent(CamelContext camelContext) {
+        super(camelContext);
+    }
+
+    // Endpoint represents a single table
+    @Override
+    protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
+        String[] parts = remaining.split(":");
+
+        if (parts.length < 2) {
+            throw new IllegalArgumentException("Google BigQuery Endpoint format \"projectId:<query>\"");
+        }
+
+        GoogleBigQuerySQLConfiguration configuration = new GoogleBigQuerySQLConfiguration();
+        setProperties(configuration, parameters);
+        configuration.parseRemaining(remaining);
+
+        if (configuration.getConnectionFactory() == null) {
+            configuration.setConnectionFactory(getConnectionFactory());
+        }
+
+        return new GoogleBigQuerySQLEndpoint(uri, this, configuration);
+    }
+
+    public String getProjectId() {
+        return projectId;
+    }
+
+    /**
+     * Google Cloud Project Id
+     */
+    public void setProjectId(String projectId) {
+        this.projectId = projectId;
+    }
+
+    public GoogleBigQueryConnectionFactory getConnectionFactory() {
+        if (connectionFactory == null) {
+            connectionFactory = new GoogleBigQueryConnectionFactory();
+        }
+        return connectionFactory;
+    }
+
+    /**
+     * ConnectionFactory to obtain connection to Bigquery Service. If non provided the default one will be used
+     */
+    public void setConnectionFactory(GoogleBigQueryConnectionFactory connectionFactory) {
+        this.connectionFactory = connectionFactory;
+    }
+}
diff --git a/components/camel-google-bigquery/src/main/java/org/apache/camel/component/google/bigquery/sql/GoogleBigQuerySQLConfiguration.java b/components/camel-google-bigquery/src/main/java/org/apache/camel/component/google/bigquery/sql/GoogleBigQuerySQLConfiguration.java
new file mode 100644
index 0000000000000..25ed0dfff1a24
--- /dev/null
+++ b/components/camel-google-bigquery/src/main/java/org/apache/camel/component/google/bigquery/sql/GoogleBigQuerySQLConfiguration.java
@@ -0,0 +1,76 @@
+/**
+ * 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
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.google.bigquery.sql;
+
+import org.apache.camel.component.google.bigquery.GoogleBigQueryConnectionFactory;
+import org.apache.camel.spi.Metadata;
+import org.apache.camel.spi.UriParam;
+import org.apache.camel.spi.UriParams;
+import org.apache.camel.spi.UriPath;
+
+@UriParams
+public class GoogleBigQuerySQLConfiguration {
+
+    @UriParam(description = "ConnectionFactory to obtain connection to Bigquery Service. If non provided the default one will be used")
+    private GoogleBigQueryConnectionFactory connectionFactory;
+    @UriPath(label = "common", description = "Google Cloud Project Id")
+    @Metadata(required = "true")
+    private String projectId;
+    @UriPath(label = "common", description = "BigQuery standard SQL query")
+    @Metadata(required = "true")
+    private String query;
+
+    public void parseRemaining(String remaining) {
+        int indexOfColon = remaining.indexOf(":");
+
+        if (indexOfColon < 0) {
+            throw new IllegalArgumentException("Google BigQuery Endpoint format \"projectId:query\"");
+        }
+
+        projectId = remaining.substring(0, indexOfColon);
+        query = remaining.substring(indexOfColon + 1);
+    }
+
+    /**
+     * ConnectionFactory to obtain connection to Bigquery Service. If non provided the default will be used.
+     */
+    public GoogleBigQueryConnectionFactory getConnectionFactory() {
+        return connectionFactory;
+    }
+
+    public void setConnectionFactory(GoogleBigQueryConnectionFactory connectionFactory) {
+        this.connectionFactory = connectionFactory;
+    }
+
+    public String getQuery() {
+        return query;
+    }
+
+    public GoogleBigQuerySQLConfiguration setQuery(String query) {
+        this.query = query;
+        return this;
+    }
+
+    public String getProjectId() {
+        return projectId;
+    }
+
+    public GoogleBigQuerySQLConfiguration setProjectId(String projectId) {
+        this.projectId = projectId;
+        return this;
+    }
+}
diff --git a/components/camel-google-bigquery/src/main/java/org/apache/camel/component/google/bigquery/sql/GoogleBigQuerySQLEndpoint.java b/components/camel-google-bigquery/src/main/java/org/apache/camel/component/google/bigquery/sql/GoogleBigQuerySQLEndpoint.java
new file mode 100644
index 0000000000000..fee9e962f7958
--- /dev/null
+++ b/components/camel-google-bigquery/src/main/java/org/apache/camel/component/google/bigquery/sql/GoogleBigQuerySQLEndpoint.java
@@ -0,0 +1,80 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.google.bigquery.sql;
+
+import com.google.api.services.bigquery.Bigquery;
+import org.apache.camel.Consumer;
+import org.apache.camel.Processor;
+import org.apache.camel.Producer;
+import org.apache.camel.impl.DefaultEndpoint;
+import org.apache.camel.spi.UriEndpoint;
+import org.apache.camel.spi.UriParam;
+
+/**
+ * Google BigQuery data warehouse for analytics.
+ * 
+ * BigQuery Endpoint Definition
+ * Represents a table within a BigQuery dataset
+ * Contains configuration details for a single table and the utility methods (such as check, create) to ease operations
+ * URI Parameters:
+ * * Logger ID - To ensure that logging is unified under Route Logger, the logger ID can be passed on
+ *               via an endpoint URI parameter
+ * * Partitioned - to indicate that the table needs to be partitioned - every UTC day to be written into a
+ *                 timestamped separate table
+ *                 side effect: Australian operational day is always split between two UTC days, and, therefore, tables
+ *
+ * Another consideration is that exceptions are not handled within the class. They are expected to bubble up and be handled
+ * by Camel.
+ */
+@UriEndpoint(firstVersion = "2.23.0", scheme = "google-bigquery-sql", title = "Google BigQuery Standard SQL", syntax = "google-bigquery-sql:query",
+    label = "cloud,messaging", producerOnly = true)
+public class GoogleBigQuerySQLEndpoint extends DefaultEndpoint {
+
+    @UriParam
+    protected final GoogleBigQuerySQLConfiguration configuration;
+
+    protected GoogleBigQuerySQLEndpoint(String endpointUri, GoogleBigQuerySQLComponent component, GoogleBigQuerySQLConfiguration configuration) {
+        super(endpointUri, component);
+        this.configuration = configuration;
+    }
+
+    @Override
+    public Producer createProducer() throws Exception {
+        Bigquery bigquery = getConfiguration().getConnectionFactory().getDefaultClient();
+        GoogleBigQuerySQLProducer producer = new GoogleBigQuerySQLProducer(bigquery, this, configuration);
+        return producer;
+    }
+
+    public Consumer createConsumer(Processor processor) throws Exception {
+        throw new UnsupportedOperationException("Cannot consume from the BigQuery endpoint: " + getEndpointUri());
+    }
+
+    public boolean isSingleton() {
+        return true;
+    }
+
+    public GoogleBigQuerySQLConfiguration getConfiguration() {
+        return configuration;
+    }
+
+    @Override
+    public GoogleBigQuerySQLComponent getComponent() {
+        return (GoogleBigQuerySQLComponent)super.getComponent();
+    }
+
+
+}
diff --git a/components/camel-google-bigquery/src/main/java/org/apache/camel/component/google/bigquery/sql/GoogleBigQuerySQLProducer.java b/components/camel-google-bigquery/src/main/java/org/apache/camel/component/google/bigquery/sql/GoogleBigQuerySQLProducer.java
new file mode 100644
index 0000000000000..e9ce93d789f99
--- /dev/null
+++ b/components/camel-google-bigquery/src/main/java/org/apache/camel/component/google/bigquery/sql/GoogleBigQuerySQLProducer.java
@@ -0,0 +1,159 @@
+/**
+ * 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
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.camel.component.google.bigquery.sql;
+
+import com.google.api.services.bigquery.Bigquery;
+import com.google.api.services.bigquery.model.*;
+import org.apache.camel.Exchange;
+import org.apache.camel.Message;
+import org.apache.camel.RuntimeExchangeException;
+import org.apache.camel.component.google.bigquery.GoogleBigQueryConstants;
+import org.apache.camel.impl.DefaultProducer;
+
+import java.util.*;
+
+/**
+ * Generic BigQuery Producer
+ */
+public class GoogleBigQuerySQLProducer extends DefaultProducer {
+
+    private final GoogleBigQuerySQLConfiguration configuration;
+    private Bigquery bigquery;
+    private String query;
+    private Set<String> queryParameterNames;
+
+    public GoogleBigQuerySQLProducer(Bigquery bigquery, GoogleBigQuerySQLEndpoint endpoint,
+                                     GoogleBigQuerySQLConfiguration configuration) {
+        super(endpoint);
+        this.bigquery = bigquery;
+        this.configuration = configuration;
+    }
+
+    /**
+     * Process the exchange
+     *
+     * The incoming exchange can be a grouped exchange in which case all the exchanges will be combined.
+     *
+     * The incoming can be
+     * <ul>
+     *     <li>A map where all map keys will map to field records. One map object maps to one bigquery row</li>
+     *     <li>A list of maps. Each entry in the list will map to one bigquery row</li>
+     * </ul>
+     * The incoming message is expected to be a List of Maps
+     * The assumptions:
+     * - All incoming records go into the same table
+     * - Incoming records sorted by the timestamp
+     */
+    @Override
+    public void process(Exchange exchange) throws Exception {
+        String translatedQuery = SqlHelper.translateQuery(query, exchange);
+        Map<String, Object> queryParameters = extractParameters(exchange);
+        exchange.getMessage().setHeader(GoogleBigQueryConstants.TRANSLATED_QUERY, translatedQuery);
+        Long affectedRows = executeSQL(translatedQuery, queryParameters);
+        log.debug("The query {} affected {} rows", query, affectedRows);
+        exchange.getMessage().setBody(affectedRows);
+    }
+
+    private Long executeSQL(String translatedQuery, Map<String, Object> queryParameters) throws Exception {
+        QueryRequest apiQueryRequest = new QueryRequest()
+                .setQuery(translatedQuery)
+                .setUseLegacySql(false);
+
+        Bigquery.Jobs.Query apiQuery = bigquery
+                .jobs()
+                .query(configuration.getProjectId(), apiQueryRequest);
+
+        setQueryParameters(queryParameters, apiQueryRequest);
+
+        if (log.isTraceEnabled()) {
+            log.trace("Sending query to bigquery standard sql: {}",
+                    translatedQuery);
+        }
+
+        QueryResponse apiResponse = apiQuery.execute();
+
+        if (apiResponse.getErrors() != null && !apiResponse.getErrors().isEmpty()) {
+            throw new Exception("Query " + translatedQuery + " failed: " + apiResponse.getErrors());
+        }
+
+        if (log.isTraceEnabled()) {
+            log.trace("Result of query {} is {}",
+                    translatedQuery, apiResponse.toPrettyString());
+        }
+        return apiResponse.getNumDmlAffectedRows();
+    }
+
+    private Map<String, Object> extractParameters(Exchange exchange) {
+        if (queryParameterNames == null || queryParameterNames.size() == 0)
+            return null;
+
+        Message message = exchange.getMessage();
+
+        HashMap<String, Object> headers = new HashMap<>(message.getHeaders());
+        if (message.getBody() instanceof Map) {
+            try {
+                headers.putAll(message.getBody(Map.class));
+            } catch (ClassCastException e) {
+                e.printStackTrace();
+            }
+        }
+
+        HashMap<String, Object> result = new HashMap<>(queryParameterNames.size());
+        queryParameterNames.forEach(s -> {
+            Object value = headers.get(s);
+            if (value == null) {
+                throw new RuntimeExchangeException("SQL parameter with name '" + s + "' not found in the message headers", exchange);
+            }
+
+            result.put(s, headers.get(s));
+        });
+
+        return result;
+    }
+
+    private void setQueryParameters(Map<String, Object> params, QueryRequest apiQueryRequest) {
+        if (params == null)
+            return;
+
+        List<QueryParameter> list = new ArrayList<>();
+        params.forEach((key, value) -> {
+            QueryParameter param = new QueryParameter();
+            param.setName(key)
+                    .setParameterType(new QueryParameterType().setType("STRING"))
+                    .setParameterValue(new QueryParameterValue().setValue(value.toString()));
+            list.add(param);
+        });
+        apiQueryRequest.setQueryParameters(list);
+    }
+
+    @Override
+    public boolean isSingleton() {
+        return true;
+    }
+
+    @Override
+    public GoogleBigQuerySQLEndpoint getEndpoint() {
+        return (GoogleBigQuerySQLEndpoint) super.getEndpoint();
+    }
+
+    @Override
+    protected void doStart() throws Exception {
+        super.doStart();
+        String placeholder = ":#"; // TODO
+        query = SqlHelper
+                .resolveQuery(getEndpoint().getCamelContext(), configuration.getQuery(), placeholder);
+        queryParameterNames = SqlHelper.extractParameterNames(query);
+    }
+}
diff --git a/components/camel-google-bigquery/src/main/java/org/apache/camel/component/google/bigquery/sql/SqlHelper.java b/components/camel-google-bigquery/src/main/java/org/apache/camel/component/google/bigquery/sql/SqlHelper.java
new file mode 100644
index 0000000000000..eb418568e9ee6
--- /dev/null
+++ b/components/camel-google-bigquery/src/main/java/org/apache/camel/component/google/bigquery/sql/SqlHelper.java
@@ -0,0 +1,94 @@
+/**
+ * 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
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.google.bigquery.sql;
+
+import org.apache.camel.*;
+import org.apache.camel.util.ResourceHelper;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public final class SqlHelper {
+
+    private static Pattern pattern = Pattern.compile("\\$\\{(\\w+)}");
+    private static Pattern parameterPattern = Pattern.compile("@(\\w+)");
+
+    private SqlHelper() {
+    }
+
+    /**
+     * Resolve the query by loading the query from the classpath or file resource if needed.
+     */
+    public static String resolveQuery(CamelContext camelContext, String query, String placeholder) throws NoTypeConversionAvailableException, IOException {
+        String answer = query;
+        if (ResourceHelper.hasScheme(query)) {
+            InputStream is = ResourceHelper
+                    .resolveMandatoryResourceAsInputStream(camelContext, query);
+            answer = camelContext.getTypeConverter().mandatoryConvertTo(String.class, is);
+            if (placeholder != null) {
+                answer = answer.replaceAll(placeholder, "@");
+            }
+        }
+        return answer;
+    }
+
+    /**
+     * Replaces pattern in query in form of "${param}" with values from message header
+     * Raises an error if param value not found in headers
+     * @param exchange
+     * @return Translated query text
+     */
+    public static String translateQuery(String query, Exchange exchange) {
+        Message message = exchange.getMessage();
+        Matcher matcher = pattern.matcher(query);
+        StringBuffer stringBuffer = new StringBuffer();
+        while (matcher.find()) {
+            String paramKey = matcher.group(1);
+
+            String value = message.getHeader(paramKey, String.class);
+            if (value == null) {
+                value = exchange.getProperty(paramKey, String.class);
+                if (value == null)
+                    throw new RuntimeExchangeException("SQL pattern with name '" + paramKey + "' not found in the message headers", exchange);
+            }
+
+            String replacement = Matcher.quoteReplacement(value);
+            matcher.appendReplacement(stringBuffer, replacement);
+        }
+        matcher.appendTail(stringBuffer);
+        return stringBuffer.toString();
+    }
+
+    /**
+     * Extracts list of parameters in form "@name" from query text
+     * @param query
+     * @return list of parameter names
+     */
+    public static Set<String> extractParameterNames(String query) {
+        Matcher matcher = parameterPattern.matcher(query);
+        Set<String> result = new HashSet<>();
+        while (matcher.find()) {
+            String paramName = matcher.group(1);
+            result.add(paramName);
+        }
+        return result;
+    }
+}
diff --git a/components/camel-google-bigquery/src/main/resources/META-INF/services/org/apache/camel/component/google-bigquery-sql b/components/camel-google-bigquery/src/main/resources/META-INF/services/org/apache/camel/component/google-bigquery-sql
new file mode 100644
index 0000000000000..1bf97f0eb2519
--- /dev/null
+++ b/components/camel-google-bigquery/src/main/resources/META-INF/services/org/apache/camel/component/google-bigquery-sql
@@ -0,0 +1,18 @@
+## ------------------------------------------------------------------------
+## 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.
+## ------------------------------------------------------------------------
+
+class=org.apache.camel.component.google.bigquery.sql.GoogleBigQuerySQLComponent
diff --git a/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/integration/sql/SqlQueryFromResourceTest.java b/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/integration/sql/SqlQueryFromResourceTest.java
new file mode 100644
index 0000000000000..1ea8f46fc4616
--- /dev/null
+++ b/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/integration/sql/SqlQueryFromResourceTest.java
@@ -0,0 +1,85 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.google.bigquery.integration.sql;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+import org.apache.camel.Endpoint;
+import org.apache.camel.EndpointInject;
+import org.apache.camel.Exchange;
+import org.apache.camel.Produce;
+import org.apache.camel.ProducerTemplate;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.google.bigquery.integration.BigQueryTestSupport;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.impl.DefaultExchange;
+import org.junit.Before;
+import org.junit.Test;
+
+public class SqlQueryFromResourceTest extends BigQueryTestSupport {
+    private static final String TABLE_ID = "test_sql_table";
+
+    @EndpointInject(uri = "direct:in")
+    private Endpoint directIn;
+
+    @EndpointInject(uri = "google-bigquery-sql:{{project.id}}:classpath:sql/insert.sql")
+    private Endpoint bigqueryEndpoint;
+
+    @EndpointInject(uri = "mock:sendResult")
+    private MockEndpoint sendResult;
+
+    @Produce(uri = "direct:in")
+    private ProducerTemplate producer;
+
+    @Before
+    public void init() throws Exception {
+        createBqTable(TABLE_ID);
+    }
+
+    @Override
+    protected RouteBuilder createRouteBuilder() throws Exception {
+        return new RouteBuilder() {
+            public void configure() {
+                from(directIn)
+                        .routeId("InsertRow")
+                        .to(bigqueryEndpoint)
+                        .to(sendResult);
+            }
+        };
+    }
+
+    @Test
+    public void insertRecordBySql() throws Exception {
+        Exchange exchange = new DefaultExchange(context);
+        String uuidCol1 = UUID.randomUUID().toString();
+        String uuidCol2 = UUID.randomUUID().toString();
+
+        Map<String, String> object = new HashMap<>();
+        object.put("col1", uuidCol1);
+        object.put("col2", uuidCol2);
+        exchange.getIn().setBody(object);
+
+        sendResult.expectedMessageCount(1);
+        sendResult.expectedBodiesReceived(1);
+        producer.send(exchange);
+        sendResult.assertIsSatisfied(4000);
+
+        assertRowExist(TABLE_ID, object);
+    }
+
+}
diff --git a/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/integration/sql/SqlQueryTest.java b/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/integration/sql/SqlQueryTest.java
new file mode 100644
index 0000000000000..fc490e5571e31
--- /dev/null
+++ b/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/integration/sql/SqlQueryTest.java
@@ -0,0 +1,85 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.google.bigquery.integration.sql;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+import org.apache.camel.Endpoint;
+import org.apache.camel.EndpointInject;
+import org.apache.camel.Exchange;
+import org.apache.camel.Produce;
+import org.apache.camel.ProducerTemplate;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.google.bigquery.integration.BigQueryTestSupport;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.impl.DefaultExchange;
+import org.junit.Before;
+import org.junit.Test;
+
+public class SqlQueryTest extends BigQueryTestSupport {
+    private static final String TABLE_ID = "test_sql_table";
+
+    @EndpointInject(uri = "direct:in")
+    private Endpoint directIn;
+
+    @EndpointInject(uri = "google-bigquery-sql:{{project.id}}: insert into {{bigquery.datasetId}}." + TABLE_ID + "(col1, col2) values (@col1, @col2)")
+    private Endpoint bigqueryEndpoint;
+
+    @EndpointInject(uri = "mock:sendResult")
+    private MockEndpoint sendResult;
+
+    @Produce(uri = "direct:in")
+    private ProducerTemplate producer;
+
+    @Before
+    public void init() throws Exception {
+        createBqTable(TABLE_ID);
+    }
+
+    @Override
+    protected RouteBuilder createRouteBuilder() throws Exception {
+        return new RouteBuilder() {
+            public void configure() {
+                from(directIn)
+                        .routeId("InsertRow")
+                        .to(bigqueryEndpoint)
+                        .to(sendResult);
+            }
+        };
+    }
+
+    @Test
+    public void insertRecordBySql() throws Exception {
+        Exchange exchange = new DefaultExchange(context);
+        String uuidCol1 = UUID.randomUUID().toString();
+        String uuidCol2 = UUID.randomUUID().toString();
+
+        Map<String, String> object = new HashMap<>();
+        object.put("col1", uuidCol1);
+        object.put("col2", uuidCol2);
+        exchange.getIn().setBody(object);
+
+        sendResult.expectedMessageCount(1);
+        sendResult.expectedBodiesReceived(1);
+        producer.send(exchange);
+        sendResult.assertIsSatisfied(4000);
+
+        assertRowExist(TABLE_ID, object);
+    }
+
+}
diff --git a/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/sql/GoogleBigQuerySQLComponentTest.java b/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/sql/GoogleBigQuerySQLComponentTest.java
new file mode 100644
index 0000000000000..ba24d0d0fc790
--- /dev/null
+++ b/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/sql/GoogleBigQuerySQLComponentTest.java
@@ -0,0 +1,52 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.google.bigquery.unit.sql;
+
+import static org.junit.Assert.assertEquals;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.component.google.bigquery.GoogleBigQueryComponent;
+import org.apache.camel.component.google.bigquery.GoogleBigQueryEndpoint;
+import org.apache.camel.component.google.bigquery.sql.GoogleBigQuerySQLComponent;
+import org.apache.camel.component.google.bigquery.sql.GoogleBigQuerySQLEndpoint;
+import org.apache.camel.component.google.bigquery.sql.SqlHelper;
+import org.junit.Test;
+import org.mockito.Mockito;
+
+public class GoogleBigQuerySQLComponentTest {
+    private CamelContext context = Mockito.mock(CamelContext.class);
+
+    @Test
+    public void testQuerySet() throws Exception {
+        String uri = "google-bigquery-sql:myproject:insert into testDatasetId.testTableId(id) values(1)";
+
+        GoogleBigQuerySQLEndpoint endpoint = (GoogleBigQuerySQLEndpoint)new GoogleBigQuerySQLComponent(context).createEndpoint(uri);
+
+        assertEquals("myproject", endpoint.getConfiguration().getProjectId());
+        assertEquals("insert into testDatasetId.testTableId(id) values(1)", endpoint.getConfiguration().getQuery());
+    }
+
+    @Test
+    public void testQueryFromResourceSet() throws Exception {
+        String uri = "google-bigquery-sql:myproject:classpath:sql/delete.sql";
+
+        GoogleBigQuerySQLEndpoint endpoint = (GoogleBigQuerySQLEndpoint)new GoogleBigQuerySQLComponent(context).createEndpoint(uri);
+
+        assertEquals("myproject", endpoint.getConfiguration().getProjectId());
+        assertEquals("classpath:sql/delete.sql", endpoint.getConfiguration().getQuery());
+    }
+}
diff --git a/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/sql/GoogleBigQuerySQLProducerBaseTest.java b/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/sql/GoogleBigQuerySQLProducerBaseTest.java
new file mode 100644
index 0000000000000..244f27c82bd65
--- /dev/null
+++ b/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/sql/GoogleBigQuerySQLProducerBaseTest.java
@@ -0,0 +1,44 @@
+package org.apache.camel.component.google.bigquery.unit.sql;
+
+import com.google.api.services.bigquery.Bigquery;
+import com.google.api.services.bigquery.model.QueryResponse;
+import org.apache.camel.component.google.bigquery.sql.GoogleBigQuerySQLConfiguration;
+import org.apache.camel.component.google.bigquery.sql.GoogleBigQuerySQLEndpoint;
+import org.apache.camel.component.google.bigquery.sql.GoogleBigQuerySQLProducer;
+import org.apache.camel.test.junit4.CamelTestSupport;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+public class GoogleBigQuerySQLProducerBaseTest extends CamelTestSupport {
+    protected GoogleBigQuerySQLEndpoint endpoint = mock(GoogleBigQuerySQLEndpoint.class);
+    protected Bigquery.Jobs mockJobs = mock(Bigquery.Jobs.class);
+    protected Bigquery.Jobs.Query mockQuery = mock(Bigquery.Jobs.Query.class);
+    protected GoogleBigQuerySQLProducer producer;
+    protected String sql;
+    protected String projectId = "testProjectId";
+    protected GoogleBigQuerySQLConfiguration configuration = new GoogleBigQuerySQLConfiguration();
+    protected Bigquery bigquery;
+
+    protected GoogleBigQuerySQLProducer createAndStartProducer() throws Exception {
+        configuration.setProjectId(projectId);
+        configuration.setQuery(sql);
+
+        GoogleBigQuerySQLProducer sqlProducer = new GoogleBigQuerySQLProducer(bigquery, endpoint, configuration);
+        sqlProducer.start();
+        return sqlProducer;
+    }
+
+    protected void setupBigqueryMock() throws Exception {
+        bigquery = mock(Bigquery.class);
+
+        when(bigquery.jobs()).thenReturn(mockJobs);
+        when(bigquery.jobs().query(anyString(), any())).thenReturn(mockQuery);
+
+        QueryResponse mockResponse = new QueryResponse()
+                .setNumDmlAffectedRows(1L);
+        when(mockQuery.execute()).thenReturn(mockResponse);
+    }
+}
diff --git a/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/sql/GoogleBigQuerySQLProducerWithParamersTest.java b/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/sql/GoogleBigQuerySQLProducerWithParamersTest.java
new file mode 100644
index 0000000000000..6227dfb40cef4
--- /dev/null
+++ b/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/sql/GoogleBigQuerySQLProducerWithParamersTest.java
@@ -0,0 +1,91 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.google.bigquery.unit.sql;
+
+import com.google.api.services.bigquery.model.QueryRequest;
+import org.apache.camel.Exchange;
+import org.apache.camel.RuntimeExchangeException;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.ArgumentCaptor;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.verify;
+
+public class GoogleBigQuerySQLProducerWithParamersTest extends GoogleBigQuerySQLProducerBaseTest {
+
+    @Before
+    public void init() throws Exception {
+        sql = "insert into testDatasetId.testTableId(id, data) values(@id, @data)";
+        setupBigqueryMock();
+        producer = createAndStartProducer();
+    }
+
+    @Test
+    public void sendMessageWithParametersInBody() throws Exception {
+        Map<String, String> body = new HashMap<>();
+        body.put("id", "100");
+        body.put("data", "some data");
+        producer.process(createExchangeWithBody(body));
+
+        ArgumentCaptor<QueryRequest> dataCaptor = ArgumentCaptor.forClass(QueryRequest.class);
+        verify(bigquery.jobs()).query(eq(projectId), dataCaptor.capture());
+
+        QueryRequest request = dataCaptor.getValue();
+        assertEquals(sql, request.getQuery());
+        assertEquals(2, request.getQueryParameters().size());
+
+        assertEquals("id", request.getQueryParameters().get(1).getName());
+        assertEquals("100", request.getQueryParameters().get(1).getParameterValue().getValue());
+
+        assertEquals("data", request.getQueryParameters().get(0).getName());
+        assertEquals("some data", request.getQueryParameters().get(0).getParameterValue().getValue());
+    }
+
+    @Test
+    public void sendMessageWithParametersInBodyAndHeaders() throws Exception {
+        Map<String, String> body = new HashMap<>();
+        body.put("id", "100");
+
+        Exchange exchange = createExchangeWithBody(body);
+        exchange.getMessage().getHeaders().put("id", "200");
+        exchange.getMessage().getHeaders().put("data", "some data");
+
+        producer.process(exchange);
+
+        ArgumentCaptor<QueryRequest> dataCaptor = ArgumentCaptor.forClass(QueryRequest.class);
+        verify(bigquery.jobs()).query(eq(projectId), dataCaptor.capture());
+
+        QueryRequest request = dataCaptor.getValue();
+        assertEquals(sql, request.getQuery());
+        assertEquals(2, request.getQueryParameters().size());
+
+        assertEquals("id", request.getQueryParameters().get(1).getName());
+        assertEquals("Body data must have higher priority", "100", request.getQueryParameters().get(1).getParameterValue().getValue());
+
+        assertEquals("data", request.getQueryParameters().get(0).getName());
+        assertEquals("some data", request.getQueryParameters().get(0).getParameterValue().getValue());
+    }
+
+    @Test(expected = RuntimeExchangeException.class)
+    public void sendMessageWithoutParameters() throws Exception {
+        producer.process(createExchangeWithBody(new HashMap<>()));
+    }
+}
diff --git a/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/sql/GoogleBigQuerySQLProducerWithPatternTest.java b/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/sql/GoogleBigQuerySQLProducerWithPatternTest.java
new file mode 100644
index 0000000000000..11cb0500ae415
--- /dev/null
+++ b/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/sql/GoogleBigQuerySQLProducerWithPatternTest.java
@@ -0,0 +1,69 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.google.bigquery.unit.sql;
+
+import com.google.api.services.bigquery.model.QueryRequest;
+import org.apache.camel.Exchange;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.ArgumentCaptor;
+
+import java.util.List;
+
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.verify;
+
+public class GoogleBigQuerySQLProducerWithPatternTest extends GoogleBigQuerySQLProducerBaseTest {
+
+    @Before
+    public void init() throws Exception {
+        sql = "insert into ${testDatasetId}.testTableId(id, data) values(1, 'test')";
+        setupBigqueryMock();
+        producer = createAndStartProducer();
+    }
+
+    @Test
+    public void sendExchangeWithProperties() throws Exception {
+        Exchange exchange = createExchangeWithBody(null);
+        exchange.getProperties().put("testDatasetId", "dataset");
+        String expected = "insert into dataset.testTableId(id, data) values(1, 'test')";
+        producer.process(exchange);
+
+        ArgumentCaptor<QueryRequest> dataCaptor = ArgumentCaptor.forClass(QueryRequest.class);
+        verify(bigquery.jobs()).query(eq(projectId), dataCaptor.capture());
+
+        List<QueryRequest> requests = dataCaptor.getAllValues();
+        assertEquals(1, requests.size());
+        assertEquals(expected, requests.get(0).getQuery());
+    }
+
+    @Test
+    public void sendMessageWithHeaders() throws Exception {
+        Exchange exchange = createExchangeWithBody(null);
+        exchange.getMessage().getHeaders().put("testDatasetId", "dataset");
+        String expected = "insert into dataset.testTableId(id, data) values(1, 'test')";
+        producer.process(exchange);
+
+        ArgumentCaptor<QueryRequest> dataCaptor = ArgumentCaptor.forClass(QueryRequest.class);
+        verify(bigquery.jobs()).query(eq(projectId), dataCaptor.capture());
+
+        List<QueryRequest> requests = dataCaptor.getAllValues();
+        assertEquals(1, requests.size());
+        assertEquals(expected, requests.get(0).getQuery());
+    }
+
+}
diff --git a/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/sql/SqlHelperTest.java b/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/sql/SqlHelperTest.java
new file mode 100644
index 0000000000000..de463552aac30
--- /dev/null
+++ b/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/sql/SqlHelperTest.java
@@ -0,0 +1,113 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.google.bigquery.unit.sql;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.Exchange;
+import org.apache.camel.Message;
+import org.apache.camel.RuntimeExchangeException;
+import org.apache.camel.component.google.bigquery.sql.SqlHelper;
+import org.junit.Ignore;
+import org.junit.Test;
+import org.mockito.Mockito;
+
+import java.util.Set;
+
+import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.when;
+
+public class SqlHelperTest {
+    private CamelContext context = Mockito.mock(CamelContext.class);
+
+    @Test
+    public void testResolveQuery() throws Exception {
+        String answer = SqlHelper.resolveQuery(context, "delete from test.test_sql_table where id = 1", null);
+        assertEquals("delete from test.test_sql_table where id = 1", answer);
+    }
+
+    @Test
+    @Ignore
+    public void testResolveClasspathQuery() throws Exception {
+        String answer = SqlHelper.resolveQuery(context, "classpath:sql/delete.sql", ":");
+        assertEquals("delete from test.test_sql_table where id = @id", answer);
+    }
+
+    String query = "INSERT INTO ${report}.test( -- TODO \n" +
+            "  id,\n" +
+            "  region\n" +
+            ")\n" +
+            "SELECT\n" +
+            "  id,\n" +
+            "  region\n" +
+            "FROM\n" +
+            "  ${import}.test\n" +
+            "WHERE\n" +
+            "  rec_date = @date AND id = @id\n";
+
+    String expected = "INSERT INTO report_data.test( -- TODO \n" +
+            "  id,\n" +
+            "  region\n" +
+            ")\n" +
+            "SELECT\n" +
+            "  id,\n" +
+            "  region\n" +
+            "FROM\n" +
+            "  import_data.test\n" +
+            "WHERE\n" +
+            "  rec_date = @date AND id = @id\n";
+
+    Exchange exchange = Mockito.mock(Exchange.class);
+    Message message = Mockito.mock(Message.class);
+
+    @Test
+    public void testTranslateQuery() {
+        when(exchange.getMessage()).thenReturn(message);
+        when(message.getHeader(eq("report"), eq(String.class))).thenReturn("report_data");
+        when(message.getHeader(eq("import"), eq(String.class))).thenReturn("import_data");
+
+        String answer = SqlHelper.translateQuery(query, exchange);
+        assertEquals(expected, answer);
+    }
+
+    @Test
+    public void testTranslateQueryProperties() {
+        when(exchange.getMessage()).thenReturn(message);
+        when(exchange.getProperty(eq("report"), eq(String.class))).thenReturn("report_data");
+        when(exchange.getProperty(eq("import"), eq(String.class))).thenReturn("import_data");
+
+        String answer = SqlHelper.translateQuery(query, exchange);
+        assertEquals(expected, answer);
+    }
+
+    @Test(expected = RuntimeExchangeException.class)
+    public void testTranslateQueryWithoutParam() {
+        when(exchange.getMessage()).thenReturn(message);
+        when(message.getHeader(eq("report"), eq(String.class))).thenReturn("report_data");
+
+        SqlHelper.translateQuery(query, exchange);
+        fail("Should have thrown exception");
+    }
+
+    @Test
+    public void testExtractParameterNames() {
+        Set<String> answer = SqlHelper.extractParameterNames(query);
+        assertEquals(2, answer.size());
+        assertTrue("Parameter 'date' not found", answer.contains("date"));
+        assertTrue("Parameter 'id' not found", answer.contains("id"));
+    }
+}
diff --git a/components/camel-google-bigquery/src/test/resources/sql/delete.sql b/components/camel-google-bigquery/src/test/resources/sql/delete.sql
new file mode 100644
index 0000000000000..d074f551105ee
--- /dev/null
+++ b/components/camel-google-bigquery/src/test/resources/sql/delete.sql
@@ -0,0 +1 @@
+delete from test.test_sql_table where id = :id
\ No newline at end of file
diff --git a/components/camel-google-bigquery/src/test/resources/sql/insert.sql b/components/camel-google-bigquery/src/test/resources/sql/insert.sql
new file mode 100644
index 0000000000000..74048aaa83d71
--- /dev/null
+++ b/components/camel-google-bigquery/src/test/resources/sql/insert.sql
@@ -0,0 +1,2 @@
+insert into test.test_sql_table (col1, col2)
+values (@col1, @col2)
\ No newline at end of file

From a8ce42321164f2f6e471a9a190012320cbbf9f87 Mon Sep 17 00:00:00 2001
From: Andrea Cosentino <ancosen@gmail.com>
Date: Wed, 28 Nov 2018 12:32:51 +0100
Subject: [PATCH 106/125] CAMEL-12930 - Fixed CS and sb starter

---
 .../sql/GoogleBigQuerySQLComponent.java       |   3 +-
 .../sql/GoogleBigQuerySQLConfiguration.java   |   9 +-
 .../sql/GoogleBigQuerySQLEndpoint.java        |  28 ++--
 .../sql/GoogleBigQuerySQLProducer.java        |  93 ++++++-------
 .../google/bigquery/sql/SqlHelper.java        |  31 +++--
 .../sql/GoogleBigQuerySQLComponentTest.java   |   7 +-
 .../GoogleBigQuerySQLProducerBaseTest.java    |  19 ++-
 ...leBigQuerySQLProducerWithParamersTest.java |   6 +-
 ...gleBigQuerySQLProducerWithPatternTest.java |   4 +-
 .../bigquery/unit/sql/SqlHelperTest.java      |  45 ++----
 ...BigQuerySQLComponentAutoConfiguration.java | 130 ++++++++++++++++++
 ...ogleBigQuerySQLComponentConfiguration.java |  93 +++++++++++++
 .../main/resources/META-INF/spring.factories  |   4 +-
 13 files changed, 349 insertions(+), 123 deletions(-)
 create mode 100644 platforms/spring-boot/components-starter/camel-google-bigquery-starter/src/main/java/org/apache/camel/component/google/bigquery/sql/springboot/GoogleBigQuerySQLComponentAutoConfiguration.java
 create mode 100644 platforms/spring-boot/components-starter/camel-google-bigquery-starter/src/main/java/org/apache/camel/component/google/bigquery/sql/springboot/GoogleBigQuerySQLComponentConfiguration.java

diff --git a/components/camel-google-bigquery/src/main/java/org/apache/camel/component/google/bigquery/sql/GoogleBigQuerySQLComponent.java b/components/camel-google-bigquery/src/main/java/org/apache/camel/component/google/bigquery/sql/GoogleBigQuerySQLComponent.java
index fcbcf66cb2c7b..a0b23639f505f 100644
--- a/components/camel-google-bigquery/src/main/java/org/apache/camel/component/google/bigquery/sql/GoogleBigQuerySQLComponent.java
+++ b/components/camel-google-bigquery/src/main/java/org/apache/camel/component/google/bigquery/sql/GoogleBigQuerySQLComponent.java
@@ -73,7 +73,8 @@ public GoogleBigQueryConnectionFactory getConnectionFactory() {
     }
 
     /**
-     * ConnectionFactory to obtain connection to Bigquery Service. If non provided the default one will be used
+     * ConnectionFactory to obtain connection to Bigquery Service. If non
+     * provided the default one will be used
      */
     public void setConnectionFactory(GoogleBigQueryConnectionFactory connectionFactory) {
         this.connectionFactory = connectionFactory;
diff --git a/components/camel-google-bigquery/src/main/java/org/apache/camel/component/google/bigquery/sql/GoogleBigQuerySQLConfiguration.java b/components/camel-google-bigquery/src/main/java/org/apache/camel/component/google/bigquery/sql/GoogleBigQuerySQLConfiguration.java
index 25ed0dfff1a24..5e766a07cd5ac 100644
--- a/components/camel-google-bigquery/src/main/java/org/apache/camel/component/google/bigquery/sql/GoogleBigQuerySQLConfiguration.java
+++ b/components/camel-google-bigquery/src/main/java/org/apache/camel/component/google/bigquery/sql/GoogleBigQuerySQLConfiguration.java
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
+ *
+ *      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.
@@ -46,7 +46,8 @@ public void parseRemaining(String remaining) {
     }
 
     /**
-     * ConnectionFactory to obtain connection to Bigquery Service. If non provided the default will be used.
+     * ConnectionFactory to obtain connection to Bigquery Service. If non
+     * provided the default will be used.
      */
     public GoogleBigQueryConnectionFactory getConnectionFactory() {
         return connectionFactory;
diff --git a/components/camel-google-bigquery/src/main/java/org/apache/camel/component/google/bigquery/sql/GoogleBigQuerySQLEndpoint.java b/components/camel-google-bigquery/src/main/java/org/apache/camel/component/google/bigquery/sql/GoogleBigQuerySQLEndpoint.java
index fee9e962f7958..4138faaac790f 100644
--- a/components/camel-google-bigquery/src/main/java/org/apache/camel/component/google/bigquery/sql/GoogleBigQuerySQLEndpoint.java
+++ b/components/camel-google-bigquery/src/main/java/org/apache/camel/component/google/bigquery/sql/GoogleBigQuerySQLEndpoint.java
@@ -25,23 +25,18 @@
 import org.apache.camel.spi.UriParam;
 
 /**
- * Google BigQuery data warehouse for analytics.
- * 
- * BigQuery Endpoint Definition
- * Represents a table within a BigQuery dataset
- * Contains configuration details for a single table and the utility methods (such as check, create) to ease operations
- * URI Parameters:
- * * Logger ID - To ensure that logging is unified under Route Logger, the logger ID can be passed on
- *               via an endpoint URI parameter
- * * Partitioned - to indicate that the table needs to be partitioned - every UTC day to be written into a
- *                 timestamped separate table
- *                 side effect: Australian operational day is always split between two UTC days, and, therefore, tables
- *
- * Another consideration is that exceptions are not handled within the class. They are expected to bubble up and be handled
- * by Camel.
+ * Google BigQuery data warehouse for analytics. BigQuery Endpoint Definition
+ * Represents a table within a BigQuery dataset Contains configuration details
+ * for a single table and the utility methods (such as check, create) to ease
+ * operations URI Parameters: * Logger ID - To ensure that logging is unified
+ * under Route Logger, the logger ID can be passed on via an endpoint URI
+ * parameter * Partitioned - to indicate that the table needs to be partitioned
+ * - every UTC day to be written into a timestamped separate table side effect:
+ * Australian operational day is always split between two UTC days, and,
+ * therefore, tables Another consideration is that exceptions are not handled
+ * within the class. They are expected to bubble up and be handled by Camel.
  */
-@UriEndpoint(firstVersion = "2.23.0", scheme = "google-bigquery-sql", title = "Google BigQuery Standard SQL", syntax = "google-bigquery-sql:query",
-    label = "cloud,messaging", producerOnly = true)
+@UriEndpoint(firstVersion = "2.23.0", scheme = "google-bigquery-sql", title = "Google BigQuery Standard SQL", syntax = "google-bigquery-sql:query", label = "cloud,messaging", producerOnly = true)
 public class GoogleBigQuerySQLEndpoint extends DefaultEndpoint {
 
     @UriParam
@@ -76,5 +71,4 @@ public GoogleBigQuerySQLComponent getComponent() {
         return (GoogleBigQuerySQLComponent)super.getComponent();
     }
 
-
 }
diff --git a/components/camel-google-bigquery/src/main/java/org/apache/camel/component/google/bigquery/sql/GoogleBigQuerySQLProducer.java b/components/camel-google-bigquery/src/main/java/org/apache/camel/component/google/bigquery/sql/GoogleBigQuerySQLProducer.java
index e9ce93d789f99..eb1366693652f 100644
--- a/components/camel-google-bigquery/src/main/java/org/apache/camel/component/google/bigquery/sql/GoogleBigQuerySQLProducer.java
+++ b/components/camel-google-bigquery/src/main/java/org/apache/camel/component/google/bigquery/sql/GoogleBigQuerySQLProducer.java
@@ -1,29 +1,40 @@
 /**
- * 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
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
- * 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.
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package org.apache.camel.component.google.bigquery.sql;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
 import com.google.api.services.bigquery.Bigquery;
-import com.google.api.services.bigquery.model.*;
+import com.google.api.services.bigquery.model.QueryParameter;
+import com.google.api.services.bigquery.model.QueryParameterType;
+import com.google.api.services.bigquery.model.QueryParameterValue;
+import com.google.api.services.bigquery.model.QueryRequest;
+import com.google.api.services.bigquery.model.QueryResponse;
+
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
 import org.apache.camel.RuntimeExchangeException;
 import org.apache.camel.component.google.bigquery.GoogleBigQueryConstants;
 import org.apache.camel.impl.DefaultProducer;
 
-import java.util.*;
-
 /**
  * Generic BigQuery Producer
  */
@@ -34,27 +45,24 @@ public class GoogleBigQuerySQLProducer extends DefaultProducer {
     private String query;
     private Set<String> queryParameterNames;
 
-    public GoogleBigQuerySQLProducer(Bigquery bigquery, GoogleBigQuerySQLEndpoint endpoint,
-                                     GoogleBigQuerySQLConfiguration configuration) {
+    public GoogleBigQuerySQLProducer(Bigquery bigquery, GoogleBigQuerySQLEndpoint endpoint, GoogleBigQuerySQLConfiguration configuration) {
         super(endpoint);
         this.bigquery = bigquery;
         this.configuration = configuration;
     }
 
     /**
-     * Process the exchange
-     *
-     * The incoming exchange can be a grouped exchange in which case all the exchanges will be combined.
-     *
-     * The incoming can be
+     * Process the exchange The incoming exchange can be a grouped exchange in
+     * which case all the exchanges will be combined. The incoming can be
      * <ul>
-     *     <li>A map where all map keys will map to field records. One map object maps to one bigquery row</li>
-     *     <li>A list of maps. Each entry in the list will map to one bigquery row</li>
+     * <li>A map where all map keys will map to field records. One map object
+     * maps to one bigquery row</li>
+     * <li>A list of maps. Each entry in the list will map to one bigquery
+     * row</li>
      * </ul>
-     * The incoming message is expected to be a List of Maps
-     * The assumptions:
-     * - All incoming records go into the same table
-     * - Incoming records sorted by the timestamp
+     * The incoming message is expected to be a List of Maps The assumptions: -
+     * All incoming records go into the same table - Incoming records sorted by
+     * the timestamp
      */
     @Override
     public void process(Exchange exchange) throws Exception {
@@ -67,19 +75,14 @@ public void process(Exchange exchange) throws Exception {
     }
 
     private Long executeSQL(String translatedQuery, Map<String, Object> queryParameters) throws Exception {
-        QueryRequest apiQueryRequest = new QueryRequest()
-                .setQuery(translatedQuery)
-                .setUseLegacySql(false);
+        QueryRequest apiQueryRequest = new QueryRequest().setQuery(translatedQuery).setUseLegacySql(false);
 
-        Bigquery.Jobs.Query apiQuery = bigquery
-                .jobs()
-                .query(configuration.getProjectId(), apiQueryRequest);
+        Bigquery.Jobs.Query apiQuery = bigquery.jobs().query(configuration.getProjectId(), apiQueryRequest);
 
         setQueryParameters(queryParameters, apiQueryRequest);
 
         if (log.isTraceEnabled()) {
-            log.trace("Sending query to bigquery standard sql: {}",
-                    translatedQuery);
+            log.trace("Sending query to bigquery standard sql: {}", translatedQuery);
         }
 
         QueryResponse apiResponse = apiQuery.execute();
@@ -89,15 +92,15 @@ private Long executeSQL(String translatedQuery, Map<String, Object> queryParamet
         }
 
         if (log.isTraceEnabled()) {
-            log.trace("Result of query {} is {}",
-                    translatedQuery, apiResponse.toPrettyString());
+            log.trace("Result of query {} is {}", translatedQuery, apiResponse.toPrettyString());
         }
         return apiResponse.getNumDmlAffectedRows();
     }
 
     private Map<String, Object> extractParameters(Exchange exchange) {
-        if (queryParameterNames == null || queryParameterNames.size() == 0)
+        if (queryParameterNames == null || queryParameterNames.size() == 0) {
             return null;
+        }
 
         Message message = exchange.getMessage();
 
@@ -124,15 +127,14 @@ private Map<String, Object> extractParameters(Exchange exchange) {
     }
 
     private void setQueryParameters(Map<String, Object> params, QueryRequest apiQueryRequest) {
-        if (params == null)
+        if (params == null) {
             return;
+        }
 
         List<QueryParameter> list = new ArrayList<>();
         params.forEach((key, value) -> {
             QueryParameter param = new QueryParameter();
-            param.setName(key)
-                    .setParameterType(new QueryParameterType().setType("STRING"))
-                    .setParameterValue(new QueryParameterValue().setValue(value.toString()));
+            param.setName(key).setParameterType(new QueryParameterType().setType("STRING")).setParameterValue(new QueryParameterValue().setValue(value.toString()));
             list.add(param);
         });
         apiQueryRequest.setQueryParameters(list);
@@ -145,15 +147,14 @@ public boolean isSingleton() {
 
     @Override
     public GoogleBigQuerySQLEndpoint getEndpoint() {
-        return (GoogleBigQuerySQLEndpoint) super.getEndpoint();
+        return (GoogleBigQuerySQLEndpoint)super.getEndpoint();
     }
 
     @Override
     protected void doStart() throws Exception {
         super.doStart();
         String placeholder = ":#"; // TODO
-        query = SqlHelper
-                .resolveQuery(getEndpoint().getCamelContext(), configuration.getQuery(), placeholder);
+        query = SqlHelper.resolveQuery(getEndpoint().getCamelContext(), configuration.getQuery(), placeholder);
         queryParameterNames = SqlHelper.extractParameterNames(query);
     }
 }
diff --git a/components/camel-google-bigquery/src/main/java/org/apache/camel/component/google/bigquery/sql/SqlHelper.java b/components/camel-google-bigquery/src/main/java/org/apache/camel/component/google/bigquery/sql/SqlHelper.java
index eb418568e9ee6..9ecd2e2d54cee 100644
--- a/components/camel-google-bigquery/src/main/java/org/apache/camel/component/google/bigquery/sql/SqlHelper.java
+++ b/components/camel-google-bigquery/src/main/java/org/apache/camel/component/google/bigquery/sql/SqlHelper.java
@@ -5,9 +5,9 @@
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
  * the License.  You may obtain a copy of the License at
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
+ *
+ *      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.
@@ -16,9 +16,6 @@
  */
 package org.apache.camel.component.google.bigquery.sql;
 
-import org.apache.camel.*;
-import org.apache.camel.util.ResourceHelper;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.HashSet;
@@ -26,6 +23,13 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import org.apache.camel.CamelContext;
+import org.apache.camel.Exchange;
+import org.apache.camel.Message;
+import org.apache.camel.NoTypeConversionAvailableException;
+import org.apache.camel.RuntimeExchangeException;
+import org.apache.camel.util.ResourceHelper;
+
 public final class SqlHelper {
 
     private static Pattern pattern = Pattern.compile("\\$\\{(\\w+)}");
@@ -35,13 +39,13 @@ private SqlHelper() {
     }
 
     /**
-     * Resolve the query by loading the query from the classpath or file resource if needed.
+     * Resolve the query by loading the query from the classpath or file
+     * resource if needed.
      */
     public static String resolveQuery(CamelContext camelContext, String query, String placeholder) throws NoTypeConversionAvailableException, IOException {
         String answer = query;
         if (ResourceHelper.hasScheme(query)) {
-            InputStream is = ResourceHelper
-                    .resolveMandatoryResourceAsInputStream(camelContext, query);
+            InputStream is = ResourceHelper.resolveMandatoryResourceAsInputStream(camelContext, query);
             answer = camelContext.getTypeConverter().mandatoryConvertTo(String.class, is);
             if (placeholder != null) {
                 answer = answer.replaceAll(placeholder, "@");
@@ -51,8 +55,9 @@ public static String resolveQuery(CamelContext camelContext, String query, Strin
     }
 
     /**
-     * Replaces pattern in query in form of "${param}" with values from message header
-     * Raises an error if param value not found in headers
+     * Replaces pattern in query in form of "${param}" with values from message
+     * header Raises an error if param value not found in headers
+     * 
      * @param exchange
      * @return Translated query text
      */
@@ -66,8 +71,9 @@ public static String translateQuery(String query, Exchange exchange) {
             String value = message.getHeader(paramKey, String.class);
             if (value == null) {
                 value = exchange.getProperty(paramKey, String.class);
-                if (value == null)
+                if (value == null) {
                     throw new RuntimeExchangeException("SQL pattern with name '" + paramKey + "' not found in the message headers", exchange);
+                }
             }
 
             String replacement = Matcher.quoteReplacement(value);
@@ -79,6 +85,7 @@ public static String translateQuery(String query, Exchange exchange) {
 
     /**
      * Extracts list of parameters in form "@name" from query text
+     * 
      * @param query
      * @return list of parameter names
      */
diff --git a/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/sql/GoogleBigQuerySQLComponentTest.java b/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/sql/GoogleBigQuerySQLComponentTest.java
index ba24d0d0fc790..5cd5d2cb6f439 100644
--- a/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/sql/GoogleBigQuerySQLComponentTest.java
+++ b/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/sql/GoogleBigQuerySQLComponentTest.java
@@ -16,17 +16,14 @@
  */
 package org.apache.camel.component.google.bigquery.unit.sql;
 
-import static org.junit.Assert.assertEquals;
-
 import org.apache.camel.CamelContext;
-import org.apache.camel.component.google.bigquery.GoogleBigQueryComponent;
-import org.apache.camel.component.google.bigquery.GoogleBigQueryEndpoint;
 import org.apache.camel.component.google.bigquery.sql.GoogleBigQuerySQLComponent;
 import org.apache.camel.component.google.bigquery.sql.GoogleBigQuerySQLEndpoint;
-import org.apache.camel.component.google.bigquery.sql.SqlHelper;
 import org.junit.Test;
 import org.mockito.Mockito;
 
+import static org.junit.Assert.assertEquals;
+
 public class GoogleBigQuerySQLComponentTest {
     private CamelContext context = Mockito.mock(CamelContext.class);
 
diff --git a/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/sql/GoogleBigQuerySQLProducerBaseTest.java b/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/sql/GoogleBigQuerySQLProducerBaseTest.java
index 244f27c82bd65..fa28b70e23583 100644
--- a/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/sql/GoogleBigQuerySQLProducerBaseTest.java
+++ b/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/sql/GoogleBigQuerySQLProducerBaseTest.java
@@ -1,3 +1,19 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package org.apache.camel.component.google.bigquery.unit.sql;
 
 import com.google.api.services.bigquery.Bigquery;
@@ -37,8 +53,7 @@ protected void setupBigqueryMock() throws Exception {
         when(bigquery.jobs()).thenReturn(mockJobs);
         when(bigquery.jobs().query(anyString(), any())).thenReturn(mockQuery);
 
-        QueryResponse mockResponse = new QueryResponse()
-                .setNumDmlAffectedRows(1L);
+        QueryResponse mockResponse = new QueryResponse().setNumDmlAffectedRows(1L);
         when(mockQuery.execute()).thenReturn(mockResponse);
     }
 }
diff --git a/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/sql/GoogleBigQuerySQLProducerWithParamersTest.java b/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/sql/GoogleBigQuerySQLProducerWithParamersTest.java
index 6227dfb40cef4..5eaa916578a32 100644
--- a/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/sql/GoogleBigQuerySQLProducerWithParamersTest.java
+++ b/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/sql/GoogleBigQuerySQLProducerWithParamersTest.java
@@ -16,6 +16,9 @@
  */
 package org.apache.camel.component.google.bigquery.unit.sql;
 
+import java.util.HashMap;
+import java.util.Map;
+
 import com.google.api.services.bigquery.model.QueryRequest;
 import org.apache.camel.Exchange;
 import org.apache.camel.RuntimeExchangeException;
@@ -23,9 +26,6 @@
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
 
-import java.util.HashMap;
-import java.util.Map;
-
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.verify;
 
diff --git a/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/sql/GoogleBigQuerySQLProducerWithPatternTest.java b/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/sql/GoogleBigQuerySQLProducerWithPatternTest.java
index 11cb0500ae415..93ac9970b2cae 100644
--- a/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/sql/GoogleBigQuerySQLProducerWithPatternTest.java
+++ b/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/sql/GoogleBigQuerySQLProducerWithPatternTest.java
@@ -16,14 +16,14 @@
  */
 package org.apache.camel.component.google.bigquery.unit.sql;
 
+import java.util.List;
+
 import com.google.api.services.bigquery.model.QueryRequest;
 import org.apache.camel.Exchange;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.ArgumentCaptor;
 
-import java.util.List;
-
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.verify;
 
diff --git a/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/sql/SqlHelperTest.java b/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/sql/SqlHelperTest.java
index de463552aac30..1ab2b2fe120fb 100644
--- a/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/sql/SqlHelperTest.java
+++ b/components/camel-google-bigquery/src/test/java/org/apache/camel/component/google/bigquery/unit/sql/SqlHelperTest.java
@@ -16,6 +16,8 @@
  */
 package org.apache.camel.component.google.bigquery.unit.sql;
 
+import java.util.Set;
+
 import org.apache.camel.CamelContext;
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
@@ -25,13 +27,23 @@
 import org.junit.Test;
 import org.mockito.Mockito;
 
-import java.util.Set;
-
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.when;
 
 public class SqlHelperTest {
+
+    String query = "INSERT INTO ${report}.test( -- TODO \n" + "  id,\n" + "  region\n" + ")\n" + "SELECT\n" + "  id,\n" + "  region\n" + "FROM\n" + "  ${import}.test\n" + "WHERE\n"
+                   + "  rec_date = @date AND id = @id\n";
+
+    String expected = "INSERT INTO report_data.test( -- TODO \n" + "  id,\n" + "  region\n" + ")\n" + "SELECT\n" + "  id,\n" + "  region\n" + "FROM\n" + "  import_data.test\n"
+                      + "WHERE\n" + "  rec_date = @date AND id = @id\n";
+
+    Exchange exchange = Mockito.mock(Exchange.class);
+    Message message = Mockito.mock(Message.class);
+    
     private CamelContext context = Mockito.mock(CamelContext.class);
 
     @Test
@@ -47,33 +59,6 @@ public void testResolveClasspathQuery() throws Exception {
         assertEquals("delete from test.test_sql_table where id = @id", answer);
     }
 
-    String query = "INSERT INTO ${report}.test( -- TODO \n" +
-            "  id,\n" +
-            "  region\n" +
-            ")\n" +
-            "SELECT\n" +
-            "  id,\n" +
-            "  region\n" +
-            "FROM\n" +
-            "  ${import}.test\n" +
-            "WHERE\n" +
-            "  rec_date = @date AND id = @id\n";
-
-    String expected = "INSERT INTO report_data.test( -- TODO \n" +
-            "  id,\n" +
-            "  region\n" +
-            ")\n" +
-            "SELECT\n" +
-            "  id,\n" +
-            "  region\n" +
-            "FROM\n" +
-            "  import_data.test\n" +
-            "WHERE\n" +
-            "  rec_date = @date AND id = @id\n";
-
-    Exchange exchange = Mockito.mock(Exchange.class);
-    Message message = Mockito.mock(Message.class);
-
     @Test
     public void testTranslateQuery() {
         when(exchange.getMessage()).thenReturn(message);
diff --git a/platforms/spring-boot/components-starter/camel-google-bigquery-starter/src/main/java/org/apache/camel/component/google/bigquery/sql/springboot/GoogleBigQuerySQLComponentAutoConfiguration.java b/platforms/spring-boot/components-starter/camel-google-bigquery-starter/src/main/java/org/apache/camel/component/google/bigquery/sql/springboot/GoogleBigQuerySQLComponentAutoConfiguration.java
new file mode 100644
index 0000000000000..f2028bd6b6265
--- /dev/null
+++ b/platforms/spring-boot/components-starter/camel-google-bigquery-starter/src/main/java/org/apache/camel/component/google/bigquery/sql/springboot/GoogleBigQuerySQLComponentAutoConfiguration.java
@@ -0,0 +1,130 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.google.bigquery.sql.springboot;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import javax.annotation.Generated;
+import org.apache.camel.CamelContext;
+import org.apache.camel.component.google.bigquery.sql.GoogleBigQuerySQLComponent;
+import org.apache.camel.spi.ComponentCustomizer;
+import org.apache.camel.spi.HasId;
+import org.apache.camel.spring.boot.CamelAutoConfiguration;
+import org.apache.camel.spring.boot.ComponentConfigurationProperties;
+import org.apache.camel.spring.boot.util.CamelPropertiesHelper;
+import org.apache.camel.spring.boot.util.ConditionalOnCamelContextAndAutoConfigurationBeans;
+import org.apache.camel.spring.boot.util.GroupCondition;
+import org.apache.camel.spring.boot.util.HierarchicalPropertiesEvaluator;
+import org.apache.camel.util.IntrospectionSupport;
+import org.apache.camel.util.ObjectHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Conditional;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Lazy;
+
+/**
+ * Generated by camel-package-maven-plugin - do not edit this file!
+ */
+@Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo")
+@Configuration
+@Conditional({ConditionalOnCamelContextAndAutoConfigurationBeans.class,
+        GoogleBigQuerySQLComponentAutoConfiguration.GroupConditions.class})
+@AutoConfigureAfter(CamelAutoConfiguration.class)
+@EnableConfigurationProperties({ComponentConfigurationProperties.class,
+        GoogleBigQuerySQLComponentConfiguration.class})
+public class GoogleBigQuerySQLComponentAutoConfiguration {
+
+    private static final Logger LOGGER = LoggerFactory
+            .getLogger(GoogleBigQuerySQLComponentAutoConfiguration.class);
+    @Autowired
+    private ApplicationContext applicationContext;
+    @Autowired
+    private CamelContext camelContext;
+    @Autowired
+    private GoogleBigQuerySQLComponentConfiguration configuration;
+    @Autowired(required = false)
+    private List<ComponentCustomizer<GoogleBigQuerySQLComponent>> customizers;
+
+    static class GroupConditions extends GroupCondition {
+        public GroupConditions() {
+            super("camel.component", "camel.component.google-bigquery-sql");
+        }
+    }
+
+    @Lazy
+    @Bean(name = "google-bigquery-sql-component")
+    @ConditionalOnMissingBean(GoogleBigQuerySQLComponent.class)
+    public GoogleBigQuerySQLComponent configureGoogleBigQuerySQLComponent()
+            throws Exception {
+        GoogleBigQuerySQLComponent component = new GoogleBigQuerySQLComponent();
+        component.setCamelContext(camelContext);
+        Map<String, Object> parameters = new HashMap<>();
+        IntrospectionSupport.getProperties(configuration, parameters, null,
+                false);
+        for (Map.Entry<String, Object> entry : parameters.entrySet()) {
+            Object value = entry.getValue();
+            Class<?> paramClass = value.getClass();
+            if (paramClass.getName().endsWith("NestedConfiguration")) {
+                Class nestedClass = null;
+                try {
+                    nestedClass = (Class) paramClass.getDeclaredField(
+                            "CAMEL_NESTED_CLASS").get(null);
+                    HashMap<String, Object> nestedParameters = new HashMap<>();
+                    IntrospectionSupport.getProperties(value, nestedParameters,
+                            null, false);
+                    Object nestedProperty = nestedClass.newInstance();
+                    CamelPropertiesHelper.setCamelProperties(camelContext,
+                            nestedProperty, nestedParameters, false);
+                    entry.setValue(nestedProperty);
+                } catch (NoSuchFieldException e) {
+                }
+            }
+        }
+        CamelPropertiesHelper.setCamelProperties(camelContext, component,
+                parameters, false);
+        if (ObjectHelper.isNotEmpty(customizers)) {
+            for (ComponentCustomizer<GoogleBigQuerySQLComponent> customizer : customizers) {
+                boolean useCustomizer = (customizer instanceof HasId)
+                        ? HierarchicalPropertiesEvaluator
+                                .evaluate(
+                                        applicationContext.getEnvironment(),
+                                        "camel.component.customizer",
+                                        "camel.component.google-bigquery-sql.customizer",
+                                        ((HasId) customizer).getId())
+                        : HierarchicalPropertiesEvaluator
+                                .evaluate(applicationContext.getEnvironment(),
+                                        "camel.component.customizer",
+                                        "camel.component.google-bigquery-sql.customizer");
+                if (useCustomizer) {
+                    LOGGER.debug("Configure component {}, with customizer {}",
+                            component, customizer);
+                    customizer.customize(component);
+                }
+            }
+        }
+        return component;
+    }
+}
\ No newline at end of file
diff --git a/platforms/spring-boot/components-starter/camel-google-bigquery-starter/src/main/java/org/apache/camel/component/google/bigquery/sql/springboot/GoogleBigQuerySQLComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-google-bigquery-starter/src/main/java/org/apache/camel/component/google/bigquery/sql/springboot/GoogleBigQuerySQLComponentConfiguration.java
new file mode 100644
index 0000000000000..fc08356952d41
--- /dev/null
+++ b/platforms/spring-boot/components-starter/camel-google-bigquery-starter/src/main/java/org/apache/camel/component/google/bigquery/sql/springboot/GoogleBigQuerySQLComponentConfiguration.java
@@ -0,0 +1,93 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.google.bigquery.sql.springboot;
+
+import javax.annotation.Generated;
+import org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+/**
+ * Google BigQuery data warehouse for analytics. BigQuery Endpoint Definition
+ * Represents a table within a BigQuery dataset Contains configuration details
+ * for a single table and the utility methods (such as check, create) to ease
+ * operations URI Parameters: Logger ID - To ensure that logging is unified
+ * under Route Logger, the logger ID can be passed on via an endpoint URI
+ * parameter Partitioned - to indicate that the table needs to be partitioned -
+ * every UTC day to be written into a timestamped separate table side effect:
+ * Australian operational day is always split between two UTC days, and,
+ * therefore, tables Another consideration is that exceptions are not handled
+ * within the class. They are expected to bubble up and be handled by Camel.
+ * 
+ * Generated by camel-package-maven-plugin - do not edit this file!
+ */
+@Generated("org.apache.camel.maven.packaging.SpringBootAutoConfigurationMojo")
+@ConfigurationProperties(prefix = "camel.component.google-bigquery-sql")
+public class GoogleBigQuerySQLComponentConfiguration
+        extends
+            ComponentConfigurationPropertiesCommon {
+
+    /**
+     * Whether to enable auto configuration of the google-bigquery-sql
+     * component. This is enabled by default.
+     */
+    private Boolean enabled;
+    /**
+     * Google Cloud Project Id
+     */
+    private String projectId;
+    /**
+     * ConnectionFactory to obtain connection to Bigquery Service. If non
+     * provided the default one will be used
+     */
+    private GoogleBigQueryConnectionFactoryNestedConfiguration connectionFactory;
+    /**
+     * Whether the component should resolve property placeholders on itself when
+     * starting. Only properties which are of String type can use property
+     * placeholders.
+     */
+    private Boolean resolvePropertyPlaceholders = true;
+
+    public String getProjectId() {
+        return projectId;
+    }
+
+    public void setProjectId(String projectId) {
+        this.projectId = projectId;
+    }
+
+    public GoogleBigQueryConnectionFactoryNestedConfiguration getConnectionFactory() {
+        return connectionFactory;
+    }
+
+    public void setConnectionFactory(
+            GoogleBigQueryConnectionFactoryNestedConfiguration connectionFactory) {
+        this.connectionFactory = connectionFactory;
+    }
+
+    public Boolean getResolvePropertyPlaceholders() {
+        return resolvePropertyPlaceholders;
+    }
+
+    public void setResolvePropertyPlaceholders(
+            Boolean resolvePropertyPlaceholders) {
+        this.resolvePropertyPlaceholders = resolvePropertyPlaceholders;
+    }
+
+    public static class GoogleBigQueryConnectionFactoryNestedConfiguration {
+        public static final Class CAMEL_NESTED_CLASS = org.apache.camel.component.google.bigquery.GoogleBigQueryConnectionFactory.class;
+    }
+}
\ No newline at end of file
diff --git a/platforms/spring-boot/components-starter/camel-google-bigquery-starter/src/main/resources/META-INF/spring.factories b/platforms/spring-boot/components-starter/camel-google-bigquery-starter/src/main/resources/META-INF/spring.factories
index 6f6a9e7307e05..14ead8114dbc5 100644
--- a/platforms/spring-boot/components-starter/camel-google-bigquery-starter/src/main/resources/META-INF/spring.factories
+++ b/platforms/spring-boot/components-starter/camel-google-bigquery-starter/src/main/resources/META-INF/spring.factories
@@ -16,4 +16,6 @@
 ## ---------------------------------------------------------------------------
 
 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.apache.camel.component.google.bigquery.springboot.GoogleBigQueryComponentAutoConfiguration
+org.apache.camel.component.google.bigquery.springboot.GoogleBigQueryComponentAutoConfiguration,\
+org.apache.camel.component.google.bigquery.sql.springboot.GoogleBigQuerySQLComponentAutoConfiguration
+

From 98c7873443f4942a52f16c779fad6da3ed34e880 Mon Sep 17 00:00:00 2001
From: Andrea Cosentino <ancosen@gmail.com>
Date: Wed, 28 Nov 2018 13:17:41 +0100
Subject: [PATCH 107/125] CAMEL-12930 - Regen

---
 .../src/main/docs/google-bigquery-sql-component.adoc      | 8 ++++----
 components/readme.adoc                                    | 5 ++++-
 docs/user-manual/en/SUMMARY.md                            | 1 +
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/components/camel-google-bigquery/src/main/docs/google-bigquery-sql-component.adoc b/components/camel-google-bigquery/src/main/docs/google-bigquery-sql-component.adoc
index 23f5df6d5bc1c..36d7cb8cddbf5 100644
--- a/components/camel-google-bigquery/src/main/docs/google-bigquery-sql-component.adoc
+++ b/components/camel-google-bigquery/src/main/docs/google-bigquery-sql-component.adoc
@@ -123,16 +123,16 @@ with the following path and query parameters:
 === Spring Boot Auto-Configuration
 
 
-The component supports 4 options, which are listed below.
+The component supports 3 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
-| *camel.component.google-bigquery-sql.enabled* | Whether to enable auto configuration of the google-bigquery component. This is enabled by default. |  | Boolean
+| *camel.component.google-bigquery-sql.enabled* | Whether to enable auto configuration of the google-bigquery-sql component. This is enabled by default. |  | Boolean
 | *camel.component.google-bigquery-sql.project-id* | Google Cloud Project Id |  | String
-//| *camel.component.google-bigquery.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
+| *camel.component.google-bigquery-sql.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
 |===
 // spring-boot-auto-configure options: END
 
@@ -148,4 +148,4 @@ The component supports 4 options, which are listed below.
 
 ### Producer Endpoints
 
-Google BigQuery SQL endpoint expects the payload to be either empty or a map of query parameters.
\ No newline at end of file
+Google BigQuery SQL endpoint expects the payload to be either empty or a map of query parameters.
diff --git a/components/readme.adoc b/components/readme.adoc
index 17c953b768bd8..c79457d7ae128 100644
--- a/components/readme.adoc
+++ b/components/readme.adoc
@@ -2,7 +2,7 @@ Components
 ^^^^^^^^^^
 
 // components: START
-Number of Components: 307 in 208 JAR artifacts (22 deprecated)
+Number of Components: 308 in 208 JAR artifacts (22 deprecated)
 
 [width="100%",cols="4,1,5",options="header"]
 |===
@@ -299,6 +299,9 @@ Number of Components: 307 in 208 JAR artifacts (22 deprecated)
 | link:camel-google-bigquery/src/main/docs/google-bigquery-component.adoc[Google BigQuery] (camel-google-bigquery) +
 `google-bigquery:projectId:datasetId:tableName` | 2.20 | Google BigQuery data warehouse for analytics.
 
+| link:camel-google-bigquery/src/main/docs/google-bigquery-sql-component.adoc[Google BigQuery Standard SQL] (camel-google-bigquery) +
+`google-bigquery-sql:query` | 2.23 | Google BigQuery data warehouse for analytics. BigQuery Endpoint Definition Represents a table within a BigQuery dataset Contains configuration details for a single table and the utility methods (such as check, create) to ease operations URI Parameters: Logger ID - To ensure that logging is unified under Route Logger, the logger ID can be passed on via an endpoint URI parameter Partitioned - to indicate that the table needs to be partitioned - every UTC day to be written into a timestamped separate table side effect: Australian operational day is always split between two UTC days, and, therefore, tables Another consideration is that exceptions are not handled within the class. They are expected to bubble up and be handled by Camel.
+
 | link:camel-google-calendar/src/main/docs/google-calendar-component.adoc[Google Calendar] (camel-google-calendar) +
 `google-calendar:apiName/methodName` | 2.15 | The google-calendar component provides access to Google Calendar.
 
diff --git a/docs/user-manual/en/SUMMARY.md b/docs/user-manual/en/SUMMARY.md
index a1893cfee24f4..03ab164a00d4d 100644
--- a/docs/user-manual/en/SUMMARY.md
+++ b/docs/user-manual/en/SUMMARY.md
@@ -255,6 +255,7 @@
 	* [Git](git-component.adoc)
 	* [GitHub](github-component.adoc)
 	* [Google BigQuery](google-bigquery-component.adoc)
+	* [Google BigQuery Standard SQL](google-bigquery-sql-component.adoc)
 	* [Google Calendar](google-calendar-component.adoc)
 	* [Google Calendar Stream](google-calendar-stream-component.adoc)
 	* [Google Drive](google-drive-component.adoc)

From cc7307bccc15c49b69f00e45230fa1d73a578088 Mon Sep 17 00:00:00 2001
From: Andrea Cosentino <ancosen@gmail.com>
Date: Wed, 28 Nov 2018 15:53:05 +0100
Subject: [PATCH 108/125] Upgrade JackRabbit to version 2.17.7

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

diff --git a/parent/pom.xml b/parent/pom.xml
index e5970d9f7caff..35d70c07c026d 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -332,7 +332,7 @@
     <jackson-spark-version>2.4.5</jackson-spark-version>
     <jackson2-scala-version>2.6.1</jackson2-scala-version>
     <jackson2-version>2.9.7</jackson2-version>
-    <jackrabbit-version>2.17.6</jackrabbit-version>
+    <jackrabbit-version>2.17.7</jackrabbit-version>
     <jackrabbit-guava-version>15.0</jackrabbit-guava-version>
     <jain-sip-ri-bundle-version>1.2.154_2</jain-sip-ri-bundle-version>
     <jasn1-version>1.10.0</jasn1-version>

From 14cfd87b6014a5ba136fa6e7e7e2e859556fa380 Mon Sep 17 00:00:00 2001
From: Andrea Cosentino <ancosen@gmail.com>
Date: Wed, 28 Nov 2018 17:02:55 +0100
Subject: [PATCH 109/125] Upgrade Pubnub version to version 4.21.0

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

diff --git a/parent/pom.xml b/parent/pom.xml
index 35d70c07c026d..280e1c49379f5 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -569,7 +569,7 @@
     <protobuf-javanano-version>3.1.0</protobuf-javanano-version>
     <protobuf-maven-plugin-version>0.5.1</protobuf-maven-plugin-version>
     <protonpack-version>1.8</protonpack-version>
-    <pubnub-version>4.20.0</pubnub-version>
+    <pubnub-version>4.21.0</pubnub-version>
     <qpid-broker-version>7.0.6</qpid-broker-version>
     <qpid-proton-j-version>0.30.0</qpid-proton-j-version>
     <qpid-jms-client-version>0.38.0</qpid-jms-client-version>

From 05c14ba47659f59f6e2a4969c1212002a88bfc27 Mon Sep 17 00:00:00 2001
From: Gregor Zurowski <gregor@zurowski.org>
Date: Thu, 29 Nov 2018 09:06:03 +0000
Subject: [PATCH 110/125] Update version to 2.24.0-SNAPSHOT

Signed-off-by: Gregor Zurowski <gregor@zurowski.org>
---
 apache-camel/pom.xml                                            | 2 +-
 archetypes/camel-archetype-activemq/pom.xml                     | 2 +-
 archetypes/camel-archetype-api-component/pom.xml                | 2 +-
 archetypes/camel-archetype-blueprint/pom.xml                    | 2 +-
 archetypes/camel-archetype-cdi/pom.xml                          | 2 +-
 archetypes/camel-archetype-component/pom.xml                    | 2 +-
 archetypes/camel-archetype-connector/pom.xml                    | 2 +-
 archetypes/camel-archetype-dataformat/pom.xml                   | 2 +-
 archetypes/camel-archetype-groovy/pom.xml                       | 2 +-
 archetypes/camel-archetype-java/pom.xml                         | 2 +-
 archetypes/camel-archetype-java8/pom.xml                        | 2 +-
 archetypes/camel-archetype-scala/pom.xml                        | 2 +-
 archetypes/camel-archetype-scr/pom.xml                          | 2 +-
 archetypes/camel-archetype-spring-boot/pom.xml                  | 2 +-
 archetypes/camel-archetype-spring/pom.xml                       | 2 +-
 archetypes/camel-archetype-web/pom.xml                          | 2 +-
 archetypes/pom.xml                                              | 2 +-
 bom/camel-bom/pom.xml                                           | 2 +-
 bom/pom.xml                                                     | 2 +-
 buildingtools/pom.xml                                           | 2 +-
 camel-core/pom.xml                                              | 2 +-
 components/camel-ahc-ws/pom.xml                                 | 2 +-
 components/camel-ahc/pom.xml                                    | 2 +-
 components/camel-amqp/pom.xml                                   | 2 +-
 components/camel-apns/pom.xml                                   | 2 +-
 components/camel-as2/camel-as2-api/pom.xml                      | 2 +-
 components/camel-as2/camel-as2-component/pom.xml                | 2 +-
 components/camel-as2/pom.xml                                    | 2 +-
 components/camel-asn1/pom.xml                                   | 2 +-
 components/camel-asterisk/pom.xml                               | 2 +-
 components/camel-atmos/pom.xml                                  | 2 +-
 components/camel-atmosphere-websocket/pom.xml                   | 2 +-
 components/camel-atom/pom.xml                                   | 2 +-
 components/camel-atomix/pom.xml                                 | 2 +-
 components/camel-avro/pom.xml                                   | 2 +-
 components/camel-aws-xray/pom.xml                               | 2 +-
 components/camel-aws/pom.xml                                    | 2 +-
 components/camel-azure/pom.xml                                  | 2 +-
 components/camel-bam/pom.xml                                    | 2 +-
 components/camel-barcode/pom.xml                                | 2 +-
 components/camel-base64/pom.xml                                 | 2 +-
 components/camel-bean-validator/pom.xml                         | 2 +-
 components/camel-beanio/pom.xml                                 | 2 +-
 components/camel-beanstalk/pom.xml                              | 2 +-
 components/camel-bindy/pom.xml                                  | 2 +-
 components/camel-blueprint/pom.xml                              | 2 +-
 components/camel-bonita/pom.xml                                 | 2 +-
 components/camel-boon/pom.xml                                   | 2 +-
 components/camel-box/camel-box-api/pom.xml                      | 2 +-
 components/camel-box/camel-box-component/pom.xml                | 2 +-
 components/camel-box/pom.xml                                    | 2 +-
 components/camel-braintree/pom.xml                              | 2 +-
 components/camel-cache/pom.xml                                  | 2 +-
 components/camel-caffeine/pom.xml                               | 2 +-
 components/camel-cassandraql/pom.xml                            | 2 +-
 components/camel-castor/pom.xml                                 | 2 +-
 components/camel-cdi/pom.xml                                    | 2 +-
 components/camel-chronicle/pom.xml                              | 2 +-
 components/camel-chunk/pom.xml                                  | 2 +-
 components/camel-cm-sms/pom.xml                                 | 2 +-
 components/camel-cmis/pom.xml                                   | 2 +-
 components/camel-coap/pom.xml                                   | 2 +-
 components/camel-cometd/pom.xml                                 | 2 +-
 components/camel-consul/pom.xml                                 | 2 +-
 components/camel-context/pom.xml                                | 2 +-
 components/camel-corda/pom.xml                                  | 2 +-
 components/camel-core-osgi/pom.xml                              | 2 +-
 components/camel-core-xml/pom.xml                               | 2 +-
 components/camel-couchbase/pom.xml                              | 2 +-
 components/camel-couchdb/pom.xml                                | 2 +-
 components/camel-crypto-cms/pom.xml                             | 2 +-
 components/camel-crypto/pom.xml                                 | 2 +-
 components/camel-csv/pom.xml                                    | 2 +-
 components/camel-cxf-transport/pom.xml                          | 2 +-
 components/camel-cxf/pom.xml                                    | 2 +-
 components/camel-digitalocean/pom.xml                           | 2 +-
 components/camel-disruptor/pom.xml                              | 2 +-
 components/camel-dns/pom.xml                                    | 2 +-
 components/camel-docker/pom.xml                                 | 2 +-
 components/camel-dozer/pom.xml                                  | 2 +-
 components/camel-drill/pom.xml                                  | 2 +-
 components/camel-dropbox/pom.xml                                | 2 +-
 components/camel-eclipse/pom.xml                                | 2 +-
 components/camel-ehcache/pom.xml                                | 2 +-
 components/camel-ejb/pom.xml                                    | 2 +-
 components/camel-elasticsearch-rest/pom.xml                     | 2 +-
 components/camel-elasticsearch/pom.xml                          | 2 +-
 components/camel-elasticsearch5/pom.xml                         | 2 +-
 components/camel-elsql/pom.xml                                  | 2 +-
 components/camel-etcd/pom.xml                                   | 2 +-
 components/camel-eventadmin/pom.xml                             | 2 +-
 components/camel-exec/pom.xml                                   | 2 +-
 components/camel-facebook/pom.xml                               | 2 +-
 components/camel-fastjson/pom.xml                               | 2 +-
 components/camel-fhir/camel-fhir-api/pom.xml                    | 2 +-
 components/camel-fhir/camel-fhir-component/pom.xml              | 2 +-
 components/camel-fhir/pom.xml                                   | 2 +-
 components/camel-flatpack/pom.xml                               | 2 +-
 components/camel-flink/pom.xml                                  | 2 +-
 components/camel-fop/pom.xml                                    | 2 +-
 components/camel-freemarker/pom.xml                             | 2 +-
 components/camel-ftp/pom.xml                                    | 2 +-
 components/camel-ganglia/pom.xml                                | 2 +-
 components/camel-geocoder/pom.xml                               | 2 +-
 components/camel-git/pom.xml                                    | 2 +-
 components/camel-github/pom.xml                                 | 2 +-
 components/camel-google-bigquery/pom.xml                        | 2 +-
 components/camel-google-calendar/pom.xml                        | 2 +-
 components/camel-google-drive/pom.xml                           | 2 +-
 components/camel-google-mail/pom.xml                            | 2 +-
 components/camel-google-pubsub/pom.xml                          | 2 +-
 components/camel-google-sheets/pom.xml                          | 2 +-
 components/camel-gora/pom.xml                                   | 2 +-
 components/camel-grape/pom.xml                                  | 2 +-
 components/camel-groovy-dsl/pom.xml                             | 2 +-
 components/camel-groovy/pom.xml                                 | 2 +-
 components/camel-grpc/pom.xml                                   | 2 +-
 components/camel-gson/pom.xml                                   | 2 +-
 components/camel-guava-eventbus/pom.xml                         | 2 +-
 components/camel-guice/pom.xml                                  | 2 +-
 components/camel-hawtdb/pom.xml                                 | 2 +-
 components/camel-hazelcast/pom.xml                              | 2 +-
 components/camel-hbase/pom.xml                                  | 2 +-
 components/camel-hdfs/pom.xml                                   | 2 +-
 components/camel-hdfs2/pom.xml                                  | 2 +-
 components/camel-headersmap/pom.xml                             | 2 +-
 components/camel-hessian/pom.xml                                | 2 +-
 components/camel-hipchat/pom.xml                                | 2 +-
 components/camel-hl7/pom.xml                                    | 2 +-
 components/camel-http-common/pom.xml                            | 2 +-
 components/camel-http/pom.xml                                   | 2 +-
 components/camel-http4/pom.xml                                  | 2 +-
 components/camel-hystrix/pom.xml                                | 2 +-
 components/camel-ibatis/pom.xml                                 | 2 +-
 components/camel-ical/pom.xml                                   | 2 +-
 components/camel-iec60870/pom.xml                               | 2 +-
 components/camel-ignite/pom.xml                                 | 2 +-
 components/camel-infinispan/pom.xml                             | 2 +-
 components/camel-influxdb/pom.xml                               | 2 +-
 components/camel-ipfs/pom.xml                                   | 2 +-
 components/camel-irc/pom.xml                                    | 2 +-
 components/camel-ironmq/pom.xml                                 | 2 +-
 components/camel-jackson/pom.xml                                | 2 +-
 components/camel-jacksonxml/pom.xml                             | 2 +-
 components/camel-jasypt/pom.xml                                 | 2 +-
 components/camel-javaspace/pom.xml                              | 2 +-
 components/camel-jaxb/pom.xml                                   | 2 +-
 components/camel-jbpm/pom.xml                                   | 2 +-
 components/camel-jcache/pom.xml                                 | 2 +-
 components/camel-jclouds/pom.xml                                | 2 +-
 components/camel-jcr/pom.xml                                    | 2 +-
 components/camel-jdbc/pom.xml                                   | 2 +-
 components/camel-jetty-common/pom.xml                           | 2 +-
 components/camel-jetty/pom.xml                                  | 2 +-
 components/camel-jetty9/pom.xml                                 | 2 +-
 components/camel-jgroups/pom.xml                                | 2 +-
 components/camel-jibx/pom.xml                                   | 2 +-
 components/camel-jing/pom.xml                                   | 2 +-
 components/camel-jira/pom.xml                                   | 2 +-
 components/camel-jms/pom.xml                                    | 2 +-
 components/camel-jmx/pom.xml                                    | 2 +-
 components/camel-johnzon/pom.xml                                | 2 +-
 components/camel-jolt/pom.xml                                   | 2 +-
 components/camel-josql/pom.xml                                  | 2 +-
 components/camel-jpa/pom.xml                                    | 2 +-
 components/camel-jsch/pom.xml                                   | 2 +-
 components/camel-json-validator/pom.xml                         | 2 +-
 components/camel-jsonpath/pom.xml                               | 2 +-
 components/camel-jt400/pom.xml                                  | 2 +-
 components/camel-juel/pom.xml                                   | 2 +-
 components/camel-jxpath/pom.xml                                 | 2 +-
 components/camel-kafka/pom.xml                                  | 2 +-
 components/camel-kestrel/pom.xml                                | 2 +-
 components/camel-krati/pom.xml                                  | 2 +-
 components/camel-kubernetes/pom.xml                             | 2 +-
 components/camel-kura/pom.xml                                   | 2 +-
 components/camel-ldap/pom.xml                                   | 2 +-
 components/camel-ldif/pom.xml                                   | 2 +-
 components/camel-leveldb/pom.xml                                | 2 +-
 components/camel-linkedin/camel-linkedin-api/pom.xml            | 2 +-
 components/camel-linkedin/camel-linkedin-component/pom.xml      | 2 +-
 components/camel-linkedin/pom.xml                               | 2 +-
 components/camel-lra/pom.xml                                    | 2 +-
 components/camel-lucene/pom.xml                                 | 2 +-
 components/camel-lumberjack/pom.xml                             | 2 +-
 components/camel-lzf/pom.xml                                    | 2 +-
 components/camel-mail/pom.xml                                   | 2 +-
 components/camel-master/pom.xml                                 | 2 +-
 components/camel-metrics/pom.xml                                | 2 +-
 components/camel-micrometer/pom.xml                             | 2 +-
 components/camel-milo/pom.xml                                   | 2 +-
 components/camel-mina/pom.xml                                   | 2 +-
 components/camel-mina2/pom.xml                                  | 2 +-
 components/camel-mllp/pom.xml                                   | 2 +-
 components/camel-mongodb-gridfs/pom.xml                         | 2 +-
 components/camel-mongodb/pom.xml                                | 2 +-
 components/camel-mongodb3/pom.xml                               | 2 +-
 components/camel-mqtt/pom.xml                                   | 2 +-
 components/camel-msv/pom.xml                                    | 2 +-
 components/camel-mustache/pom.xml                               | 2 +-
 components/camel-mvel/pom.xml                                   | 2 +-
 components/camel-mybatis/pom.xml                                | 2 +-
 components/camel-nagios/pom.xml                                 | 2 +-
 components/camel-nats/pom.xml                                   | 2 +-
 components/camel-netty-http/pom.xml                             | 2 +-
 components/camel-netty/pom.xml                                  | 2 +-
 components/camel-netty4-http/pom.xml                            | 2 +-
 components/camel-netty4/pom.xml                                 | 2 +-
 components/camel-nsq/pom.xml                                    | 2 +-
 components/camel-ognl/pom.xml                                   | 2 +-
 components/camel-olingo2/camel-olingo2-api/pom.xml              | 2 +-
 components/camel-olingo2/camel-olingo2-component/pom.xml        | 2 +-
 components/camel-olingo2/pom.xml                                | 2 +-
 components/camel-olingo4/camel-olingo4-api/pom.xml              | 2 +-
 components/camel-olingo4/camel-olingo4-component/pom.xml        | 2 +-
 components/camel-olingo4/pom.xml                                | 2 +-
 components/camel-openshift/pom.xml                              | 2 +-
 components/camel-openstack/pom.xml                              | 2 +-
 components/camel-opentracing/pom.xml                            | 2 +-
 components/camel-optaplanner/pom.xml                            | 2 +-
 components/camel-paho/pom.xml                                   | 2 +-
 components/camel-paxlogging/pom.xml                             | 2 +-
 components/camel-pdf/pom.xml                                    | 2 +-
 components/camel-pgevent/pom.xml                                | 2 +-
 components/camel-printer/pom.xml                                | 2 +-
 components/camel-protobuf/pom.xml                               | 2 +-
 components/camel-pubnub/pom.xml                                 | 2 +-
 components/camel-quartz/pom.xml                                 | 2 +-
 components/camel-quartz2/pom.xml                                | 2 +-
 components/camel-quickfix/pom.xml                               | 2 +-
 components/camel-rabbitmq/pom.xml                               | 2 +-
 components/camel-reactive-streams/pom.xml                       | 2 +-
 components/camel-reactor/pom.xml                                | 2 +-
 components/camel-rest-swagger/pom.xml                           | 2 +-
 components/camel-restlet/pom.xml                                | 2 +-
 components/camel-ribbon/pom.xml                                 | 2 +-
 components/camel-rmi/pom.xml                                    | 2 +-
 components/camel-routebox/pom.xml                               | 2 +-
 components/camel-rss/pom.xml                                    | 2 +-
 components/camel-ruby/pom.xml                                   | 2 +-
 components/camel-rx/pom.xml                                     | 2 +-
 components/camel-rxjava2/pom.xml                                | 2 +-
 components/camel-salesforce/camel-salesforce-component/pom.xml  | 2 +-
 .../camel-salesforce/camel-salesforce-maven-plugin/pom.xml      | 2 +-
 components/camel-salesforce/pom.xml                             | 2 +-
 components/camel-sap-netweaver/pom.xml                          | 2 +-
 components/camel-saxon/pom.xml                                  | 2 +-
 components/camel-scala/pom.xml                                  | 2 +-
 components/camel-schematron/pom.xml                             | 2 +-
 components/camel-scr/pom.xml                                    | 2 +-
 components/camel-script/pom.xml                                 | 2 +-
 components/camel-service/pom.xml                                | 2 +-
 components/camel-servicenow/camel-servicenow-component/pom.xml  | 2 +-
 .../camel-servicenow/camel-servicenow-maven-plugin/pom.xml      | 2 +-
 components/camel-servicenow/pom.xml                             | 2 +-
 components/camel-servlet/pom.xml                                | 2 +-
 components/camel-servletlistener/pom.xml                        | 2 +-
 components/camel-shiro/pom.xml                                  | 2 +-
 components/camel-sip/pom.xml                                    | 2 +-
 components/camel-sjms/pom.xml                                   | 2 +-
 components/camel-sjms2/pom.xml                                  | 2 +-
 components/camel-slack/pom.xml                                  | 2 +-
 components/camel-smpp/pom.xml                                   | 2 +-
 components/camel-snakeyaml/pom.xml                              | 2 +-
 components/camel-snmp/pom.xml                                   | 2 +-
 components/camel-soap/pom.xml                                   | 2 +-
 components/camel-solr/pom.xml                                   | 2 +-
 components/camel-spark-rest/pom.xml                             | 2 +-
 components/camel-spark/pom.xml                                  | 2 +-
 components/camel-splunk/pom.xml                                 | 2 +-
 components/camel-spring-batch/pom.xml                           | 2 +-
 components/camel-spring-boot/pom.xml                            | 2 +-
 components/camel-spring-cloud-consul/pom.xml                    | 2 +-
 components/camel-spring-cloud-netflix/pom.xml                   | 2 +-
 components/camel-spring-cloud-zookeeper/pom.xml                 | 2 +-
 components/camel-spring-cloud/pom.xml                           | 2 +-
 components/camel-spring-integration/pom.xml                     | 2 +-
 components/camel-spring-javaconfig/pom.xml                      | 2 +-
 components/camel-spring-ldap/pom.xml                            | 2 +-
 components/camel-spring-redis/pom.xml                           | 2 +-
 components/camel-spring-security/pom.xml                        | 2 +-
 components/camel-spring-ws/pom.xml                              | 2 +-
 components/camel-spring/pom.xml                                 | 2 +-
 components/camel-sql/pom.xml                                    | 2 +-
 components/camel-ssh/pom.xml                                    | 2 +-
 components/camel-stax/pom.xml                                   | 2 +-
 components/camel-stomp/pom.xml                                  | 2 +-
 components/camel-stream/pom.xml                                 | 2 +-
 components/camel-stringtemplate/pom.xml                         | 2 +-
 components/camel-swagger-java/pom.xml                           | 2 +-
 components/camel-swagger/pom.xml                                | 2 +-
 components/camel-syslog/pom.xml                                 | 2 +-
 components/camel-tagsoup/pom.xml                                | 2 +-
 components/camel-tarfile/pom.xml                                | 2 +-
 components/camel-telegram/pom.xml                               | 2 +-
 components/camel-test-blueprint/pom.xml                         | 2 +-
 components/camel-test-cdi/pom.xml                               | 2 +-
 components/camel-test-karaf/pom.xml                             | 2 +-
 components/camel-test-spring/pom.xml                            | 2 +-
 components/camel-test/pom.xml                                   | 2 +-
 components/camel-testcontainers-spring/pom.xml                  | 2 +-
 components/camel-testcontainers/pom.xml                         | 2 +-
 components/camel-testng/pom.xml                                 | 2 +-
 components/camel-thrift/pom.xml                                 | 2 +-
 components/camel-tika/pom.xml                                   | 2 +-
 components/camel-twilio/pom.xml                                 | 2 +-
 components/camel-twitter/pom.xml                                | 2 +-
 components/camel-undertow/pom.xml                               | 2 +-
 components/camel-univocity-parsers/pom.xml                      | 2 +-
 components/camel-urlrewrite/pom.xml                             | 2 +-
 components/camel-velocity/pom.xml                               | 2 +-
 components/camel-vertx/pom.xml                                  | 2 +-
 components/camel-weather/pom.xml                                | 2 +-
 components/camel-web3j/pom.xml                                  | 2 +-
 components/camel-websocket/pom.xml                              | 2 +-
 components/camel-wordpress/pom.xml                              | 2 +-
 components/camel-xchange/pom.xml                                | 2 +-
 components/camel-xmlbeans/pom.xml                               | 2 +-
 components/camel-xmljson/pom.xml                                | 2 +-
 components/camel-xmlrpc/pom.xml                                 | 2 +-
 components/camel-xmlsecurity/pom.xml                            | 2 +-
 components/camel-xmpp/pom.xml                                   | 2 +-
 components/camel-xstream/pom.xml                                | 2 +-
 components/camel-yammer/pom.xml                                 | 2 +-
 components/camel-yql/pom.xml                                    | 2 +-
 components/camel-zendesk/pom.xml                                | 2 +-
 components/camel-zipfile/pom.xml                                | 2 +-
 components/camel-zipkin/pom.xml                                 | 2 +-
 components/camel-zookeeper-master/pom.xml                       | 2 +-
 components/camel-zookeeper/pom.xml                              | 2 +-
 components/pom.xml                                              | 2 +-
 connectors/camel-connector-maven-plugin/pom.xml                 | 2 +-
 connectors/camel-connector/pom.xml                              | 2 +-
 connectors/pom.xml                                              | 2 +-
 docs/pom.xml                                                    | 2 +-
 etc/pom.xml                                                     | 2 +-
 examples/camel-example-activemq-tomcat/pom.xml                  | 2 +-
 examples/camel-example-aggregate/pom.xml                        | 2 +-
 examples/camel-example-artemis-amqp-blueprint/pom.xml           | 2 +-
 examples/camel-example-artemis-large-messages/pom.xml           | 2 +-
 examples/camel-example-bam/pom.xml                              | 2 +-
 examples/camel-example-cafe/pom.xml                             | 2 +-
 examples/camel-example-cassandra-kubernetes/pom.xml             | 2 +-
 examples/camel-example-cdi-aws-s3/pom.xml                       | 2 +-
 examples/camel-example-cdi-cassandraql/pom.xml                  | 2 +-
 examples/camel-example-cdi-kubernetes/pom.xml                   | 2 +-
 examples/camel-example-cdi-metrics/pom.xml                      | 2 +-
 examples/camel-example-cdi-osgi/pom.xml                         | 2 +-
 examples/camel-example-cdi-properties/pom.xml                   | 2 +-
 examples/camel-example-cdi-rest-servlet/pom.xml                 | 2 +-
 examples/camel-example-cdi-test/pom.xml                         | 2 +-
 examples/camel-example-cdi-xml/pom.xml                          | 2 +-
 examples/camel-example-cdi/pom.xml                              | 2 +-
 examples/camel-example-console/pom.xml                          | 2 +-
 examples/camel-example-cxf-blueprint/pom.xml                    | 2 +-
 examples/camel-example-cxf-proxy/pom.xml                        | 2 +-
 examples/camel-example-cxf-tomcat/pom.xml                       | 2 +-
 examples/camel-example-cxf/pom.xml                              | 2 +-
 examples/camel-example-ehcache-blueprint/pom.xml                | 2 +-
 examples/camel-example-fhir-auth-tx-spring-boot/pom.xml         | 2 +-
 examples/camel-example-fhir-osgi/pom.xml                        | 2 +-
 examples/camel-example-fhir-spring-boot/pom.xml                 | 2 +-
 examples/camel-example-fhir/pom.xml                             | 2 +-
 examples/camel-example-ftp/pom.xml                              | 2 +-
 examples/camel-example-google-pubsub/pom.xml                    | 2 +-
 examples/camel-example-groovy/pom.xml                           | 2 +-
 .../hello-camel-grpc-client-kubernetes/pom.xml                  | 2 +-
 .../hello-camel-grpc-server-kubernetes/pom.xml                  | 2 +-
 examples/camel-example-grpc-kubernetes/pom.xml                  | 2 +-
 examples/camel-example-guice-jms/pom.xml                        | 2 +-
 examples/camel-example-hazelcast-kubernetes/pom.xml             | 2 +-
 examples/camel-example-hystrix/client/pom.xml                   | 2 +-
 examples/camel-example-hystrix/pom.xml                          | 2 +-
 examples/camel-example-hystrix/service1/pom.xml                 | 2 +-
 examples/camel-example-hystrix/service2/pom.xml                 | 2 +-
 examples/camel-example-java8-rx/pom.xml                         | 2 +-
 examples/camel-example-java8/pom.xml                            | 2 +-
 examples/camel-example-jdbc/pom.xml                             | 2 +-
 examples/camel-example-jms-file/pom.xml                         | 2 +-
 examples/camel-example-jmx/pom.xml                              | 2 +-
 examples/camel-example-kafka/pom.xml                            | 2 +-
 examples/camel-example-kotlin/pom.xml                           | 2 +-
 examples/camel-example-loadbalancing/pom.xml                    | 2 +-
 examples/camel-example-loan-broker-cxf/pom.xml                  | 2 +-
 examples/camel-example-loan-broker-jms/pom.xml                  | 2 +-
 examples/camel-example-management/pom.xml                       | 2 +-
 examples/camel-example-micrometer/pom.xml                       | 2 +-
 examples/camel-example-mybatis/pom.xml                          | 2 +-
 examples/camel-example-netty-custom-correlation/pom.xml         | 2 +-
 examples/camel-example-netty-http/myapp-cdi/pom.xml             | 2 +-
 examples/camel-example-netty-http/myapp-one/pom.xml             | 2 +-
 examples/camel-example-netty-http/myapp-two/pom.xml             | 2 +-
 examples/camel-example-netty-http/pom.xml                       | 2 +-
 .../camel-example-netty-http/shared-netty-http-server/pom.xml   | 2 +-
 examples/camel-example-olingo4-blueprint/pom.xml                | 2 +-
 examples/camel-example-opentracing/client/pom.xml               | 2 +-
 examples/camel-example-opentracing/loggingtracer/pom.xml        | 2 +-
 examples/camel-example-opentracing/pom.xml                      | 2 +-
 examples/camel-example-opentracing/service1/pom.xml             | 2 +-
 examples/camel-example-opentracing/service2/pom.xml             | 2 +-
 examples/camel-example-pojo-messaging/pom.xml                   | 2 +-
 examples/camel-example-rabbitmq/pom.xml                         | 2 +-
 examples/camel-example-reactive-streams/pom.xml                 | 2 +-
 examples/camel-example-reload/pom.xml                           | 2 +-
 examples/camel-example-reportincident-wssecurity/pom.xml        | 2 +-
 examples/camel-example-reportincident/pom.xml                   | 2 +-
 examples/camel-example-rest-producer/pom.xml                    | 2 +-
 examples/camel-example-rest-swagger/pom.xml                     | 2 +-
 examples/camel-example-restlet-jdbc/pom.xml                     | 2 +-
 examples/camel-example-route-throttling/pom.xml                 | 2 +-
 examples/camel-example-scala/pom.xml                            | 2 +-
 examples/camel-example-servlet-httpregistry-blueprint/pom.xml   | 2 +-
 examples/camel-example-servlet-rest-blueprint/pom.xml           | 2 +-
 examples/camel-example-servlet-tomcat-no-spring/pom.xml         | 2 +-
 examples/camel-example-servlet-tomcat/pom.xml                   | 2 +-
 examples/camel-example-simplejirabot/javadsl/pom.xml            | 2 +-
 examples/camel-example-simplejirabot/pom.xml                    | 2 +-
 examples/camel-example-simplejirabot/xmlconf/pom.xml            | 2 +-
 examples/camel-example-spark-rest/pom.xml                       | 2 +-
 examples/camel-example-splunk/pom.xml                           | 2 +-
 examples/camel-example-spring-boot-activemq/pom.xml             | 2 +-
 .../cluster-bootstrap/pom.xml                                   | 2 +-
 .../cluster-node/pom.xml                                        | 2 +-
 .../pom.xml                                                     | 2 +-
 examples/camel-example-spring-boot-geocoder/pom.xml             | 2 +-
 .../hello-camel-grpc-client/pom.xml                             | 2 +-
 .../hello-camel-grpc-server/pom.xml                             | 2 +-
 examples/camel-example-spring-boot-grpc/pom.xml                 | 2 +-
 .../camel-example-spring-boot-health-checks/application/pom.xml | 2 +-
 examples/camel-example-spring-boot-health-checks/pom.xml        | 2 +-
 .../camel-example-spring-boot-health-checks/service/pom.xml     | 2 +-
 examples/camel-example-spring-boot-infinispan/pom.xml           | 2 +-
 examples/camel-example-spring-boot-master/pom.xml               | 2 +-
 examples/camel-example-spring-boot-metrics/pom.xml              | 2 +-
 examples/camel-example-spring-boot-pojo/pom.xml                 | 2 +-
 examples/camel-example-spring-boot-rest-jpa/pom.xml             | 2 +-
 examples/camel-example-spring-boot-rest-swagger/pom.xml         | 2 +-
 examples/camel-example-spring-boot-servicecall/consumer/pom.xml | 2 +-
 examples/camel-example-spring-boot-servicecall/pom.xml          | 2 +-
 examples/camel-example-spring-boot-servicecall/services/pom.xml | 2 +-
 .../pom.xml                                                     | 2 +-
 examples/camel-example-spring-boot-xml/pom.xml                  | 2 +-
 examples/camel-example-spring-boot/pom.xml                      | 2 +-
 .../camel-example-spring-cloud-servicecall/consumer/pom.xml     | 2 +-
 examples/camel-example-spring-cloud-servicecall/pom.xml         | 2 +-
 examples/camel-example-spring-cloud-servicecall/service/pom.xml | 2 +-
 .../camel-example-spring-cloud-serviceregistry/consumer/pom.xml | 2 +-
 examples/camel-example-spring-cloud-serviceregistry/pom.xml     | 2 +-
 .../camel-example-spring-cloud-serviceregistry/service/pom.xml  | 2 +-
 examples/camel-example-spring-javaconfig/pom.xml                | 2 +-
 examples/camel-example-spring-jms/pom.xml                       | 2 +-
 examples/camel-example-spring-security/pom.xml                  | 2 +-
 examples/camel-example-spring-ws/pom.xml                        | 2 +-
 examples/camel-example-spring-xquery/pom.xml                    | 2 +-
 examples/camel-example-spring/pom.xml                           | 2 +-
 examples/camel-example-sql-blueprint/pom.xml                    | 2 +-
 examples/camel-example-ssh-security/pom.xml                     | 2 +-
 examples/camel-example-ssh/pom.xml                              | 2 +-
 examples/camel-example-swagger-cdi/pom.xml                      | 2 +-
 examples/camel-example-swagger-osgi/pom.xml                     | 2 +-
 examples/camel-example-swagger-xml/pom.xml                      | 2 +-
 examples/camel-example-tracer/pom.xml                           | 2 +-
 examples/camel-example-transformer-blueprint/pom.xml            | 2 +-
 examples/camel-example-transformer-cdi/pom.xml                  | 2 +-
 examples/camel-example-transformer-demo/pom.xml                 | 2 +-
 examples/camel-example-twitter-salesforce/pom.xml               | 2 +-
 examples/camel-example-twitter-websocket-blueprint/pom.xml      | 2 +-
 examples/camel-example-twitter-websocket/pom.xml                | 2 +-
 examples/camel-example-validator-spring-boot/pom.xml            | 2 +-
 examples/camel-example-widget-gadget-cdi/pom.xml                | 2 +-
 examples/camel-example-widget-gadget-java/pom.xml               | 2 +-
 examples/camel-example-widget-gadget-xml/pom.xml                | 2 +-
 examples/camel-example-zipkin/client/pom.xml                    | 2 +-
 examples/camel-example-zipkin/pom.xml                           | 2 +-
 examples/camel-example-zipkin/service1/pom.xml                  | 2 +-
 examples/camel-example-zipkin/service2/pom.xml                  | 2 +-
 examples/pom.xml                                                | 2 +-
 parent/pom.xml                                                  | 2 +-
 platforms/camel-catalog-connector/pom.xml                       | 2 +-
 platforms/camel-catalog-lucene/pom.xml                          | 2 +-
 platforms/camel-catalog-maven/pom.xml                           | 2 +-
 platforms/camel-catalog-nexus/pom.xml                           | 2 +-
 platforms/camel-catalog-provider-karaf/pom.xml                  | 2 +-
 platforms/camel-catalog-provider-springboot/pom.xml             | 2 +-
 platforms/camel-catalog-rest-app/pom.xml                        | 2 +-
 platforms/camel-catalog-rest/pom.xml                            | 2 +-
 platforms/camel-catalog/pom.xml                                 | 2 +-
 platforms/commands/commands-core/pom.xml                        | 2 +-
 platforms/commands/commands-jolokia/pom.xml                     | 2 +-
 platforms/commands/pom.xml                                      | 2 +-
 platforms/dummy-component/pom.xml                               | 2 +-
 platforms/karaf/commands/pom.xml                                | 2 +-
 platforms/karaf/features/pom.xml                                | 2 +-
 platforms/karaf/pom.xml                                         | 2 +-
 platforms/myfoo-connector/pom.xml                               | 2 +-
 platforms/pom.xml                                               | 2 +-
 .../spring-boot/components-starter/camel-ahc-starter/pom.xml    | 2 +-
 .../spring-boot/components-starter/camel-ahc-ws-starter/pom.xml | 2 +-
 .../spring-boot/components-starter/camel-amqp-starter/pom.xml   | 2 +-
 .../spring-boot/components-starter/camel-apns-starter/pom.xml   | 2 +-
 .../spring-boot/components-starter/camel-as2-starter/pom.xml    | 2 +-
 .../spring-boot/components-starter/camel-asn1-starter/pom.xml   | 2 +-
 .../components-starter/camel-asterisk-starter/pom.xml           | 2 +-
 .../spring-boot/components-starter/camel-atmos-starter/pom.xml  | 2 +-
 .../camel-atmosphere-websocket-starter/pom.xml                  | 2 +-
 .../spring-boot/components-starter/camel-atom-starter/pom.xml   | 2 +-
 .../spring-boot/components-starter/camel-atomix-starter/pom.xml | 2 +-
 .../spring-boot/components-starter/camel-avro-starter/pom.xml   | 2 +-
 .../spring-boot/components-starter/camel-aws-starter/pom.xml    | 2 +-
 .../components-starter/camel-aws-xray-starter/pom.xml           | 2 +-
 .../spring-boot/components-starter/camel-azure-starter/pom.xml  | 2 +-
 .../spring-boot/components-starter/camel-bam-starter/pom.xml    | 2 +-
 .../components-starter/camel-barcode-starter/pom.xml            | 2 +-
 .../spring-boot/components-starter/camel-base64-starter/pom.xml | 2 +-
 .../components-starter/camel-bean-validator-starter/pom.xml     | 2 +-
 .../spring-boot/components-starter/camel-beanio-starter/pom.xml | 2 +-
 .../components-starter/camel-beanstalk-starter/pom.xml          | 2 +-
 .../spring-boot/components-starter/camel-bindy-starter/pom.xml  | 2 +-
 .../spring-boot/components-starter/camel-bonita-starter/pom.xml | 2 +-
 .../spring-boot/components-starter/camel-boon-starter/pom.xml   | 2 +-
 .../spring-boot/components-starter/camel-box-starter/pom.xml    | 2 +-
 .../components-starter/camel-braintree-starter/pom.xml          | 2 +-
 .../spring-boot/components-starter/camel-cache-starter/pom.xml  | 2 +-
 .../components-starter/camel-caffeine-starter/pom.xml           | 2 +-
 .../components-starter/camel-cassandraql-starter/pom.xml        | 2 +-
 .../spring-boot/components-starter/camel-castor-starter/pom.xml | 2 +-
 .../components-starter/camel-chronicle-starter/pom.xml          | 2 +-
 .../spring-boot/components-starter/camel-chunk-starter/pom.xml  | 2 +-
 .../spring-boot/components-starter/camel-cm-sms-starter/pom.xml | 2 +-
 .../spring-boot/components-starter/camel-cmis-starter/pom.xml   | 2 +-
 .../spring-boot/components-starter/camel-coap-starter/pom.xml   | 2 +-
 .../spring-boot/components-starter/camel-cometd-starter/pom.xml | 2 +-
 .../spring-boot/components-starter/camel-consul-starter/pom.xml | 2 +-
 .../components-starter/camel-context-starter/pom.xml            | 2 +-
 .../spring-boot/components-starter/camel-corda-starter/pom.xml  | 2 +-
 .../spring-boot/components-starter/camel-core-starter/pom.xml   | 2 +-
 .../components-starter/camel-couchbase-starter/pom.xml          | 2 +-
 .../components-starter/camel-couchdb-starter/pom.xml            | 2 +-
 .../components-starter/camel-crypto-cms-starter/pom.xml         | 2 +-
 .../spring-boot/components-starter/camel-crypto-starter/pom.xml | 2 +-
 .../spring-boot/components-starter/camel-csv-starter/pom.xml    | 2 +-
 .../spring-boot/components-starter/camel-cxf-starter/pom.xml    | 2 +-
 .../components-starter/camel-cxf-transport-starter/pom.xml      | 2 +-
 .../components-starter/camel-digitalocean-starter/pom.xml       | 2 +-
 .../components-starter/camel-disruptor-starter/pom.xml          | 2 +-
 .../spring-boot/components-starter/camel-dns-starter/pom.xml    | 2 +-
 .../spring-boot/components-starter/camel-docker-starter/pom.xml | 2 +-
 .../spring-boot/components-starter/camel-dozer-starter/pom.xml  | 2 +-
 .../spring-boot/components-starter/camel-drill-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-rest-starter/pom.xml | 2 +-
 .../components-starter/camel-elasticsearch-starter/pom.xml      | 2 +-
 .../components-starter/camel-elasticsearch5-starter/pom.xml     | 2 +-
 .../spring-boot/components-starter/camel-elsql-starter/pom.xml  | 2 +-
 .../spring-boot/components-starter/camel-etcd-starter/pom.xml   | 2 +-
 .../spring-boot/components-starter/camel-exec-starter/pom.xml   | 2 +-
 .../components-starter/camel-facebook-starter/pom.xml           | 2 +-
 .../components-starter/camel-fastjson-starter/pom.xml           | 2 +-
 .../spring-boot/components-starter/camel-fhir-starter/pom.xml   | 2 +-
 .../components-starter/camel-flatpack-starter/pom.xml           | 2 +-
 .../spring-boot/components-starter/camel-flink-starter/pom.xml  | 2 +-
 .../spring-boot/components-starter/camel-fop-starter/pom.xml    | 2 +-
 .../components-starter/camel-freemarker-starter/pom.xml         | 2 +-
 .../spring-boot/components-starter/camel-ftp-starter/pom.xml    | 2 +-
 .../components-starter/camel-ganglia-starter/pom.xml            | 2 +-
 .../components-starter/camel-geocoder-starter/pom.xml           | 2 +-
 .../spring-boot/components-starter/camel-git-starter/pom.xml    | 2 +-
 .../spring-boot/components-starter/camel-github-starter/pom.xml | 2 +-
 .../components-starter/camel-google-bigquery-starter/pom.xml    | 2 +-
 .../components-starter/camel-google-calendar-starter/pom.xml    | 2 +-
 .../components-starter/camel-google-drive-starter/pom.xml       | 2 +-
 .../components-starter/camel-google-mail-starter/pom.xml        | 2 +-
 .../components-starter/camel-google-pubsub-starter/pom.xml      | 2 +-
 .../components-starter/camel-google-sheets-starter/pom.xml      | 2 +-
 .../spring-boot/components-starter/camel-gora-starter/pom.xml   | 2 +-
 .../spring-boot/components-starter/camel-grape-starter/pom.xml  | 2 +-
 .../spring-boot/components-starter/camel-groovy-starter/pom.xml | 2 +-
 .../spring-boot/components-starter/camel-grpc-starter/pom.xml   | 2 +-
 .../spring-boot/components-starter/camel-gson-starter/pom.xml   | 2 +-
 .../components-starter/camel-guava-eventbus-starter/pom.xml     | 2 +-
 .../spring-boot/components-starter/camel-guice-starter/pom.xml  | 2 +-
 .../spring-boot/components-starter/camel-hawtdb-starter/pom.xml | 2 +-
 .../components-starter/camel-hazelcast-starter/pom.xml          | 2 +-
 .../spring-boot/components-starter/camel-hbase-starter/pom.xml  | 2 +-
 .../spring-boot/components-starter/camel-hdfs-starter/pom.xml   | 2 +-
 .../spring-boot/components-starter/camel-hdfs2-starter/pom.xml  | 2 +-
 .../components-starter/camel-headersmap-starter/pom.xml         | 2 +-
 .../components-starter/camel-hessian-starter/pom.xml            | 2 +-
 .../components-starter/camel-hipchat-starter/pom.xml            | 2 +-
 .../spring-boot/components-starter/camel-hl7-starter/pom.xml    | 2 +-
 .../components-starter/camel-http-common-starter/pom.xml        | 2 +-
 .../spring-boot/components-starter/camel-http-starter/pom.xml   | 2 +-
 .../spring-boot/components-starter/camel-http4-starter/pom.xml  | 2 +-
 .../components-starter/camel-hystrix-starter/pom.xml            | 2 +-
 .../spring-boot/components-starter/camel-ical-starter/pom.xml   | 2 +-
 .../components-starter/camel-iec60870-starter/pom.xml           | 2 +-
 .../spring-boot/components-starter/camel-ignite-starter/pom.xml | 2 +-
 .../components-starter/camel-infinispan-starter/pom.xml         | 2 +-
 .../components-starter/camel-influxdb-starter/pom.xml           | 2 +-
 .../spring-boot/components-starter/camel-ipfs-starter/pom.xml   | 2 +-
 .../spring-boot/components-starter/camel-irc-starter/pom.xml    | 2 +-
 .../spring-boot/components-starter/camel-ironmq-starter/pom.xml | 2 +-
 .../components-starter/camel-jackson-starter/pom.xml            | 2 +-
 .../components-starter/camel-jacksonxml-starter/pom.xml         | 2 +-
 .../spring-boot/components-starter/camel-jasypt-starter/pom.xml | 2 +-
 .../components-starter/camel-javaspace-starter/pom.xml          | 2 +-
 .../spring-boot/components-starter/camel-jaxb-starter/pom.xml   | 2 +-
 .../spring-boot/components-starter/camel-jbpm-starter/pom.xml   | 2 +-
 .../spring-boot/components-starter/camel-jcache-starter/pom.xml | 2 +-
 .../components-starter/camel-jclouds-starter/pom.xml            | 2 +-
 .../spring-boot/components-starter/camel-jcr-starter/pom.xml    | 2 +-
 .../spring-boot/components-starter/camel-jdbc-starter/pom.xml   | 2 +-
 .../components-starter/camel-jetty-common-starter/pom.xml       | 2 +-
 .../spring-boot/components-starter/camel-jetty-starter/pom.xml  | 2 +-
 .../spring-boot/components-starter/camel-jetty9-starter/pom.xml | 2 +-
 .../components-starter/camel-jgroups-starter/pom.xml            | 2 +-
 .../spring-boot/components-starter/camel-jibx-starter/pom.xml   | 2 +-
 .../spring-boot/components-starter/camel-jing-starter/pom.xml   | 2 +-
 .../spring-boot/components-starter/camel-jira-starter/pom.xml   | 2 +-
 .../spring-boot/components-starter/camel-jms-starter/pom.xml    | 2 +-
 .../spring-boot/components-starter/camel-jmx-starter/pom.xml    | 2 +-
 .../components-starter/camel-johnzon-starter/pom.xml            | 2 +-
 .../spring-boot/components-starter/camel-jolt-starter/pom.xml   | 2 +-
 .../spring-boot/components-starter/camel-josql-starter/pom.xml  | 2 +-
 .../spring-boot/components-starter/camel-jpa-starter/pom.xml    | 2 +-
 .../spring-boot/components-starter/camel-jsch-starter/pom.xml   | 2 +-
 .../components-starter/camel-json-validator-starter/pom.xml     | 2 +-
 .../components-starter/camel-jsonpath-starter/pom.xml           | 2 +-
 .../spring-boot/components-starter/camel-jt400-starter/pom.xml  | 2 +-
 .../spring-boot/components-starter/camel-juel-starter/pom.xml   | 2 +-
 .../spring-boot/components-starter/camel-jxpath-starter/pom.xml | 2 +-
 .../spring-boot/components-starter/camel-kafka-starter/pom.xml  | 2 +-
 .../components-starter/camel-kestrel-starter/pom.xml            | 2 +-
 .../spring-boot/components-starter/camel-krati-starter/pom.xml  | 2 +-
 .../components-starter/camel-kubernetes-starter/pom.xml         | 2 +-
 .../spring-boot/components-starter/camel-kura-starter/pom.xml   | 2 +-
 .../spring-boot/components-starter/camel-ldap-starter/pom.xml   | 2 +-
 .../spring-boot/components-starter/camel-ldif-starter/pom.xml   | 2 +-
 .../components-starter/camel-leveldb-starter/pom.xml            | 2 +-
 .../components-starter/camel-linkedin-starter/pom.xml           | 2 +-
 .../spring-boot/components-starter/camel-lra-starter/pom.xml    | 2 +-
 .../spring-boot/components-starter/camel-lucene-starter/pom.xml | 2 +-
 .../components-starter/camel-lumberjack-starter/pom.xml         | 2 +-
 .../spring-boot/components-starter/camel-lzf-starter/pom.xml    | 2 +-
 .../spring-boot/components-starter/camel-mail-starter/pom.xml   | 2 +-
 .../spring-boot/components-starter/camel-master-starter/pom.xml | 2 +-
 .../components-starter/camel-metrics-starter/pom.xml            | 2 +-
 .../components-starter/camel-micrometer-starter/pom.xml         | 2 +-
 .../spring-boot/components-starter/camel-milo-starter/pom.xml   | 2 +-
 .../spring-boot/components-starter/camel-mina2-starter/pom.xml  | 2 +-
 .../spring-boot/components-starter/camel-mllp-starter/pom.xml   | 2 +-
 .../components-starter/camel-mongodb-gridfs-starter/pom.xml     | 2 +-
 .../components-starter/camel-mongodb-starter/pom.xml            | 2 +-
 .../components-starter/camel-mongodb3-starter/pom.xml           | 2 +-
 .../spring-boot/components-starter/camel-mqtt-starter/pom.xml   | 2 +-
 .../spring-boot/components-starter/camel-msv-starter/pom.xml    | 2 +-
 .../components-starter/camel-mustache-starter/pom.xml           | 2 +-
 .../spring-boot/components-starter/camel-mvel-starter/pom.xml   | 2 +-
 .../components-starter/camel-mybatis-starter/pom.xml            | 2 +-
 .../spring-boot/components-starter/camel-nagios-starter/pom.xml | 2 +-
 .../spring-boot/components-starter/camel-nats-starter/pom.xml   | 2 +-
 .../components-starter/camel-netty-http-starter/pom.xml         | 2 +-
 .../spring-boot/components-starter/camel-netty-starter/pom.xml  | 2 +-
 .../components-starter/camel-netty4-http-starter/pom.xml        | 2 +-
 .../spring-boot/components-starter/camel-netty4-starter/pom.xml | 2 +-
 .../spring-boot/components-starter/camel-nsq-starter/pom.xml    | 2 +-
 .../spring-boot/components-starter/camel-ognl-starter/pom.xml   | 2 +-
 .../components-starter/camel-olingo2-starter/pom.xml            | 2 +-
 .../components-starter/camel-olingo4-starter/pom.xml            | 2 +-
 .../components-starter/camel-openshift-starter/pom.xml          | 2 +-
 .../components-starter/camel-openstack-starter/pom.xml          | 2 +-
 .../components-starter/camel-opentracing-starter/pom.xml        | 2 +-
 .../components-starter/camel-optaplanner-starter/pom.xml        | 2 +-
 .../spring-boot/components-starter/camel-paho-starter/pom.xml   | 2 +-
 .../spring-boot/components-starter/camel-pdf-starter/pom.xml    | 2 +-
 .../components-starter/camel-pgevent-starter/pom.xml            | 2 +-
 .../components-starter/camel-printer-starter/pom.xml            | 2 +-
 .../components-starter/camel-protobuf-starter/pom.xml           | 2 +-
 .../spring-boot/components-starter/camel-pubnub-starter/pom.xml | 2 +-
 .../components-starter/camel-quartz2-starter/pom.xml            | 2 +-
 .../components-starter/camel-quickfix-starter/pom.xml           | 2 +-
 .../components-starter/camel-rabbitmq-starter/pom.xml           | 2 +-
 .../components-starter/camel-reactive-streams-starter/pom.xml   | 2 +-
 .../components-starter/camel-reactor-starter/pom.xml            | 2 +-
 .../components-starter/camel-rest-swagger-starter/pom.xml       | 2 +-
 .../components-starter/camel-restlet-starter/pom.xml            | 2 +-
 .../spring-boot/components-starter/camel-ribbon-starter/pom.xml | 2 +-
 .../spring-boot/components-starter/camel-rmi-starter/pom.xml    | 2 +-
 .../components-starter/camel-routebox-starter/pom.xml           | 2 +-
 .../spring-boot/components-starter/camel-rss-starter/pom.xml    | 2 +-
 .../spring-boot/components-starter/camel-ruby-starter/pom.xml   | 2 +-
 .../spring-boot/components-starter/camel-rx-starter/pom.xml     | 2 +-
 .../components-starter/camel-rxjava2-starter/pom.xml            | 2 +-
 .../components-starter/camel-salesforce-starter/pom.xml         | 2 +-
 .../components-starter/camel-sap-netweaver-starter/pom.xml      | 2 +-
 .../spring-boot/components-starter/camel-saxon-starter/pom.xml  | 2 +-
 .../components-starter/camel-schematron-starter/pom.xml         | 2 +-
 .../spring-boot/components-starter/camel-script-starter/pom.xml | 2 +-
 .../components-starter/camel-service-starter/pom.xml            | 2 +-
 .../components-starter/camel-servicenow-starter/pom.xml         | 2 +-
 .../components-starter/camel-servlet-starter/pom.xml            | 2 +-
 .../components-starter/camel-servletlistener-starter/pom.xml    | 2 +-
 .../spring-boot/components-starter/camel-shiro-starter/pom.xml  | 2 +-
 .../spring-boot/components-starter/camel-sip-starter/pom.xml    | 2 +-
 .../spring-boot/components-starter/camel-sjms-starter/pom.xml   | 2 +-
 .../spring-boot/components-starter/camel-sjms2-starter/pom.xml  | 2 +-
 .../spring-boot/components-starter/camel-slack-starter/pom.xml  | 2 +-
 .../spring-boot/components-starter/camel-smpp-starter/pom.xml   | 2 +-
 .../components-starter/camel-snakeyaml-starter/pom.xml          | 2 +-
 .../spring-boot/components-starter/camel-snmp-starter/pom.xml   | 2 +-
 .../spring-boot/components-starter/camel-soap-starter/pom.xml   | 2 +-
 .../spring-boot/components-starter/camel-solr-starter/pom.xml   | 2 +-
 .../spring-boot/components-starter/camel-spark-starter/pom.xml  | 2 +-
 .../spring-boot/components-starter/camel-splunk-starter/pom.xml | 2 +-
 .../components-starter/camel-spring-batch-starter/pom.xml       | 2 +-
 .../components-starter/camel-spring-boot-starter/pom.xml        | 2 +-
 .../camel-spring-cloud-consul-starter/pom.xml                   | 2 +-
 .../camel-spring-cloud-netflix-starter/pom.xml                  | 2 +-
 .../components-starter/camel-spring-cloud-starter/pom.xml       | 2 +-
 .../camel-spring-cloud-zookeeper-starter/pom.xml                | 2 +-
 .../components-starter/camel-spring-integration-starter/pom.xml | 2 +-
 .../components-starter/camel-spring-javaconfig-starter/pom.xml  | 2 +-
 .../components-starter/camel-spring-ldap-starter/pom.xml        | 2 +-
 .../components-starter/camel-spring-redis-starter/pom.xml       | 2 +-
 .../components-starter/camel-spring-security-starter/pom.xml    | 2 +-
 .../spring-boot/components-starter/camel-spring-starter/pom.xml | 2 +-
 .../components-starter/camel-spring-ws-starter/pom.xml          | 2 +-
 .../spring-boot/components-starter/camel-sql-starter/pom.xml    | 2 +-
 .../spring-boot/components-starter/camel-ssh-starter/pom.xml    | 2 +-
 .../spring-boot/components-starter/camel-stax-starter/pom.xml   | 2 +-
 .../spring-boot/components-starter/camel-stomp-starter/pom.xml  | 2 +-
 .../spring-boot/components-starter/camel-stream-starter/pom.xml | 2 +-
 .../components-starter/camel-stringtemplate-starter/pom.xml     | 2 +-
 .../components-starter/camel-swagger-java-starter/pom.xml       | 2 +-
 .../spring-boot/components-starter/camel-syslog-starter/pom.xml | 2 +-
 .../components-starter/camel-tagsoup-starter/pom.xml            | 2 +-
 .../components-starter/camel-tarfile-starter/pom.xml            | 2 +-
 .../components-starter/camel-telegram-starter/pom.xml           | 2 +-
 .../spring-boot/components-starter/camel-thrift-starter/pom.xml | 2 +-
 .../spring-boot/components-starter/camel-tika-starter/pom.xml   | 2 +-
 .../spring-boot/components-starter/camel-twilio-starter/pom.xml | 2 +-
 .../components-starter/camel-twitter-starter/pom.xml            | 2 +-
 .../components-starter/camel-undertow-starter/pom.xml           | 2 +-
 .../components-starter/camel-univocity-parsers-starter/pom.xml  | 2 +-
 .../components-starter/camel-urlrewrite-starter/pom.xml         | 2 +-
 .../components-starter/camel-velocity-starter/pom.xml           | 2 +-
 .../spring-boot/components-starter/camel-vertx-starter/pom.xml  | 2 +-
 .../components-starter/camel-weather-starter/pom.xml            | 2 +-
 .../spring-boot/components-starter/camel-web3j-starter/pom.xml  | 2 +-
 .../components-starter/camel-websocket-starter/pom.xml          | 2 +-
 .../components-starter/camel-wordpress-starter/pom.xml          | 2 +-
 .../components-starter/camel-xchange-starter/pom.xml            | 2 +-
 .../components-starter/camel-xmlbeans-starter/pom.xml           | 2 +-
 .../components-starter/camel-xmljson-starter/pom.xml            | 2 +-
 .../spring-boot/components-starter/camel-xmlrpc-starter/pom.xml | 2 +-
 .../components-starter/camel-xmlsecurity-starter/pom.xml        | 2 +-
 .../spring-boot/components-starter/camel-xmpp-starter/pom.xml   | 2 +-
 .../components-starter/camel-xstream-starter/pom.xml            | 2 +-
 .../spring-boot/components-starter/camel-yammer-starter/pom.xml | 2 +-
 .../spring-boot/components-starter/camel-yql-starter/pom.xml    | 2 +-
 .../components-starter/camel-zendesk-starter/pom.xml            | 2 +-
 .../components-starter/camel-zipfile-starter/pom.xml            | 2 +-
 .../spring-boot/components-starter/camel-zipkin-starter/pom.xml | 2 +-
 .../components-starter/camel-zookeeper-master-starter/pom.xml   | 2 +-
 .../components-starter/camel-zookeeper-starter/pom.xml          | 2 +-
 platforms/spring-boot/components-starter/pom.xml                | 2 +-
 platforms/spring-boot/pom.xml                                   | 2 +-
 .../camel-spring-boot-dependencies-generator/pom.xml            | 2 +-
 .../spring-boot-dm/camel-spring-boot-dependencies/pom.xml       | 2 +-
 .../spring-boot/spring-boot-dm/camel-starter-parent/pom.xml     | 2 +-
 platforms/spring-boot/spring-boot-dm/pom.xml                    | 2 +-
 pom.xml                                                         | 2 +-
 tests/camel-blueprint-cxf-test/pom.xml                          | 2 +-
 tests/camel-blueprint-test/pom.xml                              | 2 +-
 tests/camel-itest-cdi/pom.xml                                   | 2 +-
 tests/camel-itest-jms2/pom.xml                                  | 2 +-
 tests/camel-itest-karaf/pom.xml                                 | 2 +-
 tests/camel-itest-osgi/pom.xml                                  | 2 +-
 tests/camel-itest-performance/pom.xml                           | 2 +-
 tests/camel-itest-spring-boot/pom.xml                           | 2 +-
 tests/camel-itest-standalone/pom.xml                            | 2 +-
 tests/camel-itest/pom.xml                                       | 2 +-
 tests/camel-jmh/pom.xml                                         | 2 +-
 tests/camel-partial-classpath-test/pom.xml                      | 2 +-
 tests/camel-performance/pom.xml                                 | 2 +-
 tests/camel-typeconverterscan-test/pom.xml                      | 2 +-
 tests/pom.xml                                                   | 2 +-
 tests/test-bundles/mock-javamail_1.7/pom.xml                    | 2 +-
 tests/test-bundles/pom.xml                                      | 2 +-
 tooling/apt/pom.xml                                             | 2 +-
 tooling/camel-manual/pom.xml                                    | 2 +-
 tooling/camel-route-parser/pom.xml                              | 2 +-
 tooling/json-simple-ordered/pom.xml                             | 2 +-
 tooling/maven/bom-generator-maven-plugin/pom.xml                | 2 +-
 tooling/maven/camel-api-component-maven-plugin/pom.xml          | 2 +-
 .../maven/camel-eip-documentation-enricher-maven-plugin/pom.xml | 2 +-
 tooling/maven/camel-maven-plugin/pom.xml                        | 2 +-
 tooling/maven/camel-package-maven-plugin/pom.xml                | 2 +-
 tooling/maven/camel-restdsl-swagger-plugin/pom.xml              | 2 +-
 tooling/maven/guice-maven-plugin/pom.xml                        | 2 +-
 tooling/maven/pom.xml                                           | 2 +-
 tooling/parent/pom.xml                                          | 2 +-
 tooling/pom.xml                                                 | 2 +-
 tooling/spi-annotations/pom.xml                                 | 2 +-
 tooling/swagger-rest-dsl-generator/pom.xml                      | 2 +-
 807 files changed, 807 insertions(+), 807 deletions(-)

diff --git a/apache-camel/pom.xml b/apache-camel/pom.xml
index 1481b63f7c379..39209c228265e 100644
--- a/apache-camel/pom.xml
+++ b/apache-camel/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>camel-parent</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
     <relativePath>../parent</relativePath>
   </parent>
 
diff --git a/archetypes/camel-archetype-activemq/pom.xml b/archetypes/camel-archetype-activemq/pom.xml
index 1366e1c515384..0234e9a4c1095 100644
--- a/archetypes/camel-archetype-activemq/pom.xml
+++ b/archetypes/camel-archetype-activemq/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>archetypes</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.apache.camel.archetypes</groupId>
diff --git a/archetypes/camel-archetype-api-component/pom.xml b/archetypes/camel-archetype-api-component/pom.xml
index 3ebeb43b7c19a..33ffd47d391fe 100644
--- a/archetypes/camel-archetype-api-component/pom.xml
+++ b/archetypes/camel-archetype-api-component/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>archetypes</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.apache.camel.archetypes</groupId>
diff --git a/archetypes/camel-archetype-blueprint/pom.xml b/archetypes/camel-archetype-blueprint/pom.xml
index dcccb514096fa..26fb09ab78a99 100644
--- a/archetypes/camel-archetype-blueprint/pom.xml
+++ b/archetypes/camel-archetype-blueprint/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>archetypes</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.apache.camel.archetypes</groupId>
diff --git a/archetypes/camel-archetype-cdi/pom.xml b/archetypes/camel-archetype-cdi/pom.xml
index d8bc7888aa2ca..ef0243771ac73 100644
--- a/archetypes/camel-archetype-cdi/pom.xml
+++ b/archetypes/camel-archetype-cdi/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>archetypes</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.apache.camel.archetypes</groupId>
diff --git a/archetypes/camel-archetype-component/pom.xml b/archetypes/camel-archetype-component/pom.xml
index 6e75ab096cdae..0ed268fb9f129 100644
--- a/archetypes/camel-archetype-component/pom.xml
+++ b/archetypes/camel-archetype-component/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>archetypes</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.apache.camel.archetypes</groupId>
diff --git a/archetypes/camel-archetype-connector/pom.xml b/archetypes/camel-archetype-connector/pom.xml
index 2d794a1958e1d..e8504d7602b1d 100644
--- a/archetypes/camel-archetype-connector/pom.xml
+++ b/archetypes/camel-archetype-connector/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>archetypes</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.apache.camel.archetypes</groupId>
diff --git a/archetypes/camel-archetype-dataformat/pom.xml b/archetypes/camel-archetype-dataformat/pom.xml
index 5882be02333e2..a32c1ee641d2b 100644
--- a/archetypes/camel-archetype-dataformat/pom.xml
+++ b/archetypes/camel-archetype-dataformat/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>archetypes</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.apache.camel.archetypes</groupId>
diff --git a/archetypes/camel-archetype-groovy/pom.xml b/archetypes/camel-archetype-groovy/pom.xml
index 88d596ff02091..88aae76ce6d34 100644
--- a/archetypes/camel-archetype-groovy/pom.xml
+++ b/archetypes/camel-archetype-groovy/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>archetypes</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.apache.camel.archetypes</groupId>
diff --git a/archetypes/camel-archetype-java/pom.xml b/archetypes/camel-archetype-java/pom.xml
index 0308191b50ac1..a9d4bf352bb82 100644
--- a/archetypes/camel-archetype-java/pom.xml
+++ b/archetypes/camel-archetype-java/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>archetypes</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.apache.camel.archetypes</groupId>
diff --git a/archetypes/camel-archetype-java8/pom.xml b/archetypes/camel-archetype-java8/pom.xml
index 81affebf41efe..373dff725009a 100644
--- a/archetypes/camel-archetype-java8/pom.xml
+++ b/archetypes/camel-archetype-java8/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>archetypes</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.apache.camel.archetypes</groupId>
diff --git a/archetypes/camel-archetype-scala/pom.xml b/archetypes/camel-archetype-scala/pom.xml
index 9eb048ac5b9db..856bb29a1b1b0 100644
--- a/archetypes/camel-archetype-scala/pom.xml
+++ b/archetypes/camel-archetype-scala/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>archetypes</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.apache.camel.archetypes</groupId>
diff --git a/archetypes/camel-archetype-scr/pom.xml b/archetypes/camel-archetype-scr/pom.xml
index d73d8bb4f865d..4a501e2d4bf35 100644
--- a/archetypes/camel-archetype-scr/pom.xml
+++ b/archetypes/camel-archetype-scr/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>archetypes</artifactId>
     <groupId>org.apache.camel</groupId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.apache.camel.archetypes</groupId>
diff --git a/archetypes/camel-archetype-spring-boot/pom.xml b/archetypes/camel-archetype-spring-boot/pom.xml
index 78dfebb61fbb1..23b640a9034bf 100644
--- a/archetypes/camel-archetype-spring-boot/pom.xml
+++ b/archetypes/camel-archetype-spring-boot/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>archetypes</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.apache.camel.archetypes</groupId>
diff --git a/archetypes/camel-archetype-spring/pom.xml b/archetypes/camel-archetype-spring/pom.xml
index 4474f5b256819..b871da95a5b27 100644
--- a/archetypes/camel-archetype-spring/pom.xml
+++ b/archetypes/camel-archetype-spring/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>archetypes</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.apache.camel.archetypes</groupId>
diff --git a/archetypes/camel-archetype-web/pom.xml b/archetypes/camel-archetype-web/pom.xml
index 9b3ee2a65fad8..bc36a814fb66a 100644
--- a/archetypes/camel-archetype-web/pom.xml
+++ b/archetypes/camel-archetype-web/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>archetypes</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.apache.camel.archetypes</groupId>
diff --git a/archetypes/pom.xml b/archetypes/pom.xml
index 5e7668783ea26..bb35eb0cdd05b 100644
--- a/archetypes/pom.xml
+++ b/archetypes/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>camel-parent</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
     <relativePath>../parent</relativePath>
   </parent>
   
diff --git a/bom/camel-bom/pom.xml b/bom/camel-bom/pom.xml
index 1f13e640074d9..79d820a6bdf17 100644
--- a/bom/camel-bom/pom.xml
+++ b/bom/camel-bom/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>camel</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
     <relativePath>../../</relativePath>
   </parent>
   <artifactId>camel-bom</artifactId>
diff --git a/bom/pom.xml b/bom/pom.xml
index 3307a829e8b25..5c3de896c5957 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>camel-parent</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
     <relativePath>../parent</relativePath>
   </parent>
 
diff --git a/buildingtools/pom.xml b/buildingtools/pom.xml
index 5e8d7bdbb8936..61a4b3a628064 100644
--- a/buildingtools/pom.xml
+++ b/buildingtools/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel</artifactId>
-        <version>2.23.0-SNAPSHOT</version>
+        <version>2.24.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-buildtools</artifactId>
diff --git a/camel-core/pom.xml b/camel-core/pom.xml
index f5d1c43b2d53d..2e09609f13498 100644
--- a/camel-core/pom.xml
+++ b/camel-core/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>camel-parent</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
     <relativePath>../parent</relativePath>
   </parent>
 
diff --git a/components/camel-ahc-ws/pom.xml b/components/camel-ahc-ws/pom.xml
index 8b9acef1fb114..d9bacce7a097b 100644
--- a/components/camel-ahc-ws/pom.xml
+++ b/components/camel-ahc-ws/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-ahc-ws</artifactId>
diff --git a/components/camel-ahc/pom.xml b/components/camel-ahc/pom.xml
index 47e511d52d492..fa464b89e902c 100644
--- a/components/camel-ahc/pom.xml
+++ b/components/camel-ahc/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-ahc</artifactId>
diff --git a/components/camel-amqp/pom.xml b/components/camel-amqp/pom.xml
index 92b3bf2fd15b9..351d39a569445 100644
--- a/components/camel-amqp/pom.xml
+++ b/components/camel-amqp/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-amqp</artifactId>
diff --git a/components/camel-apns/pom.xml b/components/camel-apns/pom.xml
index 46d41011bb947..49466e9801a9d 100644
--- a/components/camel-apns/pom.xml
+++ b/components/camel-apns/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-apns</artifactId>
diff --git a/components/camel-as2/camel-as2-api/pom.xml b/components/camel-as2/camel-as2-api/pom.xml
index 342b5110316a4..5eb6dc8078b3b 100644
--- a/components/camel-as2/camel-as2-api/pom.xml
+++ b/components/camel-as2/camel-as2-api/pom.xml
@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>org.apache.camel</groupId>
 		<artifactId>camel-as2-parent</artifactId>
-		<version>2.23.0-SNAPSHOT</version>
+		<version>2.24.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>camel-as2-api</artifactId>
diff --git a/components/camel-as2/camel-as2-component/pom.xml b/components/camel-as2/camel-as2-component/pom.xml
index d7756f7a0e181..8903e25dca738 100644
--- a/components/camel-as2/camel-as2-component/pom.xml
+++ b/components/camel-as2/camel-as2-component/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>camel-as2-parent</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-as2</artifactId>
diff --git a/components/camel-as2/pom.xml b/components/camel-as2/pom.xml
index a22725942d28d..b489461b9391d 100644
--- a/components/camel-as2/pom.xml
+++ b/components/camel-as2/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <artifactId>components</artifactId>
     <groupId>org.apache.camel</groupId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-as2-parent</artifactId>
diff --git a/components/camel-asn1/pom.xml b/components/camel-asn1/pom.xml
index 120539f1dcbed..8e49211b214fb 100644
--- a/components/camel-asn1/pom.xml
+++ b/components/camel-asn1/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-asn1</artifactId>
diff --git a/components/camel-asterisk/pom.xml b/components/camel-asterisk/pom.xml
index 82d3e606c54da..a829e4e97d456 100644
--- a/components/camel-asterisk/pom.xml
+++ b/components/camel-asterisk/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-asterisk</artifactId>
diff --git a/components/camel-atmos/pom.xml b/components/camel-atmos/pom.xml
index 2733acc4ee1ea..cd1aaf3a62f54 100644
--- a/components/camel-atmos/pom.xml
+++ b/components/camel-atmos/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-atmos</artifactId>
diff --git a/components/camel-atmosphere-websocket/pom.xml b/components/camel-atmosphere-websocket/pom.xml
index 35d6c1a1672d1..b00a4ee0e4181 100644
--- a/components/camel-atmosphere-websocket/pom.xml
+++ b/components/camel-atmosphere-websocket/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>components</artifactId>
-        <version>2.23.0-SNAPSHOT</version>
+        <version>2.24.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-atmosphere-websocket</artifactId>
diff --git a/components/camel-atom/pom.xml b/components/camel-atom/pom.xml
index 8d4201d437d7a..a3f8b268374da 100644
--- a/components/camel-atom/pom.xml
+++ b/components/camel-atom/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-atom</artifactId>
diff --git a/components/camel-atomix/pom.xml b/components/camel-atomix/pom.xml
index 147c404c99ff3..cd1a4c76272e9 100644
--- a/components/camel-atomix/pom.xml
+++ b/components/camel-atomix/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-atomix</artifactId>
diff --git a/components/camel-avro/pom.xml b/components/camel-avro/pom.xml
index 94f05a4b12269..d20d5bc65286b 100644
--- a/components/camel-avro/pom.xml
+++ b/components/camel-avro/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>components</artifactId>
-        <version>2.23.0-SNAPSHOT</version>
+        <version>2.24.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-avro</artifactId>
diff --git a/components/camel-aws-xray/pom.xml b/components/camel-aws-xray/pom.xml
index feac69bce8212..92415e97c5154 100644
--- a/components/camel-aws-xray/pom.xml
+++ b/components/camel-aws-xray/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>components</artifactId>
     <groupId>org.apache.camel</groupId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-aws-xray</artifactId>
diff --git a/components/camel-aws/pom.xml b/components/camel-aws/pom.xml
index 2572064332f90..6d1e732ec7101 100644
--- a/components/camel-aws/pom.xml
+++ b/components/camel-aws/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>components</artifactId>
-        <version>2.23.0-SNAPSHOT</version>
+        <version>2.24.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-aws</artifactId>
diff --git a/components/camel-azure/pom.xml b/components/camel-azure/pom.xml
index 86842ca620ba3..a1cd1ead408ae 100644
--- a/components/camel-azure/pom.xml
+++ b/components/camel-azure/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-azure</artifactId>
diff --git a/components/camel-bam/pom.xml b/components/camel-bam/pom.xml
index 790bc26381ec1..e16d66bcaeb62 100644
--- a/components/camel-bam/pom.xml
+++ b/components/camel-bam/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-bam</artifactId>
diff --git a/components/camel-barcode/pom.xml b/components/camel-barcode/pom.xml
index 354143f18fa95..d7be47649c184 100644
--- a/components/camel-barcode/pom.xml
+++ b/components/camel-barcode/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>components</artifactId>
-        <version>2.23.0-SNAPSHOT</version>
+        <version>2.24.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-barcode</artifactId>
diff --git a/components/camel-base64/pom.xml b/components/camel-base64/pom.xml
index da14db6d8bd35..2a29962e75f5a 100644
--- a/components/camel-base64/pom.xml
+++ b/components/camel-base64/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-base64</artifactId>
diff --git a/components/camel-bean-validator/pom.xml b/components/camel-bean-validator/pom.xml
index 5a3a1628235b9..4029ee2376bcd 100644
--- a/components/camel-bean-validator/pom.xml
+++ b/components/camel-bean-validator/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-bean-validator</artifactId>
diff --git a/components/camel-beanio/pom.xml b/components/camel-beanio/pom.xml
index 4086640467df0..d123077691b2d 100644
--- a/components/camel-beanio/pom.xml
+++ b/components/camel-beanio/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-beanio</artifactId>
diff --git a/components/camel-beanstalk/pom.xml b/components/camel-beanstalk/pom.xml
index 1bb7ef282aef3..071bba3faedf5 100644
--- a/components/camel-beanstalk/pom.xml
+++ b/components/camel-beanstalk/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-beanstalk</artifactId>
diff --git a/components/camel-bindy/pom.xml b/components/camel-bindy/pom.xml
index 413f63e6c6e6d..46e530df518a1 100644
--- a/components/camel-bindy/pom.xml
+++ b/components/camel-bindy/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>components</artifactId>
-        <version>2.23.0-SNAPSHOT</version>
+        <version>2.24.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-bindy</artifactId>
diff --git a/components/camel-blueprint/pom.xml b/components/camel-blueprint/pom.xml
index 86711cef58705..06b9e1e6c33de 100644
--- a/components/camel-blueprint/pom.xml
+++ b/components/camel-blueprint/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-blueprint</artifactId>
diff --git a/components/camel-bonita/pom.xml b/components/camel-bonita/pom.xml
index 585565fda4456..27505ae85b0be 100644
--- a/components/camel-bonita/pom.xml
+++ b/components/camel-bonita/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-bonita</artifactId>
diff --git a/components/camel-boon/pom.xml b/components/camel-boon/pom.xml
index 7a9b2392f38ec..ae8b7c4ac88c2 100644
--- a/components/camel-boon/pom.xml
+++ b/components/camel-boon/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>components</artifactId>
-        <version>2.23.0-SNAPSHOT</version>
+        <version>2.24.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-boon</artifactId>
diff --git a/components/camel-box/camel-box-api/pom.xml b/components/camel-box/camel-box-api/pom.xml
index 0043d306343a2..2e6b0b8105567 100644
--- a/components/camel-box/camel-box-api/pom.xml
+++ b/components/camel-box/camel-box-api/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>camel-box-parent</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-box-api</artifactId>
diff --git a/components/camel-box/camel-box-component/pom.xml b/components/camel-box/camel-box-component/pom.xml
index b675750ce1dfd..57348d1818dfe 100644
--- a/components/camel-box/camel-box-component/pom.xml
+++ b/components/camel-box/camel-box-component/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>camel-box-parent</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-box</artifactId>
diff --git a/components/camel-box/pom.xml b/components/camel-box/pom.xml
index 7f8f9a0d93860..59aabc1990e37 100644
--- a/components/camel-box/pom.xml
+++ b/components/camel-box/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>components</artifactId>
     <groupId>org.apache.camel</groupId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-box-parent</artifactId>
diff --git a/components/camel-braintree/pom.xml b/components/camel-braintree/pom.xml
index 737a743baf7cb..bddc2fa197365 100644
--- a/components/camel-braintree/pom.xml
+++ b/components/camel-braintree/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-braintree</artifactId>
diff --git a/components/camel-cache/pom.xml b/components/camel-cache/pom.xml
index 4984ce711803a..5a3eecc31cdf4 100644
--- a/components/camel-cache/pom.xml
+++ b/components/camel-cache/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>components</artifactId>
-        <version>2.23.0-SNAPSHOT</version>
+        <version>2.24.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-cache</artifactId>
diff --git a/components/camel-caffeine/pom.xml b/components/camel-caffeine/pom.xml
index 0f7353bca4c58..0ba9925f5dab8 100644
--- a/components/camel-caffeine/pom.xml
+++ b/components/camel-caffeine/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-caffeine</artifactId>
diff --git a/components/camel-cassandraql/pom.xml b/components/camel-cassandraql/pom.xml
index 36c975ba2daea..c0df2a9272dcf 100644
--- a/components/camel-cassandraql/pom.xml
+++ b/components/camel-cassandraql/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-cassandraql</artifactId>
diff --git a/components/camel-castor/pom.xml b/components/camel-castor/pom.xml
index d5b4c483cc979..909322b7c4ecd 100644
--- a/components/camel-castor/pom.xml
+++ b/components/camel-castor/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>components</artifactId>
-        <version>2.23.0-SNAPSHOT</version>
+        <version>2.24.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-castor</artifactId>
diff --git a/components/camel-cdi/pom.xml b/components/camel-cdi/pom.xml
index 41ea258c997d9..f31fa11f114f6 100644
--- a/components/camel-cdi/pom.xml
+++ b/components/camel-cdi/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-cdi</artifactId>
diff --git a/components/camel-chronicle/pom.xml b/components/camel-chronicle/pom.xml
index 8412eebaecbbf..8e87500461873 100644
--- a/components/camel-chronicle/pom.xml
+++ b/components/camel-chronicle/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-chronicle</artifactId>
diff --git a/components/camel-chunk/pom.xml b/components/camel-chunk/pom.xml
index e0efd92db49bf..c6eb4f1910ded 100644
--- a/components/camel-chunk/pom.xml
+++ b/components/camel-chunk/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>components</artifactId>
     <groupId>org.apache.camel</groupId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-chunk</artifactId>
diff --git a/components/camel-cm-sms/pom.xml b/components/camel-cm-sms/pom.xml
index e94c1eaf55ae9..b2cbb7d2d8da6 100644
--- a/components/camel-cm-sms/pom.xml
+++ b/components/camel-cm-sms/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-cm-sms</artifactId>
diff --git a/components/camel-cmis/pom.xml b/components/camel-cmis/pom.xml
index 204db1ce3ac59..d2196ca4be119 100644
--- a/components/camel-cmis/pom.xml
+++ b/components/camel-cmis/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>components</artifactId>
-        <version>2.23.0-SNAPSHOT</version>
+        <version>2.24.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-cmis</artifactId>
diff --git a/components/camel-coap/pom.xml b/components/camel-coap/pom.xml
index e11dfe1485c65..d4b991ab932da 100644
--- a/components/camel-coap/pom.xml
+++ b/components/camel-coap/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-coap</artifactId>
diff --git a/components/camel-cometd/pom.xml b/components/camel-cometd/pom.xml
index a2af82d9a87fd..a2c2f4d440bef 100644
--- a/components/camel-cometd/pom.xml
+++ b/components/camel-cometd/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>components</artifactId>
-        <version>2.23.0-SNAPSHOT</version>
+        <version>2.24.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-cometd</artifactId>
diff --git a/components/camel-consul/pom.xml b/components/camel-consul/pom.xml
index e2722a7c6f5e4..d9a1d14378f41 100644
--- a/components/camel-consul/pom.xml
+++ b/components/camel-consul/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-consul</artifactId>
diff --git a/components/camel-context/pom.xml b/components/camel-context/pom.xml
index 914829921498e..6cf017548f317 100644
--- a/components/camel-context/pom.xml
+++ b/components/camel-context/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>components</artifactId>
-        <version>2.23.0-SNAPSHOT</version>
+        <version>2.24.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-context</artifactId>
diff --git a/components/camel-corda/pom.xml b/components/camel-corda/pom.xml
index b7969a0d126ce..6cc750c1c44a2 100644
--- a/components/camel-corda/pom.xml
+++ b/components/camel-corda/pom.xml
@@ -23,7 +23,7 @@
       <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>components</artifactId>
-        <version>2.23.0-SNAPSHOT</version>
+        <version>2.24.0-SNAPSHOT</version>
       </parent>
 
       <artifactId>camel-corda</artifactId>
diff --git a/components/camel-core-osgi/pom.xml b/components/camel-core-osgi/pom.xml
index ef0508ea91eb0..9cf8183c40c3f 100644
--- a/components/camel-core-osgi/pom.xml
+++ b/components/camel-core-osgi/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-core-osgi</artifactId>
diff --git a/components/camel-core-xml/pom.xml b/components/camel-core-xml/pom.xml
index b61504f3ab742..d60287333ac05 100644
--- a/components/camel-core-xml/pom.xml
+++ b/components/camel-core-xml/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-core-xml</artifactId>
diff --git a/components/camel-couchbase/pom.xml b/components/camel-couchbase/pom.xml
index 0ec87a51e43d8..487710a7c1fd9 100644
--- a/components/camel-couchbase/pom.xml
+++ b/components/camel-couchbase/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-couchbase</artifactId>
diff --git a/components/camel-couchdb/pom.xml b/components/camel-couchdb/pom.xml
index bd45a8fe991b4..5aeb88b954b64 100644
--- a/components/camel-couchdb/pom.xml
+++ b/components/camel-couchdb/pom.xml
@@ -24,7 +24,7 @@
 	<parent>
 		<groupId>org.apache.camel</groupId>
 		<artifactId>components</artifactId>
-		<version>2.23.0-SNAPSHOT</version>
+		<version>2.24.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>camel-couchdb</artifactId>
diff --git a/components/camel-crypto-cms/pom.xml b/components/camel-crypto-cms/pom.xml
index 13284065643f8..770d2de730671 100644
--- a/components/camel-crypto-cms/pom.xml
+++ b/components/camel-crypto-cms/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-crypto-cms</artifactId>
diff --git a/components/camel-crypto/pom.xml b/components/camel-crypto/pom.xml
index 2bfe4c27834e5..45ae8fd7402d3 100644
--- a/components/camel-crypto/pom.xml
+++ b/components/camel-crypto/pom.xml
@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>org.apache.camel</groupId>
 		<artifactId>components</artifactId>
-		<version>2.23.0-SNAPSHOT</version>
+		<version>2.24.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>camel-crypto</artifactId>
diff --git a/components/camel-csv/pom.xml b/components/camel-csv/pom.xml
index 3fb92c2526d48..7dae89ccef880 100644
--- a/components/camel-csv/pom.xml
+++ b/components/camel-csv/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-csv</artifactId>
diff --git a/components/camel-cxf-transport/pom.xml b/components/camel-cxf-transport/pom.xml
index 02e1480417dd7..751495bea116b 100644
--- a/components/camel-cxf-transport/pom.xml
+++ b/components/camel-cxf-transport/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-cxf-transport</artifactId>
diff --git a/components/camel-cxf/pom.xml b/components/camel-cxf/pom.xml
index 13146000b94fe..1a3facce9efa6 100644
--- a/components/camel-cxf/pom.xml
+++ b/components/camel-cxf/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-cxf</artifactId>
diff --git a/components/camel-digitalocean/pom.xml b/components/camel-digitalocean/pom.xml
index d73af8096eb73..56a4395d707c3 100644
--- a/components/camel-digitalocean/pom.xml
+++ b/components/camel-digitalocean/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-digitalocean</artifactId>
diff --git a/components/camel-disruptor/pom.xml b/components/camel-disruptor/pom.xml
index b00c1f2be143b..e3d40897ac989 100644
--- a/components/camel-disruptor/pom.xml
+++ b/components/camel-disruptor/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>components</artifactId>
-        <version>2.23.0-SNAPSHOT</version>
+        <version>2.24.0-SNAPSHOT</version>
     </parent>
 
     <name>Camel :: Disruptor</name>
diff --git a/components/camel-dns/pom.xml b/components/camel-dns/pom.xml
index b2f1970be2802..c9cd2639c12d2 100644
--- a/components/camel-dns/pom.xml
+++ b/components/camel-dns/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <name>Camel :: DNS</name>
diff --git a/components/camel-docker/pom.xml b/components/camel-docker/pom.xml
index 7dc03d4a517a6..a136479e507be 100644
--- a/components/camel-docker/pom.xml
+++ b/components/camel-docker/pom.xml
@@ -24,7 +24,7 @@
   <parent>
       <groupId>org.apache.camel</groupId>
       <artifactId>components</artifactId>
-      <version>2.23.0-SNAPSHOT</version>
+      <version>2.24.0-SNAPSHOT</version>
   </parent>
     
   <artifactId>camel-docker</artifactId>
diff --git a/components/camel-dozer/pom.xml b/components/camel-dozer/pom.xml
index a7440c4f6756a..bc70c33e1c3d8 100644
--- a/components/camel-dozer/pom.xml
+++ b/components/camel-dozer/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>components</artifactId>
     <groupId>org.apache.camel</groupId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-dozer</artifactId>
diff --git a/components/camel-drill/pom.xml b/components/camel-drill/pom.xml
index d4af84986af89..d0b5ed2181002 100644
--- a/components/camel-drill/pom.xml
+++ b/components/camel-drill/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>components</artifactId>
-        <version>2.23.0-SNAPSHOT</version>
+        <version>2.24.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-drill</artifactId>
diff --git a/components/camel-dropbox/pom.xml b/components/camel-dropbox/pom.xml
index dcbdeefe69ae2..a920a2fd6703f 100644
--- a/components/camel-dropbox/pom.xml
+++ b/components/camel-dropbox/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-dropbox</artifactId>
diff --git a/components/camel-eclipse/pom.xml b/components/camel-eclipse/pom.xml
index c6838614a42e0..0dcb7fe37e8ea 100644
--- a/components/camel-eclipse/pom.xml
+++ b/components/camel-eclipse/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-eclipse</artifactId>
diff --git a/components/camel-ehcache/pom.xml b/components/camel-ehcache/pom.xml
index 80f7d7ac6fa08..374a477098426 100644
--- a/components/camel-ehcache/pom.xml
+++ b/components/camel-ehcache/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-ehcache</artifactId>
diff --git a/components/camel-ejb/pom.xml b/components/camel-ejb/pom.xml
index 80a6f28161351..a71e731959a0c 100644
--- a/components/camel-ejb/pom.xml
+++ b/components/camel-ejb/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>components</artifactId>
-        <version>2.23.0-SNAPSHOT</version>
+        <version>2.24.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-ejb</artifactId>
diff --git a/components/camel-elasticsearch-rest/pom.xml b/components/camel-elasticsearch-rest/pom.xml
index cdd4a1599aaff..110255cca2b43 100644
--- a/components/camel-elasticsearch-rest/pom.xml
+++ b/components/camel-elasticsearch-rest/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-elasticsearch-rest</artifactId>
diff --git a/components/camel-elasticsearch/pom.xml b/components/camel-elasticsearch/pom.xml
index 5ee02565e4b15..f248fb684194b 100644
--- a/components/camel-elasticsearch/pom.xml
+++ b/components/camel-elasticsearch/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-elasticsearch</artifactId>
diff --git a/components/camel-elasticsearch5/pom.xml b/components/camel-elasticsearch5/pom.xml
index 8ff9d24a2a005..4db7b8acdccdf 100644
--- a/components/camel-elasticsearch5/pom.xml
+++ b/components/camel-elasticsearch5/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-elasticsearch5</artifactId>
diff --git a/components/camel-elsql/pom.xml b/components/camel-elsql/pom.xml
index 2945141e21eb0..5df3caffd6ecd 100644
--- a/components/camel-elsql/pom.xml
+++ b/components/camel-elsql/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-elsql</artifactId>
diff --git a/components/camel-etcd/pom.xml b/components/camel-etcd/pom.xml
index 7e247762ecfb3..02270aa35381d 100644
--- a/components/camel-etcd/pom.xml
+++ b/components/camel-etcd/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-etcd</artifactId>
diff --git a/components/camel-eventadmin/pom.xml b/components/camel-eventadmin/pom.xml
index c8ebcaae34066..017b891176df6 100644
--- a/components/camel-eventadmin/pom.xml
+++ b/components/camel-eventadmin/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>components</artifactId>
-        <version>2.23.0-SNAPSHOT</version>
+        <version>2.24.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-eventadmin</artifactId>
diff --git a/components/camel-exec/pom.xml b/components/camel-exec/pom.xml
index d0e5bbd7b070b..db8b2e7b9e252 100644
--- a/components/camel-exec/pom.xml
+++ b/components/camel-exec/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-exec</artifactId>
diff --git a/components/camel-facebook/pom.xml b/components/camel-facebook/pom.xml
index 859244f9326dd..62f8a78a7e281 100644
--- a/components/camel-facebook/pom.xml
+++ b/components/camel-facebook/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>components</artifactId>
     <groupId>org.apache.camel</groupId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-facebook</artifactId>
diff --git a/components/camel-fastjson/pom.xml b/components/camel-fastjson/pom.xml
index bb55aa4946c89..b178d6cda7270 100644
--- a/components/camel-fastjson/pom.xml
+++ b/components/camel-fastjson/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>components</artifactId>
-        <version>2.23.0-SNAPSHOT</version>
+        <version>2.24.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-fastjson</artifactId>
diff --git a/components/camel-fhir/camel-fhir-api/pom.xml b/components/camel-fhir/camel-fhir-api/pom.xml
index fa3130b3e40a4..c51df2508728b 100644
--- a/components/camel-fhir/camel-fhir-api/pom.xml
+++ b/components/camel-fhir/camel-fhir-api/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>camel-fhir-parent</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-fhir-api</artifactId>
diff --git a/components/camel-fhir/camel-fhir-component/pom.xml b/components/camel-fhir/camel-fhir-component/pom.xml
index 5e1d7c5c2b917..aedefcb100504 100644
--- a/components/camel-fhir/camel-fhir-component/pom.xml
+++ b/components/camel-fhir/camel-fhir-component/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>camel-fhir-parent</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   
   <artifactId>camel-fhir</artifactId>
diff --git a/components/camel-fhir/pom.xml b/components/camel-fhir/pom.xml
index cfc4be48118d2..12b246be3abf2 100644
--- a/components/camel-fhir/pom.xml
+++ b/components/camel-fhir/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-fhir-parent</artifactId>
diff --git a/components/camel-flatpack/pom.xml b/components/camel-flatpack/pom.xml
index 21db4e2839074..87445f0d50702 100644
--- a/components/camel-flatpack/pom.xml
+++ b/components/camel-flatpack/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-flatpack</artifactId>
diff --git a/components/camel-flink/pom.xml b/components/camel-flink/pom.xml
index e073a9d967cf6..b9b6df00e2069 100644
--- a/components/camel-flink/pom.xml
+++ b/components/camel-flink/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <artifactId>components</artifactId>
     <groupId>org.apache.camel</groupId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-flink</artifactId>
diff --git a/components/camel-fop/pom.xml b/components/camel-fop/pom.xml
index ba1fd97846b37..a88e0d2485a65 100644
--- a/components/camel-fop/pom.xml
+++ b/components/camel-fop/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>components</artifactId>
-        <version>2.23.0-SNAPSHOT</version>
+        <version>2.24.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-fop</artifactId>
diff --git a/components/camel-freemarker/pom.xml b/components/camel-freemarker/pom.xml
index 6ace7aa902abc..eb6598413213a 100644
--- a/components/camel-freemarker/pom.xml
+++ b/components/camel-freemarker/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>components</artifactId>
-        <version>2.23.0-SNAPSHOT</version>
+        <version>2.24.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-freemarker</artifactId>
diff --git a/components/camel-ftp/pom.xml b/components/camel-ftp/pom.xml
index de0c3fc2a3efe..7411ffa80f1ba 100644
--- a/components/camel-ftp/pom.xml
+++ b/components/camel-ftp/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-ftp</artifactId>
diff --git a/components/camel-ganglia/pom.xml b/components/camel-ganglia/pom.xml
index 16ef470729b35..6c5e96236df5f 100644
--- a/components/camel-ganglia/pom.xml
+++ b/components/camel-ganglia/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-ganglia</artifactId>
diff --git a/components/camel-geocoder/pom.xml b/components/camel-geocoder/pom.xml
index 7a414a3f6932e..3f118e3f9ee7b 100644
--- a/components/camel-geocoder/pom.xml
+++ b/components/camel-geocoder/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-geocoder</artifactId>
diff --git a/components/camel-git/pom.xml b/components/camel-git/pom.xml
index 1562c0b36268b..1f1a4f1b5d13d 100644
--- a/components/camel-git/pom.xml
+++ b/components/camel-git/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-git</artifactId>
diff --git a/components/camel-github/pom.xml b/components/camel-github/pom.xml
index f2aba198aa64f..69b364a4d0489 100644
--- a/components/camel-github/pom.xml
+++ b/components/camel-github/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-github</artifactId>
diff --git a/components/camel-google-bigquery/pom.xml b/components/camel-google-bigquery/pom.xml
index ae87b2ccbb1dc..dc1715c9be563 100644
--- a/components/camel-google-bigquery/pom.xml
+++ b/components/camel-google-bigquery/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-google-bigquery</artifactId>
diff --git a/components/camel-google-calendar/pom.xml b/components/camel-google-calendar/pom.xml
index f9be968d55ce9..fb7b006d3e85f 100644
--- a/components/camel-google-calendar/pom.xml
+++ b/components/camel-google-calendar/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-google-calendar</artifactId>
diff --git a/components/camel-google-drive/pom.xml b/components/camel-google-drive/pom.xml
index e0e9e5e993c48..b101766fb9000 100644
--- a/components/camel-google-drive/pom.xml
+++ b/components/camel-google-drive/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-google-drive</artifactId>
diff --git a/components/camel-google-mail/pom.xml b/components/camel-google-mail/pom.xml
index 6e93a981deb5d..e513a2daff220 100644
--- a/components/camel-google-mail/pom.xml
+++ b/components/camel-google-mail/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-google-mail</artifactId>
diff --git a/components/camel-google-pubsub/pom.xml b/components/camel-google-pubsub/pom.xml
index 369b1cbb66738..48cd3713de447 100644
--- a/components/camel-google-pubsub/pom.xml
+++ b/components/camel-google-pubsub/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>components</artifactId>
-        <version>2.23.0-SNAPSHOT</version>
+        <version>2.24.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-google-pubsub</artifactId>
diff --git a/components/camel-google-sheets/pom.xml b/components/camel-google-sheets/pom.xml
index da26bd64c5828..01d6bfe19abf7 100644
--- a/components/camel-google-sheets/pom.xml
+++ b/components/camel-google-sheets/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-google-sheets</artifactId>
diff --git a/components/camel-gora/pom.xml b/components/camel-gora/pom.xml
index abef2abed17f7..4368f35944e67 100644
--- a/components/camel-gora/pom.xml
+++ b/components/camel-gora/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-gora</artifactId>
diff --git a/components/camel-grape/pom.xml b/components/camel-grape/pom.xml
index e408f6dc78933..151d7edfed9d0 100644
--- a/components/camel-grape/pom.xml
+++ b/components/camel-grape/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-grape</artifactId>
diff --git a/components/camel-groovy-dsl/pom.xml b/components/camel-groovy-dsl/pom.xml
index 62ac12aef9c17..5f52616e206ab 100644
--- a/components/camel-groovy-dsl/pom.xml
+++ b/components/camel-groovy-dsl/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-groovy-dsl</artifactId>
diff --git a/components/camel-groovy/pom.xml b/components/camel-groovy/pom.xml
index b80b2b94977d6..2f15443c14c18 100644
--- a/components/camel-groovy/pom.xml
+++ b/components/camel-groovy/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-groovy</artifactId>
diff --git a/components/camel-grpc/pom.xml b/components/camel-grpc/pom.xml
index 1802868798150..5cca9a968fd3d 100644
--- a/components/camel-grpc/pom.xml
+++ b/components/camel-grpc/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-grpc</artifactId>
diff --git a/components/camel-gson/pom.xml b/components/camel-gson/pom.xml
index ff3104b7cd9ee..7fda1797aab87 100644
--- a/components/camel-gson/pom.xml
+++ b/components/camel-gson/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>components</artifactId>
-        <version>2.23.0-SNAPSHOT</version>
+        <version>2.24.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-gson</artifactId>
diff --git a/components/camel-guava-eventbus/pom.xml b/components/camel-guava-eventbus/pom.xml
index 55c7a4bdc300c..d3294c6b07898 100644
--- a/components/camel-guava-eventbus/pom.xml
+++ b/components/camel-guava-eventbus/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>components</artifactId>
-        <version>2.23.0-SNAPSHOT</version>
+        <version>2.24.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-guava-eventbus</artifactId>
diff --git a/components/camel-guice/pom.xml b/components/camel-guice/pom.xml
index dcda484dfbe90..33e4e5fec11ee 100644
--- a/components/camel-guice/pom.xml
+++ b/components/camel-guice/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-guice</artifactId>
diff --git a/components/camel-hawtdb/pom.xml b/components/camel-hawtdb/pom.xml
index 51d2a06d15a37..ae285b38cac9d 100644
--- a/components/camel-hawtdb/pom.xml
+++ b/components/camel-hawtdb/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>components</artifactId>
-        <version>2.23.0-SNAPSHOT</version>
+        <version>2.24.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-hawtdb</artifactId>
diff --git a/components/camel-hazelcast/pom.xml b/components/camel-hazelcast/pom.xml
index 2640a37d03517..b1e5a622ea726 100644
--- a/components/camel-hazelcast/pom.xml
+++ b/components/camel-hazelcast/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-hazelcast</artifactId>
diff --git a/components/camel-hbase/pom.xml b/components/camel-hbase/pom.xml
index fd91cc8c4d3a8..3728b76667ec4 100644
--- a/components/camel-hbase/pom.xml
+++ b/components/camel-hbase/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>components</artifactId>
-        <version>2.23.0-SNAPSHOT</version>
+        <version>2.24.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-hbase</artifactId>
diff --git a/components/camel-hdfs/pom.xml b/components/camel-hdfs/pom.xml
index 5e04790bb3003..6998423a5f8bf 100644
--- a/components/camel-hdfs/pom.xml
+++ b/components/camel-hdfs/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>components</artifactId>
-        <version>2.23.0-SNAPSHOT</version>
+        <version>2.24.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-hdfs</artifactId>
diff --git a/components/camel-hdfs2/pom.xml b/components/camel-hdfs2/pom.xml
index 0425af44ffe20..513c8f2ce6e6d 100644
--- a/components/camel-hdfs2/pom.xml
+++ b/components/camel-hdfs2/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-hdfs2</artifactId>
diff --git a/components/camel-headersmap/pom.xml b/components/camel-headersmap/pom.xml
index 1fc42a2a77503..6021ac81e8898 100644
--- a/components/camel-headersmap/pom.xml
+++ b/components/camel-headersmap/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-headersmap</artifactId>
diff --git a/components/camel-hessian/pom.xml b/components/camel-hessian/pom.xml
index 3a59df2b95003..178dfbda4ffb1 100644
--- a/components/camel-hessian/pom.xml
+++ b/components/camel-hessian/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>components</artifactId>
-        <version>2.23.0-SNAPSHOT</version>
+        <version>2.24.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-hessian</artifactId>
diff --git a/components/camel-hipchat/pom.xml b/components/camel-hipchat/pom.xml
index 78b1613360a92..fdb0867e0b259 100644
--- a/components/camel-hipchat/pom.xml
+++ b/components/camel-hipchat/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-hipchat</artifactId>
diff --git a/components/camel-hl7/pom.xml b/components/camel-hl7/pom.xml
index 6982cd36d6e3f..4433eccaa148f 100644
--- a/components/camel-hl7/pom.xml
+++ b/components/camel-hl7/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>components</artifactId>
-        <version>2.23.0-SNAPSHOT</version>
+        <version>2.24.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-hl7</artifactId>
diff --git a/components/camel-http-common/pom.xml b/components/camel-http-common/pom.xml
index 90ee926c41564..9d78644dc2202 100644
--- a/components/camel-http-common/pom.xml
+++ b/components/camel-http-common/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-http-common</artifactId>
diff --git a/components/camel-http/pom.xml b/components/camel-http/pom.xml
index 73816ec099cc0..b1c167ce40df1 100644
--- a/components/camel-http/pom.xml
+++ b/components/camel-http/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-http</artifactId>
diff --git a/components/camel-http4/pom.xml b/components/camel-http4/pom.xml
index 573d9f5105657..32db988876290 100644
--- a/components/camel-http4/pom.xml
+++ b/components/camel-http4/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-http4</artifactId>
diff --git a/components/camel-hystrix/pom.xml b/components/camel-hystrix/pom.xml
index 932ae2ddd5306..40804646b5225 100644
--- a/components/camel-hystrix/pom.xml
+++ b/components/camel-hystrix/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-hystrix</artifactId>
diff --git a/components/camel-ibatis/pom.xml b/components/camel-ibatis/pom.xml
index 45ce4c1cd9d60..d283bef98aa68 100644
--- a/components/camel-ibatis/pom.xml
+++ b/components/camel-ibatis/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-ibatis</artifactId>
diff --git a/components/camel-ical/pom.xml b/components/camel-ical/pom.xml
index a8e7c486aadcb..472851911e69d 100644
--- a/components/camel-ical/pom.xml
+++ b/components/camel-ical/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-ical</artifactId>
diff --git a/components/camel-iec60870/pom.xml b/components/camel-iec60870/pom.xml
index 222067c8f56ab..07012b1b20aab 100644
--- a/components/camel-iec60870/pom.xml
+++ b/components/camel-iec60870/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-iec60870</artifactId>
diff --git a/components/camel-ignite/pom.xml b/components/camel-ignite/pom.xml
index d99a91e2c95c8..8d423a15094d0 100644
--- a/components/camel-ignite/pom.xml
+++ b/components/camel-ignite/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-ignite</artifactId>
diff --git a/components/camel-infinispan/pom.xml b/components/camel-infinispan/pom.xml
index ada6170a3e8df..b0ba90701e9e3 100644
--- a/components/camel-infinispan/pom.xml
+++ b/components/camel-infinispan/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>components</artifactId>
-        <version>2.23.0-SNAPSHOT</version>
+        <version>2.24.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-infinispan</artifactId>
diff --git a/components/camel-influxdb/pom.xml b/components/camel-influxdb/pom.xml
index 466790a3049fd..5a79c1e7e7806 100644
--- a/components/camel-influxdb/pom.xml
+++ b/components/camel-influxdb/pom.xml
@@ -16,7 +16,7 @@
 	<parent>
 		<groupId>org.apache.camel</groupId>
 		<artifactId>components</artifactId>
-		<version>2.23.0-SNAPSHOT</version>
+		<version>2.24.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>camel-influxdb</artifactId>
diff --git a/components/camel-ipfs/pom.xml b/components/camel-ipfs/pom.xml
index 60fa640b91bb0..ad9519417b544 100644
--- a/components/camel-ipfs/pom.xml
+++ b/components/camel-ipfs/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>components</artifactId>
     <groupId>org.apache.camel</groupId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-ipfs</artifactId>
diff --git a/components/camel-irc/pom.xml b/components/camel-irc/pom.xml
index a65b459bcb104..614eaccce6a69 100644
--- a/components/camel-irc/pom.xml
+++ b/components/camel-irc/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-irc</artifactId>
diff --git a/components/camel-ironmq/pom.xml b/components/camel-ironmq/pom.xml
index fb7c742aa64be..572b48a6fa289 100644
--- a/components/camel-ironmq/pom.xml
+++ b/components/camel-ironmq/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-ironmq</artifactId>
diff --git a/components/camel-jackson/pom.xml b/components/camel-jackson/pom.xml
index 1607a0616e7de..8c7a3a72a7e43 100644
--- a/components/camel-jackson/pom.xml
+++ b/components/camel-jackson/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>components</artifactId>
-        <version>2.23.0-SNAPSHOT</version>
+        <version>2.24.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-jackson</artifactId>
diff --git a/components/camel-jacksonxml/pom.xml b/components/camel-jacksonxml/pom.xml
index 4e8656dd396cb..07d986e005d0d 100644
--- a/components/camel-jacksonxml/pom.xml
+++ b/components/camel-jacksonxml/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-jacksonxml</artifactId>
diff --git a/components/camel-jasypt/pom.xml b/components/camel-jasypt/pom.xml
index fb777b1038068..c2248047956dc 100644
--- a/components/camel-jasypt/pom.xml
+++ b/components/camel-jasypt/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>components</artifactId>
-        <version>2.23.0-SNAPSHOT</version>
+        <version>2.24.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-jasypt</artifactId>
diff --git a/components/camel-javaspace/pom.xml b/components/camel-javaspace/pom.xml
index d09c2f925b8ae..27c9f208b2ae0 100644
--- a/components/camel-javaspace/pom.xml
+++ b/components/camel-javaspace/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>components</artifactId>
-        <version>2.23.0-SNAPSHOT</version>
+        <version>2.24.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-javaspace</artifactId>
diff --git a/components/camel-jaxb/pom.xml b/components/camel-jaxb/pom.xml
index f415811dec1bc..5b702f9c51467 100644
--- a/components/camel-jaxb/pom.xml
+++ b/components/camel-jaxb/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>components</artifactId>
-        <version>2.23.0-SNAPSHOT</version>
+        <version>2.24.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-jaxb</artifactId>
diff --git a/components/camel-jbpm/pom.xml b/components/camel-jbpm/pom.xml
index 2a5a161e5dbdd..a0536f0acbc38 100644
--- a/components/camel-jbpm/pom.xml
+++ b/components/camel-jbpm/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>components</artifactId>
-        <version>2.23.0-SNAPSHOT</version>
+        <version>2.24.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-jbpm</artifactId>
diff --git a/components/camel-jcache/pom.xml b/components/camel-jcache/pom.xml
index b8251d570c429..d6389b908115d 100644
--- a/components/camel-jcache/pom.xml
+++ b/components/camel-jcache/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-jcache</artifactId>
diff --git a/components/camel-jclouds/pom.xml b/components/camel-jclouds/pom.xml
index 143cc86b9d21d..f498aab16006d 100644
--- a/components/camel-jclouds/pom.xml
+++ b/components/camel-jclouds/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-jclouds</artifactId>
diff --git a/components/camel-jcr/pom.xml b/components/camel-jcr/pom.xml
index da788fccc22a7..e44b8bcceeb5c 100644
--- a/components/camel-jcr/pom.xml
+++ b/components/camel-jcr/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-jcr</artifactId>
diff --git a/components/camel-jdbc/pom.xml b/components/camel-jdbc/pom.xml
index ecb941f98bb6b..214181b34fed2 100644
--- a/components/camel-jdbc/pom.xml
+++ b/components/camel-jdbc/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-jdbc</artifactId>
diff --git a/components/camel-jetty-common/pom.xml b/components/camel-jetty-common/pom.xml
index d4f818dba2757..22b741a709cf7 100644
--- a/components/camel-jetty-common/pom.xml
+++ b/components/camel-jetty-common/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>components</artifactId>
-        <version>2.23.0-SNAPSHOT</version>
+        <version>2.24.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-jetty-common</artifactId>
diff --git a/components/camel-jetty/pom.xml b/components/camel-jetty/pom.xml
index 84aff37542fca..fe9c79646f211 100644
--- a/components/camel-jetty/pom.xml
+++ b/components/camel-jetty/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>components</artifactId>
-        <version>2.23.0-SNAPSHOT</version>
+        <version>2.24.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-jetty</artifactId>
diff --git a/components/camel-jetty9/pom.xml b/components/camel-jetty9/pom.xml
index 101bed7582e97..4f565e10968ef 100644
--- a/components/camel-jetty9/pom.xml
+++ b/components/camel-jetty9/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-jetty9</artifactId>
diff --git a/components/camel-jgroups/pom.xml b/components/camel-jgroups/pom.xml
index 1bf60eb11ea8d..b6babb035cd66 100644
--- a/components/camel-jgroups/pom.xml
+++ b/components/camel-jgroups/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>components</artifactId>
-        <version>2.23.0-SNAPSHOT</version>
+        <version>2.24.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-jgroups</artifactId>
diff --git a/components/camel-jibx/pom.xml b/components/camel-jibx/pom.xml
index 684f632acf0c4..94046b56c7d09 100644
--- a/components/camel-jibx/pom.xml
+++ b/components/camel-jibx/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>components</artifactId>
-        <version>2.23.0-SNAPSHOT</version>
+        <version>2.24.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-jibx</artifactId>
diff --git a/components/camel-jing/pom.xml b/components/camel-jing/pom.xml
index fc833a9cdaf61..c4e1c241eadca 100644
--- a/components/camel-jing/pom.xml
+++ b/components/camel-jing/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>components</artifactId>
-        <version>2.23.0-SNAPSHOT</version>
+        <version>2.24.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-jing</artifactId>
diff --git a/components/camel-jira/pom.xml b/components/camel-jira/pom.xml
index 0bd9cd52f7b43..d5b4621b44a2b 100644
--- a/components/camel-jira/pom.xml
+++ b/components/camel-jira/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-jira</artifactId>
diff --git a/components/camel-jms/pom.xml b/components/camel-jms/pom.xml
index 6bc9f8498842c..28ca362b2804b 100644
--- a/components/camel-jms/pom.xml
+++ b/components/camel-jms/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-jms</artifactId>
diff --git a/components/camel-jmx/pom.xml b/components/camel-jmx/pom.xml
index 10aebc4d748ec..2ae7da51c55b9 100644
--- a/components/camel-jmx/pom.xml
+++ b/components/camel-jmx/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>components</artifactId>
-        <version>2.23.0-SNAPSHOT</version>
+        <version>2.24.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-jmx</artifactId>
diff --git a/components/camel-johnzon/pom.xml b/components/camel-johnzon/pom.xml
index 7fd9fbef444f9..52aa0fdaeaa02 100644
--- a/components/camel-johnzon/pom.xml
+++ b/components/camel-johnzon/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>components</artifactId>
-        <version>2.23.0-SNAPSHOT</version>
+        <version>2.24.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-johnzon</artifactId>
diff --git a/components/camel-jolt/pom.xml b/components/camel-jolt/pom.xml
index f4e88e4506c61..5b7b475785248 100644
--- a/components/camel-jolt/pom.xml
+++ b/components/camel-jolt/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>components</artifactId>
     <groupId>org.apache.camel</groupId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-jolt</artifactId>
diff --git a/components/camel-josql/pom.xml b/components/camel-josql/pom.xml
index b47bc4d564767..3acad22ed89f7 100644
--- a/components/camel-josql/pom.xml
+++ b/components/camel-josql/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-josql</artifactId>
diff --git a/components/camel-jpa/pom.xml b/components/camel-jpa/pom.xml
index d10a5d4f0d90f..bc30272ae8cc2 100644
--- a/components/camel-jpa/pom.xml
+++ b/components/camel-jpa/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-jpa</artifactId>
diff --git a/components/camel-jsch/pom.xml b/components/camel-jsch/pom.xml
index e780e6153cfcf..ca37991d43b8b 100644
--- a/components/camel-jsch/pom.xml
+++ b/components/camel-jsch/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-jsch</artifactId>
diff --git a/components/camel-json-validator/pom.xml b/components/camel-json-validator/pom.xml
index 0983017d17b25..bc876c19f6a73 100644
--- a/components/camel-json-validator/pom.xml
+++ b/components/camel-json-validator/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-json-validator</artifactId>
diff --git a/components/camel-jsonpath/pom.xml b/components/camel-jsonpath/pom.xml
index 2a3f24eaf41f5..0a45155686efa 100644
--- a/components/camel-jsonpath/pom.xml
+++ b/components/camel-jsonpath/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-jsonpath</artifactId>
diff --git a/components/camel-jt400/pom.xml b/components/camel-jt400/pom.xml
index a5d8dd2d70afe..2fe0e83657b26 100644
--- a/components/camel-jt400/pom.xml
+++ b/components/camel-jt400/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-jt400</artifactId>
diff --git a/components/camel-juel/pom.xml b/components/camel-juel/pom.xml
index c02a5b2a89f88..209f19eae0869 100644
--- a/components/camel-juel/pom.xml
+++ b/components/camel-juel/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-juel</artifactId>
diff --git a/components/camel-jxpath/pom.xml b/components/camel-jxpath/pom.xml
index 1bc5b60e8455a..27ef5152331b0 100644
--- a/components/camel-jxpath/pom.xml
+++ b/components/camel-jxpath/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-jxpath</artifactId>
diff --git a/components/camel-kafka/pom.xml b/components/camel-kafka/pom.xml
index 6dc57def945b7..8379813c05811 100644
--- a/components/camel-kafka/pom.xml
+++ b/components/camel-kafka/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-kafka</artifactId>
diff --git a/components/camel-kestrel/pom.xml b/components/camel-kestrel/pom.xml
index 7040e6c2d1b2d..4d5450cde55c2 100644
--- a/components/camel-kestrel/pom.xml
+++ b/components/camel-kestrel/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>components</artifactId>
-        <version>2.23.0-SNAPSHOT</version>
+        <version>2.24.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-kestrel</artifactId>
diff --git a/components/camel-krati/pom.xml b/components/camel-krati/pom.xml
index 93de9b78b99ed..ee704eebaeb3b 100644
--- a/components/camel-krati/pom.xml
+++ b/components/camel-krati/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>components</artifactId>
-        <version>2.23.0-SNAPSHOT</version>
+        <version>2.24.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-krati</artifactId>
diff --git a/components/camel-kubernetes/pom.xml b/components/camel-kubernetes/pom.xml
index a17c133fcdfac..09d408ccebfd8 100644
--- a/components/camel-kubernetes/pom.xml
+++ b/components/camel-kubernetes/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-kubernetes</artifactId>
diff --git a/components/camel-kura/pom.xml b/components/camel-kura/pom.xml
index df9c581107ce0..3b10eaed0719b 100644
--- a/components/camel-kura/pom.xml
+++ b/components/camel-kura/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-kura</artifactId>
diff --git a/components/camel-ldap/pom.xml b/components/camel-ldap/pom.xml
index 52c52f6da6a01..586765134ec7f 100644
--- a/components/camel-ldap/pom.xml
+++ b/components/camel-ldap/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>components</artifactId>
-        <version>2.23.0-SNAPSHOT</version>
+        <version>2.24.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-ldap</artifactId>
diff --git a/components/camel-ldif/pom.xml b/components/camel-ldif/pom.xml
index 758cdd02b9aeb..8b19ec3603bbb 100644
--- a/components/camel-ldif/pom.xml
+++ b/components/camel-ldif/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-ldif</artifactId>
diff --git a/components/camel-leveldb/pom.xml b/components/camel-leveldb/pom.xml
index f6529268dbe3a..a7172e2eb62f7 100644
--- a/components/camel-leveldb/pom.xml
+++ b/components/camel-leveldb/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>components</artifactId>
-        <version>2.23.0-SNAPSHOT</version>
+        <version>2.24.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-leveldb</artifactId>
diff --git a/components/camel-linkedin/camel-linkedin-api/pom.xml b/components/camel-linkedin/camel-linkedin-api/pom.xml
index cefbdb657e2c0..d28546420a08f 100644
--- a/components/camel-linkedin/camel-linkedin-api/pom.xml
+++ b/components/camel-linkedin/camel-linkedin-api/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>camel-linkedin-parent</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-linkedin-api</artifactId>
diff --git a/components/camel-linkedin/camel-linkedin-component/pom.xml b/components/camel-linkedin/camel-linkedin-component/pom.xml
index 6422cdad45e0c..792f708d71104 100644
--- a/components/camel-linkedin/camel-linkedin-component/pom.xml
+++ b/components/camel-linkedin/camel-linkedin-component/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>camel-linkedin-parent</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-linkedin</artifactId>
diff --git a/components/camel-linkedin/pom.xml b/components/camel-linkedin/pom.xml
index 7762a24099d3a..5bd4fe9cf30d9 100644
--- a/components/camel-linkedin/pom.xml
+++ b/components/camel-linkedin/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>components</artifactId>
     <groupId>org.apache.camel</groupId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-linkedin-parent</artifactId>
diff --git a/components/camel-lra/pom.xml b/components/camel-lra/pom.xml
index 5da2d9fb935b7..750c4d2c9524f 100644
--- a/components/camel-lra/pom.xml
+++ b/components/camel-lra/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-lra</artifactId>
diff --git a/components/camel-lucene/pom.xml b/components/camel-lucene/pom.xml
index da9c223789634..1e23c6a92d8cb 100644
--- a/components/camel-lucene/pom.xml
+++ b/components/camel-lucene/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-lucene</artifactId>
diff --git a/components/camel-lumberjack/pom.xml b/components/camel-lumberjack/pom.xml
index 226e6f6f42b58..e102bba301d4f 100644
--- a/components/camel-lumberjack/pom.xml
+++ b/components/camel-lumberjack/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-lumberjack</artifactId>
diff --git a/components/camel-lzf/pom.xml b/components/camel-lzf/pom.xml
index be012891068ea..a504f10b0e95c 100644
--- a/components/camel-lzf/pom.xml
+++ b/components/camel-lzf/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-lzf</artifactId>
diff --git a/components/camel-mail/pom.xml b/components/camel-mail/pom.xml
index 4c9cc4811a372..fd4f0099263a3 100644
--- a/components/camel-mail/pom.xml
+++ b/components/camel-mail/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>components</artifactId>
-        <version>2.23.0-SNAPSHOT</version>
+        <version>2.24.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-mail</artifactId>
diff --git a/components/camel-master/pom.xml b/components/camel-master/pom.xml
index f68eea200b3f1..0f6f19d39f1cc 100644
--- a/components/camel-master/pom.xml
+++ b/components/camel-master/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-master</artifactId>
diff --git a/components/camel-metrics/pom.xml b/components/camel-metrics/pom.xml
index 72ed81f96caeb..5fd7c5318ea8f 100644
--- a/components/camel-metrics/pom.xml
+++ b/components/camel-metrics/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-metrics</artifactId>
diff --git a/components/camel-micrometer/pom.xml b/components/camel-micrometer/pom.xml
index d6405b35f6511..6a82c651a6ad6 100644
--- a/components/camel-micrometer/pom.xml
+++ b/components/camel-micrometer/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>components</artifactId>
-        <version>2.23.0-SNAPSHOT</version>
+        <version>2.24.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-micrometer</artifactId>
diff --git a/components/camel-milo/pom.xml b/components/camel-milo/pom.xml
index 8ff3198360780..dc62538c8f5ca 100644
--- a/components/camel-milo/pom.xml
+++ b/components/camel-milo/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-milo</artifactId>
diff --git a/components/camel-mina/pom.xml b/components/camel-mina/pom.xml
index 4e718520555dd..e69fdb0a20dfe 100644
--- a/components/camel-mina/pom.xml
+++ b/components/camel-mina/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>components</artifactId>
-        <version>2.23.0-SNAPSHOT</version>
+        <version>2.24.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-mina</artifactId>
diff --git a/components/camel-mina2/pom.xml b/components/camel-mina2/pom.xml
index a3b16dbce9010..c099f3b16cd94 100644
--- a/components/camel-mina2/pom.xml
+++ b/components/camel-mina2/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>components</artifactId>
-        <version>2.23.0-SNAPSHOT</version>
+        <version>2.24.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-mina2</artifactId>
diff --git a/components/camel-mllp/pom.xml b/components/camel-mllp/pom.xml
index ea7f3f05ffd89..5430ee7759e06 100644
--- a/components/camel-mllp/pom.xml
+++ b/components/camel-mllp/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-mllp</artifactId>
diff --git a/components/camel-mongodb-gridfs/pom.xml b/components/camel-mongodb-gridfs/pom.xml
index 4e1fc2cffe1a1..9f6b58235d3dd 100644
--- a/components/camel-mongodb-gridfs/pom.xml
+++ b/components/camel-mongodb-gridfs/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>components</artifactId>
-        <version>2.23.0-SNAPSHOT</version>
+        <version>2.24.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-mongodb-gridfs</artifactId>
diff --git a/components/camel-mongodb/pom.xml b/components/camel-mongodb/pom.xml
index 816bf34c97d18..0592e59910943 100644
--- a/components/camel-mongodb/pom.xml
+++ b/components/camel-mongodb/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-mongodb</artifactId>
diff --git a/components/camel-mongodb3/pom.xml b/components/camel-mongodb3/pom.xml
index 1cb9a26427b90..5c10762b6e607 100644
--- a/components/camel-mongodb3/pom.xml
+++ b/components/camel-mongodb3/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-mongodb3</artifactId>
diff --git a/components/camel-mqtt/pom.xml b/components/camel-mqtt/pom.xml
index 2e152bc604e25..57e025bbe222d 100644
--- a/components/camel-mqtt/pom.xml
+++ b/components/camel-mqtt/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>components</artifactId>
-        <version>2.23.0-SNAPSHOT</version>
+        <version>2.24.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-mqtt</artifactId>
diff --git a/components/camel-msv/pom.xml b/components/camel-msv/pom.xml
index e223699d43a3a..f820c14fdffd1 100644
--- a/components/camel-msv/pom.xml
+++ b/components/camel-msv/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-msv</artifactId>
diff --git a/components/camel-mustache/pom.xml b/components/camel-mustache/pom.xml
index 5bfc721f734b3..f2bf41c29fabc 100644
--- a/components/camel-mustache/pom.xml
+++ b/components/camel-mustache/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-mustache</artifactId>
diff --git a/components/camel-mvel/pom.xml b/components/camel-mvel/pom.xml
index cedeac9b10ef5..d164c8603d99c 100644
--- a/components/camel-mvel/pom.xml
+++ b/components/camel-mvel/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-mvel</artifactId>
diff --git a/components/camel-mybatis/pom.xml b/components/camel-mybatis/pom.xml
index bb3fe68a78ed6..ffeda330e2ee3 100644
--- a/components/camel-mybatis/pom.xml
+++ b/components/camel-mybatis/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-mybatis</artifactId>
diff --git a/components/camel-nagios/pom.xml b/components/camel-nagios/pom.xml
index ab644df652194..15490ed46cdd7 100644
--- a/components/camel-nagios/pom.xml
+++ b/components/camel-nagios/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-nagios</artifactId>
diff --git a/components/camel-nats/pom.xml b/components/camel-nats/pom.xml
index 4f46a40df19fa..0d9b631b43cb3 100644
--- a/components/camel-nats/pom.xml
+++ b/components/camel-nats/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-nats</artifactId>
diff --git a/components/camel-netty-http/pom.xml b/components/camel-netty-http/pom.xml
index f6e558f70cbbf..20b9ce9f716c4 100644
--- a/components/camel-netty-http/pom.xml
+++ b/components/camel-netty-http/pom.xml
@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>org.apache.camel</groupId>
 		<artifactId>components</artifactId>
-		<version>2.23.0-SNAPSHOT</version>
+		<version>2.24.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>camel-netty-http</artifactId>
diff --git a/components/camel-netty/pom.xml b/components/camel-netty/pom.xml
index 21de278031b23..65b5c7c8d2525 100644
--- a/components/camel-netty/pom.xml
+++ b/components/camel-netty/pom.xml
@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>org.apache.camel</groupId>
 		<artifactId>components</artifactId>
-		<version>2.23.0-SNAPSHOT</version>
+		<version>2.24.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>camel-netty</artifactId>
diff --git a/components/camel-netty4-http/pom.xml b/components/camel-netty4-http/pom.xml
index b83d2bd671898..e61d6d301f60d 100644
--- a/components/camel-netty4-http/pom.xml
+++ b/components/camel-netty4-http/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-netty4-http</artifactId>
diff --git a/components/camel-netty4/pom.xml b/components/camel-netty4/pom.xml
index dca3ecfb8c6c5..dcb3949aa1b50 100644
--- a/components/camel-netty4/pom.xml
+++ b/components/camel-netty4/pom.xml
@@ -23,7 +23,7 @@
   <parent>
 		<groupId>org.apache.camel</groupId>
 		<artifactId>components</artifactId>
-		<version>2.23.0-SNAPSHOT</version>
+		<version>2.24.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>camel-netty4</artifactId>
diff --git a/components/camel-nsq/pom.xml b/components/camel-nsq/pom.xml
index 45840a28b39ab..0780b2477e5d4 100644
--- a/components/camel-nsq/pom.xml
+++ b/components/camel-nsq/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>components</artifactId>
         <groupId>org.apache.camel</groupId>
-        <version>2.23.0-SNAPSHOT</version>
+        <version>2.24.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/components/camel-ognl/pom.xml b/components/camel-ognl/pom.xml
index dbf87b5ea476e..00b2873a8b2f9 100644
--- a/components/camel-ognl/pom.xml
+++ b/components/camel-ognl/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-ognl</artifactId>
diff --git a/components/camel-olingo2/camel-olingo2-api/pom.xml b/components/camel-olingo2/camel-olingo2-api/pom.xml
index d2cca42c835c6..bfd7eb2faf852 100644
--- a/components/camel-olingo2/camel-olingo2-api/pom.xml
+++ b/components/camel-olingo2/camel-olingo2-api/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>camel-olingo2-parent</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-olingo2-api</artifactId>
diff --git a/components/camel-olingo2/camel-olingo2-component/pom.xml b/components/camel-olingo2/camel-olingo2-component/pom.xml
index ae1606b13f3df..73f4501e589ce 100644
--- a/components/camel-olingo2/camel-olingo2-component/pom.xml
+++ b/components/camel-olingo2/camel-olingo2-component/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>camel-olingo2-parent</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-olingo2</artifactId>
diff --git a/components/camel-olingo2/pom.xml b/components/camel-olingo2/pom.xml
index e0f1f81c7fcbb..e83e21a15d209 100644
--- a/components/camel-olingo2/pom.xml
+++ b/components/camel-olingo2/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>components</artifactId>
     <groupId>org.apache.camel</groupId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-olingo2-parent</artifactId>
diff --git a/components/camel-olingo4/camel-olingo4-api/pom.xml b/components/camel-olingo4/camel-olingo4-api/pom.xml
index 37b6aa52f5084..2566797ba34cc 100644
--- a/components/camel-olingo4/camel-olingo4-api/pom.xml
+++ b/components/camel-olingo4/camel-olingo4-api/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>camel-olingo4-parent</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-olingo4-api</artifactId>
diff --git a/components/camel-olingo4/camel-olingo4-component/pom.xml b/components/camel-olingo4/camel-olingo4-component/pom.xml
index 9d76c1f1974e0..812e29b448802 100644
--- a/components/camel-olingo4/camel-olingo4-component/pom.xml
+++ b/components/camel-olingo4/camel-olingo4-component/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>camel-olingo4-parent</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-olingo4</artifactId>
diff --git a/components/camel-olingo4/pom.xml b/components/camel-olingo4/pom.xml
index 29fdc2519cc0b..e65ea73b20055 100644
--- a/components/camel-olingo4/pom.xml
+++ b/components/camel-olingo4/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>components</artifactId>
     <groupId>org.apache.camel</groupId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-olingo4-parent</artifactId>
diff --git a/components/camel-openshift/pom.xml b/components/camel-openshift/pom.xml
index d53224557e4fe..e04e3b7e02606 100644
--- a/components/camel-openshift/pom.xml
+++ b/components/camel-openshift/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-openshift</artifactId>
diff --git a/components/camel-openstack/pom.xml b/components/camel-openstack/pom.xml
index a5c0e598efd9a..4870486d88dc9 100644
--- a/components/camel-openstack/pom.xml
+++ b/components/camel-openstack/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-openstack</artifactId>
diff --git a/components/camel-opentracing/pom.xml b/components/camel-opentracing/pom.xml
index bde0b05054576..ac2a76f796e05 100644
--- a/components/camel-opentracing/pom.xml
+++ b/components/camel-opentracing/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <artifactId>components</artifactId>
     <groupId>org.apache.camel</groupId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-opentracing</artifactId>
diff --git a/components/camel-optaplanner/pom.xml b/components/camel-optaplanner/pom.xml
index bed607831169f..e1e6715c51f81 100644
--- a/components/camel-optaplanner/pom.xml
+++ b/components/camel-optaplanner/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-optaplanner</artifactId>
diff --git a/components/camel-paho/pom.xml b/components/camel-paho/pom.xml
index c709d7ce42f8a..3034bbe2bf275 100644
--- a/components/camel-paho/pom.xml
+++ b/components/camel-paho/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-paho</artifactId>
diff --git a/components/camel-paxlogging/pom.xml b/components/camel-paxlogging/pom.xml
index c9655d015af7a..bbffba8403d22 100644
--- a/components/camel-paxlogging/pom.xml
+++ b/components/camel-paxlogging/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>components</artifactId>
-        <version>2.23.0-SNAPSHOT</version>
+        <version>2.24.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-paxlogging</artifactId>
diff --git a/components/camel-pdf/pom.xml b/components/camel-pdf/pom.xml
index 3b7a735cf27d5..a1ff4d1c2f839 100644
--- a/components/camel-pdf/pom.xml
+++ b/components/camel-pdf/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>components</artifactId>
     <groupId>org.apache.camel</groupId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-pdf</artifactId>
diff --git a/components/camel-pgevent/pom.xml b/components/camel-pgevent/pom.xml
index 971de43bfba48..331fc07561ee7 100644
--- a/components/camel-pgevent/pom.xml
+++ b/components/camel-pgevent/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-pgevent</artifactId>
diff --git a/components/camel-printer/pom.xml b/components/camel-printer/pom.xml
index 30e3a430b8f99..4b710d7d88ab9 100644
--- a/components/camel-printer/pom.xml
+++ b/components/camel-printer/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>components</artifactId>
-        <version>2.23.0-SNAPSHOT</version>
+        <version>2.24.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-printer</artifactId>
diff --git a/components/camel-protobuf/pom.xml b/components/camel-protobuf/pom.xml
index d7a4861dec05e..8f032c2e3f56b 100644
--- a/components/camel-protobuf/pom.xml
+++ b/components/camel-protobuf/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-protobuf</artifactId>
diff --git a/components/camel-pubnub/pom.xml b/components/camel-pubnub/pom.xml
index aa7c476654498..e52830c9694db 100644
--- a/components/camel-pubnub/pom.xml
+++ b/components/camel-pubnub/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-pubnub</artifactId>
diff --git a/components/camel-quartz/pom.xml b/components/camel-quartz/pom.xml
index 3ce456c0ff9b1..3e9c4212e8762 100644
--- a/components/camel-quartz/pom.xml
+++ b/components/camel-quartz/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-quartz</artifactId>
diff --git a/components/camel-quartz2/pom.xml b/components/camel-quartz2/pom.xml
index dd3f8be6ccbc0..b5977d8f87f9f 100644
--- a/components/camel-quartz2/pom.xml
+++ b/components/camel-quartz2/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-quartz2</artifactId>
diff --git a/components/camel-quickfix/pom.xml b/components/camel-quickfix/pom.xml
index 7bae0a645db63..009934c8b7a00 100644
--- a/components/camel-quickfix/pom.xml
+++ b/components/camel-quickfix/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-quickfix</artifactId>
diff --git a/components/camel-rabbitmq/pom.xml b/components/camel-rabbitmq/pom.xml
index 04478a00eb0ea..e4310228a745c 100644
--- a/components/camel-rabbitmq/pom.xml
+++ b/components/camel-rabbitmq/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-rabbitmq</artifactId>
diff --git a/components/camel-reactive-streams/pom.xml b/components/camel-reactive-streams/pom.xml
index 542c56e51f563..19592a7268694 100644
--- a/components/camel-reactive-streams/pom.xml
+++ b/components/camel-reactive-streams/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>components</artifactId>
-        <version>2.23.0-SNAPSHOT</version>
+        <version>2.24.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-reactive-streams</artifactId>
diff --git a/components/camel-reactor/pom.xml b/components/camel-reactor/pom.xml
index 19eed6f9c143d..5878362211154 100644
--- a/components/camel-reactor/pom.xml
+++ b/components/camel-reactor/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>components</artifactId>
-        <version>2.23.0-SNAPSHOT</version>
+        <version>2.24.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-reactor</artifactId>
diff --git a/components/camel-rest-swagger/pom.xml b/components/camel-rest-swagger/pom.xml
index 5ccb1fe206e8d..5e6f628d01a78 100644
--- a/components/camel-rest-swagger/pom.xml
+++ b/components/camel-rest-swagger/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-rest-swagger</artifactId>
diff --git a/components/camel-restlet/pom.xml b/components/camel-restlet/pom.xml
index 530d3b9215689..27bf03c7e5c0a 100644
--- a/components/camel-restlet/pom.xml
+++ b/components/camel-restlet/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-restlet</artifactId>
diff --git a/components/camel-ribbon/pom.xml b/components/camel-ribbon/pom.xml
index bb7920149fe45..547c2f7d45449 100644
--- a/components/camel-ribbon/pom.xml
+++ b/components/camel-ribbon/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-ribbon</artifactId>
diff --git a/components/camel-rmi/pom.xml b/components/camel-rmi/pom.xml
index 4b8b9106aa9c8..44041dc86aa62 100644
--- a/components/camel-rmi/pom.xml
+++ b/components/camel-rmi/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-rmi</artifactId>
diff --git a/components/camel-routebox/pom.xml b/components/camel-routebox/pom.xml
index eaca48cd7c2de..ac976bc551ec0 100644
--- a/components/camel-routebox/pom.xml
+++ b/components/camel-routebox/pom.xml
@@ -23,7 +23,7 @@
 	<parent>
 		<groupId>org.apache.camel</groupId>
 		<artifactId>components</artifactId>
-		<version>2.23.0-SNAPSHOT</version>
+		<version>2.24.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>camel-routebox</artifactId>
diff --git a/components/camel-rss/pom.xml b/components/camel-rss/pom.xml
index cee8e8b9aa163..243a42b10d3ad 100644
--- a/components/camel-rss/pom.xml
+++ b/components/camel-rss/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>components</artifactId>
         <groupId>org.apache.camel</groupId>
-        <version>2.23.0-SNAPSHOT</version>
+        <version>2.24.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-rss</artifactId>
diff --git a/components/camel-ruby/pom.xml b/components/camel-ruby/pom.xml
index c3cd5a4b459e7..09cf38730ac72 100644
--- a/components/camel-ruby/pom.xml
+++ b/components/camel-ruby/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-ruby</artifactId>
diff --git a/components/camel-rx/pom.xml b/components/camel-rx/pom.xml
index 3ad6a39995340..71c5d0027a1a9 100644
--- a/components/camel-rx/pom.xml
+++ b/components/camel-rx/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-rx</artifactId>
diff --git a/components/camel-rxjava2/pom.xml b/components/camel-rxjava2/pom.xml
index 6e477e13729c7..d5c280268c795 100644
--- a/components/camel-rxjava2/pom.xml
+++ b/components/camel-rxjava2/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>components</artifactId>
-        <version>2.23.0-SNAPSHOT</version>
+        <version>2.24.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-rxjava2</artifactId>
diff --git a/components/camel-salesforce/camel-salesforce-component/pom.xml b/components/camel-salesforce/camel-salesforce-component/pom.xml
index 30e08a558e7d4..fd9f8a1441aa5 100644
--- a/components/camel-salesforce/camel-salesforce-component/pom.xml
+++ b/components/camel-salesforce/camel-salesforce-component/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>camel-salesforce-parent</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-salesforce</artifactId>
diff --git a/components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml b/components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml
index 699081a3afa6f..ff2b19eda3e90 100644
--- a/components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml
+++ b/components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>camel-salesforce-parent</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.apache.camel.maven</groupId>
diff --git a/components/camel-salesforce/pom.xml b/components/camel-salesforce/pom.xml
index bb03dee312297..caea027215b6d 100644
--- a/components/camel-salesforce/pom.xml
+++ b/components/camel-salesforce/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-salesforce-parent</artifactId>
diff --git a/components/camel-sap-netweaver/pom.xml b/components/camel-sap-netweaver/pom.xml
index 2617d80efa1c1..7af9f12845e27 100644
--- a/components/camel-sap-netweaver/pom.xml
+++ b/components/camel-sap-netweaver/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>components</artifactId>
         <groupId>org.apache.camel</groupId>
-        <version>2.23.0-SNAPSHOT</version>
+        <version>2.24.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-sap-netweaver</artifactId>
diff --git a/components/camel-saxon/pom.xml b/components/camel-saxon/pom.xml
index 0071f6aac16a6..c36b3cb1236cc 100644
--- a/components/camel-saxon/pom.xml
+++ b/components/camel-saxon/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-saxon</artifactId>
diff --git a/components/camel-scala/pom.xml b/components/camel-scala/pom.xml
index cdb15741a05bf..90138fa357972 100644
--- a/components/camel-scala/pom.xml
+++ b/components/camel-scala/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>components</artifactId>
-        <version>2.23.0-SNAPSHOT</version>
+        <version>2.24.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-scala</artifactId>
diff --git a/components/camel-schematron/pom.xml b/components/camel-schematron/pom.xml
index 0d0836be9b6b7..7f8bc576ab7ea 100644
--- a/components/camel-schematron/pom.xml
+++ b/components/camel-schematron/pom.xml
@@ -22,7 +22,7 @@
    <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>components</artifactId>
-        <version>2.23.0-SNAPSHOT</version>
+        <version>2.24.0-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/camel-scr/pom.xml b/components/camel-scr/pom.xml
index 4c9660aa1e7ee..acd3232bf8ed6 100644
--- a/components/camel-scr/pom.xml
+++ b/components/camel-scr/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>components</artifactId>
     <groupId>org.apache.camel</groupId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-scr</artifactId>
diff --git a/components/camel-script/pom.xml b/components/camel-script/pom.xml
index 177e7946349f2..74608c1f4459b 100644
--- a/components/camel-script/pom.xml
+++ b/components/camel-script/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>components</artifactId>
-        <version>2.23.0-SNAPSHOT</version>
+        <version>2.24.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-script</artifactId>
diff --git a/components/camel-service/pom.xml b/components/camel-service/pom.xml
index 0a6e55a351348..82766bcc1caee 100644
--- a/components/camel-service/pom.xml
+++ b/components/camel-service/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-service</artifactId>
diff --git a/components/camel-servicenow/camel-servicenow-component/pom.xml b/components/camel-servicenow/camel-servicenow-component/pom.xml
index 1479596a927fc..9ec2c25a761b4 100644
--- a/components/camel-servicenow/camel-servicenow-component/pom.xml
+++ b/components/camel-servicenow/camel-servicenow-component/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>camel-servicenow-parent</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-servicenow</artifactId>
diff --git a/components/camel-servicenow/camel-servicenow-maven-plugin/pom.xml b/components/camel-servicenow/camel-servicenow-maven-plugin/pom.xml
index 3493306d3204d..aa3140833723c 100644
--- a/components/camel-servicenow/camel-servicenow-maven-plugin/pom.xml
+++ b/components/camel-servicenow/camel-servicenow-maven-plugin/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>camel-servicenow-parent</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.apache.camel.maven</groupId>
diff --git a/components/camel-servicenow/pom.xml b/components/camel-servicenow/pom.xml
index 0f9bc66276db6..b95b3033f4f2c 100644
--- a/components/camel-servicenow/pom.xml
+++ b/components/camel-servicenow/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-servicenow-parent</artifactId>
diff --git a/components/camel-servlet/pom.xml b/components/camel-servlet/pom.xml
index 0156daafa2053..ce319c2803088 100644
--- a/components/camel-servlet/pom.xml
+++ b/components/camel-servlet/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-servlet</artifactId>
diff --git a/components/camel-servletlistener/pom.xml b/components/camel-servletlistener/pom.xml
index eebb40a42b106..c5a99aa146b77 100644
--- a/components/camel-servletlistener/pom.xml
+++ b/components/camel-servletlistener/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>components</artifactId>
-        <version>2.23.0-SNAPSHOT</version>
+        <version>2.24.0-SNAPSHOT</version>
     </parent>
     
   <artifactId>camel-servletlistener</artifactId>
diff --git a/components/camel-shiro/pom.xml b/components/camel-shiro/pom.xml
index 47c93a9a96028..e720bdb641f0d 100644
--- a/components/camel-shiro/pom.xml
+++ b/components/camel-shiro/pom.xml
@@ -23,7 +23,7 @@
 	<parent>
 		<artifactId>components</artifactId>
 		<groupId>org.apache.camel</groupId>
-		<version>2.23.0-SNAPSHOT</version>
+		<version>2.24.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>camel-shiro</artifactId>
diff --git a/components/camel-sip/pom.xml b/components/camel-sip/pom.xml
index 3b5c8ca8f746f..09ff2832cf8cd 100644
--- a/components/camel-sip/pom.xml
+++ b/components/camel-sip/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   
 	<artifactId>camel-sip</artifactId>
diff --git a/components/camel-sjms/pom.xml b/components/camel-sjms/pom.xml
index 9d3542be7e906..6f8bb9a0b100e 100644
--- a/components/camel-sjms/pom.xml
+++ b/components/camel-sjms/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-sjms</artifactId>
diff --git a/components/camel-sjms2/pom.xml b/components/camel-sjms2/pom.xml
index 834965a6bb374..199f2772aac17 100644
--- a/components/camel-sjms2/pom.xml
+++ b/components/camel-sjms2/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>components</artifactId>
     <groupId>org.apache.camel</groupId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-sjms2</artifactId>
diff --git a/components/camel-slack/pom.xml b/components/camel-slack/pom.xml
index 148e26d91e666..c48e058d5a209 100644
--- a/components/camel-slack/pom.xml
+++ b/components/camel-slack/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>components</artifactId>
     <groupId>org.apache.camel</groupId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-slack</artifactId>
diff --git a/components/camel-smpp/pom.xml b/components/camel-smpp/pom.xml
index c24dae3482541..999c9f00cb0ad 100644
--- a/components/camel-smpp/pom.xml
+++ b/components/camel-smpp/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>components</artifactId>
-        <version>2.23.0-SNAPSHOT</version>
+        <version>2.24.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-smpp</artifactId>
diff --git a/components/camel-snakeyaml/pom.xml b/components/camel-snakeyaml/pom.xml
index 13c7cf31f67a7..7e1dd8e0ffc91 100644
--- a/components/camel-snakeyaml/pom.xml
+++ b/components/camel-snakeyaml/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>components</artifactId>
-        <version>2.23.0-SNAPSHOT</version>
+        <version>2.24.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-snakeyaml</artifactId>
diff --git a/components/camel-snmp/pom.xml b/components/camel-snmp/pom.xml
index 117cb2fc17777..f659a900d5482 100644
--- a/components/camel-snmp/pom.xml
+++ b/components/camel-snmp/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>components</artifactId>
-        <version>2.23.0-SNAPSHOT</version>
+        <version>2.24.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-snmp</artifactId>
diff --git a/components/camel-soap/pom.xml b/components/camel-soap/pom.xml
index c2104621b13c8..f2b9e2e7deb5f 100644
--- a/components/camel-soap/pom.xml
+++ b/components/camel-soap/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>components</artifactId>
-        <version>2.23.0-SNAPSHOT</version>
+        <version>2.24.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-soap</artifactId>
diff --git a/components/camel-solr/pom.xml b/components/camel-solr/pom.xml
index 1be2c6a6ec353..020b30a520420 100644
--- a/components/camel-solr/pom.xml
+++ b/components/camel-solr/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <artifactId>components</artifactId>
     <groupId>org.apache.camel</groupId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-solr</artifactId>
diff --git a/components/camel-spark-rest/pom.xml b/components/camel-spark-rest/pom.xml
index f459d8bd732b8..bde7527cb0908 100644
--- a/components/camel-spark-rest/pom.xml
+++ b/components/camel-spark-rest/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-spark-rest</artifactId>
diff --git a/components/camel-spark/pom.xml b/components/camel-spark/pom.xml
index 8d757363deb7c..1aee9c1061876 100644
--- a/components/camel-spark/pom.xml
+++ b/components/camel-spark/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <artifactId>components</artifactId>
     <groupId>org.apache.camel</groupId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-spark</artifactId>
diff --git a/components/camel-splunk/pom.xml b/components/camel-splunk/pom.xml
index 7306c6cf1e8dd..de975e2288fc7 100644
--- a/components/camel-splunk/pom.xml
+++ b/components/camel-splunk/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <name>Camel :: Splunk</name>
diff --git a/components/camel-spring-batch/pom.xml b/components/camel-spring-batch/pom.xml
index 1d8180e8f09ab..297b6ca169828 100644
--- a/components/camel-spring-batch/pom.xml
+++ b/components/camel-spring-batch/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>components</artifactId>
-        <version>2.23.0-SNAPSHOT</version>
+        <version>2.24.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-spring-batch</artifactId>
diff --git a/components/camel-spring-boot/pom.xml b/components/camel-spring-boot/pom.xml
index b1a067627b9e4..51b8cdbabf1dd 100644
--- a/components/camel-spring-boot/pom.xml
+++ b/components/camel-spring-boot/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <name>Camel :: Spring Boot</name>
diff --git a/components/camel-spring-cloud-consul/pom.xml b/components/camel-spring-cloud-consul/pom.xml
index c9a36702e4608..79b0c98e2b48c 100644
--- a/components/camel-spring-cloud-consul/pom.xml
+++ b/components/camel-spring-cloud-consul/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <name>Camel :: Spring Cloud Consul</name>
diff --git a/components/camel-spring-cloud-netflix/pom.xml b/components/camel-spring-cloud-netflix/pom.xml
index f93df76f8041e..f1b22ff510257 100644
--- a/components/camel-spring-cloud-netflix/pom.xml
+++ b/components/camel-spring-cloud-netflix/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <name>Camel :: Spring Cloud Netflix</name>
diff --git a/components/camel-spring-cloud-zookeeper/pom.xml b/components/camel-spring-cloud-zookeeper/pom.xml
index 012df79b10b70..e52116d49d2c8 100644
--- a/components/camel-spring-cloud-zookeeper/pom.xml
+++ b/components/camel-spring-cloud-zookeeper/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <name>Camel :: Spring Cloud Zookeeper</name>
diff --git a/components/camel-spring-cloud/pom.xml b/components/camel-spring-cloud/pom.xml
index 40a75b71675f6..d57e94d55c55e 100644
--- a/components/camel-spring-cloud/pom.xml
+++ b/components/camel-spring-cloud/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <name>Camel :: Spring Cloud</name>
diff --git a/components/camel-spring-integration/pom.xml b/components/camel-spring-integration/pom.xml
index 83cea210307ed..12966b697f670 100644
--- a/components/camel-spring-integration/pom.xml
+++ b/components/camel-spring-integration/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>components</artifactId>
         <groupId>org.apache.camel</groupId>
-        <version>2.23.0-SNAPSHOT</version>
+        <version>2.24.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-spring-integration</artifactId>
diff --git a/components/camel-spring-javaconfig/pom.xml b/components/camel-spring-javaconfig/pom.xml
index c8a40d695f607..527486a460fbf 100644
--- a/components/camel-spring-javaconfig/pom.xml
+++ b/components/camel-spring-javaconfig/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>components</artifactId>
     <groupId>org.apache.camel</groupId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-spring-javaconfig</artifactId>
diff --git a/components/camel-spring-ldap/pom.xml b/components/camel-spring-ldap/pom.xml
index f6e63c8fe3026..5fa5d9191fc49 100644
--- a/components/camel-spring-ldap/pom.xml
+++ b/components/camel-spring-ldap/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>components</artifactId>
-        <version>2.23.0-SNAPSHOT</version>
+        <version>2.24.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-spring-ldap</artifactId>
diff --git a/components/camel-spring-redis/pom.xml b/components/camel-spring-redis/pom.xml
index 372bd466b3a7d..820c7811536af 100644
--- a/components/camel-spring-redis/pom.xml
+++ b/components/camel-spring-redis/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-spring-redis</artifactId>
diff --git a/components/camel-spring-security/pom.xml b/components/camel-spring-security/pom.xml
index 6bec812806b24..21666c178b638 100644
--- a/components/camel-spring-security/pom.xml
+++ b/components/camel-spring-security/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>components</artifactId>
     <groupId>org.apache.camel</groupId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-spring-security</artifactId>
diff --git a/components/camel-spring-ws/pom.xml b/components/camel-spring-ws/pom.xml
index bb7cea9675aa3..969537951d777 100644
--- a/components/camel-spring-ws/pom.xml
+++ b/components/camel-spring-ws/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-spring-ws</artifactId>
diff --git a/components/camel-spring/pom.xml b/components/camel-spring/pom.xml
index 72f88e063a9a3..d24fd9eb9354f 100644
--- a/components/camel-spring/pom.xml
+++ b/components/camel-spring/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-spring</artifactId>
diff --git a/components/camel-sql/pom.xml b/components/camel-sql/pom.xml
index 1baf155e15606..c65d7a5812dfa 100644
--- a/components/camel-sql/pom.xml
+++ b/components/camel-sql/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-sql</artifactId>
diff --git a/components/camel-ssh/pom.xml b/components/camel-ssh/pom.xml
index 1092adab991fa..9dec1998cf208 100644
--- a/components/camel-ssh/pom.xml
+++ b/components/camel-ssh/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-ssh</artifactId>
diff --git a/components/camel-stax/pom.xml b/components/camel-stax/pom.xml
index d14c7a920691d..e25f8488ac874 100644
--- a/components/camel-stax/pom.xml
+++ b/components/camel-stax/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-stax</artifactId>
diff --git a/components/camel-stomp/pom.xml b/components/camel-stomp/pom.xml
index 74d19cede29cd..e81152127fafd 100644
--- a/components/camel-stomp/pom.xml
+++ b/components/camel-stomp/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-stomp</artifactId>
diff --git a/components/camel-stream/pom.xml b/components/camel-stream/pom.xml
index 077074e96bd70..d8868a9cff49e 100644
--- a/components/camel-stream/pom.xml
+++ b/components/camel-stream/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>components</artifactId>
-        <version>2.23.0-SNAPSHOT</version>
+        <version>2.24.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-stream</artifactId>
diff --git a/components/camel-stringtemplate/pom.xml b/components/camel-stringtemplate/pom.xml
index e8041e31a08fc..650ab03600aa6 100644
--- a/components/camel-stringtemplate/pom.xml
+++ b/components/camel-stringtemplate/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-stringtemplate</artifactId>
diff --git a/components/camel-swagger-java/pom.xml b/components/camel-swagger-java/pom.xml
index 344fa323f064c..bc5cdcafd8391 100644
--- a/components/camel-swagger-java/pom.xml
+++ b/components/camel-swagger-java/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-swagger-java</artifactId>
diff --git a/components/camel-swagger/pom.xml b/components/camel-swagger/pom.xml
index 6bd29307af679..17bd114513907 100644
--- a/components/camel-swagger/pom.xml
+++ b/components/camel-swagger/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-swagger</artifactId>
diff --git a/components/camel-syslog/pom.xml b/components/camel-syslog/pom.xml
index d032fc21fe612..2221eb733099e 100644
--- a/components/camel-syslog/pom.xml
+++ b/components/camel-syslog/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-syslog</artifactId>
diff --git a/components/camel-tagsoup/pom.xml b/components/camel-tagsoup/pom.xml
index 7f08e971251e8..e50b1d92f6671 100644
--- a/components/camel-tagsoup/pom.xml
+++ b/components/camel-tagsoup/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-tagsoup</artifactId>
diff --git a/components/camel-tarfile/pom.xml b/components/camel-tarfile/pom.xml
index 8bb3d2151df03..7dd452784feb0 100644
--- a/components/camel-tarfile/pom.xml
+++ b/components/camel-tarfile/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-tarfile</artifactId>
diff --git a/components/camel-telegram/pom.xml b/components/camel-telegram/pom.xml
index c5f740ec7dc26..8a7f04148af8c 100644
--- a/components/camel-telegram/pom.xml
+++ b/components/camel-telegram/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-telegram</artifactId>
diff --git a/components/camel-test-blueprint/pom.xml b/components/camel-test-blueprint/pom.xml
index 175073b92640f..64af07a1708fc 100644
--- a/components/camel-test-blueprint/pom.xml
+++ b/components/camel-test-blueprint/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>components</artifactId>
-        <version>2.23.0-SNAPSHOT</version>
+        <version>2.24.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-test-blueprint</artifactId>
diff --git a/components/camel-test-cdi/pom.xml b/components/camel-test-cdi/pom.xml
index 0b4d0c99d3f23..e3dee198dafbe 100644
--- a/components/camel-test-cdi/pom.xml
+++ b/components/camel-test-cdi/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-test-cdi</artifactId>
diff --git a/components/camel-test-karaf/pom.xml b/components/camel-test-karaf/pom.xml
index 5f6c3ff3e9d1a..d4cf596821453 100644
--- a/components/camel-test-karaf/pom.xml
+++ b/components/camel-test-karaf/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-test-karaf</artifactId>
diff --git a/components/camel-test-spring/pom.xml b/components/camel-test-spring/pom.xml
index a406a50df91a1..eefb300af3ec4 100644
--- a/components/camel-test-spring/pom.xml
+++ b/components/camel-test-spring/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-test-spring</artifactId>
diff --git a/components/camel-test/pom.xml b/components/camel-test/pom.xml
index 545d16714ad9e..7e7e8410c1e2a 100644
--- a/components/camel-test/pom.xml
+++ b/components/camel-test/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>components</artifactId>
-        <version>2.23.0-SNAPSHOT</version>
+        <version>2.24.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-test</artifactId>
diff --git a/components/camel-testcontainers-spring/pom.xml b/components/camel-testcontainers-spring/pom.xml
index ceb0f51578185..6fd7621b0083e 100644
--- a/components/camel-testcontainers-spring/pom.xml
+++ b/components/camel-testcontainers-spring/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>components</artifactId>
-        <version>2.23.0-SNAPSHOT</version>
+        <version>2.24.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-testcontainers-spring</artifactId>
diff --git a/components/camel-testcontainers/pom.xml b/components/camel-testcontainers/pom.xml
index 4f95cbd15286a..b1333c0eea71a 100644
--- a/components/camel-testcontainers/pom.xml
+++ b/components/camel-testcontainers/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>components</artifactId>
-        <version>2.23.0-SNAPSHOT</version>
+        <version>2.24.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-testcontainers</artifactId>
diff --git a/components/camel-testng/pom.xml b/components/camel-testng/pom.xml
index 1ad175df35a4a..7a81f31af5808 100644
--- a/components/camel-testng/pom.xml
+++ b/components/camel-testng/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>components</artifactId>
-        <version>2.23.0-SNAPSHOT</version>
+        <version>2.24.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-testng</artifactId>
diff --git a/components/camel-thrift/pom.xml b/components/camel-thrift/pom.xml
index 09bfba17703c8..bdb6ee2824e89 100644
--- a/components/camel-thrift/pom.xml
+++ b/components/camel-thrift/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-thrift</artifactId>
diff --git a/components/camel-tika/pom.xml b/components/camel-tika/pom.xml
index a07b59db37fba..4d7c7d9dd08fa 100644
--- a/components/camel-tika/pom.xml
+++ b/components/camel-tika/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-tika</artifactId>
diff --git a/components/camel-twilio/pom.xml b/components/camel-twilio/pom.xml
index c7a5dd82ab17a..2631a00aaf53f 100644
--- a/components/camel-twilio/pom.xml
+++ b/components/camel-twilio/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-twilio</artifactId>
diff --git a/components/camel-twitter/pom.xml b/components/camel-twitter/pom.xml
index 1910ff264034b..13fe54119e6b8 100644
--- a/components/camel-twitter/pom.xml
+++ b/components/camel-twitter/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-twitter</artifactId>
diff --git a/components/camel-undertow/pom.xml b/components/camel-undertow/pom.xml
index 7dc8d48d9b0dc..e5a87cafa5818 100644
--- a/components/camel-undertow/pom.xml
+++ b/components/camel-undertow/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/components/camel-univocity-parsers/pom.xml b/components/camel-univocity-parsers/pom.xml
index 6f6a614098902..a5b14e710b039 100644
--- a/components/camel-univocity-parsers/pom.xml
+++ b/components/camel-univocity-parsers/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>components</artifactId>
-        <version>2.23.0-SNAPSHOT</version>
+        <version>2.24.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-univocity-parsers</artifactId>
diff --git a/components/camel-urlrewrite/pom.xml b/components/camel-urlrewrite/pom.xml
index 7fadfc8304a5b..de9f42ced3be3 100644
--- a/components/camel-urlrewrite/pom.xml
+++ b/components/camel-urlrewrite/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-urlrewrite</artifactId>
diff --git a/components/camel-velocity/pom.xml b/components/camel-velocity/pom.xml
index 0b8a9b44de50d..9fe4b7cebe46e 100644
--- a/components/camel-velocity/pom.xml
+++ b/components/camel-velocity/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>components</artifactId>
-        <version>2.23.0-SNAPSHOT</version>
+        <version>2.24.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-velocity</artifactId>
diff --git a/components/camel-vertx/pom.xml b/components/camel-vertx/pom.xml
index c39b74631d56e..50d488459c6f5 100644
--- a/components/camel-vertx/pom.xml
+++ b/components/camel-vertx/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-vertx</artifactId>
diff --git a/components/camel-weather/pom.xml b/components/camel-weather/pom.xml
index f2468d84d656c..8949a5bf4b550 100644
--- a/components/camel-weather/pom.xml
+++ b/components/camel-weather/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>components</artifactId>
     <groupId>org.apache.camel</groupId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-weather</artifactId>
diff --git a/components/camel-web3j/pom.xml b/components/camel-web3j/pom.xml
index 2f5439ede3d1b..22069d0d9ad2f 100644
--- a/components/camel-web3j/pom.xml
+++ b/components/camel-web3j/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>components</artifactId>
-        <version>2.23.0-SNAPSHOT</version>
+        <version>2.24.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-web3j</artifactId>
diff --git a/components/camel-websocket/pom.xml b/components/camel-websocket/pom.xml
index 848f792330ce5..abed4a1e72862 100644
--- a/components/camel-websocket/pom.xml
+++ b/components/camel-websocket/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-websocket</artifactId>
diff --git a/components/camel-wordpress/pom.xml b/components/camel-wordpress/pom.xml
index 41b560bb0e2a7..9919d342ae370 100644
--- a/components/camel-wordpress/pom.xml
+++ b/components/camel-wordpress/pom.xml
@@ -25,7 +25,7 @@
 	<parent>
 		<groupId>org.apache.camel</groupId>
 		<artifactId>components</artifactId>
-		<version>2.23.0-SNAPSHOT</version>
+		<version>2.24.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>camel-wordpress</artifactId>
diff --git a/components/camel-xchange/pom.xml b/components/camel-xchange/pom.xml
index 3f162098c4060..9c8fffa3c0ab0 100644
--- a/components/camel-xchange/pom.xml
+++ b/components/camel-xchange/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>components</artifactId>
     <groupId>org.apache.camel</groupId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-xchange</artifactId>
diff --git a/components/camel-xmlbeans/pom.xml b/components/camel-xmlbeans/pom.xml
index 6c9ef5b790dcf..32776c36569b5 100644
--- a/components/camel-xmlbeans/pom.xml
+++ b/components/camel-xmlbeans/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-xmlbeans</artifactId>
diff --git a/components/camel-xmljson/pom.xml b/components/camel-xmljson/pom.xml
index 442461be03dd1..fdb547b93ab03 100644
--- a/components/camel-xmljson/pom.xml
+++ b/components/camel-xmljson/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-xmljson</artifactId>
diff --git a/components/camel-xmlrpc/pom.xml b/components/camel-xmlrpc/pom.xml
index d09aa3fbabd9c..3608583053ec8 100644
--- a/components/camel-xmlrpc/pom.xml
+++ b/components/camel-xmlrpc/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>components</artifactId>
     <groupId>org.apache.camel</groupId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-xmlrpc</artifactId>
diff --git a/components/camel-xmlsecurity/pom.xml b/components/camel-xmlsecurity/pom.xml
index 87be6a4ad470b..f8fc6a7d755ad 100644
--- a/components/camel-xmlsecurity/pom.xml
+++ b/components/camel-xmlsecurity/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>components</artifactId>
-        <version>2.23.0-SNAPSHOT</version>
+        <version>2.24.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>camel-xmlsecurity</artifactId>
diff --git a/components/camel-xmpp/pom.xml b/components/camel-xmpp/pom.xml
index 31456006a08bb..97579b410475a 100644
--- a/components/camel-xmpp/pom.xml
+++ b/components/camel-xmpp/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-xmpp</artifactId>
diff --git a/components/camel-xstream/pom.xml b/components/camel-xstream/pom.xml
index 89f851b232e97..6186f297203a6 100644
--- a/components/camel-xstream/pom.xml
+++ b/components/camel-xstream/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-xstream</artifactId>
diff --git a/components/camel-yammer/pom.xml b/components/camel-yammer/pom.xml
index f60b2d28d6114..06877452232b7 100644
--- a/components/camel-yammer/pom.xml
+++ b/components/camel-yammer/pom.xml
@@ -23,7 +23,7 @@
  <parent>
   <groupId>org.apache.camel</groupId>
   <artifactId>components</artifactId>
-  <version>2.23.0-SNAPSHOT</version>
+  <version>2.24.0-SNAPSHOT</version>
  </parent>
 
  <artifactId>camel-yammer</artifactId>
diff --git a/components/camel-yql/pom.xml b/components/camel-yql/pom.xml
index 7d34d2e9b5c89..e14ac2d3a4e83 100644
--- a/components/camel-yql/pom.xml
+++ b/components/camel-yql/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-yql</artifactId>
diff --git a/components/camel-zendesk/pom.xml b/components/camel-zendesk/pom.xml
index 7660a8b85fc33..9b936adcc6b40 100644
--- a/components/camel-zendesk/pom.xml
+++ b/components/camel-zendesk/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-zendesk</artifactId>
diff --git a/components/camel-zipfile/pom.xml b/components/camel-zipfile/pom.xml
index bed54babd6871..7071c5e722d63 100644
--- a/components/camel-zipfile/pom.xml
+++ b/components/camel-zipfile/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-zipfile</artifactId>
diff --git a/components/camel-zipkin/pom.xml b/components/camel-zipkin/pom.xml
index 80b4542b79518..74f7fb7a07633 100644
--- a/components/camel-zipkin/pom.xml
+++ b/components/camel-zipkin/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <artifactId>components</artifactId>
     <groupId>org.apache.camel</groupId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-zipkin</artifactId>
diff --git a/components/camel-zookeeper-master/pom.xml b/components/camel-zookeeper-master/pom.xml
index cf99899b9b622..ab47b9bcf971f 100644
--- a/components/camel-zookeeper-master/pom.xml
+++ b/components/camel-zookeeper-master/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>components</artifactId>
     <groupId>org.apache.camel</groupId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-zookeeper-master</artifactId>
diff --git a/components/camel-zookeeper/pom.xml b/components/camel-zookeeper/pom.xml
index bab4f2fdf23f8..a249498bf782a 100644
--- a/components/camel-zookeeper/pom.xml
+++ b/components/camel-zookeeper/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>components</artifactId>
     <groupId>org.apache.camel</groupId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-zookeeper</artifactId>
diff --git a/components/pom.xml b/components/pom.xml
index fc8e6c92f53a9..6f2c7e4fc00ef 100644
--- a/components/pom.xml
+++ b/components/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>camel-parent</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
     <relativePath>../parent</relativePath>
   </parent>
 
diff --git a/connectors/camel-connector-maven-plugin/pom.xml b/connectors/camel-connector-maven-plugin/pom.xml
index 9bb1738330859..3c756f528ecb4 100644
--- a/connectors/camel-connector-maven-plugin/pom.xml
+++ b/connectors/camel-connector-maven-plugin/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>connectors</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-connector-maven-plugin</artifactId>
diff --git a/connectors/camel-connector/pom.xml b/connectors/camel-connector/pom.xml
index e4c9fb84ae87a..ae5e705b8faab 100644
--- a/connectors/camel-connector/pom.xml
+++ b/connectors/camel-connector/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>connectors</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-connector</artifactId>
diff --git a/connectors/pom.xml b/connectors/pom.xml
index b62481c26e055..054b82ab4f3b4 100644
--- a/connectors/pom.xml
+++ b/connectors/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>camel-parent</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
     <relativePath>../parent</relativePath>
   </parent>
 
diff --git a/docs/pom.xml b/docs/pom.xml
index 9032b1d2b35ec..fab953778a47c 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-parent</artifactId>
-        <version>2.23.0-SNAPSHOT</version>
+        <version>2.24.0-SNAPSHOT</version>
         <relativePath>../parent</relativePath>
     </parent>
 
diff --git a/etc/pom.xml b/etc/pom.xml
index 5a4ac47c9a5a1..0827d30177121 100644
--- a/etc/pom.xml
+++ b/etc/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>camel-parent</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
     <relativePath>../parent</relativePath>
   </parent>
 
diff --git a/examples/camel-example-activemq-tomcat/pom.xml b/examples/camel-example-activemq-tomcat/pom.xml
index 3b51ee9b74f83..ec4fcde5ecdcb 100644
--- a/examples/camel-example-activemq-tomcat/pom.xml
+++ b/examples/camel-example-activemq-tomcat/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-activemq-tomcat</artifactId>
diff --git a/examples/camel-example-aggregate/pom.xml b/examples/camel-example-aggregate/pom.xml
index 2b35d67e19ed7..5b03bd7a11640 100644
--- a/examples/camel-example-aggregate/pom.xml
+++ b/examples/camel-example-aggregate/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-aggregate</artifactId>
diff --git a/examples/camel-example-artemis-amqp-blueprint/pom.xml b/examples/camel-example-artemis-amqp-blueprint/pom.xml
index efcf8c22cea17..711cbd71bfa41 100644
--- a/examples/camel-example-artemis-amqp-blueprint/pom.xml
+++ b/examples/camel-example-artemis-amqp-blueprint/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-artemis-amqp-blueprint</artifactId>
diff --git a/examples/camel-example-artemis-large-messages/pom.xml b/examples/camel-example-artemis-large-messages/pom.xml
index 9c86fcbc7d75c..c77490c2c1175 100644
--- a/examples/camel-example-artemis-large-messages/pom.xml
+++ b/examples/camel-example-artemis-large-messages/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-artemis-large-messages</artifactId>
diff --git a/examples/camel-example-bam/pom.xml b/examples/camel-example-bam/pom.xml
index ed6cce61722b8..fccb0777bf8a2 100644
--- a/examples/camel-example-bam/pom.xml
+++ b/examples/camel-example-bam/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-bam</artifactId>
diff --git a/examples/camel-example-cafe/pom.xml b/examples/camel-example-cafe/pom.xml
index 969c6623acda6..240facb3709d7 100644
--- a/examples/camel-example-cafe/pom.xml
+++ b/examples/camel-example-cafe/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId> 
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-cafe</artifactId>
diff --git a/examples/camel-example-cassandra-kubernetes/pom.xml b/examples/camel-example-cassandra-kubernetes/pom.xml
index 7fbc4557e8532..25dc5e5c4fcab 100644
--- a/examples/camel-example-cassandra-kubernetes/pom.xml
+++ b/examples/camel-example-cassandra-kubernetes/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-cassandra-kubernetes-example</artifactId>
diff --git a/examples/camel-example-cdi-aws-s3/pom.xml b/examples/camel-example-cdi-aws-s3/pom.xml
index b389528dec6c3..082263f01628c 100644
--- a/examples/camel-example-cdi-aws-s3/pom.xml
+++ b/examples/camel-example-cdi-aws-s3/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-cdi-aws-s3</artifactId>
diff --git a/examples/camel-example-cdi-cassandraql/pom.xml b/examples/camel-example-cdi-cassandraql/pom.xml
index 48d4440cdc436..96a1871426d23 100644
--- a/examples/camel-example-cdi-cassandraql/pom.xml
+++ b/examples/camel-example-cdi-cassandraql/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-cdi-cassandraql</artifactId>
diff --git a/examples/camel-example-cdi-kubernetes/pom.xml b/examples/camel-example-cdi-kubernetes/pom.xml
index ad20ac060fa0a..c56f714761c41 100644
--- a/examples/camel-example-cdi-kubernetes/pom.xml
+++ b/examples/camel-example-cdi-kubernetes/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-cdi-kubernetes</artifactId>
diff --git a/examples/camel-example-cdi-metrics/pom.xml b/examples/camel-example-cdi-metrics/pom.xml
index 6528b12fa69b2..dc237c3ec8fb2 100644
--- a/examples/camel-example-cdi-metrics/pom.xml
+++ b/examples/camel-example-cdi-metrics/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-cdi-metrics</artifactId>
diff --git a/examples/camel-example-cdi-osgi/pom.xml b/examples/camel-example-cdi-osgi/pom.xml
index ef19e294d0f2f..ca04f6566e372 100644
--- a/examples/camel-example-cdi-osgi/pom.xml
+++ b/examples/camel-example-cdi-osgi/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-cdi-osgi</artifactId>
diff --git a/examples/camel-example-cdi-properties/pom.xml b/examples/camel-example-cdi-properties/pom.xml
index 7a3b533f470f2..a41b4d11884c7 100644
--- a/examples/camel-example-cdi-properties/pom.xml
+++ b/examples/camel-example-cdi-properties/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-cdi-properties</artifactId>
diff --git a/examples/camel-example-cdi-rest-servlet/pom.xml b/examples/camel-example-cdi-rest-servlet/pom.xml
index b202c9a0d0560..931a4905d3634 100644
--- a/examples/camel-example-cdi-rest-servlet/pom.xml
+++ b/examples/camel-example-cdi-rest-servlet/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-cdi-rest-servlet</artifactId>
diff --git a/examples/camel-example-cdi-test/pom.xml b/examples/camel-example-cdi-test/pom.xml
index 35b7e86b59da2..3bc3919a7996b 100644
--- a/examples/camel-example-cdi-test/pom.xml
+++ b/examples/camel-example-cdi-test/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-cdi-test</artifactId>
diff --git a/examples/camel-example-cdi-xml/pom.xml b/examples/camel-example-cdi-xml/pom.xml
index a4a35176c978a..247951b88d030 100644
--- a/examples/camel-example-cdi-xml/pom.xml
+++ b/examples/camel-example-cdi-xml/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-cdi-xml</artifactId>
diff --git a/examples/camel-example-cdi/pom.xml b/examples/camel-example-cdi/pom.xml
index 07b1816f33764..34d650b52f85a 100644
--- a/examples/camel-example-cdi/pom.xml
+++ b/examples/camel-example-cdi/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-cdi</artifactId>
diff --git a/examples/camel-example-console/pom.xml b/examples/camel-example-console/pom.xml
index bffbb1806f4a7..33712222985d8 100644
--- a/examples/camel-example-console/pom.xml
+++ b/examples/camel-example-console/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-console</artifactId>
diff --git a/examples/camel-example-cxf-blueprint/pom.xml b/examples/camel-example-cxf-blueprint/pom.xml
index 32652cb53ea3e..2f2255a7991fd 100644
--- a/examples/camel-example-cxf-blueprint/pom.xml
+++ b/examples/camel-example-cxf-blueprint/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-cxf-blueprint</artifactId>
diff --git a/examples/camel-example-cxf-proxy/pom.xml b/examples/camel-example-cxf-proxy/pom.xml
index 49dfa31365c78..1323b3eb2ad0d 100644
--- a/examples/camel-example-cxf-proxy/pom.xml
+++ b/examples/camel-example-cxf-proxy/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-cxf-proxy</artifactId>
diff --git a/examples/camel-example-cxf-tomcat/pom.xml b/examples/camel-example-cxf-tomcat/pom.xml
index fd5028172ee5d..45ab7f3242fe4 100644
--- a/examples/camel-example-cxf-tomcat/pom.xml
+++ b/examples/camel-example-cxf-tomcat/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-cxf-tomcat</artifactId>
diff --git a/examples/camel-example-cxf/pom.xml b/examples/camel-example-cxf/pom.xml
index d8d7511ed5421..41e4082f7f52a 100644
--- a/examples/camel-example-cxf/pom.xml
+++ b/examples/camel-example-cxf/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-cxf</artifactId>
diff --git a/examples/camel-example-ehcache-blueprint/pom.xml b/examples/camel-example-ehcache-blueprint/pom.xml
index 996d0c28c5ea2..8097220b2d766 100644
--- a/examples/camel-example-ehcache-blueprint/pom.xml
+++ b/examples/camel-example-ehcache-blueprint/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-ehcache-blueprint</artifactId>
diff --git a/examples/camel-example-fhir-auth-tx-spring-boot/pom.xml b/examples/camel-example-fhir-auth-tx-spring-boot/pom.xml
index 06148b60cbf89..5730e5662d6d7 100644
--- a/examples/camel-example-fhir-auth-tx-spring-boot/pom.xml
+++ b/examples/camel-example-fhir-auth-tx-spring-boot/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-fhir-auth-tx-spring-boot</artifactId>
diff --git a/examples/camel-example-fhir-osgi/pom.xml b/examples/camel-example-fhir-osgi/pom.xml
index 57dc385be3d50..6ee3e857304e9 100644
--- a/examples/camel-example-fhir-osgi/pom.xml
+++ b/examples/camel-example-fhir-osgi/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-fhir-osgi</artifactId>
diff --git a/examples/camel-example-fhir-spring-boot/pom.xml b/examples/camel-example-fhir-spring-boot/pom.xml
index 60b10895a6c28..796ae75f0e761 100644
--- a/examples/camel-example-fhir-spring-boot/pom.xml
+++ b/examples/camel-example-fhir-spring-boot/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-fhir-spring-boot</artifactId>
diff --git a/examples/camel-example-fhir/pom.xml b/examples/camel-example-fhir/pom.xml
index 1cccfddab5169..16803fbf536f1 100644
--- a/examples/camel-example-fhir/pom.xml
+++ b/examples/camel-example-fhir/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-fhir</artifactId>
diff --git a/examples/camel-example-ftp/pom.xml b/examples/camel-example-ftp/pom.xml
index 7e3b89581bdeb..6f70477877c3b 100644
--- a/examples/camel-example-ftp/pom.xml
+++ b/examples/camel-example-ftp/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-ftp</artifactId>
diff --git a/examples/camel-example-google-pubsub/pom.xml b/examples/camel-example-google-pubsub/pom.xml
index 45f0df0651945..313968d9c1b04 100644
--- a/examples/camel-example-google-pubsub/pom.xml
+++ b/examples/camel-example-google-pubsub/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-google-pubsub</artifactId>
diff --git a/examples/camel-example-groovy/pom.xml b/examples/camel-example-groovy/pom.xml
index 577f398fa2e32..9ff4d6922233d 100644
--- a/examples/camel-example-groovy/pom.xml
+++ b/examples/camel-example-groovy/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-groovy</artifactId>
diff --git a/examples/camel-example-grpc-kubernetes/hello-camel-grpc-client-kubernetes/pom.xml b/examples/camel-example-grpc-kubernetes/hello-camel-grpc-client-kubernetes/pom.xml
index 7173fc138c552..6f8e4ea990d99 100644
--- a/examples/camel-example-grpc-kubernetes/hello-camel-grpc-client-kubernetes/pom.xml
+++ b/examples/camel-example-grpc-kubernetes/hello-camel-grpc-client-kubernetes/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>camel-example-grpc-kubernetes</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-hello-grpc-client-kubernetes</artifactId>
diff --git a/examples/camel-example-grpc-kubernetes/hello-camel-grpc-server-kubernetes/pom.xml b/examples/camel-example-grpc-kubernetes/hello-camel-grpc-server-kubernetes/pom.xml
index b526418d98a9f..5fbb1d434cbe8 100644
--- a/examples/camel-example-grpc-kubernetes/hello-camel-grpc-server-kubernetes/pom.xml
+++ b/examples/camel-example-grpc-kubernetes/hello-camel-grpc-server-kubernetes/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>camel-example-grpc-kubernetes</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-hello-grpc-server-kubernetes</artifactId>
diff --git a/examples/camel-example-grpc-kubernetes/pom.xml b/examples/camel-example-grpc-kubernetes/pom.xml
index 51ea5ced6dda9..48d61eddd8fb1 100644
--- a/examples/camel-example-grpc-kubernetes/pom.xml
+++ b/examples/camel-example-grpc-kubernetes/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-grpc-kubernetes</artifactId>
diff --git a/examples/camel-example-guice-jms/pom.xml b/examples/camel-example-guice-jms/pom.xml
index 5e3874e296f6c..0440c7bbeae2c 100644
--- a/examples/camel-example-guice-jms/pom.xml
+++ b/examples/camel-example-guice-jms/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-guice-jms</artifactId>
diff --git a/examples/camel-example-hazelcast-kubernetes/pom.xml b/examples/camel-example-hazelcast-kubernetes/pom.xml
index 6f0c5b1f13a38..6fcbdbf1cea16 100644
--- a/examples/camel-example-hazelcast-kubernetes/pom.xml
+++ b/examples/camel-example-hazelcast-kubernetes/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-hazelcast-kubernetes-example</artifactId>
diff --git a/examples/camel-example-hystrix/client/pom.xml b/examples/camel-example-hystrix/client/pom.xml
index 2995e4ed07d8a..41c30c775b5f7 100644
--- a/examples/camel-example-hystrix/client/pom.xml
+++ b/examples/camel-example-hystrix/client/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>camel-example-hystrix</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-hystrix-client</artifactId>
diff --git a/examples/camel-example-hystrix/pom.xml b/examples/camel-example-hystrix/pom.xml
index 86494ced83430..4fe3331e9522b 100644
--- a/examples/camel-example-hystrix/pom.xml
+++ b/examples/camel-example-hystrix/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-hystrix</artifactId>
diff --git a/examples/camel-example-hystrix/service1/pom.xml b/examples/camel-example-hystrix/service1/pom.xml
index 70be2e99b03b1..c4e4d67a1a14f 100644
--- a/examples/camel-example-hystrix/service1/pom.xml
+++ b/examples/camel-example-hystrix/service1/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>camel-example-hystrix</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-hystrix-service1</artifactId>
diff --git a/examples/camel-example-hystrix/service2/pom.xml b/examples/camel-example-hystrix/service2/pom.xml
index f5aeab756799e..d0c561b40c861 100644
--- a/examples/camel-example-hystrix/service2/pom.xml
+++ b/examples/camel-example-hystrix/service2/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>camel-example-hystrix</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-hystrix-service2</artifactId>
diff --git a/examples/camel-example-java8-rx/pom.xml b/examples/camel-example-java8-rx/pom.xml
index 48e84ff340b12..3ddd54fd28d9b 100644
--- a/examples/camel-example-java8-rx/pom.xml
+++ b/examples/camel-example-java8-rx/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-java8-rx</artifactId>
diff --git a/examples/camel-example-java8/pom.xml b/examples/camel-example-java8/pom.xml
index 7e24527a7d244..129aa711d2d2f 100644
--- a/examples/camel-example-java8/pom.xml
+++ b/examples/camel-example-java8/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-java8</artifactId>
diff --git a/examples/camel-example-jdbc/pom.xml b/examples/camel-example-jdbc/pom.xml
index d312b795f264e..b0f2072a00bbe 100644
--- a/examples/camel-example-jdbc/pom.xml
+++ b/examples/camel-example-jdbc/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-jdbc</artifactId>
diff --git a/examples/camel-example-jms-file/pom.xml b/examples/camel-example-jms-file/pom.xml
index 7633796f9b951..10a68ab270d95 100644
--- a/examples/camel-example-jms-file/pom.xml
+++ b/examples/camel-example-jms-file/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-jms-file</artifactId>
diff --git a/examples/camel-example-jmx/pom.xml b/examples/camel-example-jmx/pom.xml
index 4705e82f06162..effebffd77cae 100644
--- a/examples/camel-example-jmx/pom.xml
+++ b/examples/camel-example-jmx/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-jmx</artifactId>
diff --git a/examples/camel-example-kafka/pom.xml b/examples/camel-example-kafka/pom.xml
index b9a825adf6aa9..9556ae27e0784 100644
--- a/examples/camel-example-kafka/pom.xml
+++ b/examples/camel-example-kafka/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-kafka</artifactId>
diff --git a/examples/camel-example-kotlin/pom.xml b/examples/camel-example-kotlin/pom.xml
index 4acf240c3146b..9831cdc2ed0ad 100644
--- a/examples/camel-example-kotlin/pom.xml
+++ b/examples/camel-example-kotlin/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-kotlin</artifactId>
diff --git a/examples/camel-example-loadbalancing/pom.xml b/examples/camel-example-loadbalancing/pom.xml
index ee7e2fab76573..367eeb607c619 100644
--- a/examples/camel-example-loadbalancing/pom.xml
+++ b/examples/camel-example-loadbalancing/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-loadbalancing</artifactId>
diff --git a/examples/camel-example-loan-broker-cxf/pom.xml b/examples/camel-example-loan-broker-cxf/pom.xml
index 3be3754da1865..5176fbbb88b77 100644
--- a/examples/camel-example-loan-broker-cxf/pom.xml
+++ b/examples/camel-example-loan-broker-cxf/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-loan-broker-cxf</artifactId>
diff --git a/examples/camel-example-loan-broker-jms/pom.xml b/examples/camel-example-loan-broker-jms/pom.xml
index 38ff034b7ca7f..9bce830fc546d 100644
--- a/examples/camel-example-loan-broker-jms/pom.xml
+++ b/examples/camel-example-loan-broker-jms/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-loan-broker-jms</artifactId>
diff --git a/examples/camel-example-management/pom.xml b/examples/camel-example-management/pom.xml
index f60ff98d83d71..c7497defb1a56 100644
--- a/examples/camel-example-management/pom.xml
+++ b/examples/camel-example-management/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-management</artifactId>
diff --git a/examples/camel-example-micrometer/pom.xml b/examples/camel-example-micrometer/pom.xml
index 64cc0f186af76..23631ef82e4ef 100644
--- a/examples/camel-example-micrometer/pom.xml
+++ b/examples/camel-example-micrometer/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-micrometer</artifactId>
diff --git a/examples/camel-example-mybatis/pom.xml b/examples/camel-example-mybatis/pom.xml
index 9f0ff1612a81f..206ca7541930d 100644
--- a/examples/camel-example-mybatis/pom.xml
+++ b/examples/camel-example-mybatis/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-mybatis</artifactId>
diff --git a/examples/camel-example-netty-custom-correlation/pom.xml b/examples/camel-example-netty-custom-correlation/pom.xml
index b484ab4796bc2..ff49cfa9aa887 100644
--- a/examples/camel-example-netty-custom-correlation/pom.xml
+++ b/examples/camel-example-netty-custom-correlation/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-netty-custom-correlation</artifactId>
diff --git a/examples/camel-example-netty-http/myapp-cdi/pom.xml b/examples/camel-example-netty-http/myapp-cdi/pom.xml
index cc9b6c6c01b5c..c1162589af96e 100644
--- a/examples/camel-example-netty-http/myapp-cdi/pom.xml
+++ b/examples/camel-example-netty-http/myapp-cdi/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <artifactId>camel-example-netty-http</artifactId>
     <groupId>org.apache.camel.example</groupId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-netty-myapp-cdi</artifactId>
diff --git a/examples/camel-example-netty-http/myapp-one/pom.xml b/examples/camel-example-netty-http/myapp-one/pom.xml
index e951dee2c94c8..c0aa8ab255612 100644
--- a/examples/camel-example-netty-http/myapp-one/pom.xml
+++ b/examples/camel-example-netty-http/myapp-one/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <artifactId>camel-example-netty-http</artifactId>
     <groupId>org.apache.camel.example</groupId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-netty-myapp-one</artifactId>
diff --git a/examples/camel-example-netty-http/myapp-two/pom.xml b/examples/camel-example-netty-http/myapp-two/pom.xml
index bfff4794b1622..cd8893e4a67ca 100644
--- a/examples/camel-example-netty-http/myapp-two/pom.xml
+++ b/examples/camel-example-netty-http/myapp-two/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <artifactId>camel-example-netty-http</artifactId>
     <groupId>org.apache.camel.example</groupId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-netty-myapp-two</artifactId>
diff --git a/examples/camel-example-netty-http/pom.xml b/examples/camel-example-netty-http/pom.xml
index 25da3e7f94238..5ec67adf91913 100644
--- a/examples/camel-example-netty-http/pom.xml
+++ b/examples/camel-example-netty-http/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-netty-http</artifactId>
diff --git a/examples/camel-example-netty-http/shared-netty-http-server/pom.xml b/examples/camel-example-netty-http/shared-netty-http-server/pom.xml
index b8381ff630747..766e8db1ecdef 100644
--- a/examples/camel-example-netty-http/shared-netty-http-server/pom.xml
+++ b/examples/camel-example-netty-http/shared-netty-http-server/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <artifactId>camel-example-netty-http</artifactId>
     <groupId>org.apache.camel.example</groupId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-netty-http-shared</artifactId>
diff --git a/examples/camel-example-olingo4-blueprint/pom.xml b/examples/camel-example-olingo4-blueprint/pom.xml
index 4f0301257eee5..3aae6c4a763a9 100644
--- a/examples/camel-example-olingo4-blueprint/pom.xml
+++ b/examples/camel-example-olingo4-blueprint/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-olingo4-blueprint</artifactId>
diff --git a/examples/camel-example-opentracing/client/pom.xml b/examples/camel-example-opentracing/client/pom.xml
index 55a8dcdb94240..5854173cdf1f0 100644
--- a/examples/camel-example-opentracing/client/pom.xml
+++ b/examples/camel-example-opentracing/client/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>camel-example-opentracing</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-opentracing-client</artifactId>
diff --git a/examples/camel-example-opentracing/loggingtracer/pom.xml b/examples/camel-example-opentracing/loggingtracer/pom.xml
index cf8b5ec56129b..a3fc0710f0354 100644
--- a/examples/camel-example-opentracing/loggingtracer/pom.xml
+++ b/examples/camel-example-opentracing/loggingtracer/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>camel-example-opentracing</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-opentracing-loggingtracer</artifactId>
diff --git a/examples/camel-example-opentracing/pom.xml b/examples/camel-example-opentracing/pom.xml
index 1981a013c2b9a..fdbd7b52b1603 100644
--- a/examples/camel-example-opentracing/pom.xml
+++ b/examples/camel-example-opentracing/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-opentracing</artifactId>
diff --git a/examples/camel-example-opentracing/service1/pom.xml b/examples/camel-example-opentracing/service1/pom.xml
index 7b6983c4ab6ac..fe2b07975933e 100644
--- a/examples/camel-example-opentracing/service1/pom.xml
+++ b/examples/camel-example-opentracing/service1/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>camel-example-opentracing</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-opentracing-service1</artifactId>
diff --git a/examples/camel-example-opentracing/service2/pom.xml b/examples/camel-example-opentracing/service2/pom.xml
index 3264f46f051dd..ac214af1bca8d 100644
--- a/examples/camel-example-opentracing/service2/pom.xml
+++ b/examples/camel-example-opentracing/service2/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>camel-example-opentracing</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-opentracing-service2</artifactId>
diff --git a/examples/camel-example-pojo-messaging/pom.xml b/examples/camel-example-pojo-messaging/pom.xml
index d4a4d991f11ab..18ac6266560bb 100644
--- a/examples/camel-example-pojo-messaging/pom.xml
+++ b/examples/camel-example-pojo-messaging/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-pojo-messaging</artifactId>
diff --git a/examples/camel-example-rabbitmq/pom.xml b/examples/camel-example-rabbitmq/pom.xml
index 00c88dcda520f..c2afc8a71821e 100644
--- a/examples/camel-example-rabbitmq/pom.xml
+++ b/examples/camel-example-rabbitmq/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-rabbitmq</artifactId>
diff --git a/examples/camel-example-reactive-streams/pom.xml b/examples/camel-example-reactive-streams/pom.xml
index f47bc7654505a..4efe4c8057cc3 100644
--- a/examples/camel-example-reactive-streams/pom.xml
+++ b/examples/camel-example-reactive-streams/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-reactive-streams</artifactId>
diff --git a/examples/camel-example-reload/pom.xml b/examples/camel-example-reload/pom.xml
index 79001b240056c..6a7777a0f2653 100644
--- a/examples/camel-example-reload/pom.xml
+++ b/examples/camel-example-reload/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-reload</artifactId>
diff --git a/examples/camel-example-reportincident-wssecurity/pom.xml b/examples/camel-example-reportincident-wssecurity/pom.xml
index 017340a641d92..051cf5109b12a 100644
--- a/examples/camel-example-reportincident-wssecurity/pom.xml
+++ b/examples/camel-example-reportincident-wssecurity/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-reportincident-wssecurity</artifactId>
diff --git a/examples/camel-example-reportincident/pom.xml b/examples/camel-example-reportincident/pom.xml
index 0cffa444f6317..8575d685a5311 100644
--- a/examples/camel-example-reportincident/pom.xml
+++ b/examples/camel-example-reportincident/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-reportincident</artifactId>
diff --git a/examples/camel-example-rest-producer/pom.xml b/examples/camel-example-rest-producer/pom.xml
index d7c2d99f0378f..5621d210b562b 100644
--- a/examples/camel-example-rest-producer/pom.xml
+++ b/examples/camel-example-rest-producer/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-rest-producer</artifactId>
diff --git a/examples/camel-example-rest-swagger/pom.xml b/examples/camel-example-rest-swagger/pom.xml
index 4efdbb4f7347b..c94b52ac884a5 100644
--- a/examples/camel-example-rest-swagger/pom.xml
+++ b/examples/camel-example-rest-swagger/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-rest-swagger</artifactId>
diff --git a/examples/camel-example-restlet-jdbc/pom.xml b/examples/camel-example-restlet-jdbc/pom.xml
index 51b1d8457acc9..6e208880eb898 100644
--- a/examples/camel-example-restlet-jdbc/pom.xml
+++ b/examples/camel-example-restlet-jdbc/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-restlet-jdbc</artifactId>
diff --git a/examples/camel-example-route-throttling/pom.xml b/examples/camel-example-route-throttling/pom.xml
index 00f8506ca0e92..cc1f4a34ef4f9 100644
--- a/examples/camel-example-route-throttling/pom.xml
+++ b/examples/camel-example-route-throttling/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-route-throttling</artifactId>
diff --git a/examples/camel-example-scala/pom.xml b/examples/camel-example-scala/pom.xml
index 6fee4eb25d64c..2b2fe4b76932d 100644
--- a/examples/camel-example-scala/pom.xml
+++ b/examples/camel-example-scala/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-scala</artifactId>
diff --git a/examples/camel-example-servlet-httpregistry-blueprint/pom.xml b/examples/camel-example-servlet-httpregistry-blueprint/pom.xml
index 6b10a81407e10..b24e9c30cebc2 100644
--- a/examples/camel-example-servlet-httpregistry-blueprint/pom.xml
+++ b/examples/camel-example-servlet-httpregistry-blueprint/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-servlet-httpregistry-blueprint</artifactId>
diff --git a/examples/camel-example-servlet-rest-blueprint/pom.xml b/examples/camel-example-servlet-rest-blueprint/pom.xml
index efb7b38e7794a..1eb8606bd98ef 100644
--- a/examples/camel-example-servlet-rest-blueprint/pom.xml
+++ b/examples/camel-example-servlet-rest-blueprint/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-servlet-rest-blueprint</artifactId>
diff --git a/examples/camel-example-servlet-tomcat-no-spring/pom.xml b/examples/camel-example-servlet-tomcat-no-spring/pom.xml
index 71e76390ef835..73fc66ff40f34 100644
--- a/examples/camel-example-servlet-tomcat-no-spring/pom.xml
+++ b/examples/camel-example-servlet-tomcat-no-spring/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-servlet-tomcat-no-spring</artifactId>
diff --git a/examples/camel-example-servlet-tomcat/pom.xml b/examples/camel-example-servlet-tomcat/pom.xml
index 103d0931fcc87..4720f4f7a82c8 100644
--- a/examples/camel-example-servlet-tomcat/pom.xml
+++ b/examples/camel-example-servlet-tomcat/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-servlet-tomcat</artifactId>
diff --git a/examples/camel-example-simplejirabot/javadsl/pom.xml b/examples/camel-example-simplejirabot/javadsl/pom.xml
index 14b3595a4d1a2..5f6aa41a1d4b8 100644
--- a/examples/camel-example-simplejirabot/javadsl/pom.xml
+++ b/examples/camel-example-simplejirabot/javadsl/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <artifactId>camel-example-simplejirabot</artifactId>
     <groupId>org.apache.camel.example</groupId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-simplejirabot-javadsl</artifactId>
diff --git a/examples/camel-example-simplejirabot/pom.xml b/examples/camel-example-simplejirabot/pom.xml
index c45784ad3c8e2..cf10d6a92ad4b 100644
--- a/examples/camel-example-simplejirabot/pom.xml
+++ b/examples/camel-example-simplejirabot/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-simplejirabot</artifactId>
diff --git a/examples/camel-example-simplejirabot/xmlconf/pom.xml b/examples/camel-example-simplejirabot/xmlconf/pom.xml
index ccee358a1122b..8a0c6ab19da3b 100644
--- a/examples/camel-example-simplejirabot/xmlconf/pom.xml
+++ b/examples/camel-example-simplejirabot/xmlconf/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <artifactId>camel-example-simplejirabot</artifactId>
     <groupId>org.apache.camel.example</groupId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-simplejirabot-xmlconf</artifactId>
diff --git a/examples/camel-example-spark-rest/pom.xml b/examples/camel-example-spark-rest/pom.xml
index 81e92228cbce7..9695e1a2712e6 100644
--- a/examples/camel-example-spark-rest/pom.xml
+++ b/examples/camel-example-spark-rest/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-spark-rest</artifactId>
diff --git a/examples/camel-example-splunk/pom.xml b/examples/camel-example-splunk/pom.xml
index 23583cb82c038..f291a533e9cc5 100644
--- a/examples/camel-example-splunk/pom.xml
+++ b/examples/camel-example-splunk/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-splunk</artifactId>
diff --git a/examples/camel-example-spring-boot-activemq/pom.xml b/examples/camel-example-spring-boot-activemq/pom.xml
index 6ab6da66b0fd8..f74235acf589e 100644
--- a/examples/camel-example-spring-boot-activemq/pom.xml
+++ b/examples/camel-example-spring-boot-activemq/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-spring-boot-activemq</artifactId>
diff --git a/examples/camel-example-spring-boot-clustered-route-controller/cluster-bootstrap/pom.xml b/examples/camel-example-spring-boot-clustered-route-controller/cluster-bootstrap/pom.xml
index 99b26bc7818b9..e8fbb2adc5fee 100644
--- a/examples/camel-example-spring-boot-clustered-route-controller/cluster-bootstrap/pom.xml
+++ b/examples/camel-example-spring-boot-clustered-route-controller/cluster-bootstrap/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>camel-example-spring-boot-clustered-route-controller</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-spring-boot-clustered-route-controller-cluster-bootstrap</artifactId>
diff --git a/examples/camel-example-spring-boot-clustered-route-controller/cluster-node/pom.xml b/examples/camel-example-spring-boot-clustered-route-controller/cluster-node/pom.xml
index b7652920aac0b..1d29e7df0418c 100644
--- a/examples/camel-example-spring-boot-clustered-route-controller/cluster-node/pom.xml
+++ b/examples/camel-example-spring-boot-clustered-route-controller/cluster-node/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>camel-example-spring-boot-clustered-route-controller</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-spring-boot-clustered-route-controller-cluster-node</artifactId>
diff --git a/examples/camel-example-spring-boot-clustered-route-controller/pom.xml b/examples/camel-example-spring-boot-clustered-route-controller/pom.xml
index fac7c9c47c3fc..29cdc87132cca 100644
--- a/examples/camel-example-spring-boot-clustered-route-controller/pom.xml
+++ b/examples/camel-example-spring-boot-clustered-route-controller/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-spring-boot-clustered-route-controller</artifactId>
diff --git a/examples/camel-example-spring-boot-geocoder/pom.xml b/examples/camel-example-spring-boot-geocoder/pom.xml
index d8d215830f56c..a774768b4c26c 100644
--- a/examples/camel-example-spring-boot-geocoder/pom.xml
+++ b/examples/camel-example-spring-boot-geocoder/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-spring-boot-geocoder</artifactId>
diff --git a/examples/camel-example-spring-boot-grpc/hello-camel-grpc-client/pom.xml b/examples/camel-example-spring-boot-grpc/hello-camel-grpc-client/pom.xml
index 2a6c39cd6e59b..0ca7433b9246e 100644
--- a/examples/camel-example-spring-boot-grpc/hello-camel-grpc-client/pom.xml
+++ b/examples/camel-example-spring-boot-grpc/hello-camel-grpc-client/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>camel-example-spring-boot-grpc</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-hello-grpc-client</artifactId>
diff --git a/examples/camel-example-spring-boot-grpc/hello-camel-grpc-server/pom.xml b/examples/camel-example-spring-boot-grpc/hello-camel-grpc-server/pom.xml
index a12ec56c3e8f3..4165a9e577131 100644
--- a/examples/camel-example-spring-boot-grpc/hello-camel-grpc-server/pom.xml
+++ b/examples/camel-example-spring-boot-grpc/hello-camel-grpc-server/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>camel-example-spring-boot-grpc</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-hello-grpc-server</artifactId>
diff --git a/examples/camel-example-spring-boot-grpc/pom.xml b/examples/camel-example-spring-boot-grpc/pom.xml
index 61cd1dcb7547d..af7028e9853c9 100644
--- a/examples/camel-example-spring-boot-grpc/pom.xml
+++ b/examples/camel-example-spring-boot-grpc/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-spring-boot-grpc</artifactId>
diff --git a/examples/camel-example-spring-boot-health-checks/application/pom.xml b/examples/camel-example-spring-boot-health-checks/application/pom.xml
index e7c36a70f7a60..7f4a14e66dd18 100644
--- a/examples/camel-example-spring-boot-health-checks/application/pom.xml
+++ b/examples/camel-example-spring-boot-health-checks/application/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>camel-example-spring-boot-health-checks</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-spring-boot-health-checks-application</artifactId>
diff --git a/examples/camel-example-spring-boot-health-checks/pom.xml b/examples/camel-example-spring-boot-health-checks/pom.xml
index ecbb3bb487579..0c83439544145 100644
--- a/examples/camel-example-spring-boot-health-checks/pom.xml
+++ b/examples/camel-example-spring-boot-health-checks/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-spring-boot-health-checks</artifactId>
diff --git a/examples/camel-example-spring-boot-health-checks/service/pom.xml b/examples/camel-example-spring-boot-health-checks/service/pom.xml
index 58c0a5cee19b3..faf6cc7cfce7a 100644
--- a/examples/camel-example-spring-boot-health-checks/service/pom.xml
+++ b/examples/camel-example-spring-boot-health-checks/service/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>camel-example-spring-boot-health-checks</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-spring-boot-health-checks-service</artifactId>
diff --git a/examples/camel-example-spring-boot-infinispan/pom.xml b/examples/camel-example-spring-boot-infinispan/pom.xml
index 5fef9cf5646d6..6b6706af6cabe 100644
--- a/examples/camel-example-spring-boot-infinispan/pom.xml
+++ b/examples/camel-example-spring-boot-infinispan/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-spring-boot-infinispan</artifactId>
diff --git a/examples/camel-example-spring-boot-master/pom.xml b/examples/camel-example-spring-boot-master/pom.xml
index 034e6f94be6a0..be32e35b89371 100644
--- a/examples/camel-example-spring-boot-master/pom.xml
+++ b/examples/camel-example-spring-boot-master/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-spring-boot-master</artifactId>
diff --git a/examples/camel-example-spring-boot-metrics/pom.xml b/examples/camel-example-spring-boot-metrics/pom.xml
index fc87265729b36..a92fe56906993 100644
--- a/examples/camel-example-spring-boot-metrics/pom.xml
+++ b/examples/camel-example-spring-boot-metrics/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-spring-boot-metrics</artifactId>
diff --git a/examples/camel-example-spring-boot-pojo/pom.xml b/examples/camel-example-spring-boot-pojo/pom.xml
index 7920fe0ed5ebf..3d1ebc23ce3e6 100644
--- a/examples/camel-example-spring-boot-pojo/pom.xml
+++ b/examples/camel-example-spring-boot-pojo/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-spring-boot-pojo</artifactId>
diff --git a/examples/camel-example-spring-boot-rest-jpa/pom.xml b/examples/camel-example-spring-boot-rest-jpa/pom.xml
index a79b32d28190d..64e9cf36fc7c5 100644
--- a/examples/camel-example-spring-boot-rest-jpa/pom.xml
+++ b/examples/camel-example-spring-boot-rest-jpa/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-spring-boot-rest-jpa</artifactId>
diff --git a/examples/camel-example-spring-boot-rest-swagger/pom.xml b/examples/camel-example-spring-boot-rest-swagger/pom.xml
index 1b314c7d96838..1161d7fb231e9 100644
--- a/examples/camel-example-spring-boot-rest-swagger/pom.xml
+++ b/examples/camel-example-spring-boot-rest-swagger/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-spring-boot-rest-swagger</artifactId>
diff --git a/examples/camel-example-spring-boot-servicecall/consumer/pom.xml b/examples/camel-example-spring-boot-servicecall/consumer/pom.xml
index 6ff655af1770c..e534ae8f88bf6 100644
--- a/examples/camel-example-spring-boot-servicecall/consumer/pom.xml
+++ b/examples/camel-example-spring-boot-servicecall/consumer/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>camel-example-spring-boot-servicecall</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-spring-boot-servicecall-consumer</artifactId>
diff --git a/examples/camel-example-spring-boot-servicecall/pom.xml b/examples/camel-example-spring-boot-servicecall/pom.xml
index 4c35b9e668298..f3d087324e537 100644
--- a/examples/camel-example-spring-boot-servicecall/pom.xml
+++ b/examples/camel-example-spring-boot-servicecall/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-spring-boot-servicecall</artifactId>
diff --git a/examples/camel-example-spring-boot-servicecall/services/pom.xml b/examples/camel-example-spring-boot-servicecall/services/pom.xml
index c9925d1326812..6244da0490192 100644
--- a/examples/camel-example-spring-boot-servicecall/services/pom.xml
+++ b/examples/camel-example-spring-boot-servicecall/services/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>camel-example-spring-boot-servicecall</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-spring-boot-servicecall-services</artifactId>
diff --git a/examples/camel-example-spring-boot-supervising-route-controller/pom.xml b/examples/camel-example-spring-boot-supervising-route-controller/pom.xml
index 62105647654cc..79f13c6aceb51 100644
--- a/examples/camel-example-spring-boot-supervising-route-controller/pom.xml
+++ b/examples/camel-example-spring-boot-supervising-route-controller/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-spring-boot-supervising-route-controller</artifactId>
diff --git a/examples/camel-example-spring-boot-xml/pom.xml b/examples/camel-example-spring-boot-xml/pom.xml
index 29e6a0a196270..0fed4f34862ec 100644
--- a/examples/camel-example-spring-boot-xml/pom.xml
+++ b/examples/camel-example-spring-boot-xml/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-spring-boot-xml</artifactId>
diff --git a/examples/camel-example-spring-boot/pom.xml b/examples/camel-example-spring-boot/pom.xml
index 64808c4597528..3e21f3bc44561 100644
--- a/examples/camel-example-spring-boot/pom.xml
+++ b/examples/camel-example-spring-boot/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-spring-boot</artifactId>
diff --git a/examples/camel-example-spring-cloud-servicecall/consumer/pom.xml b/examples/camel-example-spring-cloud-servicecall/consumer/pom.xml
index 795b3b607d755..cc3258397e509 100644
--- a/examples/camel-example-spring-cloud-servicecall/consumer/pom.xml
+++ b/examples/camel-example-spring-cloud-servicecall/consumer/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>camel-example-spring-cloud-servicecall</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-spring-cloud-servicecall-consumer</artifactId>
diff --git a/examples/camel-example-spring-cloud-servicecall/pom.xml b/examples/camel-example-spring-cloud-servicecall/pom.xml
index ba4f008d21fe1..d2b32c6e31443 100644
--- a/examples/camel-example-spring-cloud-servicecall/pom.xml
+++ b/examples/camel-example-spring-cloud-servicecall/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-spring-cloud-servicecall</artifactId>
diff --git a/examples/camel-example-spring-cloud-servicecall/service/pom.xml b/examples/camel-example-spring-cloud-servicecall/service/pom.xml
index 6b59fbc8ae18c..3582afd3fd5f7 100644
--- a/examples/camel-example-spring-cloud-servicecall/service/pom.xml
+++ b/examples/camel-example-spring-cloud-servicecall/service/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>camel-example-spring-cloud-servicecall</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-spring-cloud-servicecall-service</artifactId>
diff --git a/examples/camel-example-spring-cloud-serviceregistry/consumer/pom.xml b/examples/camel-example-spring-cloud-serviceregistry/consumer/pom.xml
index 4dc44f49f3c15..214beafc90d1e 100644
--- a/examples/camel-example-spring-cloud-serviceregistry/consumer/pom.xml
+++ b/examples/camel-example-spring-cloud-serviceregistry/consumer/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>camel-example-spring-cloud-serviceregistry</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-spring-cloud-serviceregistry-consumer</artifactId>
diff --git a/examples/camel-example-spring-cloud-serviceregistry/pom.xml b/examples/camel-example-spring-cloud-serviceregistry/pom.xml
index 915d501777aa1..7b04977cd3e3b 100644
--- a/examples/camel-example-spring-cloud-serviceregistry/pom.xml
+++ b/examples/camel-example-spring-cloud-serviceregistry/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-spring-cloud-serviceregistry</artifactId>
diff --git a/examples/camel-example-spring-cloud-serviceregistry/service/pom.xml b/examples/camel-example-spring-cloud-serviceregistry/service/pom.xml
index a8a13cc5e4d3d..b322de6f3629e 100644
--- a/examples/camel-example-spring-cloud-serviceregistry/service/pom.xml
+++ b/examples/camel-example-spring-cloud-serviceregistry/service/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>camel-example-spring-cloud-serviceregistry</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-spring-cloud-serviceregistry-service</artifactId>
diff --git a/examples/camel-example-spring-javaconfig/pom.xml b/examples/camel-example-spring-javaconfig/pom.xml
index 88715c176b445..ace26dba447ca 100644
--- a/examples/camel-example-spring-javaconfig/pom.xml
+++ b/examples/camel-example-spring-javaconfig/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-spring-javaconfig</artifactId>
diff --git a/examples/camel-example-spring-jms/pom.xml b/examples/camel-example-spring-jms/pom.xml
index 64fd1e48f0789..621d31e8ca669 100644
--- a/examples/camel-example-spring-jms/pom.xml
+++ b/examples/camel-example-spring-jms/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-spring-jms</artifactId>
diff --git a/examples/camel-example-spring-security/pom.xml b/examples/camel-example-spring-security/pom.xml
index 26cf378de4905..9cbd533d59420 100644
--- a/examples/camel-example-spring-security/pom.xml
+++ b/examples/camel-example-spring-security/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-spring-security</artifactId>
diff --git a/examples/camel-example-spring-ws/pom.xml b/examples/camel-example-spring-ws/pom.xml
index 02e896b75186d..c1929b392bb0d 100644
--- a/examples/camel-example-spring-ws/pom.xml
+++ b/examples/camel-example-spring-ws/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-spring-ws</artifactId>
diff --git a/examples/camel-example-spring-xquery/pom.xml b/examples/camel-example-spring-xquery/pom.xml
index 253d8d7fea1fb..11147e60424c7 100644
--- a/examples/camel-example-spring-xquery/pom.xml
+++ b/examples/camel-example-spring-xquery/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-spring-xquery</artifactId>
diff --git a/examples/camel-example-spring/pom.xml b/examples/camel-example-spring/pom.xml
index 0b0a1e2ac5c15..f3e10e5af796e 100644
--- a/examples/camel-example-spring/pom.xml
+++ b/examples/camel-example-spring/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-spring</artifactId>
diff --git a/examples/camel-example-sql-blueprint/pom.xml b/examples/camel-example-sql-blueprint/pom.xml
index cf25d510a89e2..a7cfe2d08d9a8 100644
--- a/examples/camel-example-sql-blueprint/pom.xml
+++ b/examples/camel-example-sql-blueprint/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-sql-blueprint</artifactId>
diff --git a/examples/camel-example-ssh-security/pom.xml b/examples/camel-example-ssh-security/pom.xml
index d6be9325b0bcc..927f9ecf012ba 100644
--- a/examples/camel-example-ssh-security/pom.xml
+++ b/examples/camel-example-ssh-security/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-ssh-security</artifactId>
diff --git a/examples/camel-example-ssh/pom.xml b/examples/camel-example-ssh/pom.xml
index 5c3434cb25e7d..6430f715952ad 100644
--- a/examples/camel-example-ssh/pom.xml
+++ b/examples/camel-example-ssh/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-ssh</artifactId>
diff --git a/examples/camel-example-swagger-cdi/pom.xml b/examples/camel-example-swagger-cdi/pom.xml
index 12567e0c2734a..cf80797612759 100644
--- a/examples/camel-example-swagger-cdi/pom.xml
+++ b/examples/camel-example-swagger-cdi/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-swagger-cdi</artifactId>
diff --git a/examples/camel-example-swagger-osgi/pom.xml b/examples/camel-example-swagger-osgi/pom.xml
index 9c19fc3572d83..232d121b5002f 100644
--- a/examples/camel-example-swagger-osgi/pom.xml
+++ b/examples/camel-example-swagger-osgi/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-swagger-osgi</artifactId>
diff --git a/examples/camel-example-swagger-xml/pom.xml b/examples/camel-example-swagger-xml/pom.xml
index 8640adb226e28..2132231b9d424 100644
--- a/examples/camel-example-swagger-xml/pom.xml
+++ b/examples/camel-example-swagger-xml/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-swagger-xml</artifactId>
diff --git a/examples/camel-example-tracer/pom.xml b/examples/camel-example-tracer/pom.xml
index 15ffe6e3315d8..de8e349e28287 100644
--- a/examples/camel-example-tracer/pom.xml
+++ b/examples/camel-example-tracer/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-tracer</artifactId>
diff --git a/examples/camel-example-transformer-blueprint/pom.xml b/examples/camel-example-transformer-blueprint/pom.xml
index fed7c9ea9ea24..f253325dde66d 100644
--- a/examples/camel-example-transformer-blueprint/pom.xml
+++ b/examples/camel-example-transformer-blueprint/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-transformer-blueprint</artifactId>
diff --git a/examples/camel-example-transformer-cdi/pom.xml b/examples/camel-example-transformer-cdi/pom.xml
index db03ef15312c6..896d4d16bd886 100644
--- a/examples/camel-example-transformer-cdi/pom.xml
+++ b/examples/camel-example-transformer-cdi/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-transformer-cdi</artifactId>
diff --git a/examples/camel-example-transformer-demo/pom.xml b/examples/camel-example-transformer-demo/pom.xml
index a85874b18c8b6..cbe6ef69f489c 100644
--- a/examples/camel-example-transformer-demo/pom.xml
+++ b/examples/camel-example-transformer-demo/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-transformer-demo</artifactId>
diff --git a/examples/camel-example-twitter-salesforce/pom.xml b/examples/camel-example-twitter-salesforce/pom.xml
index f43287e940e1a..e39760eea40d4 100644
--- a/examples/camel-example-twitter-salesforce/pom.xml
+++ b/examples/camel-example-twitter-salesforce/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-twitter-salesforce</artifactId>
diff --git a/examples/camel-example-twitter-websocket-blueprint/pom.xml b/examples/camel-example-twitter-websocket-blueprint/pom.xml
index 57b775908d494..46da6906d4c18 100644
--- a/examples/camel-example-twitter-websocket-blueprint/pom.xml
+++ b/examples/camel-example-twitter-websocket-blueprint/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-twitter-websocket-blueprint</artifactId>
diff --git a/examples/camel-example-twitter-websocket/pom.xml b/examples/camel-example-twitter-websocket/pom.xml
index 8f6f5d5a277aa..e03ae220a1130 100644
--- a/examples/camel-example-twitter-websocket/pom.xml
+++ b/examples/camel-example-twitter-websocket/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-twitter-websocket</artifactId>
diff --git a/examples/camel-example-validator-spring-boot/pom.xml b/examples/camel-example-validator-spring-boot/pom.xml
index 417f2b4c034d3..2286525c0cbeb 100644
--- a/examples/camel-example-validator-spring-boot/pom.xml
+++ b/examples/camel-example-validator-spring-boot/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-validator-spring-boot</artifactId>
diff --git a/examples/camel-example-widget-gadget-cdi/pom.xml b/examples/camel-example-widget-gadget-cdi/pom.xml
index d68b44e1cb936..e387408ab7a9b 100644
--- a/examples/camel-example-widget-gadget-cdi/pom.xml
+++ b/examples/camel-example-widget-gadget-cdi/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-widget-gadget-cdi</artifactId>
diff --git a/examples/camel-example-widget-gadget-java/pom.xml b/examples/camel-example-widget-gadget-java/pom.xml
index 01f58b2fc69b3..0a40ab6d7346a 100644
--- a/examples/camel-example-widget-gadget-java/pom.xml
+++ b/examples/camel-example-widget-gadget-java/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-widget-gadget-java</artifactId>
diff --git a/examples/camel-example-widget-gadget-xml/pom.xml b/examples/camel-example-widget-gadget-xml/pom.xml
index f913da2a3f6d8..0fe4039f44d82 100644
--- a/examples/camel-example-widget-gadget-xml/pom.xml
+++ b/examples/camel-example-widget-gadget-xml/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-widget-gadget-xml</artifactId>
diff --git a/examples/camel-example-zipkin/client/pom.xml b/examples/camel-example-zipkin/client/pom.xml
index 603b0a915bd7b..0df4342b5a1c3 100644
--- a/examples/camel-example-zipkin/client/pom.xml
+++ b/examples/camel-example-zipkin/client/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>camel-example-zipkin</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-zipkin-client</artifactId>
diff --git a/examples/camel-example-zipkin/pom.xml b/examples/camel-example-zipkin/pom.xml
index 97040e5082432..3fb25490168ec 100644
--- a/examples/camel-example-zipkin/pom.xml
+++ b/examples/camel-example-zipkin/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>examples</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-zipkin</artifactId>
diff --git a/examples/camel-example-zipkin/service1/pom.xml b/examples/camel-example-zipkin/service1/pom.xml
index 107d3eb827a0c..fc2b8c3e2cafb 100644
--- a/examples/camel-example-zipkin/service1/pom.xml
+++ b/examples/camel-example-zipkin/service1/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>camel-example-zipkin</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-zipkin-service1</artifactId>
diff --git a/examples/camel-example-zipkin/service2/pom.xml b/examples/camel-example-zipkin/service2/pom.xml
index ea5446ae255c5..235242ca56f8d 100644
--- a/examples/camel-example-zipkin/service2/pom.xml
+++ b/examples/camel-example-zipkin/service2/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel.example</groupId>
     <artifactId>camel-example-zipkin</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-example-zipkin-service2</artifactId>
diff --git a/examples/pom.xml b/examples/pom.xml
index fea0e77ff4128..cb491065ec0e3 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>camel-parent</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
     <relativePath>../parent</relativePath>
   </parent>
 
diff --git a/parent/pom.xml b/parent/pom.xml
index 280e1c49379f5..c9258c2662398 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>camel</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/platforms/camel-catalog-connector/pom.xml b/platforms/camel-catalog-connector/pom.xml
index 988b4b19dcd56..829f73b51e7ee 100644
--- a/platforms/camel-catalog-connector/pom.xml
+++ b/platforms/camel-catalog-connector/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>platforms</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-catalog-connector</artifactId>
diff --git a/platforms/camel-catalog-lucene/pom.xml b/platforms/camel-catalog-lucene/pom.xml
index 3a004b2b30923..c9e5873adc974 100644
--- a/platforms/camel-catalog-lucene/pom.xml
+++ b/platforms/camel-catalog-lucene/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>platforms</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-catalog-lucene</artifactId>
diff --git a/platforms/camel-catalog-maven/pom.xml b/platforms/camel-catalog-maven/pom.xml
index 02fcf0bd7446d..051caf9946283 100644
--- a/platforms/camel-catalog-maven/pom.xml
+++ b/platforms/camel-catalog-maven/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>platforms</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-catalog-maven</artifactId>
diff --git a/platforms/camel-catalog-nexus/pom.xml b/platforms/camel-catalog-nexus/pom.xml
index eb4ac954e86c5..61cd870438f5d 100644
--- a/platforms/camel-catalog-nexus/pom.xml
+++ b/platforms/camel-catalog-nexus/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>platforms</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-catalog-nexus</artifactId>
diff --git a/platforms/camel-catalog-provider-karaf/pom.xml b/platforms/camel-catalog-provider-karaf/pom.xml
index eec167c9198c2..f43fb2ed3778e 100644
--- a/platforms/camel-catalog-provider-karaf/pom.xml
+++ b/platforms/camel-catalog-provider-karaf/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>platforms</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-catalog-provider-karaf</artifactId>
diff --git a/platforms/camel-catalog-provider-springboot/pom.xml b/platforms/camel-catalog-provider-springboot/pom.xml
index 16429458ad893..f283edb6e5c90 100644
--- a/platforms/camel-catalog-provider-springboot/pom.xml
+++ b/platforms/camel-catalog-provider-springboot/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>platforms</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-catalog-provider-springboot</artifactId>
diff --git a/platforms/camel-catalog-rest-app/pom.xml b/platforms/camel-catalog-rest-app/pom.xml
index 978a62c95a7c5..50e56aef81db2 100644
--- a/platforms/camel-catalog-rest-app/pom.xml
+++ b/platforms/camel-catalog-rest-app/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>platforms</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-catalog-rest-app</artifactId>
diff --git a/platforms/camel-catalog-rest/pom.xml b/platforms/camel-catalog-rest/pom.xml
index 8c4528d014df3..a1fbcfb394f8c 100644
--- a/platforms/camel-catalog-rest/pom.xml
+++ b/platforms/camel-catalog-rest/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>platforms</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-catalog-rest</artifactId>
diff --git a/platforms/camel-catalog/pom.xml b/platforms/camel-catalog/pom.xml
index 92e01fddd9fa5..9567c5ef573a5 100644
--- a/platforms/camel-catalog/pom.xml
+++ b/platforms/camel-catalog/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>platforms</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-catalog</artifactId>
diff --git a/platforms/commands/commands-core/pom.xml b/platforms/commands/commands-core/pom.xml
index 5304270fcc192..55257fcde935e 100644
--- a/platforms/commands/commands-core/pom.xml
+++ b/platforms/commands/commands-core/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>commands</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-commands-core</artifactId>
diff --git a/platforms/commands/commands-jolokia/pom.xml b/platforms/commands/commands-jolokia/pom.xml
index 436e8c8bd0cfc..bb29d88409424 100644
--- a/platforms/commands/commands-jolokia/pom.xml
+++ b/platforms/commands/commands-jolokia/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>commands</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-commands-jolokia</artifactId>
diff --git a/platforms/commands/pom.xml b/platforms/commands/pom.xml
index f0820099d165f..863ee0d7a2b27 100644
--- a/platforms/commands/pom.xml
+++ b/platforms/commands/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>platforms</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>commands</artifactId>
diff --git a/platforms/dummy-component/pom.xml b/platforms/dummy-component/pom.xml
index b2ee1e20651c9..c25816cdeef0d 100644
--- a/platforms/dummy-component/pom.xml
+++ b/platforms/dummy-component/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>platforms</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 
diff --git a/platforms/karaf/commands/pom.xml b/platforms/karaf/commands/pom.xml
index 2f9784ff2e1c1..6f1c8fa081106 100644
--- a/platforms/karaf/commands/pom.xml
+++ b/platforms/karaf/commands/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>karaf</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.apache.camel.karaf</groupId>
diff --git a/platforms/karaf/features/pom.xml b/platforms/karaf/features/pom.xml
index 627b703898a6f..3134619725338 100644
--- a/platforms/karaf/features/pom.xml
+++ b/platforms/karaf/features/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>karaf</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <groupId>org.apache.camel.karaf</groupId>
diff --git a/platforms/karaf/pom.xml b/platforms/karaf/pom.xml
index 88a308e556f3e..f636a6d3104a8 100644
--- a/platforms/karaf/pom.xml
+++ b/platforms/karaf/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>platforms</artifactId>
-        <version>2.23.0-SNAPSHOT</version>
+        <version>2.24.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>karaf</artifactId>
diff --git a/platforms/myfoo-connector/pom.xml b/platforms/myfoo-connector/pom.xml
index 4082cdc3509d0..df63c72d7882a 100644
--- a/platforms/myfoo-connector/pom.xml
+++ b/platforms/myfoo-connector/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>platforms</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 
diff --git a/platforms/pom.xml b/platforms/pom.xml
index cea1b615a3a01..e495d776b6947 100644
--- a/platforms/pom.xml
+++ b/platforms/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>camel-parent</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
     <relativePath>../parent</relativePath>
   </parent>
 
diff --git a/platforms/spring-boot/components-starter/camel-ahc-starter/pom.xml b/platforms/spring-boot/components-starter/camel-ahc-starter/pom.xml
index 34a5bcc7d6de8..5ee9b020fc7f2 100644
--- a/platforms/spring-boot/components-starter/camel-ahc-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-ahc-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-ahc-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-ahc-ws-starter/pom.xml b/platforms/spring-boot/components-starter/camel-ahc-ws-starter/pom.xml
index 875a61b808b17..6c0ad03a03efc 100644
--- a/platforms/spring-boot/components-starter/camel-ahc-ws-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-ahc-ws-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-ahc-ws-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-amqp-starter/pom.xml b/platforms/spring-boot/components-starter/camel-amqp-starter/pom.xml
index 7bd8c09f74279..4fef8b884dca3 100644
--- a/platforms/spring-boot/components-starter/camel-amqp-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-amqp-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-amqp-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-apns-starter/pom.xml b/platforms/spring-boot/components-starter/camel-apns-starter/pom.xml
index ccdede7c9dc42..599a6d060d208 100644
--- a/platforms/spring-boot/components-starter/camel-apns-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-apns-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-apns-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-as2-starter/pom.xml b/platforms/spring-boot/components-starter/camel-as2-starter/pom.xml
index 7c516ad47a485..f6116b193d6f0 100644
--- a/platforms/spring-boot/components-starter/camel-as2-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-as2-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-as2-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-asn1-starter/pom.xml b/platforms/spring-boot/components-starter/camel-asn1-starter/pom.xml
index 46928d4d9ea66..ff45be84f9759 100644
--- a/platforms/spring-boot/components-starter/camel-asn1-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-asn1-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-asn1-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-asterisk-starter/pom.xml b/platforms/spring-boot/components-starter/camel-asterisk-starter/pom.xml
index e3ca73c270793..ff11cec0ddee2 100644
--- a/platforms/spring-boot/components-starter/camel-asterisk-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-asterisk-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-asterisk-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-atmos-starter/pom.xml b/platforms/spring-boot/components-starter/camel-atmos-starter/pom.xml
index 5db163e1b00d7..906e2a592fefc 100644
--- a/platforms/spring-boot/components-starter/camel-atmos-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-atmos-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-atmos-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-atmosphere-websocket-starter/pom.xml b/platforms/spring-boot/components-starter/camel-atmosphere-websocket-starter/pom.xml
index a150a1d6a3aa3..d8ee720cf7f94 100644
--- a/platforms/spring-boot/components-starter/camel-atmosphere-websocket-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-atmosphere-websocket-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-atmosphere-websocket-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-atom-starter/pom.xml b/platforms/spring-boot/components-starter/camel-atom-starter/pom.xml
index e3133365b0ab9..86c88a73aab78 100644
--- a/platforms/spring-boot/components-starter/camel-atom-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-atom-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-atom-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-atomix-starter/pom.xml b/platforms/spring-boot/components-starter/camel-atomix-starter/pom.xml
index 2fcda49b00160..032781abd9118 100644
--- a/platforms/spring-boot/components-starter/camel-atomix-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-atomix-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-atomix-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-avro-starter/pom.xml b/platforms/spring-boot/components-starter/camel-avro-starter/pom.xml
index 85b842509cf80..ad23b15320a20 100644
--- a/platforms/spring-boot/components-starter/camel-avro-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-avro-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-avro-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-aws-starter/pom.xml b/platforms/spring-boot/components-starter/camel-aws-starter/pom.xml
index d1ea792806fc8..905c137a719bc 100644
--- a/platforms/spring-boot/components-starter/camel-aws-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-aws-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-aws-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-aws-xray-starter/pom.xml b/platforms/spring-boot/components-starter/camel-aws-xray-starter/pom.xml
index ad5e7392e57a1..ab254d17b04db 100644
--- a/platforms/spring-boot/components-starter/camel-aws-xray-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-aws-xray-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-aws-xray-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-azure-starter/pom.xml b/platforms/spring-boot/components-starter/camel-azure-starter/pom.xml
index ab647606abd81..66e3d2cc2ccef 100644
--- a/platforms/spring-boot/components-starter/camel-azure-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-azure-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-azure-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-bam-starter/pom.xml b/platforms/spring-boot/components-starter/camel-bam-starter/pom.xml
index 45df333285b89..2a3a6809cf296 100644
--- a/platforms/spring-boot/components-starter/camel-bam-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-bam-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-bam-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-barcode-starter/pom.xml b/platforms/spring-boot/components-starter/camel-barcode-starter/pom.xml
index 6901de11fe99a..aeeddcbc9e97c 100644
--- a/platforms/spring-boot/components-starter/camel-barcode-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-barcode-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-barcode-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-base64-starter/pom.xml b/platforms/spring-boot/components-starter/camel-base64-starter/pom.xml
index c6df3c3841600..2ac7abb8bd647 100644
--- a/platforms/spring-boot/components-starter/camel-base64-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-base64-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-base64-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-bean-validator-starter/pom.xml b/platforms/spring-boot/components-starter/camel-bean-validator-starter/pom.xml
index ef0e0c562f8e2..42d7279e2d9a2 100644
--- a/platforms/spring-boot/components-starter/camel-bean-validator-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-bean-validator-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-bean-validator-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-beanio-starter/pom.xml b/platforms/spring-boot/components-starter/camel-beanio-starter/pom.xml
index fe98509ee545e..53909b03eac47 100644
--- a/platforms/spring-boot/components-starter/camel-beanio-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-beanio-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-beanio-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-beanstalk-starter/pom.xml b/platforms/spring-boot/components-starter/camel-beanstalk-starter/pom.xml
index 3d2caccd4b998..47655cfd57d3c 100644
--- a/platforms/spring-boot/components-starter/camel-beanstalk-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-beanstalk-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-beanstalk-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-bindy-starter/pom.xml b/platforms/spring-boot/components-starter/camel-bindy-starter/pom.xml
index 35d7597b7cc7e..656c36f3b751b 100644
--- a/platforms/spring-boot/components-starter/camel-bindy-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-bindy-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-bindy-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-bonita-starter/pom.xml b/platforms/spring-boot/components-starter/camel-bonita-starter/pom.xml
index 7d3028cf0206c..10ba7522b32e0 100644
--- a/platforms/spring-boot/components-starter/camel-bonita-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-bonita-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-bonita-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-boon-starter/pom.xml b/platforms/spring-boot/components-starter/camel-boon-starter/pom.xml
index 768b25e1d4384..cdb7af77ef6d6 100644
--- a/platforms/spring-boot/components-starter/camel-boon-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-boon-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-boon-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-box-starter/pom.xml b/platforms/spring-boot/components-starter/camel-box-starter/pom.xml
index a367b2cda6374..7dea78ae50202 100644
--- a/platforms/spring-boot/components-starter/camel-box-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-box-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-box-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-braintree-starter/pom.xml b/platforms/spring-boot/components-starter/camel-braintree-starter/pom.xml
index f38befc06fa79..2dc485819da34 100644
--- a/platforms/spring-boot/components-starter/camel-braintree-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-braintree-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-braintree-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-cache-starter/pom.xml b/platforms/spring-boot/components-starter/camel-cache-starter/pom.xml
index 14f2bf0ddbc3b..7ba7cce52355f 100644
--- a/platforms/spring-boot/components-starter/camel-cache-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-cache-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-cache-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-caffeine-starter/pom.xml b/platforms/spring-boot/components-starter/camel-caffeine-starter/pom.xml
index dd62b2f92830c..510322a534f48 100644
--- a/platforms/spring-boot/components-starter/camel-caffeine-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-caffeine-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-caffeine-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-cassandraql-starter/pom.xml b/platforms/spring-boot/components-starter/camel-cassandraql-starter/pom.xml
index 054e8858d53bf..7ee2b7acb4123 100644
--- a/platforms/spring-boot/components-starter/camel-cassandraql-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-cassandraql-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-cassandraql-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-castor-starter/pom.xml b/platforms/spring-boot/components-starter/camel-castor-starter/pom.xml
index 56ac246017ed9..2712049f35c82 100644
--- a/platforms/spring-boot/components-starter/camel-castor-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-castor-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-castor-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-chronicle-starter/pom.xml b/platforms/spring-boot/components-starter/camel-chronicle-starter/pom.xml
index 0c1745b536fdf..3f33203404f3a 100644
--- a/platforms/spring-boot/components-starter/camel-chronicle-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-chronicle-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-chronicle-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-chunk-starter/pom.xml b/platforms/spring-boot/components-starter/camel-chunk-starter/pom.xml
index 492d3b19428c6..6d82f43ba62ec 100644
--- a/platforms/spring-boot/components-starter/camel-chunk-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-chunk-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-chunk-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-cm-sms-starter/pom.xml b/platforms/spring-boot/components-starter/camel-cm-sms-starter/pom.xml
index 5602c306f861d..7a564c20e99a4 100644
--- a/platforms/spring-boot/components-starter/camel-cm-sms-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-cm-sms-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-cm-sms-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-cmis-starter/pom.xml b/platforms/spring-boot/components-starter/camel-cmis-starter/pom.xml
index f07ae56bafee4..bf947c1f9dcd2 100644
--- a/platforms/spring-boot/components-starter/camel-cmis-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-cmis-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-cmis-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-coap-starter/pom.xml b/platforms/spring-boot/components-starter/camel-coap-starter/pom.xml
index d465c5f2e21ac..9b3af66302a42 100644
--- a/platforms/spring-boot/components-starter/camel-coap-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-coap-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-coap-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-cometd-starter/pom.xml b/platforms/spring-boot/components-starter/camel-cometd-starter/pom.xml
index 0b423fb2afb07..5d1ab27e44d37 100644
--- a/platforms/spring-boot/components-starter/camel-cometd-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-cometd-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-cometd-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-consul-starter/pom.xml b/platforms/spring-boot/components-starter/camel-consul-starter/pom.xml
index ed6a49e4efc01..29e4c78c59a8a 100644
--- a/platforms/spring-boot/components-starter/camel-consul-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-consul-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-consul-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-context-starter/pom.xml b/platforms/spring-boot/components-starter/camel-context-starter/pom.xml
index 2fa821a5aef46..6b0752aa42d0e 100644
--- a/platforms/spring-boot/components-starter/camel-context-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-context-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-context-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-corda-starter/pom.xml b/platforms/spring-boot/components-starter/camel-corda-starter/pom.xml
index e1636b21fba52..e2dec9a6c7359 100644
--- a/platforms/spring-boot/components-starter/camel-corda-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-corda-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-corda-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-core-starter/pom.xml b/platforms/spring-boot/components-starter/camel-core-starter/pom.xml
index 9f9672ee8427e..d21305c493e0a 100644
--- a/platforms/spring-boot/components-starter/camel-core-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-core-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-core-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-couchbase-starter/pom.xml b/platforms/spring-boot/components-starter/camel-couchbase-starter/pom.xml
index d0cb914f20d44..24d1c39bf3ac0 100644
--- a/platforms/spring-boot/components-starter/camel-couchbase-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-couchbase-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-couchbase-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-couchdb-starter/pom.xml b/platforms/spring-boot/components-starter/camel-couchdb-starter/pom.xml
index 9c8e220377d91..b608ac41dacbc 100644
--- a/platforms/spring-boot/components-starter/camel-couchdb-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-couchdb-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-couchdb-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-crypto-cms-starter/pom.xml b/platforms/spring-boot/components-starter/camel-crypto-cms-starter/pom.xml
index 7fc154ac1c28a..8d3f166fd4b5d 100644
--- a/platforms/spring-boot/components-starter/camel-crypto-cms-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-crypto-cms-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-crypto-cms-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-crypto-starter/pom.xml b/platforms/spring-boot/components-starter/camel-crypto-starter/pom.xml
index 5fdb0979e396c..b8ef9ab57fda6 100644
--- a/platforms/spring-boot/components-starter/camel-crypto-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-crypto-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-crypto-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-csv-starter/pom.xml b/platforms/spring-boot/components-starter/camel-csv-starter/pom.xml
index 62ff7a08c7a40..49856b9229f56 100644
--- a/platforms/spring-boot/components-starter/camel-csv-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-csv-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-csv-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-cxf-starter/pom.xml b/platforms/spring-boot/components-starter/camel-cxf-starter/pom.xml
index 9451233860646..eee3942cb2a81 100644
--- a/platforms/spring-boot/components-starter/camel-cxf-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-cxf-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-cxf-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-cxf-transport-starter/pom.xml b/platforms/spring-boot/components-starter/camel-cxf-transport-starter/pom.xml
index 32f2b80a2a320..ec28e9f54b637 100644
--- a/platforms/spring-boot/components-starter/camel-cxf-transport-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-cxf-transport-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-cxf-transport-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-digitalocean-starter/pom.xml b/platforms/spring-boot/components-starter/camel-digitalocean-starter/pom.xml
index 997c71434b390..8c09f34d5f9f2 100644
--- a/platforms/spring-boot/components-starter/camel-digitalocean-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-digitalocean-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-digitalocean-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-disruptor-starter/pom.xml b/platforms/spring-boot/components-starter/camel-disruptor-starter/pom.xml
index 710f152f6feee..d8aae09c58c0e 100644
--- a/platforms/spring-boot/components-starter/camel-disruptor-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-disruptor-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-disruptor-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-dns-starter/pom.xml b/platforms/spring-boot/components-starter/camel-dns-starter/pom.xml
index 48af4ffb218b0..0cad7ed170e21 100644
--- a/platforms/spring-boot/components-starter/camel-dns-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-dns-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-dns-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-docker-starter/pom.xml b/platforms/spring-boot/components-starter/camel-docker-starter/pom.xml
index 6ae3579bb3d18..e1a8a7bf33d4f 100644
--- a/platforms/spring-boot/components-starter/camel-docker-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-docker-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-docker-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-dozer-starter/pom.xml b/platforms/spring-boot/components-starter/camel-dozer-starter/pom.xml
index a7300b0c7e83d..eaefbe47be7c1 100644
--- a/platforms/spring-boot/components-starter/camel-dozer-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-dozer-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-dozer-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-drill-starter/pom.xml b/platforms/spring-boot/components-starter/camel-drill-starter/pom.xml
index fd53402030df9..92a8efc8051b1 100644
--- a/platforms/spring-boot/components-starter/camel-drill-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-drill-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-drill-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-dropbox-starter/pom.xml b/platforms/spring-boot/components-starter/camel-dropbox-starter/pom.xml
index ff1a5964fadc3..c74a78fbc90f7 100644
--- a/platforms/spring-boot/components-starter/camel-dropbox-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-dropbox-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-dropbox-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-eclipse-starter/pom.xml b/platforms/spring-boot/components-starter/camel-eclipse-starter/pom.xml
index 34313ce75e604..45cfbe1572066 100644
--- a/platforms/spring-boot/components-starter/camel-eclipse-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-eclipse-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-eclipse-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-ehcache-starter/pom.xml b/platforms/spring-boot/components-starter/camel-ehcache-starter/pom.xml
index aa4862bd62c37..a624900f8c4cf 100644
--- a/platforms/spring-boot/components-starter/camel-ehcache-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-ehcache-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-ehcache-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-elasticsearch-rest-starter/pom.xml b/platforms/spring-boot/components-starter/camel-elasticsearch-rest-starter/pom.xml
index 89f82902a1818..2fd435491da8b 100644
--- a/platforms/spring-boot/components-starter/camel-elasticsearch-rest-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-elasticsearch-rest-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-elasticsearch-rest-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-elasticsearch-starter/pom.xml b/platforms/spring-boot/components-starter/camel-elasticsearch-starter/pom.xml
index ee3d418d238ac..fe1ecf09feb51 100644
--- a/platforms/spring-boot/components-starter/camel-elasticsearch-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-elasticsearch-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-elasticsearch-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-elasticsearch5-starter/pom.xml b/platforms/spring-boot/components-starter/camel-elasticsearch5-starter/pom.xml
index b1d6c8061c1d5..72d4a307e8d34 100644
--- a/platforms/spring-boot/components-starter/camel-elasticsearch5-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-elasticsearch5-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-elasticsearch5-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-elsql-starter/pom.xml b/platforms/spring-boot/components-starter/camel-elsql-starter/pom.xml
index 939ce1939738f..4440c94fff999 100644
--- a/platforms/spring-boot/components-starter/camel-elsql-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-elsql-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-elsql-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-etcd-starter/pom.xml b/platforms/spring-boot/components-starter/camel-etcd-starter/pom.xml
index 6928ca06bca9e..fa663d36a061b 100644
--- a/platforms/spring-boot/components-starter/camel-etcd-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-etcd-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-etcd-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-exec-starter/pom.xml b/platforms/spring-boot/components-starter/camel-exec-starter/pom.xml
index 815c2919ca53a..545b313c07665 100644
--- a/platforms/spring-boot/components-starter/camel-exec-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-exec-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-exec-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-facebook-starter/pom.xml b/platforms/spring-boot/components-starter/camel-facebook-starter/pom.xml
index bd7ab4c31471b..540758146ee0e 100644
--- a/platforms/spring-boot/components-starter/camel-facebook-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-facebook-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-facebook-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-fastjson-starter/pom.xml b/platforms/spring-boot/components-starter/camel-fastjson-starter/pom.xml
index eb13c5deaa70d..271983ea4ac2a 100644
--- a/platforms/spring-boot/components-starter/camel-fastjson-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-fastjson-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-fastjson-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-fhir-starter/pom.xml b/platforms/spring-boot/components-starter/camel-fhir-starter/pom.xml
index 644844e9ea01d..0897ba25ea42b 100644
--- a/platforms/spring-boot/components-starter/camel-fhir-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-fhir-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-fhir-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-flatpack-starter/pom.xml b/platforms/spring-boot/components-starter/camel-flatpack-starter/pom.xml
index b2beda0b4fe1c..0fb2c45fad7af 100644
--- a/platforms/spring-boot/components-starter/camel-flatpack-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-flatpack-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-flatpack-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-flink-starter/pom.xml b/platforms/spring-boot/components-starter/camel-flink-starter/pom.xml
index 4fda16c9dcd37..c5de99834ef33 100644
--- a/platforms/spring-boot/components-starter/camel-flink-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-flink-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-flink-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-fop-starter/pom.xml b/platforms/spring-boot/components-starter/camel-fop-starter/pom.xml
index 4cba1529b078e..f1bf263a639a6 100644
--- a/platforms/spring-boot/components-starter/camel-fop-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-fop-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-fop-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-freemarker-starter/pom.xml b/platforms/spring-boot/components-starter/camel-freemarker-starter/pom.xml
index 9b37bf415fff8..9b3ea66088060 100644
--- a/platforms/spring-boot/components-starter/camel-freemarker-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-freemarker-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-freemarker-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-ftp-starter/pom.xml b/platforms/spring-boot/components-starter/camel-ftp-starter/pom.xml
index c75a426a8acbf..8199ef3f79458 100644
--- a/platforms/spring-boot/components-starter/camel-ftp-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-ftp-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-ftp-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-ganglia-starter/pom.xml b/platforms/spring-boot/components-starter/camel-ganglia-starter/pom.xml
index 81ab440f183b1..e979b380c4957 100644
--- a/platforms/spring-boot/components-starter/camel-ganglia-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-ganglia-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-ganglia-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-geocoder-starter/pom.xml b/platforms/spring-boot/components-starter/camel-geocoder-starter/pom.xml
index 8683ba84713ac..a4248f2449999 100644
--- a/platforms/spring-boot/components-starter/camel-geocoder-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-geocoder-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-geocoder-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-git-starter/pom.xml b/platforms/spring-boot/components-starter/camel-git-starter/pom.xml
index 5067e6ac9d264..9eb6dbbf00234 100644
--- a/platforms/spring-boot/components-starter/camel-git-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-git-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-git-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-github-starter/pom.xml b/platforms/spring-boot/components-starter/camel-github-starter/pom.xml
index ed87476191e24..33760a1838b54 100644
--- a/platforms/spring-boot/components-starter/camel-github-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-github-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-github-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-google-bigquery-starter/pom.xml b/platforms/spring-boot/components-starter/camel-google-bigquery-starter/pom.xml
index 64b89baca23e9..c9504f6da2c1d 100644
--- a/platforms/spring-boot/components-starter/camel-google-bigquery-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-google-bigquery-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-google-bigquery-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-google-calendar-starter/pom.xml b/platforms/spring-boot/components-starter/camel-google-calendar-starter/pom.xml
index e608a0cde301d..0d11ce6831adb 100644
--- a/platforms/spring-boot/components-starter/camel-google-calendar-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-google-calendar-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-google-calendar-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-google-drive-starter/pom.xml b/platforms/spring-boot/components-starter/camel-google-drive-starter/pom.xml
index 554549680d782..fc832c2cc1231 100644
--- a/platforms/spring-boot/components-starter/camel-google-drive-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-google-drive-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-google-drive-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-google-mail-starter/pom.xml b/platforms/spring-boot/components-starter/camel-google-mail-starter/pom.xml
index 8e87b2d88bd47..fd1ec73859f1f 100644
--- a/platforms/spring-boot/components-starter/camel-google-mail-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-google-mail-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-google-mail-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-google-pubsub-starter/pom.xml b/platforms/spring-boot/components-starter/camel-google-pubsub-starter/pom.xml
index 3927495c087cb..9ade8dfe26551 100644
--- a/platforms/spring-boot/components-starter/camel-google-pubsub-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-google-pubsub-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-google-pubsub-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-google-sheets-starter/pom.xml b/platforms/spring-boot/components-starter/camel-google-sheets-starter/pom.xml
index be435029d5db1..1dac0c2f0d4e4 100644
--- a/platforms/spring-boot/components-starter/camel-google-sheets-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-google-sheets-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-google-sheets-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-gora-starter/pom.xml b/platforms/spring-boot/components-starter/camel-gora-starter/pom.xml
index 5c4aac7c92dbc..b0089cadeebff 100644
--- a/platforms/spring-boot/components-starter/camel-gora-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-gora-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-gora-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-grape-starter/pom.xml b/platforms/spring-boot/components-starter/camel-grape-starter/pom.xml
index af80679a1601a..19b41c6d66e46 100644
--- a/platforms/spring-boot/components-starter/camel-grape-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-grape-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-grape-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-groovy-starter/pom.xml b/platforms/spring-boot/components-starter/camel-groovy-starter/pom.xml
index bb82c140d9298..049fa11b8d415 100644
--- a/platforms/spring-boot/components-starter/camel-groovy-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-groovy-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-groovy-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-grpc-starter/pom.xml b/platforms/spring-boot/components-starter/camel-grpc-starter/pom.xml
index 39e1b5b91f14c..4cee8fe1299cc 100644
--- a/platforms/spring-boot/components-starter/camel-grpc-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-grpc-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-grpc-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-gson-starter/pom.xml b/platforms/spring-boot/components-starter/camel-gson-starter/pom.xml
index 4ebba6dc04f0f..287288854dca6 100644
--- a/platforms/spring-boot/components-starter/camel-gson-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-gson-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-gson-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-guava-eventbus-starter/pom.xml b/platforms/spring-boot/components-starter/camel-guava-eventbus-starter/pom.xml
index 4c373df9b2980..d3647b84c47ca 100644
--- a/platforms/spring-boot/components-starter/camel-guava-eventbus-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-guava-eventbus-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-guava-eventbus-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-guice-starter/pom.xml b/platforms/spring-boot/components-starter/camel-guice-starter/pom.xml
index ddcd3c64b7672..3fc36d2adb7ee 100644
--- a/platforms/spring-boot/components-starter/camel-guice-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-guice-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-guice-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-hawtdb-starter/pom.xml b/platforms/spring-boot/components-starter/camel-hawtdb-starter/pom.xml
index cd937cc88506f..5fc1e620511df 100644
--- a/platforms/spring-boot/components-starter/camel-hawtdb-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-hawtdb-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-hawtdb-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-hazelcast-starter/pom.xml b/platforms/spring-boot/components-starter/camel-hazelcast-starter/pom.xml
index e41e675cc6788..73521133ea2b5 100644
--- a/platforms/spring-boot/components-starter/camel-hazelcast-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-hazelcast-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-hazelcast-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-hbase-starter/pom.xml b/platforms/spring-boot/components-starter/camel-hbase-starter/pom.xml
index 1f020353aa3fb..008b9b2d63c04 100644
--- a/platforms/spring-boot/components-starter/camel-hbase-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-hbase-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-hbase-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-hdfs-starter/pom.xml b/platforms/spring-boot/components-starter/camel-hdfs-starter/pom.xml
index b78a713f35aef..4816613916bfe 100644
--- a/platforms/spring-boot/components-starter/camel-hdfs-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-hdfs-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-hdfs-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-hdfs2-starter/pom.xml b/platforms/spring-boot/components-starter/camel-hdfs2-starter/pom.xml
index b35bc0d93fc86..9d265e34fdc20 100644
--- a/platforms/spring-boot/components-starter/camel-hdfs2-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-hdfs2-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-hdfs2-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-headersmap-starter/pom.xml b/platforms/spring-boot/components-starter/camel-headersmap-starter/pom.xml
index 48d6543b3c40e..7b5e13bcdff5a 100644
--- a/platforms/spring-boot/components-starter/camel-headersmap-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-headersmap-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-headersmap-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-hessian-starter/pom.xml b/platforms/spring-boot/components-starter/camel-hessian-starter/pom.xml
index 58944849893d8..9c5aa1de015d5 100644
--- a/platforms/spring-boot/components-starter/camel-hessian-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-hessian-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-hessian-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-hipchat-starter/pom.xml b/platforms/spring-boot/components-starter/camel-hipchat-starter/pom.xml
index 719c3a1aee0c2..701488704a0d8 100644
--- a/platforms/spring-boot/components-starter/camel-hipchat-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-hipchat-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-hipchat-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-hl7-starter/pom.xml b/platforms/spring-boot/components-starter/camel-hl7-starter/pom.xml
index 4adfbc3dcb211..ac9b3bbdc427c 100644
--- a/platforms/spring-boot/components-starter/camel-hl7-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-hl7-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-hl7-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-http-common-starter/pom.xml b/platforms/spring-boot/components-starter/camel-http-common-starter/pom.xml
index c30787632ef98..04de67e44efa7 100644
--- a/platforms/spring-boot/components-starter/camel-http-common-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-http-common-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-http-common-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-http-starter/pom.xml b/platforms/spring-boot/components-starter/camel-http-starter/pom.xml
index 3a3bd8c9e3e87..fc1d92488964f 100644
--- a/platforms/spring-boot/components-starter/camel-http-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-http-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-http-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-http4-starter/pom.xml b/platforms/spring-boot/components-starter/camel-http4-starter/pom.xml
index e985769fa2662..9d23e7e900a33 100644
--- a/platforms/spring-boot/components-starter/camel-http4-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-http4-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-http4-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-hystrix-starter/pom.xml b/platforms/spring-boot/components-starter/camel-hystrix-starter/pom.xml
index 0eab75053de7d..4218909653bcd 100644
--- a/platforms/spring-boot/components-starter/camel-hystrix-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-hystrix-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-hystrix-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-ical-starter/pom.xml b/platforms/spring-boot/components-starter/camel-ical-starter/pom.xml
index 65a67a8ed3365..bc71a65c3b08d 100644
--- a/platforms/spring-boot/components-starter/camel-ical-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-ical-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-ical-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-iec60870-starter/pom.xml b/platforms/spring-boot/components-starter/camel-iec60870-starter/pom.xml
index 4af4312d7bae1..34544084ac939 100644
--- a/platforms/spring-boot/components-starter/camel-iec60870-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-iec60870-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-iec60870-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-ignite-starter/pom.xml b/platforms/spring-boot/components-starter/camel-ignite-starter/pom.xml
index 475795bf09c44..721b98a71d111 100644
--- a/platforms/spring-boot/components-starter/camel-ignite-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-ignite-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-ignite-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-infinispan-starter/pom.xml b/platforms/spring-boot/components-starter/camel-infinispan-starter/pom.xml
index f039a66c0b44d..d3b5dfab11630 100644
--- a/platforms/spring-boot/components-starter/camel-infinispan-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-infinispan-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-infinispan-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-influxdb-starter/pom.xml b/platforms/spring-boot/components-starter/camel-influxdb-starter/pom.xml
index f84c74de1dd08..2ef0520d42bd3 100644
--- a/platforms/spring-boot/components-starter/camel-influxdb-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-influxdb-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-influxdb-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-ipfs-starter/pom.xml b/platforms/spring-boot/components-starter/camel-ipfs-starter/pom.xml
index 3e5b17be79b10..3f46b81b25d48 100644
--- a/platforms/spring-boot/components-starter/camel-ipfs-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-ipfs-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-ipfs-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-irc-starter/pom.xml b/platforms/spring-boot/components-starter/camel-irc-starter/pom.xml
index 69be4e18fe075..8f3b03b9ca3ad 100644
--- a/platforms/spring-boot/components-starter/camel-irc-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-irc-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-irc-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-ironmq-starter/pom.xml b/platforms/spring-boot/components-starter/camel-ironmq-starter/pom.xml
index b5384eac6b7e7..f9b7a3b2f95fd 100644
--- a/platforms/spring-boot/components-starter/camel-ironmq-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-ironmq-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-ironmq-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-jackson-starter/pom.xml b/platforms/spring-boot/components-starter/camel-jackson-starter/pom.xml
index ca91e4fca2882..ac6dc75fd8653 100644
--- a/platforms/spring-boot/components-starter/camel-jackson-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-jackson-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-jackson-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-jacksonxml-starter/pom.xml b/platforms/spring-boot/components-starter/camel-jacksonxml-starter/pom.xml
index dd9eabd934a01..179134fd7f710 100644
--- a/platforms/spring-boot/components-starter/camel-jacksonxml-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-jacksonxml-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-jacksonxml-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-jasypt-starter/pom.xml b/platforms/spring-boot/components-starter/camel-jasypt-starter/pom.xml
index 8e7a1db5425ad..b8ebd3ef85cbd 100644
--- a/platforms/spring-boot/components-starter/camel-jasypt-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-jasypt-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-jasypt-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-javaspace-starter/pom.xml b/platforms/spring-boot/components-starter/camel-javaspace-starter/pom.xml
index 35bf4b32d9e8d..972cce29d6a49 100644
--- a/platforms/spring-boot/components-starter/camel-javaspace-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-javaspace-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-javaspace-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-jaxb-starter/pom.xml b/platforms/spring-boot/components-starter/camel-jaxb-starter/pom.xml
index ed9dd13d995e2..14c7519fa8354 100644
--- a/platforms/spring-boot/components-starter/camel-jaxb-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-jaxb-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-jaxb-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-jbpm-starter/pom.xml b/platforms/spring-boot/components-starter/camel-jbpm-starter/pom.xml
index b5196719eb135..502c7dbc48e77 100644
--- a/platforms/spring-boot/components-starter/camel-jbpm-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-jbpm-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-jbpm-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-jcache-starter/pom.xml b/platforms/spring-boot/components-starter/camel-jcache-starter/pom.xml
index 6ef8ab95cb1a4..664d94b968817 100644
--- a/platforms/spring-boot/components-starter/camel-jcache-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-jcache-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-jcache-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-jclouds-starter/pom.xml b/platforms/spring-boot/components-starter/camel-jclouds-starter/pom.xml
index a979f7d933cfa..c532679bc1ffc 100644
--- a/platforms/spring-boot/components-starter/camel-jclouds-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-jclouds-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-jclouds-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-jcr-starter/pom.xml b/platforms/spring-boot/components-starter/camel-jcr-starter/pom.xml
index 20ca1e71c9a31..6626c1f9d312a 100644
--- a/platforms/spring-boot/components-starter/camel-jcr-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-jcr-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-jcr-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-jdbc-starter/pom.xml b/platforms/spring-boot/components-starter/camel-jdbc-starter/pom.xml
index d4bff3803a4ad..3057d3b61c107 100644
--- a/platforms/spring-boot/components-starter/camel-jdbc-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-jdbc-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-jdbc-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-jetty-common-starter/pom.xml b/platforms/spring-boot/components-starter/camel-jetty-common-starter/pom.xml
index bcf9b9fbaad23..94addd7075c44 100644
--- a/platforms/spring-boot/components-starter/camel-jetty-common-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-jetty-common-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-jetty-common-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-jetty-starter/pom.xml b/platforms/spring-boot/components-starter/camel-jetty-starter/pom.xml
index 891bb7aa05629..8638e2eeb8c46 100644
--- a/platforms/spring-boot/components-starter/camel-jetty-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-jetty-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-jetty-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-jetty9-starter/pom.xml b/platforms/spring-boot/components-starter/camel-jetty9-starter/pom.xml
index 9502067cd8619..9905d4c3ceb91 100644
--- a/platforms/spring-boot/components-starter/camel-jetty9-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-jetty9-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-jetty9-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-jgroups-starter/pom.xml b/platforms/spring-boot/components-starter/camel-jgroups-starter/pom.xml
index efbca3445ee18..729573c6797f2 100644
--- a/platforms/spring-boot/components-starter/camel-jgroups-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-jgroups-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-jgroups-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-jibx-starter/pom.xml b/platforms/spring-boot/components-starter/camel-jibx-starter/pom.xml
index a0b2a33d4f921..7aa03ef5e753d 100644
--- a/platforms/spring-boot/components-starter/camel-jibx-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-jibx-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-jibx-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-jing-starter/pom.xml b/platforms/spring-boot/components-starter/camel-jing-starter/pom.xml
index e6c29466cfd3e..81b28b9f4a331 100644
--- a/platforms/spring-boot/components-starter/camel-jing-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-jing-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-jing-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-jira-starter/pom.xml b/platforms/spring-boot/components-starter/camel-jira-starter/pom.xml
index 181113750cf4b..a5c867e64dcee 100644
--- a/platforms/spring-boot/components-starter/camel-jira-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-jira-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-jira-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-jms-starter/pom.xml b/platforms/spring-boot/components-starter/camel-jms-starter/pom.xml
index a624d555a4508..ea246c10d891f 100644
--- a/platforms/spring-boot/components-starter/camel-jms-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-jms-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-jms-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-jmx-starter/pom.xml b/platforms/spring-boot/components-starter/camel-jmx-starter/pom.xml
index 4a81efe59c0c3..cf6946d8148ba 100644
--- a/platforms/spring-boot/components-starter/camel-jmx-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-jmx-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-jmx-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-johnzon-starter/pom.xml b/platforms/spring-boot/components-starter/camel-johnzon-starter/pom.xml
index 4e7fdbff03284..6bb61b1de3f45 100644
--- a/platforms/spring-boot/components-starter/camel-johnzon-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-johnzon-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-johnzon-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-jolt-starter/pom.xml b/platforms/spring-boot/components-starter/camel-jolt-starter/pom.xml
index 905d3d90dfeeb..4f82aa5c8eb2f 100644
--- a/platforms/spring-boot/components-starter/camel-jolt-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-jolt-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-jolt-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-josql-starter/pom.xml b/platforms/spring-boot/components-starter/camel-josql-starter/pom.xml
index ecf5ca65a7ed7..6e2f8ba613145 100644
--- a/platforms/spring-boot/components-starter/camel-josql-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-josql-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-josql-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-jpa-starter/pom.xml b/platforms/spring-boot/components-starter/camel-jpa-starter/pom.xml
index 89790be95818b..30322dc281c8c 100644
--- a/platforms/spring-boot/components-starter/camel-jpa-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-jpa-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-jpa-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-jsch-starter/pom.xml b/platforms/spring-boot/components-starter/camel-jsch-starter/pom.xml
index f54acdacc0520..8fff391dad488 100644
--- a/platforms/spring-boot/components-starter/camel-jsch-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-jsch-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-jsch-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-json-validator-starter/pom.xml b/platforms/spring-boot/components-starter/camel-json-validator-starter/pom.xml
index 4d74e257ba63c..ea3a1d0aca473 100644
--- a/platforms/spring-boot/components-starter/camel-json-validator-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-json-validator-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-json-validator-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-jsonpath-starter/pom.xml b/platforms/spring-boot/components-starter/camel-jsonpath-starter/pom.xml
index 610ef9c12713b..c6834aa8431f5 100644
--- a/platforms/spring-boot/components-starter/camel-jsonpath-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-jsonpath-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-jsonpath-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-jt400-starter/pom.xml b/platforms/spring-boot/components-starter/camel-jt400-starter/pom.xml
index db47c6e467331..b70370d1584f0 100644
--- a/platforms/spring-boot/components-starter/camel-jt400-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-jt400-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-jt400-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-juel-starter/pom.xml b/platforms/spring-boot/components-starter/camel-juel-starter/pom.xml
index e0342c983949a..86b9aeaf02896 100644
--- a/platforms/spring-boot/components-starter/camel-juel-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-juel-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-juel-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-jxpath-starter/pom.xml b/platforms/spring-boot/components-starter/camel-jxpath-starter/pom.xml
index f02bc04d6805d..7922c9341cb05 100644
--- a/platforms/spring-boot/components-starter/camel-jxpath-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-jxpath-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-jxpath-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-kafka-starter/pom.xml b/platforms/spring-boot/components-starter/camel-kafka-starter/pom.xml
index dcbc8b165c63b..b1e58d7f7029d 100644
--- a/platforms/spring-boot/components-starter/camel-kafka-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-kafka-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-kafka-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-kestrel-starter/pom.xml b/platforms/spring-boot/components-starter/camel-kestrel-starter/pom.xml
index 4786e49be92b6..1318c5e9d7178 100644
--- a/platforms/spring-boot/components-starter/camel-kestrel-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-kestrel-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-kestrel-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-krati-starter/pom.xml b/platforms/spring-boot/components-starter/camel-krati-starter/pom.xml
index f2b9b5d49eb64..b9b9b5c5a699d 100644
--- a/platforms/spring-boot/components-starter/camel-krati-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-krati-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-krati-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-kubernetes-starter/pom.xml b/platforms/spring-boot/components-starter/camel-kubernetes-starter/pom.xml
index cd04602c31ce4..76d8632c690c5 100644
--- a/platforms/spring-boot/components-starter/camel-kubernetes-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-kubernetes-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-kubernetes-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-kura-starter/pom.xml b/platforms/spring-boot/components-starter/camel-kura-starter/pom.xml
index 4d425472b5fb7..f4177f91a8d66 100644
--- a/platforms/spring-boot/components-starter/camel-kura-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-kura-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-kura-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-ldap-starter/pom.xml b/platforms/spring-boot/components-starter/camel-ldap-starter/pom.xml
index 664d0a3c3e7c5..56e682f1e9f01 100644
--- a/platforms/spring-boot/components-starter/camel-ldap-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-ldap-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-ldap-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-ldif-starter/pom.xml b/platforms/spring-boot/components-starter/camel-ldif-starter/pom.xml
index 1834f445e7715..8fc2a2ff983ba 100644
--- a/platforms/spring-boot/components-starter/camel-ldif-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-ldif-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-ldif-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-leveldb-starter/pom.xml b/platforms/spring-boot/components-starter/camel-leveldb-starter/pom.xml
index 4c8c7f0c91734..a239d2d77d985 100644
--- a/platforms/spring-boot/components-starter/camel-leveldb-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-leveldb-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-leveldb-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-linkedin-starter/pom.xml b/platforms/spring-boot/components-starter/camel-linkedin-starter/pom.xml
index c201d1db53299..5c255bb0158cb 100644
--- a/platforms/spring-boot/components-starter/camel-linkedin-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-linkedin-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-linkedin-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-lra-starter/pom.xml b/platforms/spring-boot/components-starter/camel-lra-starter/pom.xml
index e51fc4f264cf2..d59b58107a4bd 100644
--- a/platforms/spring-boot/components-starter/camel-lra-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-lra-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-lra-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-lucene-starter/pom.xml b/platforms/spring-boot/components-starter/camel-lucene-starter/pom.xml
index 7dfe510ff2052..78a2abec2c3ed 100644
--- a/platforms/spring-boot/components-starter/camel-lucene-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-lucene-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-lucene-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-lumberjack-starter/pom.xml b/platforms/spring-boot/components-starter/camel-lumberjack-starter/pom.xml
index 168416cc1c5e6..3e697da489db2 100644
--- a/platforms/spring-boot/components-starter/camel-lumberjack-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-lumberjack-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-lumberjack-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-lzf-starter/pom.xml b/platforms/spring-boot/components-starter/camel-lzf-starter/pom.xml
index f7286c43e9563..02e026039275d 100644
--- a/platforms/spring-boot/components-starter/camel-lzf-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-lzf-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-lzf-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-mail-starter/pom.xml b/platforms/spring-boot/components-starter/camel-mail-starter/pom.xml
index fafedd88b5299..6dfc8a4e70548 100644
--- a/platforms/spring-boot/components-starter/camel-mail-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-mail-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-mail-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-master-starter/pom.xml b/platforms/spring-boot/components-starter/camel-master-starter/pom.xml
index 22803a5af788a..ff6a53c1bb1e7 100644
--- a/platforms/spring-boot/components-starter/camel-master-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-master-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-master-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-metrics-starter/pom.xml b/platforms/spring-boot/components-starter/camel-metrics-starter/pom.xml
index f9510d3d12724..f95c3fbf9dd16 100644
--- a/platforms/spring-boot/components-starter/camel-metrics-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-metrics-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-metrics-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-micrometer-starter/pom.xml b/platforms/spring-boot/components-starter/camel-micrometer-starter/pom.xml
index 38d5a5a608f96..b2d31aaf62575 100644
--- a/platforms/spring-boot/components-starter/camel-micrometer-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-micrometer-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-micrometer-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-milo-starter/pom.xml b/platforms/spring-boot/components-starter/camel-milo-starter/pom.xml
index 39aedc581ae2e..d8b229d585aef 100644
--- a/platforms/spring-boot/components-starter/camel-milo-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-milo-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-milo-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-mina2-starter/pom.xml b/platforms/spring-boot/components-starter/camel-mina2-starter/pom.xml
index 0b1b16a5f2dc4..629ebad372f7c 100644
--- a/platforms/spring-boot/components-starter/camel-mina2-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-mina2-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-mina2-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-mllp-starter/pom.xml b/platforms/spring-boot/components-starter/camel-mllp-starter/pom.xml
index c4c4bca794a65..33f91455916b5 100644
--- a/platforms/spring-boot/components-starter/camel-mllp-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-mllp-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-mllp-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-mongodb-gridfs-starter/pom.xml b/platforms/spring-boot/components-starter/camel-mongodb-gridfs-starter/pom.xml
index 3222e284b2971..8be1acc60a2ee 100644
--- a/platforms/spring-boot/components-starter/camel-mongodb-gridfs-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-mongodb-gridfs-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-mongodb-gridfs-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-mongodb-starter/pom.xml b/platforms/spring-boot/components-starter/camel-mongodb-starter/pom.xml
index 2712a986e73b5..0f8a20eedc3ca 100644
--- a/platforms/spring-boot/components-starter/camel-mongodb-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-mongodb-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-mongodb-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-mongodb3-starter/pom.xml b/platforms/spring-boot/components-starter/camel-mongodb3-starter/pom.xml
index c9f98b6ddcd05..00da887918be5 100644
--- a/platforms/spring-boot/components-starter/camel-mongodb3-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-mongodb3-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-mongodb3-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-mqtt-starter/pom.xml b/platforms/spring-boot/components-starter/camel-mqtt-starter/pom.xml
index 9504d26e5bd8f..81c7f57f98f35 100644
--- a/platforms/spring-boot/components-starter/camel-mqtt-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-mqtt-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-mqtt-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-msv-starter/pom.xml b/platforms/spring-boot/components-starter/camel-msv-starter/pom.xml
index db0f633924896..b2257ac85f70d 100644
--- a/platforms/spring-boot/components-starter/camel-msv-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-msv-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-msv-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-mustache-starter/pom.xml b/platforms/spring-boot/components-starter/camel-mustache-starter/pom.xml
index 713db6a6f2b1f..a7e04e58c5490 100644
--- a/platforms/spring-boot/components-starter/camel-mustache-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-mustache-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-mustache-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-mvel-starter/pom.xml b/platforms/spring-boot/components-starter/camel-mvel-starter/pom.xml
index 1057f951d060d..11b8968b4fd8c 100644
--- a/platforms/spring-boot/components-starter/camel-mvel-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-mvel-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-mvel-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-mybatis-starter/pom.xml b/platforms/spring-boot/components-starter/camel-mybatis-starter/pom.xml
index 75141d1476a00..4e4d099a4ad5c 100644
--- a/platforms/spring-boot/components-starter/camel-mybatis-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-mybatis-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-mybatis-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-nagios-starter/pom.xml b/platforms/spring-boot/components-starter/camel-nagios-starter/pom.xml
index 22ae60d4e1919..ea9307d712f95 100644
--- a/platforms/spring-boot/components-starter/camel-nagios-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-nagios-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-nagios-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-nats-starter/pom.xml b/platforms/spring-boot/components-starter/camel-nats-starter/pom.xml
index 91417d3452ff8..871ee7781c98b 100644
--- a/platforms/spring-boot/components-starter/camel-nats-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-nats-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-nats-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-netty-http-starter/pom.xml b/platforms/spring-boot/components-starter/camel-netty-http-starter/pom.xml
index 536051a85f838..ddda555b1cd4c 100644
--- a/platforms/spring-boot/components-starter/camel-netty-http-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-netty-http-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-netty-http-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-netty-starter/pom.xml b/platforms/spring-boot/components-starter/camel-netty-starter/pom.xml
index 5c7cf12da0fd4..0b34cf79d9600 100644
--- a/platforms/spring-boot/components-starter/camel-netty-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-netty-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-netty-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-netty4-http-starter/pom.xml b/platforms/spring-boot/components-starter/camel-netty4-http-starter/pom.xml
index 86fc09690b53e..31170288c3288 100644
--- a/platforms/spring-boot/components-starter/camel-netty4-http-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-netty4-http-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-netty4-http-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-netty4-starter/pom.xml b/platforms/spring-boot/components-starter/camel-netty4-starter/pom.xml
index 3db3305815a38..678750cbf9025 100644
--- a/platforms/spring-boot/components-starter/camel-netty4-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-netty4-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-netty4-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-nsq-starter/pom.xml b/platforms/spring-boot/components-starter/camel-nsq-starter/pom.xml
index cfabb893a99db..e5c71bc3316b1 100644
--- a/platforms/spring-boot/components-starter/camel-nsq-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-nsq-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-nsq-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-ognl-starter/pom.xml b/platforms/spring-boot/components-starter/camel-ognl-starter/pom.xml
index d4dc4e58e7052..56f334700db77 100644
--- a/platforms/spring-boot/components-starter/camel-ognl-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-ognl-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-ognl-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-olingo2-starter/pom.xml b/platforms/spring-boot/components-starter/camel-olingo2-starter/pom.xml
index 38d70b4a8fade..87dc7896d5ce9 100644
--- a/platforms/spring-boot/components-starter/camel-olingo2-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-olingo2-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-olingo2-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-olingo4-starter/pom.xml b/platforms/spring-boot/components-starter/camel-olingo4-starter/pom.xml
index f88b8c781cbd2..9dd5306b46bca 100644
--- a/platforms/spring-boot/components-starter/camel-olingo4-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-olingo4-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-olingo4-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-openshift-starter/pom.xml b/platforms/spring-boot/components-starter/camel-openshift-starter/pom.xml
index c69240426a6e3..fe7b36a87773f 100644
--- a/platforms/spring-boot/components-starter/camel-openshift-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-openshift-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-openshift-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-openstack-starter/pom.xml b/platforms/spring-boot/components-starter/camel-openstack-starter/pom.xml
index e9b9d871f0d59..c8d95e6e9754c 100644
--- a/platforms/spring-boot/components-starter/camel-openstack-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-openstack-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-openstack-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-opentracing-starter/pom.xml b/platforms/spring-boot/components-starter/camel-opentracing-starter/pom.xml
index 778f7b92031d7..b74e0925c15a1 100644
--- a/platforms/spring-boot/components-starter/camel-opentracing-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-opentracing-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-opentracing-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-optaplanner-starter/pom.xml b/platforms/spring-boot/components-starter/camel-optaplanner-starter/pom.xml
index cf805b2faf687..db5a78a50fec1 100644
--- a/platforms/spring-boot/components-starter/camel-optaplanner-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-optaplanner-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-optaplanner-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-paho-starter/pom.xml b/platforms/spring-boot/components-starter/camel-paho-starter/pom.xml
index d7037ac1c3ad7..00cb1788bc89e 100644
--- a/platforms/spring-boot/components-starter/camel-paho-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-paho-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-paho-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-pdf-starter/pom.xml b/platforms/spring-boot/components-starter/camel-pdf-starter/pom.xml
index b678b686095ce..cf57fdb7748f3 100644
--- a/platforms/spring-boot/components-starter/camel-pdf-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-pdf-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-pdf-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-pgevent-starter/pom.xml b/platforms/spring-boot/components-starter/camel-pgevent-starter/pom.xml
index 0264460f44432..4ba3aaeb03d8a 100644
--- a/platforms/spring-boot/components-starter/camel-pgevent-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-pgevent-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-pgevent-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-printer-starter/pom.xml b/platforms/spring-boot/components-starter/camel-printer-starter/pom.xml
index f15da11587969..cc980a8865545 100644
--- a/platforms/spring-boot/components-starter/camel-printer-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-printer-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-printer-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-protobuf-starter/pom.xml b/platforms/spring-boot/components-starter/camel-protobuf-starter/pom.xml
index baf0a23956e48..d770036a84946 100644
--- a/platforms/spring-boot/components-starter/camel-protobuf-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-protobuf-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-protobuf-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-pubnub-starter/pom.xml b/platforms/spring-boot/components-starter/camel-pubnub-starter/pom.xml
index 7f9edaaf923c4..eb796b1b945af 100644
--- a/platforms/spring-boot/components-starter/camel-pubnub-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-pubnub-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-pubnub-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-quartz2-starter/pom.xml b/platforms/spring-boot/components-starter/camel-quartz2-starter/pom.xml
index 38c5b4b03a67f..ff5c6ef3968a3 100644
--- a/platforms/spring-boot/components-starter/camel-quartz2-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-quartz2-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-quartz2-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-quickfix-starter/pom.xml b/platforms/spring-boot/components-starter/camel-quickfix-starter/pom.xml
index 0f9698b086aec..c7f196fbbf13d 100644
--- a/platforms/spring-boot/components-starter/camel-quickfix-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-quickfix-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-quickfix-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-rabbitmq-starter/pom.xml b/platforms/spring-boot/components-starter/camel-rabbitmq-starter/pom.xml
index 2d44096390d91..60379206f19ec 100644
--- a/platforms/spring-boot/components-starter/camel-rabbitmq-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-rabbitmq-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-rabbitmq-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-reactive-streams-starter/pom.xml b/platforms/spring-boot/components-starter/camel-reactive-streams-starter/pom.xml
index 7a0e4c6887a4c..533a4102afdb7 100644
--- a/platforms/spring-boot/components-starter/camel-reactive-streams-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-reactive-streams-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-reactive-streams-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-reactor-starter/pom.xml b/platforms/spring-boot/components-starter/camel-reactor-starter/pom.xml
index d7117f11f7ec8..4c941e924346e 100644
--- a/platforms/spring-boot/components-starter/camel-reactor-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-reactor-starter/pom.xml
@@ -20,7 +20,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-reactor-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-rest-swagger-starter/pom.xml b/platforms/spring-boot/components-starter/camel-rest-swagger-starter/pom.xml
index 87e9af631a58a..806c738beb839 100644
--- a/platforms/spring-boot/components-starter/camel-rest-swagger-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-rest-swagger-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-rest-swagger-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-restlet-starter/pom.xml b/platforms/spring-boot/components-starter/camel-restlet-starter/pom.xml
index 57786194f2f68..5bbf2765ada67 100644
--- a/platforms/spring-boot/components-starter/camel-restlet-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-restlet-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-restlet-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-ribbon-starter/pom.xml b/platforms/spring-boot/components-starter/camel-ribbon-starter/pom.xml
index 1ec1f4c2ea8e5..673ec4d66e556 100644
--- a/platforms/spring-boot/components-starter/camel-ribbon-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-ribbon-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-ribbon-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-rmi-starter/pom.xml b/platforms/spring-boot/components-starter/camel-rmi-starter/pom.xml
index 1415dfb8c205c..f452e3875bcfe 100644
--- a/platforms/spring-boot/components-starter/camel-rmi-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-rmi-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-rmi-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-routebox-starter/pom.xml b/platforms/spring-boot/components-starter/camel-routebox-starter/pom.xml
index c1257c38348e8..0235eb962c29d 100644
--- a/platforms/spring-boot/components-starter/camel-routebox-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-routebox-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-routebox-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-rss-starter/pom.xml b/platforms/spring-boot/components-starter/camel-rss-starter/pom.xml
index 5adc7a0fe0012..2074220e63f13 100644
--- a/platforms/spring-boot/components-starter/camel-rss-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-rss-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-rss-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-ruby-starter/pom.xml b/platforms/spring-boot/components-starter/camel-ruby-starter/pom.xml
index 399c1819918ab..bd2870869dee3 100644
--- a/platforms/spring-boot/components-starter/camel-ruby-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-ruby-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-ruby-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-rx-starter/pom.xml b/platforms/spring-boot/components-starter/camel-rx-starter/pom.xml
index b00bcd47cd5db..0c1d791214a14 100644
--- a/platforms/spring-boot/components-starter/camel-rx-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-rx-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-rx-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-rxjava2-starter/pom.xml b/platforms/spring-boot/components-starter/camel-rxjava2-starter/pom.xml
index cdc362cba57a7..b658c6b2dde9b 100644
--- a/platforms/spring-boot/components-starter/camel-rxjava2-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-rxjava2-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-rxjava2-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-salesforce-starter/pom.xml b/platforms/spring-boot/components-starter/camel-salesforce-starter/pom.xml
index 0055290e4448f..1baf243a9d3bc 100644
--- a/platforms/spring-boot/components-starter/camel-salesforce-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-salesforce-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-salesforce-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-sap-netweaver-starter/pom.xml b/platforms/spring-boot/components-starter/camel-sap-netweaver-starter/pom.xml
index 5ad8d8b86159e..da15a4d8484df 100644
--- a/platforms/spring-boot/components-starter/camel-sap-netweaver-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-sap-netweaver-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-sap-netweaver-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-saxon-starter/pom.xml b/platforms/spring-boot/components-starter/camel-saxon-starter/pom.xml
index 0acea0250e4e9..b51745366e6cb 100644
--- a/platforms/spring-boot/components-starter/camel-saxon-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-saxon-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-saxon-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-schematron-starter/pom.xml b/platforms/spring-boot/components-starter/camel-schematron-starter/pom.xml
index 6d82b226dda29..14f7856a113ed 100644
--- a/platforms/spring-boot/components-starter/camel-schematron-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-schematron-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-schematron-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-script-starter/pom.xml b/platforms/spring-boot/components-starter/camel-script-starter/pom.xml
index fa42c28263f9a..456090d9ecc5a 100644
--- a/platforms/spring-boot/components-starter/camel-script-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-script-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-script-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-service-starter/pom.xml b/platforms/spring-boot/components-starter/camel-service-starter/pom.xml
index 9d3f40b99f1fc..cd0cf87c54d8b 100644
--- a/platforms/spring-boot/components-starter/camel-service-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-service-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-service-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-servicenow-starter/pom.xml b/platforms/spring-boot/components-starter/camel-servicenow-starter/pom.xml
index c1fe58aa7d0f5..f4639a67f7828 100644
--- a/platforms/spring-boot/components-starter/camel-servicenow-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-servicenow-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-servicenow-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-servlet-starter/pom.xml b/platforms/spring-boot/components-starter/camel-servlet-starter/pom.xml
index 382d8889dffce..b4380822f3175 100644
--- a/platforms/spring-boot/components-starter/camel-servlet-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-servlet-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-servlet-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-servletlistener-starter/pom.xml b/platforms/spring-boot/components-starter/camel-servletlistener-starter/pom.xml
index 9f73e715d46e7..6f1678f3a1e09 100644
--- a/platforms/spring-boot/components-starter/camel-servletlistener-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-servletlistener-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-servletlistener-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-shiro-starter/pom.xml b/platforms/spring-boot/components-starter/camel-shiro-starter/pom.xml
index fd7e5bef7c71e..2eb63c2296d0b 100644
--- a/platforms/spring-boot/components-starter/camel-shiro-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-shiro-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-shiro-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-sip-starter/pom.xml b/platforms/spring-boot/components-starter/camel-sip-starter/pom.xml
index e83654b37f596..637e0dd9d1250 100644
--- a/platforms/spring-boot/components-starter/camel-sip-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-sip-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-sip-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-sjms-starter/pom.xml b/platforms/spring-boot/components-starter/camel-sjms-starter/pom.xml
index 5d4449ee65f6b..df86b7e14e2d6 100644
--- a/platforms/spring-boot/components-starter/camel-sjms-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-sjms-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-sjms-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-sjms2-starter/pom.xml b/platforms/spring-boot/components-starter/camel-sjms2-starter/pom.xml
index 42963e72685ee..ae66682343e24 100644
--- a/platforms/spring-boot/components-starter/camel-sjms2-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-sjms2-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-sjms2-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-slack-starter/pom.xml b/platforms/spring-boot/components-starter/camel-slack-starter/pom.xml
index b729a20afa8af..e44afc72eece5 100644
--- a/platforms/spring-boot/components-starter/camel-slack-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-slack-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-slack-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-smpp-starter/pom.xml b/platforms/spring-boot/components-starter/camel-smpp-starter/pom.xml
index 5e58d24e1ef85..6ec0a6d061f03 100644
--- a/platforms/spring-boot/components-starter/camel-smpp-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-smpp-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-smpp-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-snakeyaml-starter/pom.xml b/platforms/spring-boot/components-starter/camel-snakeyaml-starter/pom.xml
index 483a0df7c1f61..8d7841ca42386 100644
--- a/platforms/spring-boot/components-starter/camel-snakeyaml-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-snakeyaml-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-snakeyaml-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-snmp-starter/pom.xml b/platforms/spring-boot/components-starter/camel-snmp-starter/pom.xml
index 8d95edf5369fd..dd3aa86c7e5a1 100644
--- a/platforms/spring-boot/components-starter/camel-snmp-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-snmp-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-snmp-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-soap-starter/pom.xml b/platforms/spring-boot/components-starter/camel-soap-starter/pom.xml
index 55cb036a07ead..8356903cd3036 100644
--- a/platforms/spring-boot/components-starter/camel-soap-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-soap-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-soap-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-solr-starter/pom.xml b/platforms/spring-boot/components-starter/camel-solr-starter/pom.xml
index 0c6eee975f24b..e3ec250e085b9 100644
--- a/platforms/spring-boot/components-starter/camel-solr-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-solr-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-solr-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-spark-starter/pom.xml b/platforms/spring-boot/components-starter/camel-spark-starter/pom.xml
index ca774cf64f068..6224b33501b43 100644
--- a/platforms/spring-boot/components-starter/camel-spark-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-spark-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-spark-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-splunk-starter/pom.xml b/platforms/spring-boot/components-starter/camel-splunk-starter/pom.xml
index 0817567a70f51..c0c39904038d0 100644
--- a/platforms/spring-boot/components-starter/camel-splunk-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-splunk-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-splunk-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-spring-batch-starter/pom.xml b/platforms/spring-boot/components-starter/camel-spring-batch-starter/pom.xml
index cccdb02a2fa38..2f1c184257ceb 100644
--- a/platforms/spring-boot/components-starter/camel-spring-batch-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-spring-batch-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-spring-batch-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-spring-boot-starter/pom.xml b/platforms/spring-boot/components-starter/camel-spring-boot-starter/pom.xml
index 8fa4306b8f909..f0a25ef7edd0c 100644
--- a/platforms/spring-boot/components-starter/camel-spring-boot-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-spring-boot-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-spring-boot-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-spring-cloud-consul-starter/pom.xml b/platforms/spring-boot/components-starter/camel-spring-cloud-consul-starter/pom.xml
index aa8c98e7588b7..cc3f494ad68b3 100644
--- a/platforms/spring-boot/components-starter/camel-spring-cloud-consul-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-spring-cloud-consul-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-spring-cloud-consul-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-spring-cloud-netflix-starter/pom.xml b/platforms/spring-boot/components-starter/camel-spring-cloud-netflix-starter/pom.xml
index e9da74398ca68..0e48d13298b09 100644
--- a/platforms/spring-boot/components-starter/camel-spring-cloud-netflix-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-spring-cloud-netflix-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-spring-cloud-netflix-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-spring-cloud-starter/pom.xml b/platforms/spring-boot/components-starter/camel-spring-cloud-starter/pom.xml
index 9f5121400ae47..e2d1adbaa56ca 100644
--- a/platforms/spring-boot/components-starter/camel-spring-cloud-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-spring-cloud-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-spring-cloud-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-spring-cloud-zookeeper-starter/pom.xml b/platforms/spring-boot/components-starter/camel-spring-cloud-zookeeper-starter/pom.xml
index f095afa4e1d84..98845f3c1bcd7 100644
--- a/platforms/spring-boot/components-starter/camel-spring-cloud-zookeeper-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-spring-cloud-zookeeper-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-spring-cloud-zookeeper-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-spring-integration-starter/pom.xml b/platforms/spring-boot/components-starter/camel-spring-integration-starter/pom.xml
index d268434bbc93d..05e96970f90c9 100644
--- a/platforms/spring-boot/components-starter/camel-spring-integration-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-spring-integration-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-spring-integration-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-spring-javaconfig-starter/pom.xml b/platforms/spring-boot/components-starter/camel-spring-javaconfig-starter/pom.xml
index 1f419ffd10bcd..c6ad5779c19b5 100644
--- a/platforms/spring-boot/components-starter/camel-spring-javaconfig-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-spring-javaconfig-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-spring-javaconfig-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-spring-ldap-starter/pom.xml b/platforms/spring-boot/components-starter/camel-spring-ldap-starter/pom.xml
index 3105ec8bd719d..502b8824efbf6 100644
--- a/platforms/spring-boot/components-starter/camel-spring-ldap-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-spring-ldap-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-spring-ldap-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-spring-redis-starter/pom.xml b/platforms/spring-boot/components-starter/camel-spring-redis-starter/pom.xml
index 3234c953cc6a7..c08fa5a287f09 100644
--- a/platforms/spring-boot/components-starter/camel-spring-redis-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-spring-redis-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-spring-redis-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-spring-security-starter/pom.xml b/platforms/spring-boot/components-starter/camel-spring-security-starter/pom.xml
index 1b7d7891611fb..5c63db721a0bd 100644
--- a/platforms/spring-boot/components-starter/camel-spring-security-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-spring-security-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-spring-security-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-spring-starter/pom.xml b/platforms/spring-boot/components-starter/camel-spring-starter/pom.xml
index 6d9bbd770b5ef..700fa8d7158f8 100644
--- a/platforms/spring-boot/components-starter/camel-spring-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-spring-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-spring-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-spring-ws-starter/pom.xml b/platforms/spring-boot/components-starter/camel-spring-ws-starter/pom.xml
index 02c48d684c834..bdca56723eae1 100644
--- a/platforms/spring-boot/components-starter/camel-spring-ws-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-spring-ws-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-spring-ws-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-sql-starter/pom.xml b/platforms/spring-boot/components-starter/camel-sql-starter/pom.xml
index e6a799f237cab..9c90e1ffb2f2d 100644
--- a/platforms/spring-boot/components-starter/camel-sql-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-sql-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-sql-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-ssh-starter/pom.xml b/platforms/spring-boot/components-starter/camel-ssh-starter/pom.xml
index 1cecd18c8f7f1..c63735ab252c6 100644
--- a/platforms/spring-boot/components-starter/camel-ssh-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-ssh-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-ssh-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-stax-starter/pom.xml b/platforms/spring-boot/components-starter/camel-stax-starter/pom.xml
index c9a6831f34592..02fd58a3f3b7a 100644
--- a/platforms/spring-boot/components-starter/camel-stax-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-stax-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-stax-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-stomp-starter/pom.xml b/platforms/spring-boot/components-starter/camel-stomp-starter/pom.xml
index 0605e5f346b22..4abb6fcb8f8cc 100644
--- a/platforms/spring-boot/components-starter/camel-stomp-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-stomp-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-stomp-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-stream-starter/pom.xml b/platforms/spring-boot/components-starter/camel-stream-starter/pom.xml
index c1fdd9dd8ba40..4c9ff5cab9809 100644
--- a/platforms/spring-boot/components-starter/camel-stream-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-stream-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-stream-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-stringtemplate-starter/pom.xml b/platforms/spring-boot/components-starter/camel-stringtemplate-starter/pom.xml
index 539a6dc276d3b..755d481e78261 100644
--- a/platforms/spring-boot/components-starter/camel-stringtemplate-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-stringtemplate-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-stringtemplate-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-swagger-java-starter/pom.xml b/platforms/spring-boot/components-starter/camel-swagger-java-starter/pom.xml
index b8eb4e84f8a98..cfb5294f2d4f2 100644
--- a/platforms/spring-boot/components-starter/camel-swagger-java-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-swagger-java-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-swagger-java-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-syslog-starter/pom.xml b/platforms/spring-boot/components-starter/camel-syslog-starter/pom.xml
index 6907cfee36634..af9c29c11d799 100644
--- a/platforms/spring-boot/components-starter/camel-syslog-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-syslog-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-syslog-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-tagsoup-starter/pom.xml b/platforms/spring-boot/components-starter/camel-tagsoup-starter/pom.xml
index 5a05c1af9e517..f1d853eaa2f97 100644
--- a/platforms/spring-boot/components-starter/camel-tagsoup-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-tagsoup-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-tagsoup-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-tarfile-starter/pom.xml b/platforms/spring-boot/components-starter/camel-tarfile-starter/pom.xml
index daa500870d156..395d7f1bbc30d 100644
--- a/platforms/spring-boot/components-starter/camel-tarfile-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-tarfile-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-tarfile-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-telegram-starter/pom.xml b/platforms/spring-boot/components-starter/camel-telegram-starter/pom.xml
index e13812cd89771..90b93341ddfd5 100644
--- a/platforms/spring-boot/components-starter/camel-telegram-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-telegram-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-telegram-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-thrift-starter/pom.xml b/platforms/spring-boot/components-starter/camel-thrift-starter/pom.xml
index 6bc9a1ad0e7be..efc376369e150 100644
--- a/platforms/spring-boot/components-starter/camel-thrift-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-thrift-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-thrift-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-tika-starter/pom.xml b/platforms/spring-boot/components-starter/camel-tika-starter/pom.xml
index 4d2a1210f3b52..e99bc4678f17f 100644
--- a/platforms/spring-boot/components-starter/camel-tika-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-tika-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-tika-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-twilio-starter/pom.xml b/platforms/spring-boot/components-starter/camel-twilio-starter/pom.xml
index 89d1b0ae62c1d..3ab62a5050d49 100644
--- a/platforms/spring-boot/components-starter/camel-twilio-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-twilio-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-twilio-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-twitter-starter/pom.xml b/platforms/spring-boot/components-starter/camel-twitter-starter/pom.xml
index 81eda115d984f..a718ae56e7679 100644
--- a/platforms/spring-boot/components-starter/camel-twitter-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-twitter-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-twitter-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-undertow-starter/pom.xml b/platforms/spring-boot/components-starter/camel-undertow-starter/pom.xml
index 95e51e07ee3a9..3e4ac5138177c 100644
--- a/platforms/spring-boot/components-starter/camel-undertow-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-undertow-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-undertow-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-univocity-parsers-starter/pom.xml b/platforms/spring-boot/components-starter/camel-univocity-parsers-starter/pom.xml
index 60deafa0e0766..ddecccad1ed2b 100644
--- a/platforms/spring-boot/components-starter/camel-univocity-parsers-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-univocity-parsers-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-univocity-parsers-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-urlrewrite-starter/pom.xml b/platforms/spring-boot/components-starter/camel-urlrewrite-starter/pom.xml
index 5ef329f267ada..270b91a4ac62b 100644
--- a/platforms/spring-boot/components-starter/camel-urlrewrite-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-urlrewrite-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-urlrewrite-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-velocity-starter/pom.xml b/platforms/spring-boot/components-starter/camel-velocity-starter/pom.xml
index d2d730844368d..cfd997db925d9 100644
--- a/platforms/spring-boot/components-starter/camel-velocity-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-velocity-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-velocity-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-vertx-starter/pom.xml b/platforms/spring-boot/components-starter/camel-vertx-starter/pom.xml
index ca8dc69afc11a..51190a3789b16 100644
--- a/platforms/spring-boot/components-starter/camel-vertx-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-vertx-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-vertx-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-weather-starter/pom.xml b/platforms/spring-boot/components-starter/camel-weather-starter/pom.xml
index f90a2d9e0cd21..bb2662fc43b5e 100644
--- a/platforms/spring-boot/components-starter/camel-weather-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-weather-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-weather-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-web3j-starter/pom.xml b/platforms/spring-boot/components-starter/camel-web3j-starter/pom.xml
index 992edb2b95e23..8f1e6fc523e0c 100644
--- a/platforms/spring-boot/components-starter/camel-web3j-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-web3j-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-web3j-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-websocket-starter/pom.xml b/platforms/spring-boot/components-starter/camel-websocket-starter/pom.xml
index 154a52895aeb6..cfa341f953908 100644
--- a/platforms/spring-boot/components-starter/camel-websocket-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-websocket-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-websocket-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-wordpress-starter/pom.xml b/platforms/spring-boot/components-starter/camel-wordpress-starter/pom.xml
index 6777b02ac347d..e0f3b17f36c02 100644
--- a/platforms/spring-boot/components-starter/camel-wordpress-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-wordpress-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-wordpress-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-xchange-starter/pom.xml b/platforms/spring-boot/components-starter/camel-xchange-starter/pom.xml
index 2ab26e1332838..6b48258e84df5 100644
--- a/platforms/spring-boot/components-starter/camel-xchange-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-xchange-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-xchange-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-xmlbeans-starter/pom.xml b/platforms/spring-boot/components-starter/camel-xmlbeans-starter/pom.xml
index 309c430093d3b..a245ed7bd186c 100644
--- a/platforms/spring-boot/components-starter/camel-xmlbeans-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-xmlbeans-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-xmlbeans-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-xmljson-starter/pom.xml b/platforms/spring-boot/components-starter/camel-xmljson-starter/pom.xml
index f6c4ad98b65fc..69162abc455ea 100644
--- a/platforms/spring-boot/components-starter/camel-xmljson-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-xmljson-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-xmljson-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-xmlrpc-starter/pom.xml b/platforms/spring-boot/components-starter/camel-xmlrpc-starter/pom.xml
index 7e4f820925ef1..dcaf2bc5d8c8d 100644
--- a/platforms/spring-boot/components-starter/camel-xmlrpc-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-xmlrpc-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-xmlrpc-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-xmlsecurity-starter/pom.xml b/platforms/spring-boot/components-starter/camel-xmlsecurity-starter/pom.xml
index 5c675642dc473..ece65e3c36cf0 100644
--- a/platforms/spring-boot/components-starter/camel-xmlsecurity-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-xmlsecurity-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-xmlsecurity-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-xmpp-starter/pom.xml b/platforms/spring-boot/components-starter/camel-xmpp-starter/pom.xml
index 5a9bfb7e5fb68..7c9f728489d2f 100644
--- a/platforms/spring-boot/components-starter/camel-xmpp-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-xmpp-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-xmpp-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-xstream-starter/pom.xml b/platforms/spring-boot/components-starter/camel-xstream-starter/pom.xml
index a0332344f9fa1..aabcf6e7e0def 100644
--- a/platforms/spring-boot/components-starter/camel-xstream-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-xstream-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-xstream-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-yammer-starter/pom.xml b/platforms/spring-boot/components-starter/camel-yammer-starter/pom.xml
index b9dba6fb9e9c0..4aaa73119b6af 100644
--- a/platforms/spring-boot/components-starter/camel-yammer-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-yammer-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-yammer-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-yql-starter/pom.xml b/platforms/spring-boot/components-starter/camel-yql-starter/pom.xml
index e7092b85f4024..6809839aa52a4 100644
--- a/platforms/spring-boot/components-starter/camel-yql-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-yql-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-yql-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-zendesk-starter/pom.xml b/platforms/spring-boot/components-starter/camel-zendesk-starter/pom.xml
index 2e21646efdd2d..8ed73d493672d 100644
--- a/platforms/spring-boot/components-starter/camel-zendesk-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-zendesk-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-zendesk-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-zipfile-starter/pom.xml b/platforms/spring-boot/components-starter/camel-zipfile-starter/pom.xml
index 4071abbc5c69f..b0e686c6edb1a 100644
--- a/platforms/spring-boot/components-starter/camel-zipfile-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-zipfile-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-zipfile-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-zipkin-starter/pom.xml b/platforms/spring-boot/components-starter/camel-zipkin-starter/pom.xml
index a248034329d59..ee8624441f25d 100644
--- a/platforms/spring-boot/components-starter/camel-zipkin-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-zipkin-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-zipkin-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-zookeeper-master-starter/pom.xml b/platforms/spring-boot/components-starter/camel-zookeeper-master-starter/pom.xml
index 97d7618d4079f..585387d2fee02 100644
--- a/platforms/spring-boot/components-starter/camel-zookeeper-master-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-zookeeper-master-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-zookeeper-master-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/camel-zookeeper-starter/pom.xml b/platforms/spring-boot/components-starter/camel-zookeeper-starter/pom.xml
index 2d3b8395296af..44444feb26cb7 100644
--- a/platforms/spring-boot/components-starter/camel-zookeeper-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/camel-zookeeper-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>components-starter</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-zookeeper-starter</artifactId>
   <packaging>jar</packaging>
diff --git a/platforms/spring-boot/components-starter/pom.xml b/platforms/spring-boot/components-starter/pom.xml
index 79f84bf8c6cd4..dc16fdc557858 100644
--- a/platforms/spring-boot/components-starter/pom.xml
+++ b/platforms/spring-boot/components-starter/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>camel-starter-parent</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
     <relativePath>../../../platforms/spring-boot/spring-boot-dm/camel-starter-parent</relativePath>
   </parent>
   <artifactId>components-starter</artifactId>
diff --git a/platforms/spring-boot/pom.xml b/platforms/spring-boot/pom.xml
index 9a96a3e598e80..40e4356193eb0 100644
--- a/platforms/spring-boot/pom.xml
+++ b/platforms/spring-boot/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>camel</artifactId>
         <groupId>org.apache.camel</groupId>
-        <version>2.23.0-SNAPSHOT</version>
+        <version>2.24.0-SNAPSHOT</version>
         <relativePath>../../</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies-generator/pom.xml b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies-generator/pom.xml
index 472ed09e6f35c..0e9d087bdf79d 100644
--- a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies-generator/pom.xml
+++ b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies-generator/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <artifactId>camel-spring-boot-dm</artifactId>
     <groupId>org.apache.camel</groupId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-spring-boot-dependencies-generator</artifactId>
diff --git a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
index 880be45a6f5e3..8db69b3f638c0 100644
--- a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
+++ b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
@@ -22,7 +22,7 @@
   <parent>
     <artifactId>camel-spring-boot-dm</artifactId>
     <groupId>org.apache.camel</groupId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
   <artifactId>camel-spring-boot-dependencies</artifactId>
   <packaging>pom</packaging>
diff --git a/platforms/spring-boot/spring-boot-dm/camel-starter-parent/pom.xml b/platforms/spring-boot/spring-boot-dm/camel-starter-parent/pom.xml
index 388296b4325d4..56eacef886024 100644
--- a/platforms/spring-boot/spring-boot-dm/camel-starter-parent/pom.xml
+++ b/platforms/spring-boot/spring-boot-dm/camel-starter-parent/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <artifactId>camel-spring-boot-dm</artifactId>
     <groupId>org.apache.camel</groupId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-starter-parent</artifactId>
diff --git a/platforms/spring-boot/spring-boot-dm/pom.xml b/platforms/spring-boot/spring-boot-dm/pom.xml
index f25e2dbb61081..de418c5e25529 100644
--- a/platforms/spring-boot/spring-boot-dm/pom.xml
+++ b/platforms/spring-boot/spring-boot-dm/pom.xml
@@ -26,7 +26,7 @@
   <parent>
     <artifactId>spring-boot</artifactId>
     <groupId>org.apache.camel</groupId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-spring-boot-dm</artifactId>
diff --git a/pom.xml b/pom.xml
index a7e7584b70c47..0186a70cfa0a2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
 
   <groupId>org.apache.camel</groupId>
   <artifactId>camel</artifactId>
-  <version>2.23.0-SNAPSHOT</version>
+  <version>2.24.0-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>Camel</name>
   <description>Camel build POM</description>
diff --git a/tests/camel-blueprint-cxf-test/pom.xml b/tests/camel-blueprint-cxf-test/pom.xml
index 7b76c0141bbca..309bc074fb001 100644
--- a/tests/camel-blueprint-cxf-test/pom.xml
+++ b/tests/camel-blueprint-cxf-test/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>tests</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-blueprint-cxf-test</artifactId>
diff --git a/tests/camel-blueprint-test/pom.xml b/tests/camel-blueprint-test/pom.xml
index af080263e0826..d724be5571915 100644
--- a/tests/camel-blueprint-test/pom.xml
+++ b/tests/camel-blueprint-test/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>tests</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-blueprint-test</artifactId>
diff --git a/tests/camel-itest-cdi/pom.xml b/tests/camel-itest-cdi/pom.xml
index 6a315f6d9ca26..aecce1d710d85 100644
--- a/tests/camel-itest-cdi/pom.xml
+++ b/tests/camel-itest-cdi/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>tests</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-itest-cdi</artifactId>
diff --git a/tests/camel-itest-jms2/pom.xml b/tests/camel-itest-jms2/pom.xml
index c7536c470337a..32b796d765297 100644
--- a/tests/camel-itest-jms2/pom.xml
+++ b/tests/camel-itest-jms2/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>tests</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-itest-jms2</artifactId>
diff --git a/tests/camel-itest-karaf/pom.xml b/tests/camel-itest-karaf/pom.xml
index 02510709f2abe..7df596fd36c9c 100644
--- a/tests/camel-itest-karaf/pom.xml
+++ b/tests/camel-itest-karaf/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>tests</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-itest-karaf</artifactId>
diff --git a/tests/camel-itest-osgi/pom.xml b/tests/camel-itest-osgi/pom.xml
index cfed3526d8097..19b88299f3e39 100644
--- a/tests/camel-itest-osgi/pom.xml
+++ b/tests/camel-itest-osgi/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>tests</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-itest-osgi</artifactId>
diff --git a/tests/camel-itest-performance/pom.xml b/tests/camel-itest-performance/pom.xml
index 028068df567a0..49be54ccc9502 100644
--- a/tests/camel-itest-performance/pom.xml
+++ b/tests/camel-itest-performance/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>tests</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-itest-performance</artifactId>
diff --git a/tests/camel-itest-spring-boot/pom.xml b/tests/camel-itest-spring-boot/pom.xml
index f859eb269cc97..89d4386382444 100644
--- a/tests/camel-itest-spring-boot/pom.xml
+++ b/tests/camel-itest-spring-boot/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>tests</artifactId>
     <groupId>org.apache.camel</groupId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-itest-spring-boot</artifactId>
diff --git a/tests/camel-itest-standalone/pom.xml b/tests/camel-itest-standalone/pom.xml
index 0e696796a15e5..7d575964aa733 100644
--- a/tests/camel-itest-standalone/pom.xml
+++ b/tests/camel-itest-standalone/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>tests</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-itest-standalone</artifactId>
diff --git a/tests/camel-itest/pom.xml b/tests/camel-itest/pom.xml
index adfa7d48b68de..33984e8b5dc91 100644
--- a/tests/camel-itest/pom.xml
+++ b/tests/camel-itest/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>tests</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-itest</artifactId>
diff --git a/tests/camel-jmh/pom.xml b/tests/camel-jmh/pom.xml
index 6caf8de18ada2..f127109c26812 100644
--- a/tests/camel-jmh/pom.xml
+++ b/tests/camel-jmh/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>tests</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-jmh</artifactId>
diff --git a/tests/camel-partial-classpath-test/pom.xml b/tests/camel-partial-classpath-test/pom.xml
index ce857fe8129b1..b570f843ac1cf 100644
--- a/tests/camel-partial-classpath-test/pom.xml
+++ b/tests/camel-partial-classpath-test/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>tests</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-partial-classpath-test</artifactId>
diff --git a/tests/camel-performance/pom.xml b/tests/camel-performance/pom.xml
index 33ee033f56f3a..17904aa33aa22 100644
--- a/tests/camel-performance/pom.xml
+++ b/tests/camel-performance/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>tests</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-performance</artifactId>
diff --git a/tests/camel-typeconverterscan-test/pom.xml b/tests/camel-typeconverterscan-test/pom.xml
index 945f0814ecb2d..4c25820ffcdd3 100644
--- a/tests/camel-typeconverterscan-test/pom.xml
+++ b/tests/camel-typeconverterscan-test/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>tests</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-typeconverterscan-test</artifactId>
diff --git a/tests/pom.xml b/tests/pom.xml
index 34a936b767e08..511a671e0f418 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>camel-parent</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
     <relativePath>../parent</relativePath>
   </parent>
 
diff --git a/tests/test-bundles/mock-javamail_1.7/pom.xml b/tests/test-bundles/mock-javamail_1.7/pom.xml
index 0fdf509a6d8ba..1bd2401d0a0e5 100644
--- a/tests/test-bundles/mock-javamail_1.7/pom.xml
+++ b/tests/test-bundles/mock-javamail_1.7/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.camel.tests.bundles</groupId>
         <artifactId>bundles-pom</artifactId>
-        <version>2.23.0-SNAPSHOT</version>
+        <version>2.24.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.camel.tests</groupId>
diff --git a/tests/test-bundles/pom.xml b/tests/test-bundles/pom.xml
index f35ee980ccca9..1d248a684446d 100644
--- a/tests/test-bundles/pom.xml
+++ b/tests/test-bundles/pom.xml
@@ -24,7 +24,7 @@
     <parent>
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-parent</artifactId>
-      <version>2.23.0-SNAPSHOT</version>
+      <version>2.24.0-SNAPSHOT</version>
       <relativePath>../../parent</relativePath>
     </parent>
 
diff --git a/tooling/apt/pom.xml b/tooling/apt/pom.xml
index 6afd3aa763e1d..c44dc85ed02df 100644
--- a/tooling/apt/pom.xml
+++ b/tooling/apt/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>tooling</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>apt</artifactId>
diff --git a/tooling/camel-manual/pom.xml b/tooling/camel-manual/pom.xml
index baf5d70473643..a56066c6958a3 100644
--- a/tooling/camel-manual/pom.xml
+++ b/tooling/camel-manual/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>tooling</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-manual</artifactId>
diff --git a/tooling/camel-route-parser/pom.xml b/tooling/camel-route-parser/pom.xml
index 0606f65e76526..6d9f1c781b366 100644
--- a/tooling/camel-route-parser/pom.xml
+++ b/tooling/camel-route-parser/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>tooling</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-route-parser</artifactId>
diff --git a/tooling/json-simple-ordered/pom.xml b/tooling/json-simple-ordered/pom.xml
index dd27a91437379..36114c36a955e 100644
--- a/tooling/json-simple-ordered/pom.xml
+++ b/tooling/json-simple-ordered/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>tooling</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <!-- should not be OSGi bundle as we shade this component into camel-core and camel-catalog -->
diff --git a/tooling/maven/bom-generator-maven-plugin/pom.xml b/tooling/maven/bom-generator-maven-plugin/pom.xml
index 3730a065f155b..359d2e4058eab 100644
--- a/tooling/maven/bom-generator-maven-plugin/pom.xml
+++ b/tooling/maven/bom-generator-maven-plugin/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <artifactId>maven-plugins</artifactId>
         <groupId>org.apache.camel</groupId>
-        <version>2.23.0-SNAPSHOT</version>
+        <version>2.24.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
diff --git a/tooling/maven/camel-api-component-maven-plugin/pom.xml b/tooling/maven/camel-api-component-maven-plugin/pom.xml
index 0070fd6df8e43..ab268a8f2a03e 100644
--- a/tooling/maven/camel-api-component-maven-plugin/pom.xml
+++ b/tooling/maven/camel-api-component-maven-plugin/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>maven-plugins</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-api-component-maven-plugin</artifactId>
diff --git a/tooling/maven/camel-eip-documentation-enricher-maven-plugin/pom.xml b/tooling/maven/camel-eip-documentation-enricher-maven-plugin/pom.xml
index 95b9b295e2449..37dcbae8bfcd6 100644
--- a/tooling/maven/camel-eip-documentation-enricher-maven-plugin/pom.xml
+++ b/tooling/maven/camel-eip-documentation-enricher-maven-plugin/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>maven-plugins</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-eip-documentation-enricher-maven-plugin</artifactId>
diff --git a/tooling/maven/camel-maven-plugin/pom.xml b/tooling/maven/camel-maven-plugin/pom.xml
index a096a5c1a6e16..055aed52c8a85 100644
--- a/tooling/maven/camel-maven-plugin/pom.xml
+++ b/tooling/maven/camel-maven-plugin/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>maven-plugins</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-maven-plugin</artifactId>
diff --git a/tooling/maven/camel-package-maven-plugin/pom.xml b/tooling/maven/camel-package-maven-plugin/pom.xml
index ed4a0b73fbcff..01be52278ae5e 100644
--- a/tooling/maven/camel-package-maven-plugin/pom.xml
+++ b/tooling/maven/camel-package-maven-plugin/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>maven-plugins</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-package-maven-plugin</artifactId>
diff --git a/tooling/maven/camel-restdsl-swagger-plugin/pom.xml b/tooling/maven/camel-restdsl-swagger-plugin/pom.xml
index 7a99f0aca0bba..d4a705279b6a6 100644
--- a/tooling/maven/camel-restdsl-swagger-plugin/pom.xml
+++ b/tooling/maven/camel-restdsl-swagger-plugin/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>maven-plugins</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-restdsl-swagger-plugin</artifactId>
diff --git a/tooling/maven/guice-maven-plugin/pom.xml b/tooling/maven/guice-maven-plugin/pom.xml
index 43742e3ebb63b..a6cde3114ecb2 100644
--- a/tooling/maven/guice-maven-plugin/pom.xml
+++ b/tooling/maven/guice-maven-plugin/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>maven-plugins</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>guice-maven-plugin</artifactId>
diff --git a/tooling/maven/pom.xml b/tooling/maven/pom.xml
index 7d1293209934e..1b819db8eaa03 100644
--- a/tooling/maven/pom.xml
+++ b/tooling/maven/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>tooling</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>maven-plugins</artifactId>
diff --git a/tooling/parent/pom.xml b/tooling/parent/pom.xml
index 2e37f229be79d..01d3dbc0c3434 100644
--- a/tooling/parent/pom.xml
+++ b/tooling/parent/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>tooling</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>tooling-parent</artifactId>
diff --git a/tooling/pom.xml b/tooling/pom.xml
index 52804e27eb9cb..f7e0436c382b3 100644
--- a/tooling/pom.xml
+++ b/tooling/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>camel-parent</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
     <relativePath>../parent</relativePath>
   </parent>
 
diff --git a/tooling/spi-annotations/pom.xml b/tooling/spi-annotations/pom.xml
index 0adc979edae70..c32c89cbeb210 100644
--- a/tooling/spi-annotations/pom.xml
+++ b/tooling/spi-annotations/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>tooling</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <!-- should not be OSGi bundle as we shade this component into camel-core -->
diff --git a/tooling/swagger-rest-dsl-generator/pom.xml b/tooling/swagger-rest-dsl-generator/pom.xml
index ca8acb53fb0e7..23f3053ef33a5 100644
--- a/tooling/swagger-rest-dsl-generator/pom.xml
+++ b/tooling/swagger-rest-dsl-generator/pom.xml
@@ -25,7 +25,7 @@
   <parent>
     <groupId>org.apache.camel</groupId>
     <artifactId>tooling</artifactId>
-    <version>2.23.0-SNAPSHOT</version>
+    <version>2.24.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>camel-swagger-rest-dsl-generator</artifactId>

From 3c4ba2c32e57328050cf938695060e8041b3a2d4 Mon Sep 17 00:00:00 2001
From: Gregor Zurowski <gregor@zurowski.org>
Date: Thu, 29 Nov 2018 09:10:26 +0000
Subject: [PATCH 111/125] Update connector to version 2.24.0-SNAPSHOT

Signed-off-by: Gregor Zurowski <gregor@zurowski.org>
---
 .../src/main/resources/camel-connector-schema.json          | 4 ++--
 .../myfoo-connector/src/main/resources/camel-connector.json | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/platforms/myfoo-connector/src/main/resources/camel-connector-schema.json b/platforms/myfoo-connector/src/main/resources/camel-connector-schema.json
index 42191977411c0..dff22b543277d 100644
--- a/platforms/myfoo-connector/src/main/resources/camel-connector-schema.json
+++ b/platforms/myfoo-connector/src/main/resources/camel-connector-schema.json
@@ -14,7 +14,7 @@
     "javaType":"org.myfoo.connector.MyFooComponent",
     "groupId":"org.apache.camel",
     "artifactId":"myfoo-connector",
-    "version":"2.23.0-SNAPSHOT"
+    "version":"2.24.0-SNAPSHOT"
   },
   "componentProperties":{
     
@@ -59,4 +59,4 @@
   "connectorProperties":{
     
   }
-}
\ No newline at end of file
+}
diff --git a/platforms/myfoo-connector/src/main/resources/camel-connector.json b/platforms/myfoo-connector/src/main/resources/camel-connector.json
index 69e1753797a0a..0647d8113063b 100644
--- a/platforms/myfoo-connector/src/main/resources/camel-connector.json
+++ b/platforms/myfoo-connector/src/main/resources/camel-connector.json
@@ -2,14 +2,14 @@
   "baseScheme" : "timer",
   "baseGroupId" : "org.apache.camel",
   "baseArtifactId" : "camel-core",
-  "baseVersion" : "2.23.0-SNAPSHOT",
+  "baseVersion" : "2.24.0-SNAPSHOT",
   "baseJavaType" : "org.apache.camel.component.timer.TimerComponent",
   "name" : "MyFoo",
   "scheme" : "my-foo",
   "javaType" : "org.myfoo.connector.MyFooComponent",
   "groupId" : "org.myfoo",
   "artifactId" : "myfoo-connector",
-  "version" : "2.23.0-SNAPSHOT",
+  "version" : "2.24.0-SNAPSHOT",
   "description" : "Something cool",
   "labels" : [ "foo", "timer" ],
   "pattern" : "From",
@@ -18,4 +18,4 @@
     "fixedRate" : true,
     "period" : 5000
   }
-}
\ No newline at end of file
+}

From fb208236c0a5578e23ea8569620d219289f71276 Mon Sep 17 00:00:00 2001
From: Gregor Zurowski <gregor@zurowski.org>
Date: Thu, 29 Nov 2018 10:18:38 +0100
Subject: [PATCH 112/125] Add version 2.23.0 to XML schema files

Signed-off-by: Gregor Zurowski <gregor@zurowski.org>
---
 components/camel-cxf/src/main/resources/META-INF/spring.schemas  | 1 +
 .../src/main/resources/META-INF/spring.schemas                   | 1 +
 .../src/main/resources/META-INF/spring.schemas                   | 1 +
 .../camel-spring/src/main/resources/META-INF/spring.schemas      | 1 +
 4 files changed, 4 insertions(+)

diff --git a/components/camel-cxf/src/main/resources/META-INF/spring.schemas b/components/camel-cxf/src/main/resources/META-INF/spring.schemas
index 62cba3af8ec78..e3d3c0a89e792 100644
--- a/components/camel-cxf/src/main/resources/META-INF/spring.schemas
+++ b/components/camel-cxf/src/main/resources/META-INF/spring.schemas
@@ -126,4 +126,5 @@ http\://camel.apache.org/schema/cxf/camel-cxf-2.21.3.xsd=schema/cxfEndpoint.xsd
 http\://camel.apache.org/schema/cxf/camel-cxf-2.22.0.xsd=schema/cxfEndpoint.xsd
 http\://camel.apache.org/schema/cxf/camel-cxf-2.22.1.xsd=schema/cxfEndpoint.xsd
 http\://camel.apache.org/schema/cxf/camel-cxf-2.22.2.xsd=schema/cxfEndpoint.xsd
+http\://camel.apache.org/schema/cxf/camel-cxf-2.23.0.xsd=schema/cxfEndpoint.xsd
 http\://camel.apache.org/schema/cxf/camel-cxf-${project.version}.xsd=schema/cxfEndpoint.xsd
diff --git a/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas b/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas
index 8b03c82391e2a..aa83cf7301dde 100644
--- a/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas
+++ b/components/camel-spring-integration/src/main/resources/META-INF/spring.schemas
@@ -123,4 +123,5 @@ http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.21
 http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.22.0.xsd=schema/camel-spring-integration.xsd
 http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.22.1.xsd=schema/camel-spring-integration.xsd
 http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.22.2.xsd=schema/camel-spring-integration.xsd
+http\://camel.apache.org/schema/spring/integration/camel-spring-integration-2.23.0.xsd=schema/camel-spring-integration.xsd
 http\://camel.apache.org/schema/spring/integration/camel-spring-integration-${project.version}.xsd=schema/camel-spring-integration.xsd
diff --git a/components/camel-spring-security/src/main/resources/META-INF/spring.schemas b/components/camel-spring-security/src/main/resources/META-INF/spring.schemas
index 829085eb75d45..8196173a3c93a 100644
--- a/components/camel-spring-security/src/main/resources/META-INF/spring.schemas
+++ b/components/camel-spring-security/src/main/resources/META-INF/spring.schemas
@@ -117,4 +117,5 @@ http\://camel.apache.org/schema/spring-security/camel-spring-security-2.21.3.xsd
 http\://camel.apache.org/schema/spring-security/camel-spring-security-2.22.0.xsd=schema/camel-spring-security.xsd
 http\://camel.apache.org/schema/spring-security/camel-spring-security-2.22.1.xsd=schema/camel-spring-security.xsd
 http\://camel.apache.org/schema/spring-security/camel-spring-security-2.22.2.xsd=schema/camel-spring-security.xsd
+http\://camel.apache.org/schema/spring-security/camel-spring-security-2.23.0.xsd=schema/camel-spring-security.xsd
 http\://camel.apache.org/schema/spring-security/camel-spring-security-${project.version}.xsd=schema/camel-spring-security.xsd
diff --git a/components/camel-spring/src/main/resources/META-INF/spring.schemas b/components/camel-spring/src/main/resources/META-INF/spring.schemas
index c7d5846937761..252fe6948aaa6 100644
--- a/components/camel-spring/src/main/resources/META-INF/spring.schemas
+++ b/components/camel-spring/src/main/resources/META-INF/spring.schemas
@@ -125,4 +125,5 @@ http\://camel.apache.org/schema/spring/camel-spring-2.21.3.xsd=camel-spring.xsd
 http\://camel.apache.org/schema/spring/camel-spring-2.22.0.xsd=camel-spring.xsd
 http\://camel.apache.org/schema/spring/camel-spring-2.22.1.xsd=camel-spring.xsd
 http\://camel.apache.org/schema/spring/camel-spring-2.22.2.xsd=camel-spring.xsd
+http\://camel.apache.org/schema/spring/camel-spring-2.23.0.xsd=camel-spring.xsd
 http\://camel.apache.org/schema/spring/camel-spring-${project.version}.xsd=camel-spring.xsd

From e243becb7252231043836e1f1435b11ddcfd0d7c Mon Sep 17 00:00:00 2001
From: Andrea Cosentino <ancosen@gmail.com>
Date: Thu, 29 Nov 2018 10:50:05 +0100
Subject: [PATCH 113/125] Regen

---
 .../src/main/resources/camel-connector-schema.json              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platforms/myfoo-connector/src/main/resources/camel-connector-schema.json b/platforms/myfoo-connector/src/main/resources/camel-connector-schema.json
index dff22b543277d..5d40e92e78c7e 100644
--- a/platforms/myfoo-connector/src/main/resources/camel-connector-schema.json
+++ b/platforms/myfoo-connector/src/main/resources/camel-connector-schema.json
@@ -59,4 +59,4 @@
   "connectorProperties":{
     
   }
-}
+}
\ No newline at end of file

From fc3c2658db29e90ac2b331874321a2381772744e Mon Sep 17 00:00:00 2001
From: Andrea Cosentino <ancosen@gmail.com>
Date: Fri, 30 Nov 2018 08:48:36 +0100
Subject: [PATCH 114/125] Upgrade Netty to version 4.1.32.Final

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

diff --git a/parent/pom.xml b/parent/pom.xml
index c9258c2662398..4ea081ae78098 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -521,7 +521,7 @@
     <nekohtml-version>1.9.22</nekohtml-version>
     <neoscada-version>0.4.0</neoscada-version>
     <netty3-version>3.10.6.Final</netty3-version>
-    <netty-version>4.1.31.Final</netty-version>
+    <netty-version>4.1.32.Final</netty-version>
     <netty40-version>4.0.56.Final</netty40-version>
     <networknt-json-schema-validator-version>0.1.24</networknt-json-schema-validator-version>
     <noggit-bundle-version>0.5_1</noggit-bundle-version>

From 128f84189a366db43a47461353c2ccaa8d8f658c Mon Sep 17 00:00:00 2001
From: Duncan Doyle <Duncan.Doyle@gmail.com>
Date: Wed, 28 Nov 2018 13:50:22 +0100
Subject: [PATCH 115/125] CAMEL-12964: Initial import of jBPM CamelWIH and
 Command.

---
 components/camel-jbpm/pom.xml                 |  27 ++++
 .../component/jbpm/workitem/CamelCommand.java | 121 ++++++++++++++++
 .../jbpm/workitem/CamelWorkItemHandler.java   | 137 ++++++++++++++++++
 .../jbpm/workitem/CamelCommandTest.java       | 134 +++++++++++++++++
 .../workitem/CamelWorkItemHandlerTest.java    | 137 ++++++++++++++++++
 5 files changed, 556 insertions(+)
 create mode 100644 components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/CamelCommand.java
 create mode 100644 components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/CamelWorkItemHandler.java
 create mode 100644 components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/CamelCommandTest.java
 create mode 100644 components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/CamelWorkItemHandlerTest.java

diff --git a/components/camel-jbpm/pom.xml b/components/camel-jbpm/pom.xml
index a0536f0acbc38..7927c7c2347d8 100644
--- a/components/camel-jbpm/pom.xml
+++ b/components/camel-jbpm/pom.xml
@@ -92,6 +92,15 @@
             <optional>true</optional>
         </dependency>
         
+        <!-- jBPM WorkItems -->
+        <dependency>
+        	<groupId>org.jbpm</groupId>
+        	<artifactId>jbpm-workitems-core</artifactId>
+        	<version>${jbpm-version}</version>
+        	<scope>provided</scope>
+        	<optional>true</optional>
+        </dependency>
+        
         <dependency>
             <groupId>org.jboss.logging</groupId>
             <artifactId>jboss-logging</artifactId>
@@ -128,6 +137,24 @@
             <artifactId>camel-test</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+        	<groupId>org.mockito</groupId>
+        	<artifactId>mockito-core</artifactId>
+        	<scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jbpm</groupId>
+            <artifactId>jbpm-workitems-core</artifactId>
+            <version>${jbpm-version}</version>
+            <type>test-jar</type>
+            <scope>test</scope>
+            <exclusions>
+               <exclusion>
+                   <groupId>xml-apis</groupId>
+                   <artifactId>xml-apis</artifactId>
+               </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
 </project>
diff --git a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/CamelCommand.java b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/CamelCommand.java
new file mode 100644
index 0000000000000..80c767e0e8687
--- /dev/null
+++ b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/CamelCommand.java
@@ -0,0 +1,121 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.camel.component.jbpm.workitem;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.Exchange;
+import org.apache.camel.Message;
+import org.apache.camel.ProducerTemplate;
+import org.apache.camel.builder.ExchangeBuilder;
+import org.jbpm.services.api.service.ServiceRegistry;
+import org.kie.api.executor.Command;
+import org.kie.api.executor.CommandContext;
+import org.kie.api.executor.ExecutionResults;
+import org.kie.api.runtime.manager.RuntimeManager;
+import org.kie.api.runtime.process.WorkItem;
+import org.kie.internal.runtime.Cacheable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Camel jBPM {@link Command} which allows to call Camel routes with a <code>direct</code> endpoint.
+ * <p/>
+ * The command passes the {@WorkItem} retrieved from the {@link CommandContext} to the route that has a consumer on the endpoint-id 
+ * that can be passed with the <code>camel-endpoint-id</code> {@link WorkItem} parameter. E.g. when a the value "myCamelEndpoint" is passed to the 
+ * {link WorkItem} via the <code>camel-endpoint-id</code> parameter, this {@link Command} will send the {@link WorkItem} to 
+ * the Camel URI <code>direct://myCamelEndpoint</code>.  
+ * <p/>
+ * The body of the result {@link Message} of the invocation is returned via the <code>response</code> parameter. Access to the raw response 
+ * {@link Message} is provided via the <code>message</code> parameter. This gives the user access to more advanced fields like message headers 
+ * and attachments.  
+ * <p/>
+ * This {@link Command} can be constructed in 2 ways. When using the default constructor, the {link Command} will try to find 
+ * the global KIE {@link CamelContext} from the <code>jBPM</code> {@link ServiceRegistry}. 
+ * When the {@link RuntimeManager} is passed to the constructor, the {@link Command} will retrieve and use the {@link CamelContext} bound 
+ * to the {@link RuntimeManage} from the {@link ServiceRegistry}
+ * 
+ */
+public class CamelCommand implements Command,
+                                          Cacheable {
+
+	private static final String GLOBAL_CAMEL_CONTEXT_SERVICE_KEY = "GlobalCamelService";
+	private static final String RUNTIME_CAMEL_CONTEXT_SERVICE_POSTFIX = "_CamelService";
+	
+	private static final String CAMEL_ENDPOINT_ID_PARAM = "camel-endpoint-id";
+	private static final String RESPONSE_PARAM = "response";
+	private static final String MESSAGE_PARAM = "out-headers";
+
+	
+    private static final Logger logger = LoggerFactory.getLogger(CamelCommand.class);
+
+	private final ProducerTemplate producerTemplate;
+
+
+	public CamelCommand() {
+		CamelContext globalCamelContext = (CamelContext) ServiceRegistry.get().service(GLOBAL_CAMEL_CONTEXT_SERVICE_KEY);
+		// TODO: Should we allow to set the maximumCacheSize on the producer?
+		this.producerTemplate = globalCamelContext.createProducerTemplate();
+	}
+	
+	public CamelCommand(RuntimeManager runtimeManager) {
+		String runtimeCamelContextKey = runtimeManager.getIdentifier() + RUNTIME_CAMEL_CONTEXT_SERVICE_POSTFIX;
+		CamelContext runtimeCamelContext = (CamelContext) ServiceRegistry.get().service(runtimeCamelContextKey);
+		// TODO: Should we allow to set the maximumCacheSize on the producer?
+		this.producerTemplate = runtimeCamelContext.createProducerTemplate();
+	}
+	
+	
+	
+    @Override
+    public ExecutionResults execute(CommandContext ctx) throws Exception {
+        
+    	WorkItem workItem = (WorkItem) ctx.getData("workItem");
+    	
+    	String camelEndpointId = (String) workItem.getParameter(CAMEL_ENDPOINT_ID_PARAM);
+		
+		// We only support direct. We don't need to support more, as direct simply gives us the entrypoint into the actual Camel Routes.
+		String camelUri = "direct://" + camelEndpointId;
+		
+		Exchange inExchange = ExchangeBuilder.anExchange(producerTemplate.getCamelContext()).withBody(workItem).build();
+		Exchange outExchange = producerTemplate.send(camelUri, inExchange);
+		// producerTemplate.send does not throw exceptions, instead they are set on the returned Exchange.
+		if (outExchange.getException() != null) {
+			throw outExchange.getException();
+		}
+		Message outMessage = outExchange.getOut();
+		
+		ExecutionResults results = new ExecutionResults();
+		Object response = outMessage.getBody();
+		results.setData(RESPONSE_PARAM, response);
+		results.setData(MESSAGE_PARAM, outMessage);
+    	
+        return results;
+    }
+
+    
+	@Override
+	public void close() {
+		try {
+			this.producerTemplate.stop();
+		} catch (Exception e) {
+			logger.warn("Error encountered while closing the Camel Producer Template.", e);
+			// Not much we can do here, so swallowing exception.
+		}
+	}
+
+}
\ No newline at end of file
diff --git a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/CamelWorkItemHandler.java b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/CamelWorkItemHandler.java
new file mode 100644
index 0000000000000..7734dd9f264be
--- /dev/null
+++ b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/CamelWorkItemHandler.java
@@ -0,0 +1,137 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.camel.component.jbpm.workitem;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.Exchange;
+import org.apache.camel.Message;
+import org.apache.camel.ProducerTemplate;
+import org.apache.camel.builder.ExchangeBuilder;
+import org.jbpm.process.workitem.core.AbstractLogOrThrowWorkItemHandler;
+import org.jbpm.process.workitem.core.util.Wid;
+import org.jbpm.process.workitem.core.util.WidMavenDepends;
+import org.jbpm.process.workitem.core.util.WidParameter;
+import org.jbpm.process.workitem.core.util.WidResult;
+import org.jbpm.process.workitem.core.util.service.WidAction;
+import org.jbpm.process.workitem.core.util.service.WidService;
+import org.jbpm.services.api.service.ServiceRegistry;
+import org.kie.api.runtime.manager.RuntimeManager;
+import org.kie.api.runtime.process.WorkItem;
+import org.kie.api.runtime.process.WorkItemManager;
+import org.kie.internal.runtime.Cacheable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Camel jBPM {@link WorkItemHandler} which allows to call Camel routes with a <code>direct</code> endpoint.
+ * <p/>
+ * The handler passes the {@WorkItem} to the route that has a consumer on the endpoint-id that can be passed with the
+ * <code>camel-endpoint-id</code>{@link WorkItem} parameter. E.g. when a the value "myCamelEndpoint" is passed to the 
+ * {link WorkItem} via the <code>camel-endpoint-id</code> parameter, this command will send the {@link WorkItem} to the Camel URI
+ * <code>direct://myCamelEndpoint</code>.
+ * <p/>
+ * The body of the result {@link Message} of the invocation is returned via the <code>response</code> parameter. Access to the raw response
+ * {@link Message} is provided via the <code>message</code> parameter. This gives the user access to more advanced fields like message
+ * headers and attachments.
+ * <p/>
+ * This handler can be constructed in 2 ways. When using the default constructor, the handler will try to find the global KIE
+ * {@link CamelContext} from the <code>jBPM</code> {@link ServiceRegistry}. When the {@link RuntimeManager} is passed to the constructor,
+ * the handler will retrieve and use the {@link CamelContext} bound to the {@link RuntimeManage} from the {@link ServiceRegistry}
+ * 
+ */
+@Wid(widfile = "CamelConnector.wid", name = "CamelConnector", displayName = "CamelConnector", defaultHandler = "mvel: new org.apache.camel.component.jbpm.workitem.CamelWorkitemHandler()", documentation = "${artifactId}/index.html", parameters = {
+		@WidParameter(name = "camel-endpoint-id") }, results = { @WidResult(name = "response"),
+				@WidResult(name = "message") }, mavenDepends = {
+						@WidMavenDepends(group = "${groupId}", artifact = "${artifactId}", version = "${version}") }, serviceInfo = @WidService(category = "${name}", description = "${description}", keywords = "apache,camel,payload,route,connector", action = @WidAction(title = "Send payload to a Camel endpoint")))
+public class CamelWorkItemHandler extends AbstractLogOrThrowWorkItemHandler implements Cacheable {
+
+	private static final String GLOBAL_CAMEL_CONTEXT_SERVICE_KEY = "GlobalCamelService";
+	private static final String RUNTIME_CAMEL_CONTEXT_SERVICE_POSTFIX = "_CamelService";
+
+	private static final String CAMEL_ENDPOINT_ID_PARAM = "camel-endpoint-id";
+	private static final String RESPONSE_PARAM = "response";
+	private static final String MESSAGE_PARAM = "message";
+
+	private static Logger logger = LoggerFactory.getLogger(CamelWorkItemHandler.class);
+
+	private final ProducerTemplate producerTemplate;
+
+	/**
+	 * Default Constructor. This creates a {@link ProducerTemplate} for the global {@link CamelContext}.
+	 */
+	public CamelWorkItemHandler() {
+		CamelContext globalCamelContext = (CamelContext) ServiceRegistry.get().service(GLOBAL_CAMEL_CONTEXT_SERVICE_KEY);
+		// TODO: Should we allow to set the maximumCacheSize on the producer?
+		this.producerTemplate = globalCamelContext.createProducerTemplate();
+	}
+
+	/**
+	 * Constructor which accepts {@link RuntimeManager}. This causes this WorkItemHanlder to create a {@link ProducerTemplate} for the
+	 * runtime specific {@link CamelContext}.
+	 */
+	public CamelWorkItemHandler(RuntimeManager runtimeManager) {
+		String runtimeCamelContextKey = runtimeManager.getIdentifier() + RUNTIME_CAMEL_CONTEXT_SERVICE_POSTFIX;
+		CamelContext runtimeCamelContext = (CamelContext) ServiceRegistry.get().service(runtimeCamelContextKey);
+		// TODO: Should we allow to set the maximumCacheSize on the producer?
+		this.producerTemplate = runtimeCamelContext.createProducerTemplate();
+	}
+
+	public void executeWorkItem(WorkItem workItem, final WorkItemManager manager) {
+
+		String camelEndpointId = (String) workItem.getParameter(CAMEL_ENDPOINT_ID_PARAM);
+
+		// We only support direct. We don't need to support more, as direct simply gives us the entrypoint into the actual Camel Routes.
+		String camelUri = "direct://" + camelEndpointId;
+		try {
+			Exchange inExchange = ExchangeBuilder.anExchange(producerTemplate.getCamelContext()).withBody(workItem).build();
+			Exchange outExchange = producerTemplate.send(camelUri, inExchange);
+			// producerTemplate.send does not throw exceptions, instead they are set on the returned Exchange.
+			if (outExchange.getException() != null) {
+				throw outExchange.getException();
+			}
+			Message outMessage = outExchange.getOut();
+
+			Map<String, Object> result = new HashMap<>();
+			Object response = outMessage.getBody();
+			result.put(RESPONSE_PARAM, response);
+			result.put(MESSAGE_PARAM, outMessage);
+
+			manager.completeWorkItem(workItem.getId(), result);
+		} catch (Exception e) {
+			handleException(e);
+		}
+	}
+
+	public void abortWorkItem(WorkItem workItem, WorkItemManager manager) {
+		// Do nothing, cannot be aborted
+	}
+
+	@Override
+	public void close() {
+		try {
+			this.producerTemplate.stop();
+		} catch (Exception e) {
+			logger.warn("Error encountered while closing the Camel Producer Template.", e);
+			// Not much we can do here, so swallowing exception.
+		}
+	}
+
+}
\ No newline at end of file
diff --git a/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/CamelCommandTest.java b/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/CamelCommandTest.java
new file mode 100644
index 0000000000000..543b833555ca7
--- /dev/null
+++ b/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/CamelCommandTest.java
@@ -0,0 +1,134 @@
+/*
+ * Copyright 2018 Red Hat, Inc. and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.jbpm.workitem;
+
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
+import static org.mockito.ArgumentMatchers.any;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.Exchange;
+import org.apache.camel.Message;
+import org.apache.camel.ProducerTemplate;
+import org.drools.core.process.instance.impl.WorkItemImpl;
+import org.jbpm.services.api.service.ServiceRegistry;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.kie.api.executor.CommandContext;
+import org.kie.api.executor.ExecutionResults;
+import org.kie.api.runtime.manager.RuntimeManager;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+
+@RunWith(MockitoJUnitRunner.class)
+public class CamelCommandTest {
+
+	@Mock
+    ProducerTemplate producerTemplate;
+
+    @Mock
+    Exchange outExchange;
+    
+    @Mock
+    Message outMessage;
+    
+    @Mock
+    CamelContext camelContext;
+    
+    @Mock
+    RuntimeManager runtimeManager;
+    
+    @Mock
+    CommandContext commandContext;
+
+    @Test
+    public void testExecuteComamnd() throws Exception {
+    
+    	String camelEndpointId = "testCamelRoute";
+    	String camelRouteUri = "direct://" + camelEndpointId;
+    	
+    	String testReponse = "testResponse";
+    	
+    	String runtimeManagerId = "testRuntimeManager";
+    	
+    	when(producerTemplate.send(eq(camelRouteUri), any(Exchange.class))).thenReturn(outExchange);
+    	
+    	
+    	when(producerTemplate.getCamelContext()).thenReturn(camelContext);
+    	
+    	when(camelContext.createProducerTemplate()).thenReturn(producerTemplate);
+    	
+    	when(outExchange.getOut()).thenReturn(outMessage);
+    	when(outMessage.getBody()).thenReturn(testReponse);
+    	
+    	//Register the RuntimeManager bound camelcontext.
+    	ServiceRegistry.get().register("GlobalCamelService", camelContext);
+    	
+        WorkItemImpl workItem = new WorkItemImpl();
+        workItem.setParameter("camel-endpoint-id", camelEndpointId);
+        workItem.setParameter("request", "someRequest");
+        
+        when(commandContext.getData(anyString())).thenReturn(workItem);
+        
+        CamelCommand command = new CamelCommand();
+        ExecutionResults results = command.execute(commandContext);
+        
+        
+        assertNotNull(results);
+        assertEquals(2, results.getData().size());
+        assertEquals(testReponse, results.getData().get("response"));
+    }
+    
+    
+    @Test
+    public void testExecuteCommandLocalCamelContext() throws Exception {
+    
+    	String camelEndpointId = "testCamelRoute";
+    	String camelRouteUri = "direct://" + camelEndpointId;
+    	
+    	String testReponse = "testResponse";
+    	
+    	String runtimeManagerId = "testRuntimeManager";
+    	
+    	when(runtimeManager.getIdentifier()).thenReturn(runtimeManagerId);
+    	
+    	when(producerTemplate.send(eq(camelRouteUri), any(Exchange.class))).thenReturn(outExchange);
+    	//when(producerTemplate.send(argThat(not(camelRouteUri)), any(Exchange.class))).thenThrow(new IllegalArgumentException("Unexpected route id"));
+    	when(producerTemplate.getCamelContext()).thenReturn(camelContext);
+    	
+    	when(camelContext.createProducerTemplate()).thenReturn(producerTemplate);
+    	
+    	when(outExchange.getOut()).thenReturn(outMessage);
+    	when(outMessage.getBody()).thenReturn(testReponse);
+    	
+    	//Register the RuntimeManager bound camelcontext.
+    	ServiceRegistry.get().register(runtimeManagerId + "_CamelService", camelContext);
+    	
+        WorkItemImpl workItem = new WorkItemImpl();
+        workItem.setParameter("camel-endpoint-id", camelEndpointId);
+        workItem.setParameter("request", "someRequest");
+        
+        when(commandContext.getData(anyString())).thenReturn(workItem);
+        
+        CamelCommand command = new CamelCommand(runtimeManager);
+        ExecutionResults results = command.execute(commandContext);
+        
+        assertNotNull(results);
+        assertEquals(2, results.getData().size());
+        assertEquals(testReponse, results.getData().get("response"));
+    }
+
+}
diff --git a/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/CamelWorkItemHandlerTest.java b/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/CamelWorkItemHandlerTest.java
new file mode 100644
index 0000000000000..787213266cc33
--- /dev/null
+++ b/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/CamelWorkItemHandlerTest.java
@@ -0,0 +1,137 @@
+/*
+ * Copyright 2018 Red Hat, Inc. and/or its affiliates.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.camel.component.jbpm.workitem;
+
+import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.*;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.*;
+
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.Exchange;
+import org.apache.camel.Message;
+import org.apache.camel.ProducerTemplate;
+import org.drools.core.process.instance.impl.WorkItemImpl;
+import org.jbpm.process.workitem.core.TestWorkItemManager;
+import org.jbpm.services.api.service.ServiceRegistry;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.kie.api.runtime.manager.RuntimeManager;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+
+@RunWith(MockitoJUnitRunner.class)
+public class CamelWorkItemHandlerTest {
+
+    @Mock
+    ProducerTemplate producerTemplate;
+
+    @Mock
+    Exchange outExchange;
+    
+    @Mock
+    Message outMessage;
+    
+    @Mock
+    CamelContext camelContext;
+    
+    @Mock
+    RuntimeManager runtimeManager;
+
+    @Test
+    public void testExecuteGlobalCamelContext() throws Exception {
+    
+    	String camelEndpointId = "testCamelRoute";
+    	String camelRouteUri = "direct://" + camelEndpointId;
+    	
+    	String testReponse = "testResponse";
+    	
+    	when(producerTemplate.send(eq(camelRouteUri), any(Exchange.class))).thenReturn(outExchange);
+    	when(producerTemplate.getCamelContext()).thenReturn(camelContext);
+    	
+    	when(camelContext.createProducerTemplate()).thenReturn(producerTemplate);
+    	
+    	when(outExchange.getOut()).thenReturn(outMessage);
+    	when(outMessage.getBody()).thenReturn(testReponse);
+    	
+    	ServiceRegistry.get().register("GlobalCamelService", camelContext);
+    	
+    	
+        TestWorkItemManager manager = new TestWorkItemManager();
+        WorkItemImpl workItem = new WorkItemImpl();
+        workItem.setParameter("camel-endpoint-id", camelEndpointId);
+        workItem.setParameter("request", "someRequest");
+        
+        CamelWorkItemHandler handler = new CamelWorkItemHandler();
+        
+        handler.executeWorkItem(workItem,
+                                manager);
+        assertNotNull(manager.getResults());
+        assertEquals(1,
+                     manager.getResults().size());
+        assertTrue(manager.getResults().containsKey(workItem.getId()));
+        Map<String, Object> results = manager.getResults(workItem.getId());
+        assertEquals(2, results.size());
+        assertEquals(testReponse, results.get("response"));
+    }
+    
+    @Test
+    public void testExecuteLocalCamelContext() throws Exception {
+    
+    	String camelEndpointId = "testCamelRoute";
+    	String camelRouteUri = "direct://" + camelEndpointId;
+    	
+    	String testReponse = "testResponse";
+    	
+    	String runtimeManagerId = "testRuntimeManager";
+    	
+    	when(runtimeManager.getIdentifier()).thenReturn(runtimeManagerId);
+    	
+    	when(producerTemplate.send(eq(camelRouteUri), any(Exchange.class))).thenReturn(outExchange);
+       	when(producerTemplate.getCamelContext()).thenReturn(camelContext);
+    	
+    	when(camelContext.createProducerTemplate()).thenReturn(producerTemplate);
+    	
+    	when(outExchange.getOut()).thenReturn(outMessage);
+    	when(outMessage.getBody()).thenReturn(testReponse);
+    	
+    	//Register the RuntimeManager bound camelcontext.
+    	ServiceRegistry.get().register(runtimeManagerId + "_CamelService", camelContext);
+    	
+    	
+        WorkItemImpl workItem = new WorkItemImpl();
+        workItem.setParameter("camel-endpoint-id", camelEndpointId);
+        workItem.setParameter("request", "someRequest");
+        
+        CamelWorkItemHandler handler = new CamelWorkItemHandler(runtimeManager);
+        
+        TestWorkItemManager manager = new TestWorkItemManager();
+        handler.executeWorkItem(workItem,
+                                manager);
+        assertNotNull(manager.getResults());
+        assertEquals(1,
+                     manager.getResults().size());
+        assertTrue(manager.getResults().containsKey(workItem.getId()));
+        Map<String, Object> results = manager.getResults(workItem.getId());
+        assertEquals(2, results.size());
+        assertEquals(testReponse, results.get("response"));
+    }
+
+
+}

From 89f1070c7bfd6f8d4a71f405bfcc41249723fc46 Mon Sep 17 00:00:00 2001
From: Duncan Doyle <Duncan.Doyle@gmail.com>
Date: Thu, 29 Nov 2018 15:02:15 +0100
Subject: [PATCH 116/125] CamelCommand splitted in a separate command for Camel
 DeploymentContext and GlobalContext. WorkItemHandler can now be configured
 with default route. WIH supports both InOut and InOnly MEPs. Added tests that
 use a test CamelContext and test-routes to verify behaviour on Exceptions.

---
 ...Command.java => AbstractCamelCommand.java} |  46 +---
 .../AbstractCamelWorkItemHandler.java         | 156 ++++++++++++++
 .../jbpm/workitem/CamelWorkItemHandler.java   | 137 ------------
 .../DeploymentContextCamelCommand.java        |  73 +++++++
 .../workitem/GlobalContextCamelCommand.java   |  60 ++++++
 .../workitem/InOnlyCamelWorkItemHandler.java  | 106 +++++++++
 .../workitem/InOutCamelWorkItemHandler.java   | 119 ++++++++++
 .../CamelWorkItemHandlerIntegrationTests.java | 204 ++++++++++++++++++
 .../workitem/CamelWorkItemHandlerTest.java    | 137 ------------
 .../DeploymentContextCamelCommandTest.java    |  95 ++++++++
 ...ava => GlobalContextCamelCommandTest.java} |  65 ++----
 .../InOnlyCamelWorkItemHandlerTest.java       |  97 +++++++++
 .../InOutCamelWorkItemHandlerTest.java        | 147 +++++++++++++
 13 files changed, 1078 insertions(+), 364 deletions(-)
 rename components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/{CamelCommand.java => AbstractCamelCommand.java} (68%)
 create mode 100644 components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/AbstractCamelWorkItemHandler.java
 delete mode 100644 components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/CamelWorkItemHandler.java
 create mode 100644 components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/DeploymentContextCamelCommand.java
 create mode 100644 components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/GlobalContextCamelCommand.java
 create mode 100644 components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/InOnlyCamelWorkItemHandler.java
 create mode 100644 components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/InOutCamelWorkItemHandler.java
 create mode 100644 components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/CamelWorkItemHandlerIntegrationTests.java
 delete mode 100644 components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/CamelWorkItemHandlerTest.java
 create mode 100644 components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/DeploymentContextCamelCommandTest.java
 rename components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/{CamelCommandTest.java => GlobalContextCamelCommandTest.java} (54%)
 create mode 100644 components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/InOnlyCamelWorkItemHandlerTest.java
 create mode 100644 components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/InOutCamelWorkItemHandlerTest.java

diff --git a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/CamelCommand.java b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/AbstractCamelCommand.java
similarity index 68%
rename from components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/CamelCommand.java
rename to components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/AbstractCamelCommand.java
index 80c767e0e8687..3cb1ee48227a1 100644
--- a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/CamelCommand.java
+++ b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/AbstractCamelCommand.java
@@ -42,48 +42,24 @@
  * <p/>
  * The body of the result {@link Message} of the invocation is returned via the <code>response</code> parameter. Access to the raw response 
  * {@link Message} is provided via the <code>message</code> parameter. This gives the user access to more advanced fields like message headers 
- * and attachments.  
- * <p/>
- * This {@link Command} can be constructed in 2 ways. When using the default constructor, the {link Command} will try to find 
- * the global KIE {@link CamelContext} from the <code>jBPM</code> {@link ServiceRegistry}. 
- * When the {@link RuntimeManager} is passed to the constructor, the {@link Command} will retrieve and use the {@link CamelContext} bound 
- * to the {@link RuntimeManage} from the {@link ServiceRegistry}
- * 
+ * and attachments.
  */
-public class CamelCommand implements Command,
+public abstract class AbstractCamelCommand implements Command,
                                           Cacheable {
 
-	private static final String GLOBAL_CAMEL_CONTEXT_SERVICE_KEY = "GlobalCamelService";
-	private static final String RUNTIME_CAMEL_CONTEXT_SERVICE_POSTFIX = "_CamelService";
-	
 	private static final String CAMEL_ENDPOINT_ID_PARAM = "camel-endpoint-id";
 	private static final String RESPONSE_PARAM = "response";
 	private static final String MESSAGE_PARAM = "out-headers";
-
 	
-    private static final Logger logger = LoggerFactory.getLogger(CamelCommand.class);
-
-	private final ProducerTemplate producerTemplate;
+    private static final Logger logger = LoggerFactory.getLogger(AbstractCamelCommand.class);
 
-
-	public CamelCommand() {
-		CamelContext globalCamelContext = (CamelContext) ServiceRegistry.get().service(GLOBAL_CAMEL_CONTEXT_SERVICE_KEY);
-		// TODO: Should we allow to set the maximumCacheSize on the producer?
-		this.producerTemplate = globalCamelContext.createProducerTemplate();
-	}
-	
-	public CamelCommand(RuntimeManager runtimeManager) {
-		String runtimeCamelContextKey = runtimeManager.getIdentifier() + RUNTIME_CAMEL_CONTEXT_SERVICE_POSTFIX;
-		CamelContext runtimeCamelContext = (CamelContext) ServiceRegistry.get().service(runtimeCamelContextKey);
-		// TODO: Should we allow to set the maximumCacheSize on the producer?
-		this.producerTemplate = runtimeCamelContext.createProducerTemplate();
+	public AbstractCamelCommand() {
 	}
 	
-	
-	
     @Override
     public ExecutionResults execute(CommandContext ctx) throws Exception {
         
+        
     	WorkItem workItem = (WorkItem) ctx.getData("workItem");
     	
     	String camelEndpointId = (String) workItem.getParameter(CAMEL_ENDPOINT_ID_PARAM);
@@ -91,6 +67,7 @@ public ExecutionResults execute(CommandContext ctx) throws Exception {
 		// We only support direct. We don't need to support more, as direct simply gives us the entrypoint into the actual Camel Routes.
 		String camelUri = "direct://" + camelEndpointId;
 		
+		ProducerTemplate producerTemplate = getProducerTemplate(ctx);
 		Exchange inExchange = ExchangeBuilder.anExchange(producerTemplate.getCamelContext()).withBody(workItem).build();
 		Exchange outExchange = producerTemplate.send(camelUri, inExchange);
 		// producerTemplate.send does not throw exceptions, instead they are set on the returned Exchange.
@@ -106,16 +83,7 @@ public ExecutionResults execute(CommandContext ctx) throws Exception {
     	
         return results;
     }
-
     
-	@Override
-	public void close() {
-		try {
-			this.producerTemplate.stop();
-		} catch (Exception e) {
-			logger.warn("Error encountered while closing the Camel Producer Template.", e);
-			// Not much we can do here, so swallowing exception.
-		}
-	}
+    protected abstract ProducerTemplate getProducerTemplate(CommandContext ctx);
 
 }
\ No newline at end of file
diff --git a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/AbstractCamelWorkItemHandler.java b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/AbstractCamelWorkItemHandler.java
new file mode 100644
index 0000000000000..db88e70d53031
--- /dev/null
+++ b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/AbstractCamelWorkItemHandler.java
@@ -0,0 +1,156 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.camel.component.jbpm.workitem;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.Exchange;
+import org.apache.camel.Message;
+import org.apache.camel.ProducerTemplate;
+import org.jbpm.process.workitem.core.AbstractLogOrThrowWorkItemHandler;
+import org.jbpm.services.api.service.ServiceRegistry;
+import org.kie.api.runtime.manager.RuntimeManager;
+import org.kie.api.runtime.process.WorkItem;
+import org.kie.api.runtime.process.WorkItemHandler;
+import org.kie.api.runtime.process.WorkItemManager;
+import org.kie.internal.runtime.Cacheable;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Camel jBPM {@link WorkItemHandler} which allows to call Camel routes with a <code>direct</code> endpoint.
+ * <p/>
+ * The handler passes the {@WorkItem} to the route that has a consumer on the endpoint-id that can be passed with the
+ * <code>camel-endpoint-id</code>{@link WorkItem} parameter. E.g. when a the value "myCamelEndpoint" is passed to the {link WorkItem} via
+ * the <code>camel-endpoint-id</code> parameter, this command will send the {@link WorkItem} to the Camel URI
+ * <code>direct://myCamelEndpoint</code>.
+ * <p/>
+ * The body of the result {@link Message} of the invocation is returned via the <code>response</code> parameter. Access to the raw response
+ * {@link Message} is provided via the <code>message</code> parameter. This gives the user access to more advanced fields like message
+ * headers and attachments.
+ * <p/>
+ * This handler can be constructed in multiple ways. When you don't pass a {@link RuntimeManager} to the constructor, the handler will try
+ * to find the global KIE {@link CamelContext} from the <code>jBPM</code> {@link ServiceRegistry}. When the {@link RuntimeManager} is passed
+ * to the constructor, the handler will retrieve and use the {@link CamelContext} bound to the {@link RuntimeManage} from the
+ * {@link ServiceRegistry}. When a <code>camel-endpoint-id</code> is passed to the constructor, the handler will send all requests to the
+ * Camel route that is consuming from that endpoint, unless the endpoint is overridden by passing a the <code>camel-endpoint-id</code> in
+ * the {@link WorkItem} parameters.
+ * 
+ */
+public abstract class AbstractCamelWorkItemHandler extends AbstractLogOrThrowWorkItemHandler implements Cacheable {
+
+    private static final String GLOBAL_CAMEL_CONTEXT_SERVICE_KEY = "GlobalCamelService";
+    private static final String RUNTIME_CAMEL_CONTEXT_SERVICE_POSTFIX = "_CamelService";
+
+    private static final String CAMEL_ENDPOINT_ID_PARAM = "camel-endpoint-id";
+
+    private static Logger logger = LoggerFactory.getLogger(AbstractCamelWorkItemHandler.class);
+
+    private final ProducerTemplate producerTemplate;
+
+    private final String camelEndpointId;
+
+    /**
+     * Default Constructor. This creates a {@link ProducerTemplate} for the global {@link CamelContext}.
+     */
+    public AbstractCamelWorkItemHandler() {
+        this("");
+    }
+
+    public AbstractCamelWorkItemHandler(String camelEndointId) {
+        CamelContext globalCamelContext = (CamelContext) ServiceRegistry.get().service(GLOBAL_CAMEL_CONTEXT_SERVICE_KEY);
+        // TODO: Should we allow to set the maximumCacheSize on the producer?
+        this.producerTemplate = globalCamelContext.createProducerTemplate();
+        this.camelEndpointId = camelEndointId;
+    }
+
+    /**
+     * Constructor which accepts {@link RuntimeManager}. This causes this WorkItemHanlder to create a {@link ProducerTemplate} for the
+     * runtime specific {@link CamelContext}.
+     */
+    public AbstractCamelWorkItemHandler(RuntimeManager runtimeManager) {
+        this(runtimeManager, "");
+    }
+
+    public AbstractCamelWorkItemHandler(RuntimeManager runtimeManager, String camelEndpointId) {
+        String runtimeCamelContextKey = runtimeManager.getIdentifier() + RUNTIME_CAMEL_CONTEXT_SERVICE_POSTFIX;
+        CamelContext runtimeCamelContext = (CamelContext) ServiceRegistry.get().service(runtimeCamelContextKey);
+        // TODO: Should we allow to set the maximumCacheSize on the producer?
+        this.producerTemplate = runtimeCamelContext.createProducerTemplate();
+        this.camelEndpointId = camelEndpointId;
+    }
+
+    public void executeWorkItem(WorkItem workItem, final WorkItemManager manager) {
+
+        String workItemCamelEndpointId = getCamelEndpointId(workItem);
+
+        // We only support direct. We don't need to support more, as direct simply gives us the entrypoint into the actual Camel Routes.
+        String camelUri = "direct://" + workItemCamelEndpointId;
+
+        try {
+            Exchange requestExchange = buildExchange(producerTemplate, workItem);
+            logger.debug("Sending Camel Exchange to: " + camelUri);
+            Exchange responseExchange = producerTemplate.send(camelUri, requestExchange);
+            // producerTemplate.send does not throw exceptions, instead they are set on the returned Exchange.
+            if (responseExchange.getException() != null) {
+                throw responseExchange.getException();
+            }
+            handleResponse(responseExchange, workItem, manager);
+        } catch (Exception e) {
+            handleException(e);
+        }
+    }
+
+    private String getCamelEndpointId(WorkItem workItem) {
+        String workItemCamelEndpointId = (String) workItem.getParameter(CAMEL_ENDPOINT_ID_PARAM);
+
+        if (camelEndpointId != null && !camelEndpointId.isEmpty()) {
+            if (workItemCamelEndpointId != null && !workItemCamelEndpointId.isEmpty()) {
+                logger.debug(
+                        "The Camel Endpoint ID has been set on both the WorkItemHanlder and WorkItem. The camel-endpoint-id configured on the WorkItem overrides the global configuation.");
+            } else {
+                workItemCamelEndpointId = camelEndpointId;
+            }
+        }
+
+        if (workItemCamelEndpointId == null || workItemCamelEndpointId.isEmpty()) {
+            throw new IllegalArgumentException(
+                    "No Camel Endpoint ID specified. Please configure the 'camel-endpoint-id' in either the constructor of this WorkItemHandler, or pass it via the "
+                            + CAMEL_ENDPOINT_ID_PARAM + "' WorkItem parameter.");
+        }
+        return workItemCamelEndpointId;
+    }
+
+    protected abstract void handleResponse(Exchange responseExchange, WorkItem workItem, WorkItemManager manager);
+
+    protected abstract Exchange buildExchange(ProducerTemplate template, WorkItem workItem);
+
+    public void abortWorkItem(WorkItem workItem, WorkItemManager manager) {
+        // Do nothing, cannot be aborted
+    }
+
+    @Override
+    public void close() {
+        try {
+            this.producerTemplate.stop();
+        } catch (Exception e) {
+            logger.warn("Error encountered while closing the Camel Producer Template.", e);
+            // Not much we can do here, so swallowing exception.
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/CamelWorkItemHandler.java b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/CamelWorkItemHandler.java
deleted file mode 100644
index 7734dd9f264be..0000000000000
--- a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/CamelWorkItemHandler.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.camel.component.jbpm.workitem;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.Exchange;
-import org.apache.camel.Message;
-import org.apache.camel.ProducerTemplate;
-import org.apache.camel.builder.ExchangeBuilder;
-import org.jbpm.process.workitem.core.AbstractLogOrThrowWorkItemHandler;
-import org.jbpm.process.workitem.core.util.Wid;
-import org.jbpm.process.workitem.core.util.WidMavenDepends;
-import org.jbpm.process.workitem.core.util.WidParameter;
-import org.jbpm.process.workitem.core.util.WidResult;
-import org.jbpm.process.workitem.core.util.service.WidAction;
-import org.jbpm.process.workitem.core.util.service.WidService;
-import org.jbpm.services.api.service.ServiceRegistry;
-import org.kie.api.runtime.manager.RuntimeManager;
-import org.kie.api.runtime.process.WorkItem;
-import org.kie.api.runtime.process.WorkItemManager;
-import org.kie.internal.runtime.Cacheable;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Camel jBPM {@link WorkItemHandler} which allows to call Camel routes with a <code>direct</code> endpoint.
- * <p/>
- * The handler passes the {@WorkItem} to the route that has a consumer on the endpoint-id that can be passed with the
- * <code>camel-endpoint-id</code>{@link WorkItem} parameter. E.g. when a the value "myCamelEndpoint" is passed to the 
- * {link WorkItem} via the <code>camel-endpoint-id</code> parameter, this command will send the {@link WorkItem} to the Camel URI
- * <code>direct://myCamelEndpoint</code>.
- * <p/>
- * The body of the result {@link Message} of the invocation is returned via the <code>response</code> parameter. Access to the raw response
- * {@link Message} is provided via the <code>message</code> parameter. This gives the user access to more advanced fields like message
- * headers and attachments.
- * <p/>
- * This handler can be constructed in 2 ways. When using the default constructor, the handler will try to find the global KIE
- * {@link CamelContext} from the <code>jBPM</code> {@link ServiceRegistry}. When the {@link RuntimeManager} is passed to the constructor,
- * the handler will retrieve and use the {@link CamelContext} bound to the {@link RuntimeManage} from the {@link ServiceRegistry}
- * 
- */
-@Wid(widfile = "CamelConnector.wid", name = "CamelConnector", displayName = "CamelConnector", defaultHandler = "mvel: new org.apache.camel.component.jbpm.workitem.CamelWorkitemHandler()", documentation = "${artifactId}/index.html", parameters = {
-		@WidParameter(name = "camel-endpoint-id") }, results = { @WidResult(name = "response"),
-				@WidResult(name = "message") }, mavenDepends = {
-						@WidMavenDepends(group = "${groupId}", artifact = "${artifactId}", version = "${version}") }, serviceInfo = @WidService(category = "${name}", description = "${description}", keywords = "apache,camel,payload,route,connector", action = @WidAction(title = "Send payload to a Camel endpoint")))
-public class CamelWorkItemHandler extends AbstractLogOrThrowWorkItemHandler implements Cacheable {
-
-	private static final String GLOBAL_CAMEL_CONTEXT_SERVICE_KEY = "GlobalCamelService";
-	private static final String RUNTIME_CAMEL_CONTEXT_SERVICE_POSTFIX = "_CamelService";
-
-	private static final String CAMEL_ENDPOINT_ID_PARAM = "camel-endpoint-id";
-	private static final String RESPONSE_PARAM = "response";
-	private static final String MESSAGE_PARAM = "message";
-
-	private static Logger logger = LoggerFactory.getLogger(CamelWorkItemHandler.class);
-
-	private final ProducerTemplate producerTemplate;
-
-	/**
-	 * Default Constructor. This creates a {@link ProducerTemplate} for the global {@link CamelContext}.
-	 */
-	public CamelWorkItemHandler() {
-		CamelContext globalCamelContext = (CamelContext) ServiceRegistry.get().service(GLOBAL_CAMEL_CONTEXT_SERVICE_KEY);
-		// TODO: Should we allow to set the maximumCacheSize on the producer?
-		this.producerTemplate = globalCamelContext.createProducerTemplate();
-	}
-
-	/**
-	 * Constructor which accepts {@link RuntimeManager}. This causes this WorkItemHanlder to create a {@link ProducerTemplate} for the
-	 * runtime specific {@link CamelContext}.
-	 */
-	public CamelWorkItemHandler(RuntimeManager runtimeManager) {
-		String runtimeCamelContextKey = runtimeManager.getIdentifier() + RUNTIME_CAMEL_CONTEXT_SERVICE_POSTFIX;
-		CamelContext runtimeCamelContext = (CamelContext) ServiceRegistry.get().service(runtimeCamelContextKey);
-		// TODO: Should we allow to set the maximumCacheSize on the producer?
-		this.producerTemplate = runtimeCamelContext.createProducerTemplate();
-	}
-
-	public void executeWorkItem(WorkItem workItem, final WorkItemManager manager) {
-
-		String camelEndpointId = (String) workItem.getParameter(CAMEL_ENDPOINT_ID_PARAM);
-
-		// We only support direct. We don't need to support more, as direct simply gives us the entrypoint into the actual Camel Routes.
-		String camelUri = "direct://" + camelEndpointId;
-		try {
-			Exchange inExchange = ExchangeBuilder.anExchange(producerTemplate.getCamelContext()).withBody(workItem).build();
-			Exchange outExchange = producerTemplate.send(camelUri, inExchange);
-			// producerTemplate.send does not throw exceptions, instead they are set on the returned Exchange.
-			if (outExchange.getException() != null) {
-				throw outExchange.getException();
-			}
-			Message outMessage = outExchange.getOut();
-
-			Map<String, Object> result = new HashMap<>();
-			Object response = outMessage.getBody();
-			result.put(RESPONSE_PARAM, response);
-			result.put(MESSAGE_PARAM, outMessage);
-
-			manager.completeWorkItem(workItem.getId(), result);
-		} catch (Exception e) {
-			handleException(e);
-		}
-	}
-
-	public void abortWorkItem(WorkItem workItem, WorkItemManager manager) {
-		// Do nothing, cannot be aborted
-	}
-
-	@Override
-	public void close() {
-		try {
-			this.producerTemplate.stop();
-		} catch (Exception e) {
-			logger.warn("Error encountered while closing the Camel Producer Template.", e);
-			// Not much we can do here, so swallowing exception.
-		}
-	}
-
-}
\ No newline at end of file
diff --git a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/DeploymentContextCamelCommand.java b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/DeploymentContextCamelCommand.java
new file mode 100644
index 0000000000000..e3d3fd19d176d
--- /dev/null
+++ b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/DeploymentContextCamelCommand.java
@@ -0,0 +1,73 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.camel.component.jbpm.workitem;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.ProducerTemplate;
+import org.jbpm.services.api.service.ServiceRegistry;
+import org.kie.api.executor.CommandContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * CamelCommand that uses the {@link CamelContext} registered on the {@link ServiceRegistry} for this specific deployment.
+ */
+public class DeploymentContextCamelCommand extends AbstractCamelCommand {
+
+    private static final String RUNTIME_CAMEL_CONTEXT_SERVICE_POSTFIX = "_CamelService";
+
+    private final Map<String, ProducerTemplate> templates = new ConcurrentHashMap<>();
+
+    private static final Logger logger = LoggerFactory.getLogger(DeploymentContextCamelCommand.class);
+
+    @Override
+    protected ProducerTemplate getProducerTemplate(CommandContext ctx) {
+        String deploymentId = (String) ctx.getData("deploymentId");
+        ProducerTemplate template = templates.get(deploymentId);
+
+        if (template == null) {
+            synchronized (this) {
+                template = templates.get(deploymentId);
+                if (template == null) {
+                    CamelContext deploymentCamelContext = (CamelContext) ServiceRegistry.get()
+                            .service(deploymentId + RUNTIME_CAMEL_CONTEXT_SERVICE_POSTFIX);
+                    template = deploymentCamelContext.createProducerTemplate();
+                    templates.put(deploymentId, template);
+                }
+            }
+        }
+        return template;
+    }
+
+    @Override
+    public void close() {
+        for (ProducerTemplate nextTemplate : templates.values()) {
+            try {
+                nextTemplate.stop();
+            } catch (Exception e) {
+                logger.warn("Error encountered while closing the Camel Producer Template.", e);
+                // Not much we can do here, so swallowing exception.
+            }
+        }
+
+    }
+
+}
diff --git a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/GlobalContextCamelCommand.java b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/GlobalContextCamelCommand.java
new file mode 100644
index 0000000000000..974b8965ae86e
--- /dev/null
+++ b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/GlobalContextCamelCommand.java
@@ -0,0 +1,60 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.camel.component.jbpm.workitem;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.ProducerTemplate;
+import org.jbpm.services.api.service.ServiceRegistry;
+import org.kie.api.executor.CommandContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * CamelCommand that uses the global {@link CamelContext} registered on the {@link ServiceRegistry}.
+ */
+public class GlobalContextCamelCommand extends AbstractCamelCommand {
+
+    private static final String GLOBAL_CAMEL_CONTEXT_SERVICE_KEY = "GlobalCamelService";
+    
+    private final ProducerTemplate globalContextProducerTemplate;
+    
+    private static final Logger logger = LoggerFactory.getLogger(GlobalContextCamelCommand.class);
+    
+    public GlobalContextCamelCommand() {
+        CamelContext globalCamelContext = (CamelContext) ServiceRegistry.get().service(GLOBAL_CAMEL_CONTEXT_SERVICE_KEY);
+        // TODO: Should we allow to set the maximumCacheSize on the producer?
+        this.globalContextProducerTemplate = globalCamelContext.createProducerTemplate();
+    }
+    
+    @Override
+    protected ProducerTemplate getProducerTemplate(CommandContext ctx) {
+        return globalContextProducerTemplate;
+    }
+    
+    @Override
+    public void close() {
+        try {
+            this.globalContextProducerTemplate.stop();
+        } catch (Exception e) {
+            logger.warn("Error encountered while closing the Camel Producer Template.", e);
+            // Not much we can do here, so swallowing exception.
+        }
+    }
+    
+
+}
diff --git a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/InOnlyCamelWorkItemHandler.java b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/InOnlyCamelWorkItemHandler.java
new file mode 100644
index 0000000000000..0588c02598e03
--- /dev/null
+++ b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/InOnlyCamelWorkItemHandler.java
@@ -0,0 +1,106 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.camel.component.jbpm.workitem;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.ExchangePattern;
+import org.apache.camel.Message;
+import org.apache.camel.ProducerTemplate;
+import org.apache.camel.builder.ExchangeBuilder;
+import org.drools.core.process.instance.impl.WorkItemImpl;
+import org.jbpm.process.workitem.core.util.Wid;
+import org.jbpm.process.workitem.core.util.WidMavenDepends;
+import org.jbpm.process.workitem.core.util.WidParameter;
+import org.jbpm.process.workitem.core.util.WidResult;
+import org.jbpm.process.workitem.core.util.service.WidAction;
+import org.jbpm.process.workitem.core.util.service.WidService;
+import org.kie.api.runtime.manager.RuntimeManager;
+import org.kie.api.runtime.process.WorkItem;
+import org.kie.api.runtime.process.WorkItemHandler;
+import org.kie.api.runtime.process.WorkItemManager;
+
+/**
+ * Camel jBPM {@link WorkItemHandler} that sends {@link Exchange Exchanges} with an <code>InOnly</code> Message Exchange Pattern.
+ * <p/>
+ * This handler does <b>NOT<b/> complete the {@link WorkItem}, and will not parse any response from the Camel route, other than possible exceptions.
+ * The use-case for this handler is asynchronous, one-way, communication, where an external party is responsible for completing the
+ * {@link WorkItem} at a later point in time.
+ * <p/>
+ * The handler creates a Camel Exchange and sets the {@link WorkItem} as the body of the {@link Message}. Furthermore, the following message
+ * headers are set:
+ * <ul>
+ * <li>deploymentId</li>
+ * <li>processInstanceId</li>
+ * <li>workItemId</li>
+ * </ul>
+ */
+@Wid(
+        widfile = "InOnlyCamelConnector.wid",
+        name = "InOnlyCamelConnector",
+        displayName = "InOnlyCamelConnector",
+        defaultHandler = "mvel: new org.apache.camel.component.jbpm.workitem.InOnlyCamelWorkitemHandler()",
+        documentation = "${artifactId}/index.html",
+        parameters = {
+                @WidParameter(name = "camel-endpoint-id")
+        },
+        results = {
+                @WidResult(name = "response"),
+                @WidResult(name = "message") },
+        mavenDepends = {
+                @WidMavenDepends(group = "${groupId}",
+                        artifact = "${artifactId}",
+                        version = "${version}")
+        },
+        serviceInfo = @WidService(category = "${name}",
+                description = "${description}",
+                keywords = "apache,camel,payload,route,connector",
+                action = @WidAction(title = "Send payload to a Camel endpoint")))
+public class InOnlyCamelWorkItemHandler extends AbstractCamelWorkItemHandler {
+
+    public InOnlyCamelWorkItemHandler() {
+        super();
+    }
+
+    public InOnlyCamelWorkItemHandler(String camelEndpointId) {
+        super(camelEndpointId);
+    }
+
+    public InOnlyCamelWorkItemHandler(RuntimeManager runtimeManager) {
+        super(runtimeManager);
+    }
+
+    public InOnlyCamelWorkItemHandler(RuntimeManager runtimeManager, String camelEndpointId) {
+        super(runtimeManager, camelEndpointId);
+    }
+
+    @Override
+    protected void handleResponse(Exchange responseExchange, WorkItem workItem, WorkItemManager manager) {
+        // no-op. There is no response for InOnly, so need to handle anything
+    }
+
+    @Override
+    protected Exchange buildExchange(ProducerTemplate template, WorkItem workItem) {
+        return ExchangeBuilder.anExchange(template.getCamelContext())
+                .withPattern(ExchangePattern.InOnly)
+                .withHeader("deploymentId", ((WorkItemImpl) workItem).getDeploymentId())
+                .withHeader("processInstanceId", workItem.getProcessInstanceId())
+                .withHeader("workItemId", workItem.getId())
+                .withBody(workItem).build();
+    }
+
+}
diff --git a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/InOutCamelWorkItemHandler.java b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/InOutCamelWorkItemHandler.java
new file mode 100644
index 0000000000000..d53c882a7cbcd
--- /dev/null
+++ b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/InOutCamelWorkItemHandler.java
@@ -0,0 +1,119 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.camel.component.jbpm.workitem;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.ExchangePattern;
+import org.apache.camel.Message;
+import org.apache.camel.ProducerTemplate;
+import org.apache.camel.builder.ExchangeBuilder;
+import org.drools.core.process.instance.impl.WorkItemImpl;
+import org.jbpm.process.workitem.core.util.Wid;
+import org.jbpm.process.workitem.core.util.WidMavenDepends;
+import org.jbpm.process.workitem.core.util.WidParameter;
+import org.jbpm.process.workitem.core.util.WidResult;
+import org.jbpm.process.workitem.core.util.service.WidAction;
+import org.jbpm.process.workitem.core.util.service.WidService;
+import org.kie.api.runtime.manager.RuntimeManager;
+import org.kie.api.runtime.process.WorkItem;
+import org.kie.api.runtime.process.WorkItemHandler;
+import org.kie.api.runtime.process.WorkItemManager;
+
+/**
+ * Camel jBPM {@link WorkItemHandler} that sends {@link Exchange Exchanges} with an <code>InOut</code> Message Exchange Pattern.
+ * <p/>
+ * This handler parses the response message from the given Camel route and completes the {@link WorkItem}. The use-case for this handler is
+ * synchronous, request-response style, communication.
+ * <p/>
+ * The handler creates a Camel Exchange and sets the {@link WorkItem} as the body of the {@link Message}. Furthermore, the following message
+ * headers are set:
+ * <ul>
+ * <li>deploymentId</li>
+ * <li>processInstanceId</li>
+ * <li>workItemId</li>
+ * </ul>
+ */
+@Wid(
+        widfile = "InOutCamelConnector.wid",
+        name = "InOutCamelConnector",
+        displayName = "InOutCamelConnector",
+        defaultHandler = "mvel: new org.apache.camel.component.jbpm.workitem.InOutCamelWorkitemHandler()",
+        documentation = "${artifactId}/index.html",
+        parameters = {
+                @WidParameter(name = "camel-endpoint-id")
+        },
+        results = {
+                @WidResult(name = "response"),
+                @WidResult(name = "message") },
+        mavenDepends = {
+                @WidMavenDepends(group = "${groupId}",
+                        artifact = "${artifactId}",
+                        version = "${version}")
+        },
+        serviceInfo = @WidService(category = "${name}",
+                description = "${description}",
+                keywords = "apache,camel,payload,route,connector",
+                action = @WidAction(title = "Send payload to a Camel endpoint")))
+public class InOutCamelWorkItemHandler extends AbstractCamelWorkItemHandler {
+
+    private static final String RESPONSE_PARAM = "response";
+    private static final String MESSAGE_PARAM = "message";
+
+    public InOutCamelWorkItemHandler() {
+        super();
+    }
+
+    public InOutCamelWorkItemHandler(String camelEndpointId) {
+        super(camelEndpointId);
+    }
+
+    public InOutCamelWorkItemHandler(RuntimeManager runtimeManager) {
+        super(runtimeManager);
+    }
+
+    public InOutCamelWorkItemHandler(RuntimeManager runtimeManager, String camelEndpointId) {
+        super(runtimeManager, camelEndpointId);
+    }
+
+    @Override
+    protected void handleResponse(Exchange responseExchange, WorkItem workItem, WorkItemManager manager) {
+        Message outMessage = responseExchange.getOut();
+
+        Map<String, Object> result = new HashMap<>();
+        Object response = outMessage.getBody();
+        result.put(RESPONSE_PARAM, response);
+        result.put(MESSAGE_PARAM, outMessage);
+
+        manager.completeWorkItem(workItem.getId(), result);
+    }
+
+    @Override
+    protected Exchange buildExchange(ProducerTemplate template, WorkItem workItem) {
+        return ExchangeBuilder.anExchange(template.getCamelContext())
+                .withPattern(ExchangePattern.InOut)
+                .withHeader("deploymentId", ((WorkItemImpl) workItem).getDeploymentId())
+                .withHeader("processInstanceId", workItem.getProcessInstanceId())
+                .withHeader("workItemId", workItem.getId())
+                .withBody(workItem)
+                .build();
+    }
+
+}
diff --git a/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/CamelWorkItemHandlerIntegrationTests.java b/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/CamelWorkItemHandlerIntegrationTests.java
new file mode 100644
index 0000000000000..39fd86103b320
--- /dev/null
+++ b/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/CamelWorkItemHandlerIntegrationTests.java
@@ -0,0 +1,204 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.camel.component.jbpm.workitem;
+
+import static org.hamcrest.CoreMatchers.*;
+
+import org.apache.camel.EndpointInject;
+import org.apache.camel.Produce;
+import org.apache.camel.ProducerTemplate;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.drools.core.process.instance.impl.WorkItemImpl;
+import org.jbpm.bpmn2.handler.WorkItemHandlerRuntimeException;
+import org.jbpm.process.workitem.core.TestWorkItemManager;
+import org.jbpm.services.api.service.ServiceRegistry;
+import org.junit.Test;
+import org.kie.api.runtime.process.WorkItemHandler;
+
+//http://camel.apache.org/using-getin-or-getout-methods-on-exchange.html
+//http://camel.apache.org/async.html
+public class CamelWorkItemHandlerIntegrationTests extends CamelTestSupport {
+
+    @EndpointInject(uri = "mock:result")
+    protected MockEndpoint resultEndpoint;
+
+    @Produce(uri = "direct:start")
+    protected ProducerTemplate template;
+
+    @Test
+    public void testSyncInOnly() throws Exception {
+        // Setup
+        String routeId = "testSyncInOnlyExceptionRoute";
+        RouteBuilder builder = new RouteBuilder() {
+            @Override
+            public void configure() throws Exception {
+                from("direct:start").routeId(routeId)
+                        .setBody(simple("${body.getParameter(\"request\")}"))
+                        .to("mock:result");
+            }
+        };
+        context.addRoutes(builder);
+        try {
+            // Register the Camel Context with the jBPM ServiceRegistry.
+            ServiceRegistry.get().register("GlobalCamelService", context);
+
+            // Test
+            String expectedBody = "helloRequest";
+            resultEndpoint.expectedBodiesReceived(expectedBody);
+
+            WorkItemImpl workItem = new WorkItemImpl();
+            workItem.setParameter("camel-endpoint-id", "start");
+            workItem.setParameter("request", expectedBody);
+
+            TestWorkItemManager manager = new TestWorkItemManager();
+
+            WorkItemHandler handler = new InOnlyCamelWorkItemHandler();
+
+            handler.executeWorkItem(workItem, manager);
+
+            // Assertions
+            assertThat(manager.getResults().size(), equalTo(0));
+            resultEndpoint.assertIsSatisfied();
+        } finally {
+            // Cleanup
+            context.removeRoute(routeId);
+        }
+    }
+
+    @Test(expected = WorkItemHandlerRuntimeException.class)
+    public void testSyncInOnlyException() throws Exception {
+        // Setup
+        String routeId = "testSyncInOnlyExceptionRoute";
+        RouteBuilder builder = new RouteBuilder() {
+            @Override
+            public void configure() throws Exception {
+                from("direct:start").routeId(routeId)
+                        .setBody(simple("${body.getParameter(\"request\")}"))
+                        .throwException(new IllegalArgumentException("Illegal contennt!"))
+                        .to("mock:result");
+            }
+        };
+        context.addRoutes(builder);
+        try {
+            // Register the Camel Context with the jBPM ServiceRegistry.
+            ServiceRegistry.get().register("GlobalCamelService", context);
+
+            // Test
+            String expectedBody = "helloRequest";
+            resultEndpoint.expectedBodiesReceived(expectedBody);
+
+            WorkItemImpl workItem = new WorkItemImpl();
+            workItem.setParameter("camel-endpoint-id", "start");
+            workItem.setParameter("request", expectedBody);
+
+            TestWorkItemManager manager = new TestWorkItemManager();
+
+            WorkItemHandler handler = new InOnlyCamelWorkItemHandler();
+
+            handler.executeWorkItem(workItem, manager);
+
+            // Assertions
+            assertThat(manager.getResults().size(), equalTo(0));
+            resultEndpoint.assertIsSatisfied();
+        } finally {
+            // Cleanup
+            context.removeRoute(routeId);
+        }
+    }
+
+    @Test
+    public void testSyncInOut() throws Exception {
+        // Setup
+        String routeId = "testSyncInOnlyExceptionRoute";
+        RouteBuilder builder = new RouteBuilder() {
+            @Override
+            public void configure() throws Exception {
+                from("direct:start").routeId(routeId)
+                        .setBody(simple("${body.getParameter(\"request\")}"))
+                        .to("mock:result");
+            }
+        };
+        context.addRoutes(builder);
+        try {
+            // Register the Camel Context with the jBPM ServiceRegistry.
+            ServiceRegistry.get().register("GlobalCamelService", context);
+
+            // Test
+            String expectedBody = "helloRequest";
+            resultEndpoint.expectedBodiesReceived(expectedBody);
+
+            WorkItemImpl workItem = new WorkItemImpl();
+            workItem.setParameter("camel-endpoint-id", "start");
+            workItem.setParameter("request", expectedBody);
+
+            TestWorkItemManager manager = new TestWorkItemManager();
+
+            AbstractCamelWorkItemHandler handler = new InOutCamelWorkItemHandler();
+
+            handler.executeWorkItem(workItem, manager);
+
+            // Assertions
+            assertThat(manager.getResults().size(), equalTo(1));
+            resultEndpoint.assertIsSatisfied();
+        } finally {
+            // Cleanup
+            context.removeRoute(routeId);
+        }
+
+    }
+
+    @Test(expected = WorkItemHandlerRuntimeException.class)
+    public void testSyncInOutException() throws Exception {
+        // Setup
+        String routeId = "testSyncInOutExceptionRoute";
+        RouteBuilder builder = new RouteBuilder() {
+            @Override
+            public void configure() throws Exception {
+                from("direct:start").routeId(routeId)
+                        .setBody(simple("${body.getParameter(\"request\")}"))
+                        .throwException(new IllegalArgumentException("Illegal contennt!"))
+                        .to("mock:result");
+            }
+        };
+        context.addRoutes(builder);
+        try {
+            // Register the Camel Context with the jBPM ServiceRegistry.
+            ServiceRegistry.get().register("GlobalCamelService", context);
+
+            // Test
+            String expectedBody = "helloRequest";
+            resultEndpoint.expectedBodiesReceived(expectedBody);
+
+            WorkItemImpl workItem = new WorkItemImpl();
+            workItem.setParameter("camel-endpoint-id", "start");
+            workItem.setParameter("request", expectedBody);
+
+            TestWorkItemManager manager = new TestWorkItemManager();
+
+            WorkItemHandler handler = new InOutCamelWorkItemHandler();
+
+            handler.executeWorkItem(workItem, manager);
+        } finally {
+            // Cleanup
+            context.removeRoute(routeId);
+        }
+    }
+
+}
diff --git a/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/CamelWorkItemHandlerTest.java b/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/CamelWorkItemHandlerTest.java
deleted file mode 100644
index 787213266cc33..0000000000000
--- a/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/CamelWorkItemHandlerTest.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * Copyright 2018 Red Hat, Inc. and/or its affiliates.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.camel.component.jbpm.workitem;
-
-import static org.junit.Assert.*;
-import static org.mockito.ArgumentMatchers.*;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.*;
-
-import java.util.Map;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.Exchange;
-import org.apache.camel.Message;
-import org.apache.camel.ProducerTemplate;
-import org.drools.core.process.instance.impl.WorkItemImpl;
-import org.jbpm.process.workitem.core.TestWorkItemManager;
-import org.jbpm.services.api.service.ServiceRegistry;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.kie.api.runtime.manager.RuntimeManager;
-import org.mockito.Mock;
-import org.mockito.junit.MockitoJUnitRunner;
-
-@RunWith(MockitoJUnitRunner.class)
-public class CamelWorkItemHandlerTest {
-
-    @Mock
-    ProducerTemplate producerTemplate;
-
-    @Mock
-    Exchange outExchange;
-    
-    @Mock
-    Message outMessage;
-    
-    @Mock
-    CamelContext camelContext;
-    
-    @Mock
-    RuntimeManager runtimeManager;
-
-    @Test
-    public void testExecuteGlobalCamelContext() throws Exception {
-    
-    	String camelEndpointId = "testCamelRoute";
-    	String camelRouteUri = "direct://" + camelEndpointId;
-    	
-    	String testReponse = "testResponse";
-    	
-    	when(producerTemplate.send(eq(camelRouteUri), any(Exchange.class))).thenReturn(outExchange);
-    	when(producerTemplate.getCamelContext()).thenReturn(camelContext);
-    	
-    	when(camelContext.createProducerTemplate()).thenReturn(producerTemplate);
-    	
-    	when(outExchange.getOut()).thenReturn(outMessage);
-    	when(outMessage.getBody()).thenReturn(testReponse);
-    	
-    	ServiceRegistry.get().register("GlobalCamelService", camelContext);
-    	
-    	
-        TestWorkItemManager manager = new TestWorkItemManager();
-        WorkItemImpl workItem = new WorkItemImpl();
-        workItem.setParameter("camel-endpoint-id", camelEndpointId);
-        workItem.setParameter("request", "someRequest");
-        
-        CamelWorkItemHandler handler = new CamelWorkItemHandler();
-        
-        handler.executeWorkItem(workItem,
-                                manager);
-        assertNotNull(manager.getResults());
-        assertEquals(1,
-                     manager.getResults().size());
-        assertTrue(manager.getResults().containsKey(workItem.getId()));
-        Map<String, Object> results = manager.getResults(workItem.getId());
-        assertEquals(2, results.size());
-        assertEquals(testReponse, results.get("response"));
-    }
-    
-    @Test
-    public void testExecuteLocalCamelContext() throws Exception {
-    
-    	String camelEndpointId = "testCamelRoute";
-    	String camelRouteUri = "direct://" + camelEndpointId;
-    	
-    	String testReponse = "testResponse";
-    	
-    	String runtimeManagerId = "testRuntimeManager";
-    	
-    	when(runtimeManager.getIdentifier()).thenReturn(runtimeManagerId);
-    	
-    	when(producerTemplate.send(eq(camelRouteUri), any(Exchange.class))).thenReturn(outExchange);
-       	when(producerTemplate.getCamelContext()).thenReturn(camelContext);
-    	
-    	when(camelContext.createProducerTemplate()).thenReturn(producerTemplate);
-    	
-    	when(outExchange.getOut()).thenReturn(outMessage);
-    	when(outMessage.getBody()).thenReturn(testReponse);
-    	
-    	//Register the RuntimeManager bound camelcontext.
-    	ServiceRegistry.get().register(runtimeManagerId + "_CamelService", camelContext);
-    	
-    	
-        WorkItemImpl workItem = new WorkItemImpl();
-        workItem.setParameter("camel-endpoint-id", camelEndpointId);
-        workItem.setParameter("request", "someRequest");
-        
-        CamelWorkItemHandler handler = new CamelWorkItemHandler(runtimeManager);
-        
-        TestWorkItemManager manager = new TestWorkItemManager();
-        handler.executeWorkItem(workItem,
-                                manager);
-        assertNotNull(manager.getResults());
-        assertEquals(1,
-                     manager.getResults().size());
-        assertTrue(manager.getResults().containsKey(workItem.getId()));
-        Map<String, Object> results = manager.getResults(workItem.getId());
-        assertEquals(2, results.size());
-        assertEquals(testReponse, results.get("response"));
-    }
-
-
-}
diff --git a/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/DeploymentContextCamelCommandTest.java b/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/DeploymentContextCamelCommandTest.java
new file mode 100644
index 0000000000000..b7034568ea751
--- /dev/null
+++ b/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/DeploymentContextCamelCommandTest.java
@@ -0,0 +1,95 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.camel.component.jbpm.workitem;
+
+import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.*;
+import static org.mockito.Mockito.*;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.Exchange;
+import org.apache.camel.Message;
+import org.apache.camel.ProducerTemplate;
+import org.drools.core.process.instance.impl.WorkItemImpl;
+import org.jbpm.services.api.service.ServiceRegistry;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.kie.api.executor.Command;
+import org.kie.api.executor.CommandContext;
+import org.kie.api.executor.ExecutionResults;
+import org.kie.api.runtime.manager.RuntimeManager;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+
+@RunWith(MockitoJUnitRunner.class)
+public class DeploymentContextCamelCommandTest {
+    
+    @Mock
+    ProducerTemplate producerTemplate;
+
+    @Mock
+    Exchange outExchange;
+    
+    @Mock
+    Message outMessage;
+    
+    @Mock
+    CamelContext camelContext;
+    
+    @Mock
+    RuntimeManager runtimeManager;
+    
+    @Mock
+    CommandContext commandContext;
+
+    @Test
+    public void testExecuteCommandDeploymentCamelContext() throws Exception {
+    
+        String camelEndpointId = "testCamelRoute";
+        String camelRouteUri = "direct://" + camelEndpointId;
+        
+        String testReponse = "testResponse";
+        
+        String deploymentId = "testDeployment";
+        
+        when(producerTemplate.send(eq(camelRouteUri), any(Exchange.class))).thenReturn(outExchange);
+        when(producerTemplate.getCamelContext()).thenReturn(camelContext);
+        
+        when(camelContext.createProducerTemplate()).thenReturn(producerTemplate);
+        
+        when(outExchange.getOut()).thenReturn(outMessage);
+        when(outMessage.getBody()).thenReturn(testReponse);
+        
+        //Register the RuntimeManager bound camelcontext.
+        ServiceRegistry.get().register(deploymentId + "_CamelService", camelContext);
+        
+        WorkItemImpl workItem = new WorkItemImpl();
+        workItem.setParameter("camel-endpoint-id", camelEndpointId);
+        workItem.setParameter("request", "someRequest");
+        
+        when(commandContext.getData("workItem")).thenReturn(workItem);
+        when(commandContext.getData("deploymentId")).thenReturn(deploymentId);
+        
+        Command command = new DeploymentContextCamelCommand();
+        ExecutionResults results = command.execute(commandContext);
+        
+        assertNotNull(results);
+        assertEquals(2, results.getData().size());
+        assertEquals(testReponse, results.getData().get("response"));
+    }
+}
diff --git a/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/CamelCommandTest.java b/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/GlobalContextCamelCommandTest.java
similarity index 54%
rename from components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/CamelCommandTest.java
rename to components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/GlobalContextCamelCommandTest.java
index 543b833555ca7..ad36879c04afc 100644
--- a/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/CamelCommandTest.java
+++ b/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/GlobalContextCamelCommandTest.java
@@ -1,11 +1,12 @@
-/*
- * Copyright 2018 Red Hat, Inc. and/or its affiliates.
+/**
+ * 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
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -13,11 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.camel.component.jbpm.workitem;
 
 import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.*;
-import static org.mockito.ArgumentMatchers.any;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.Exchange;
@@ -27,6 +29,7 @@
 import org.jbpm.services.api.service.ServiceRegistry;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.kie.api.executor.Command;
 import org.kie.api.executor.CommandContext;
 import org.kie.api.executor.ExecutionResults;
 import org.kie.api.runtime.manager.RuntimeManager;
@@ -34,7 +37,7 @@
 import org.mockito.junit.MockitoJUnitRunner;
 
 @RunWith(MockitoJUnitRunner.class)
-public class CamelCommandTest {
+public class GlobalContextCamelCommandTest {
 
 	@Mock
     ProducerTemplate producerTemplate;
@@ -55,7 +58,7 @@ public class CamelCommandTest {
     CommandContext commandContext;
 
     @Test
-    public void testExecuteComamnd() throws Exception {
+    public void testExecuteGlobalCommand() throws Exception {
     
     	String camelEndpointId = "testCamelRoute";
     	String camelRouteUri = "direct://" + camelEndpointId;
@@ -83,7 +86,7 @@ public void testExecuteComamnd() throws Exception {
         
         when(commandContext.getData(anyString())).thenReturn(workItem);
         
-        CamelCommand command = new CamelCommand();
+        Command command = new GlobalContextCamelCommand();
         ExecutionResults results = command.execute(commandContext);
         
         
@@ -91,44 +94,4 @@ public void testExecuteComamnd() throws Exception {
         assertEquals(2, results.getData().size());
         assertEquals(testReponse, results.getData().get("response"));
     }
-    
-    
-    @Test
-    public void testExecuteCommandLocalCamelContext() throws Exception {
-    
-    	String camelEndpointId = "testCamelRoute";
-    	String camelRouteUri = "direct://" + camelEndpointId;
-    	
-    	String testReponse = "testResponse";
-    	
-    	String runtimeManagerId = "testRuntimeManager";
-    	
-    	when(runtimeManager.getIdentifier()).thenReturn(runtimeManagerId);
-    	
-    	when(producerTemplate.send(eq(camelRouteUri), any(Exchange.class))).thenReturn(outExchange);
-    	//when(producerTemplate.send(argThat(not(camelRouteUri)), any(Exchange.class))).thenThrow(new IllegalArgumentException("Unexpected route id"));
-    	when(producerTemplate.getCamelContext()).thenReturn(camelContext);
-    	
-    	when(camelContext.createProducerTemplate()).thenReturn(producerTemplate);
-    	
-    	when(outExchange.getOut()).thenReturn(outMessage);
-    	when(outMessage.getBody()).thenReturn(testReponse);
-    	
-    	//Register the RuntimeManager bound camelcontext.
-    	ServiceRegistry.get().register(runtimeManagerId + "_CamelService", camelContext);
-    	
-        WorkItemImpl workItem = new WorkItemImpl();
-        workItem.setParameter("camel-endpoint-id", camelEndpointId);
-        workItem.setParameter("request", "someRequest");
-        
-        when(commandContext.getData(anyString())).thenReturn(workItem);
-        
-        CamelCommand command = new CamelCommand(runtimeManager);
-        ExecutionResults results = command.execute(commandContext);
-        
-        assertNotNull(results);
-        assertEquals(2, results.getData().size());
-        assertEquals(testReponse, results.getData().get("response"));
-    }
-
 }
diff --git a/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/InOnlyCamelWorkItemHandlerTest.java b/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/InOnlyCamelWorkItemHandlerTest.java
new file mode 100644
index 0000000000000..1ad1bf9832d78
--- /dev/null
+++ b/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/InOnlyCamelWorkItemHandlerTest.java
@@ -0,0 +1,97 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.camel.component.jbpm.workitem;
+
+import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.*;
+import static org.mockito.Mockito.*;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.Exchange;
+import org.apache.camel.Message;
+import org.apache.camel.ProducerTemplate;
+import org.apache.camel.impl.DefaultHeadersMapFactory;
+import org.apache.camel.spi.HeadersMapFactory;
+import org.drools.core.process.instance.impl.WorkItemImpl;
+import org.jbpm.process.workitem.core.TestWorkItemManager;
+import org.jbpm.services.api.service.ServiceRegistry;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.kie.api.runtime.manager.RuntimeManager;
+import org.mockito.ArgumentMatchers;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+
+@RunWith(MockitoJUnitRunner.class)
+public class InOnlyCamelWorkItemHandlerTest {
+
+    @Mock
+    ProducerTemplate producerTemplate;
+
+    @Mock
+    Exchange outExchange;
+
+    @Mock
+    Message outMessage;
+
+    @Mock
+    CamelContext camelContext;
+
+    @Mock
+    RuntimeManager runtimeManager;
+
+    @Test
+    public void testExecuteInOnlyLocalCamelContext() throws Exception {
+
+        String camelEndpointId = "testCamelRoute";
+        String camelRouteUri = "direct://" + camelEndpointId;
+
+        String testReponse = "testResponse";
+
+        String runtimeManagerId = "testRuntimeManager";
+
+        when(runtimeManager.getIdentifier()).thenReturn(runtimeManagerId);
+
+        when(producerTemplate.send(eq(camelRouteUri), ArgumentMatchers.any(Exchange.class))).thenReturn(outExchange);
+        when(producerTemplate.getCamelContext()).thenReturn(camelContext);
+
+        when(camelContext.createProducerTemplate()).thenReturn(producerTemplate);
+        HeadersMapFactory hmf = new DefaultHeadersMapFactory();
+        when(camelContext.getHeadersMapFactory()).thenReturn(hmf);
+
+        // Register the RuntimeManager bound camelcontext.
+        ServiceRegistry.get().register(runtimeManagerId + "_CamelService", camelContext);
+
+        WorkItemImpl workItem = new WorkItemImpl();
+        workItem.setParameter("camel-endpoint-id", camelEndpointId);
+        workItem.setParameter("request", "someRequest");
+        workItem.setDeploymentId("testDeploymentId");
+        workItem.setProcessInstanceId(1L);
+        workItem.setId(1L);
+        
+        AbstractCamelWorkItemHandler handler = new InOnlyCamelWorkItemHandler(runtimeManager);
+
+        TestWorkItemManager manager = new TestWorkItemManager();
+        handler.executeWorkItem(workItem,
+                manager);
+        assertThat(manager.getResults(), is(notNullValue()));
+        //InOnly does not complete WorkItem.
+        assertThat(manager.getResults().size(), equalTo(0));
+    }
+}
diff --git a/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/InOutCamelWorkItemHandlerTest.java b/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/InOutCamelWorkItemHandlerTest.java
new file mode 100644
index 0000000000000..e4bc6bab37992
--- /dev/null
+++ b/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/InOutCamelWorkItemHandlerTest.java
@@ -0,0 +1,147 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.camel.component.jbpm.workitem;
+
+import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.*;
+import static org.mockito.Mockito.*;
+
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.Exchange;
+import org.apache.camel.Message;
+import org.apache.camel.ProducerTemplate;
+import org.apache.camel.impl.DefaultHeadersMapFactory;
+import org.apache.camel.spi.HeadersMapFactory;
+import org.drools.core.process.instance.impl.WorkItemImpl;
+import org.jbpm.process.workitem.core.TestWorkItemManager;
+import org.jbpm.services.api.service.ServiceRegistry;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.kie.api.runtime.manager.RuntimeManager;
+import org.mockito.ArgumentMatchers;
+import org.mockito.Mock;
+import org.mockito.junit.MockitoJUnitRunner;
+
+@RunWith(MockitoJUnitRunner.class)
+public class InOutCamelWorkItemHandlerTest {
+
+    @Mock
+    ProducerTemplate producerTemplate;
+
+    @Mock
+    Exchange outExchange;
+
+    @Mock
+    Message outMessage;
+
+    @Mock
+    CamelContext camelContext;
+
+    @Mock
+    RuntimeManager runtimeManager;
+
+    @Test
+    public void testExecuteInOutGlobalCamelContext() throws Exception {
+
+        String camelEndpointId = "testCamelRoute";
+        String camelRouteUri = "direct://" + camelEndpointId;
+
+        String testReponse = "testResponse";
+
+        when(producerTemplate.send(eq(camelRouteUri), ArgumentMatchers.any(Exchange.class))).thenReturn(outExchange);
+        when(producerTemplate.getCamelContext()).thenReturn(camelContext);
+
+        when(camelContext.createProducerTemplate()).thenReturn(producerTemplate);
+        HeadersMapFactory hmf = new DefaultHeadersMapFactory();
+        when(camelContext.getHeadersMapFactory()).thenReturn(hmf);
+
+        when(outExchange.getOut()).thenReturn(outMessage);
+        when(outMessage.getBody()).thenReturn(testReponse);
+
+        ServiceRegistry.get().register("GlobalCamelService", camelContext);
+
+        TestWorkItemManager manager = new TestWorkItemManager();
+        WorkItemImpl workItem = new WorkItemImpl();
+        workItem.setParameter("camel-endpoint-id", camelEndpointId);
+        workItem.setParameter("request", "someRequest");
+        workItem.setDeploymentId("testDeploymentId");
+        workItem.setProcessInstanceId(1L);
+        workItem.setId(1L);
+
+        AbstractCamelWorkItemHandler handler = new InOutCamelWorkItemHandler();
+
+        handler.executeWorkItem(workItem,
+                manager);
+        assertThat(manager.getResults(), is(notNullValue()));
+        assertThat(manager.getResults().size(), equalTo(1));
+        assertThat(manager.getResults().containsKey(workItem.getId()), is(true));
+        Map<String, Object> results = manager.getResults(workItem.getId());
+        assertThat(results.size(), equalTo(2));
+        assertThat(results.get("response"), equalTo(testReponse));
+    }
+
+    @Test
+    public void testExecuteInOutLocalCamelContext() throws Exception {
+
+        String camelEndpointId = "testCamelRoute";
+        String camelRouteUri = "direct://" + camelEndpointId;
+
+        String testReponse = "testResponse";
+
+        String runtimeManagerId = "testRuntimeManager";
+
+        when(runtimeManager.getIdentifier()).thenReturn(runtimeManagerId);
+
+        when(producerTemplate.send(eq(camelRouteUri), ArgumentMatchers.any(Exchange.class))).thenReturn(outExchange);
+        when(producerTemplate.getCamelContext()).thenReturn(camelContext);
+
+        when(camelContext.createProducerTemplate()).thenReturn(producerTemplate);
+        HeadersMapFactory hmf = new DefaultHeadersMapFactory();
+        when(camelContext.getHeadersMapFactory()).thenReturn(hmf);
+
+        when(outExchange.getOut()).thenReturn(outMessage);
+        when(outMessage.getBody()).thenReturn(testReponse);
+
+        // Register the RuntimeManager bound camelcontext.
+        ServiceRegistry.get().register(runtimeManagerId + "_CamelService", camelContext);
+
+        WorkItemImpl workItem = new WorkItemImpl();
+        workItem.setParameter("camel-endpoint-id", camelEndpointId);
+        workItem.setParameter("request", "someRequest");
+        workItem.setDeploymentId("testDeploymentId");
+        workItem.setProcessInstanceId(1L);
+        workItem.setId(1L);
+
+        AbstractCamelWorkItemHandler handler = new InOutCamelWorkItemHandler(runtimeManager);
+
+        TestWorkItemManager manager = new TestWorkItemManager();
+        handler.executeWorkItem(workItem,
+                manager);
+        assertThat(manager.getResults(), is(notNullValue()));
+        assertThat(manager.getResults().size(), equalTo(1));
+        assertThat(manager.getResults().containsKey(workItem.getId()), is(true));
+        
+        Map<String, Object> results = manager.getResults(workItem.getId());
+        assertThat(results.size(), equalTo(2));
+        assertThat(results.get("response"), equalTo(testReponse));
+    }
+   
+}

From 8672088c837021d58b6c1231fdac7e54ac555f6d Mon Sep 17 00:00:00 2001
From: Duncan Doyle <Duncan.Doyle@gmail.com>
Date: Fri, 30 Nov 2018 09:24:45 +0100
Subject: [PATCH 117/125] Replaced hard-coded strings with constants. Changed
 WorkItem parameter names to be inline with other WorkItemHandlers.

---
 .../camel/component/jbpm/JBPMConstants.java   |  8 +++++
 .../jbpm/server/CamelKieServerExtension.java  |  5 +--
 .../jbpm/workitem/AbstractCamelCommand.java   | 15 ++++----
 .../AbstractCamelWorkItemHandler.java         | 35 +++++++++----------
 .../DeploymentContextCamelCommand.java        |  5 ++-
 .../workitem/GlobalContextCamelCommand.java   |  5 ++-
 .../workitem/InOnlyCamelWorkItemHandler.java  |  7 ++--
 .../workitem/InOutCamelWorkItemHandler.java   | 14 ++++----
 .../CamelWorkItemHandlerIntegrationTests.java | 33 ++++++++---------
 .../DeploymentContextCamelCommandTest.java    |  9 ++---
 .../GlobalContextCamelCommandTest.java        |  9 ++---
 .../InOnlyCamelWorkItemHandlerTest.java       |  5 +--
 .../InOutCamelWorkItemHandlerTest.java        | 13 +++----
 13 files changed, 85 insertions(+), 78 deletions(-)

diff --git a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMConstants.java b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMConstants.java
index 8341cfd619c81..94ff0ca77baf9 100644
--- a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMConstants.java
+++ b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/JBPMConstants.java
@@ -43,4 +43,12 @@ public interface JBPMConstants {
     String JBPM_TASK_EVENT_LISTENER = "task";
     String JBPM_CASE_EVENT_LISTENER = "case";
     String JBPM_EVENT_EMITTER = "emitter";
+    
+    String GLOBAL_CAMEL_CONTEXT_SERVICE_KEY = "GlobalCamelService";
+    String DEPLOYMENT_CAMEL_CONTEXT_SERVICE_KEY_POSTFIX = "_CamelService";
+    String CAMEL_ENDPOINT_ID_WI_PARAM = "CamelEndpointId";
+    String RESPONSE_WI_PARAM = "Response";
+    String MESSAGE_WI_PARAM = "Message";
+
+    
 }
diff --git a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/server/CamelKieServerExtension.java b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/server/CamelKieServerExtension.java
index 0e297bece0f73..659a498c2dba3 100644
--- a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/server/CamelKieServerExtension.java
+++ b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/server/CamelKieServerExtension.java
@@ -23,6 +23,7 @@
 import java.util.List;
 import java.util.Map;
 
+import org.apache.camel.component.jbpm.JBPMConstants;
 import org.apache.camel.impl.DefaultCamelContext;
 import org.apache.camel.model.FromDefinition;
 import org.apache.camel.model.RouteDefinition;
@@ -85,7 +86,7 @@ public void init(KieServerImpl kieServer, KieServerRegistry registry) {
             }
         }
 
-        ServiceRegistry.get().register("GlobalCamelService", this.camel);
+        ServiceRegistry.get().register(JBPMConstants.GLOBAL_CAMEL_CONTEXT_SERVICE_KEY, this.camel);
     }
 
     @Override
@@ -117,7 +118,7 @@ public void createContainer(String id, KieContainerInstance kieContainerInstance
                 context.start();
                 camelContexts.put(id, context);
 
-                ServiceRegistry.get().register(id + "_CamelService", context);
+                ServiceRegistry.get().register(id + JBPMConstants.DEPLOYMENT_CAMEL_CONTEXT_SERVICE_KEY_POSTFIX, context);
 
             }
         } catch (Exception e) {
diff --git a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/AbstractCamelCommand.java b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/AbstractCamelCommand.java
index 3cb1ee48227a1..adfd413136433 100644
--- a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/AbstractCamelCommand.java
+++ b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/AbstractCamelCommand.java
@@ -22,6 +22,7 @@
 import org.apache.camel.Message;
 import org.apache.camel.ProducerTemplate;
 import org.apache.camel.builder.ExchangeBuilder;
+import org.apache.camel.component.jbpm.JBPMConstants;
 import org.jbpm.services.api.service.ServiceRegistry;
 import org.kie.api.executor.Command;
 import org.kie.api.executor.CommandContext;
@@ -40,17 +41,13 @@
  * {link WorkItem} via the <code>camel-endpoint-id</code> parameter, this {@link Command} will send the {@link WorkItem} to 
  * the Camel URI <code>direct://myCamelEndpoint</code>.  
  * <p/>
- * The body of the result {@link Message} of the invocation is returned via the <code>response</code> parameter. Access to the raw response 
- * {@link Message} is provided via the <code>message</code> parameter. This gives the user access to more advanced fields like message headers 
+ * The body of the result {@link Message} of the invocation is returned via the <code>Response</code> parameter. Access to the raw response 
+ * {@link Message} is provided via the <code>Message</code> parameter. This gives the user access to more advanced fields like message headers 
  * and attachments.
  */
 public abstract class AbstractCamelCommand implements Command,
                                           Cacheable {
 
-	private static final String CAMEL_ENDPOINT_ID_PARAM = "camel-endpoint-id";
-	private static final String RESPONSE_PARAM = "response";
-	private static final String MESSAGE_PARAM = "out-headers";
-	
     private static final Logger logger = LoggerFactory.getLogger(AbstractCamelCommand.class);
 
 	public AbstractCamelCommand() {
@@ -62,7 +59,7 @@ public ExecutionResults execute(CommandContext ctx) throws Exception {
         
     	WorkItem workItem = (WorkItem) ctx.getData("workItem");
     	
-    	String camelEndpointId = (String) workItem.getParameter(CAMEL_ENDPOINT_ID_PARAM);
+    	String camelEndpointId = (String) workItem.getParameter(JBPMConstants.CAMEL_ENDPOINT_ID_WI_PARAM);
 		
 		// We only support direct. We don't need to support more, as direct simply gives us the entrypoint into the actual Camel Routes.
 		String camelUri = "direct://" + camelEndpointId;
@@ -78,8 +75,8 @@ public ExecutionResults execute(CommandContext ctx) throws Exception {
 		
 		ExecutionResults results = new ExecutionResults();
 		Object response = outMessage.getBody();
-		results.setData(RESPONSE_PARAM, response);
-		results.setData(MESSAGE_PARAM, outMessage);
+		results.setData(JBPMConstants.RESPONSE_WI_PARAM, response);
+		results.setData(JBPMConstants.MESSAGE_WI_PARAM, outMessage);
     	
         return results;
     }
diff --git a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/AbstractCamelWorkItemHandler.java b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/AbstractCamelWorkItemHandler.java
index db88e70d53031..743393c38c7ee 100644
--- a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/AbstractCamelWorkItemHandler.java
+++ b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/AbstractCamelWorkItemHandler.java
@@ -21,6 +21,7 @@
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
 import org.apache.camel.ProducerTemplate;
+import org.apache.camel.component.jbpm.JBPMConstants;
 import org.jbpm.process.workitem.core.AbstractLogOrThrowWorkItemHandler;
 import org.jbpm.services.api.service.ServiceRegistry;
 import org.kie.api.runtime.manager.RuntimeManager;
@@ -35,29 +36,24 @@
  * Camel jBPM {@link WorkItemHandler} which allows to call Camel routes with a <code>direct</code> endpoint.
  * <p/>
  * The handler passes the {@WorkItem} to the route that has a consumer on the endpoint-id that can be passed with the
- * <code>camel-endpoint-id</code>{@link WorkItem} parameter. E.g. when a the value "myCamelEndpoint" is passed to the {link WorkItem} via
- * the <code>camel-endpoint-id</code> parameter, this command will send the {@link WorkItem} to the Camel URI
+ * <code>CamelEndpointId</code>{@link WorkItem} parameter. E.g. when a the value "myCamelEndpoint" is passed to the {link WorkItem} via
+ * the <code>CamelEndpointId</code> parameter, this command will send the {@link WorkItem} to the Camel URI
  * <code>direct://myCamelEndpoint</code>.
  * <p/>
- * The body of the result {@link Message} of the invocation is returned via the <code>response</code> parameter. Access to the raw response
- * {@link Message} is provided via the <code>message</code> parameter. This gives the user access to more advanced fields like message
+ * The body of the result {@link Message} of the invocation is returned via the <code>Response</code> parameter. Access to the raw response
+ * {@link Message} is provided via the <code>Message</code> parameter. This gives the user access to more advanced fields like message
  * headers and attachments.
  * <p/>
  * This handler can be constructed in multiple ways. When you don't pass a {@link RuntimeManager} to the constructor, the handler will try
  * to find the global KIE {@link CamelContext} from the <code>jBPM</code> {@link ServiceRegistry}. When the {@link RuntimeManager} is passed
  * to the constructor, the handler will retrieve and use the {@link CamelContext} bound to the {@link RuntimeManage} from the
- * {@link ServiceRegistry}. When a <code>camel-endpoint-id</code> is passed to the constructor, the handler will send all requests to the
- * Camel route that is consuming from that endpoint, unless the endpoint is overridden by passing a the <code>camel-endpoint-id</code> in
+ * {@link ServiceRegistry}. When a <code>CamelEndpointId</code> is passed to the constructor, the handler will send all requests to the
+ * Camel route that is consuming from that endpoint, unless the endpoint is overridden by passing a the <code>CamelEndpointId</code> in
  * the {@link WorkItem} parameters.
  * 
  */
 public abstract class AbstractCamelWorkItemHandler extends AbstractLogOrThrowWorkItemHandler implements Cacheable {
 
-    private static final String GLOBAL_CAMEL_CONTEXT_SERVICE_KEY = "GlobalCamelService";
-    private static final String RUNTIME_CAMEL_CONTEXT_SERVICE_POSTFIX = "_CamelService";
-
-    private static final String CAMEL_ENDPOINT_ID_PARAM = "camel-endpoint-id";
-
     private static Logger logger = LoggerFactory.getLogger(AbstractCamelWorkItemHandler.class);
 
     private final ProducerTemplate producerTemplate;
@@ -72,7 +68,7 @@ public AbstractCamelWorkItemHandler() {
     }
 
     public AbstractCamelWorkItemHandler(String camelEndointId) {
-        CamelContext globalCamelContext = (CamelContext) ServiceRegistry.get().service(GLOBAL_CAMEL_CONTEXT_SERVICE_KEY);
+        CamelContext globalCamelContext = (CamelContext) ServiceRegistry.get().service(JBPMConstants.GLOBAL_CAMEL_CONTEXT_SERVICE_KEY);
         // TODO: Should we allow to set the maximumCacheSize on the producer?
         this.producerTemplate = globalCamelContext.createProducerTemplate();
         this.camelEndpointId = camelEndointId;
@@ -87,7 +83,7 @@ public AbstractCamelWorkItemHandler(RuntimeManager runtimeManager) {
     }
 
     public AbstractCamelWorkItemHandler(RuntimeManager runtimeManager, String camelEndpointId) {
-        String runtimeCamelContextKey = runtimeManager.getIdentifier() + RUNTIME_CAMEL_CONTEXT_SERVICE_POSTFIX;
+        String runtimeCamelContextKey = runtimeManager.getIdentifier() + JBPMConstants.DEPLOYMENT_CAMEL_CONTEXT_SERVICE_KEY_POSTFIX;
         CamelContext runtimeCamelContext = (CamelContext) ServiceRegistry.get().service(runtimeCamelContextKey);
         // TODO: Should we allow to set the maximumCacheSize on the producer?
         this.producerTemplate = runtimeCamelContext.createProducerTemplate();
@@ -115,13 +111,15 @@ public void executeWorkItem(WorkItem workItem, final WorkItemManager manager) {
         }
     }
 
-    private String getCamelEndpointId(WorkItem workItem) {
-        String workItemCamelEndpointId = (String) workItem.getParameter(CAMEL_ENDPOINT_ID_PARAM);
+    protected String getCamelEndpointId(WorkItem workItem) {
+        String workItemCamelEndpointId = (String) workItem.getParameter(JBPMConstants.CAMEL_ENDPOINT_ID_WI_PARAM);
 
         if (camelEndpointId != null && !camelEndpointId.isEmpty()) {
             if (workItemCamelEndpointId != null && !workItemCamelEndpointId.isEmpty()) {
                 logger.debug(
-                        "The Camel Endpoint ID has been set on both the WorkItemHanlder and WorkItem. The camel-endpoint-id configured on the WorkItem overrides the global configuation.");
+                        "The Camel Endpoint ID has been set on both the WorkItemHanlder and WorkItem. The '"
+                                + JBPMConstants.CAMEL_ENDPOINT_ID_WI_PARAM
+                                + "' configured on the WorkItem overrides the global configuation.");
             } else {
                 workItemCamelEndpointId = camelEndpointId;
             }
@@ -129,8 +127,9 @@ private String getCamelEndpointId(WorkItem workItem) {
 
         if (workItemCamelEndpointId == null || workItemCamelEndpointId.isEmpty()) {
             throw new IllegalArgumentException(
-                    "No Camel Endpoint ID specified. Please configure the 'camel-endpoint-id' in either the constructor of this WorkItemHandler, or pass it via the "
-                            + CAMEL_ENDPOINT_ID_PARAM + "' WorkItem parameter.");
+                    "No Camel Endpoint ID specified. Please configure the '" + JBPMConstants.CAMEL_ENDPOINT_ID_WI_PARAM
+                            + "' in either the constructor of this WorkItemHandler, or pass it via the "
+                            + JBPMConstants.CAMEL_ENDPOINT_ID_WI_PARAM + "' WorkItem parameter.");
         }
         return workItemCamelEndpointId;
     }
diff --git a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/DeploymentContextCamelCommand.java b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/DeploymentContextCamelCommand.java
index e3d3fd19d176d..009b909468636 100644
--- a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/DeploymentContextCamelCommand.java
+++ b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/DeploymentContextCamelCommand.java
@@ -22,6 +22,7 @@
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.ProducerTemplate;
+import org.apache.camel.component.jbpm.JBPMConstants;
 import org.jbpm.services.api.service.ServiceRegistry;
 import org.kie.api.executor.CommandContext;
 import org.slf4j.Logger;
@@ -32,8 +33,6 @@
  */
 public class DeploymentContextCamelCommand extends AbstractCamelCommand {
 
-    private static final String RUNTIME_CAMEL_CONTEXT_SERVICE_POSTFIX = "_CamelService";
-
     private final Map<String, ProducerTemplate> templates = new ConcurrentHashMap<>();
 
     private static final Logger logger = LoggerFactory.getLogger(DeploymentContextCamelCommand.class);
@@ -48,7 +47,7 @@ protected ProducerTemplate getProducerTemplate(CommandContext ctx) {
                 template = templates.get(deploymentId);
                 if (template == null) {
                     CamelContext deploymentCamelContext = (CamelContext) ServiceRegistry.get()
-                            .service(deploymentId + RUNTIME_CAMEL_CONTEXT_SERVICE_POSTFIX);
+                            .service(deploymentId + JBPMConstants.DEPLOYMENT_CAMEL_CONTEXT_SERVICE_KEY_POSTFIX);
                     template = deploymentCamelContext.createProducerTemplate();
                     templates.put(deploymentId, template);
                 }
diff --git a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/GlobalContextCamelCommand.java b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/GlobalContextCamelCommand.java
index 974b8965ae86e..10950b3e87901 100644
--- a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/GlobalContextCamelCommand.java
+++ b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/GlobalContextCamelCommand.java
@@ -19,6 +19,7 @@
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.ProducerTemplate;
+import org.apache.camel.component.jbpm.JBPMConstants;
 import org.jbpm.services.api.service.ServiceRegistry;
 import org.kie.api.executor.CommandContext;
 import org.slf4j.Logger;
@@ -29,14 +30,12 @@
  */
 public class GlobalContextCamelCommand extends AbstractCamelCommand {
 
-    private static final String GLOBAL_CAMEL_CONTEXT_SERVICE_KEY = "GlobalCamelService";
-    
     private final ProducerTemplate globalContextProducerTemplate;
     
     private static final Logger logger = LoggerFactory.getLogger(GlobalContextCamelCommand.class);
     
     public GlobalContextCamelCommand() {
-        CamelContext globalCamelContext = (CamelContext) ServiceRegistry.get().service(GLOBAL_CAMEL_CONTEXT_SERVICE_KEY);
+        CamelContext globalCamelContext = (CamelContext) ServiceRegistry.get().service(JBPMConstants.GLOBAL_CAMEL_CONTEXT_SERVICE_KEY);
         // TODO: Should we allow to set the maximumCacheSize on the producer?
         this.globalContextProducerTemplate = globalCamelContext.createProducerTemplate();
     }
diff --git a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/InOnlyCamelWorkItemHandler.java b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/InOnlyCamelWorkItemHandler.java
index 0588c02598e03..b97b0ad415636 100644
--- a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/InOnlyCamelWorkItemHandler.java
+++ b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/InOnlyCamelWorkItemHandler.java
@@ -22,6 +22,7 @@
 import org.apache.camel.Message;
 import org.apache.camel.ProducerTemplate;
 import org.apache.camel.builder.ExchangeBuilder;
+import org.apache.camel.component.jbpm.JBPMConstants;
 import org.drools.core.process.instance.impl.WorkItemImpl;
 import org.jbpm.process.workitem.core.util.Wid;
 import org.jbpm.process.workitem.core.util.WidMavenDepends;
@@ -56,11 +57,11 @@
         defaultHandler = "mvel: new org.apache.camel.component.jbpm.workitem.InOnlyCamelWorkitemHandler()",
         documentation = "${artifactId}/index.html",
         parameters = {
-                @WidParameter(name = "camel-endpoint-id")
+                @WidParameter(name = JBPMConstants.CAMEL_ENDPOINT_ID_WI_PARAM)
         },
         results = {
-                @WidResult(name = "response"),
-                @WidResult(name = "message") },
+                @WidResult(name = JBPMConstants.RESPONSE_WI_PARAM),
+                @WidResult(name = JBPMConstants.MESSAGE_WI_PARAM) },
         mavenDepends = {
                 @WidMavenDepends(group = "${groupId}",
                         artifact = "${artifactId}",
diff --git a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/InOutCamelWorkItemHandler.java b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/InOutCamelWorkItemHandler.java
index d53c882a7cbcd..a8482dde6d919 100644
--- a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/InOutCamelWorkItemHandler.java
+++ b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/InOutCamelWorkItemHandler.java
@@ -25,6 +25,7 @@
 import org.apache.camel.Message;
 import org.apache.camel.ProducerTemplate;
 import org.apache.camel.builder.ExchangeBuilder;
+import org.apache.camel.component.jbpm.JBPMConstants;
 import org.drools.core.process.instance.impl.WorkItemImpl;
 import org.jbpm.process.workitem.core.util.Wid;
 import org.jbpm.process.workitem.core.util.WidMavenDepends;
@@ -58,11 +59,11 @@
         defaultHandler = "mvel: new org.apache.camel.component.jbpm.workitem.InOutCamelWorkitemHandler()",
         documentation = "${artifactId}/index.html",
         parameters = {
-                @WidParameter(name = "camel-endpoint-id")
+                @WidParameter(name = JBPMConstants.CAMEL_ENDPOINT_ID_WI_PARAM)
         },
         results = {
-                @WidResult(name = "response"),
-                @WidResult(name = "message") },
+                @WidResult(name = JBPMConstants.RESPONSE_WI_PARAM),
+                @WidResult(name = JBPMConstants.MESSAGE_WI_PARAM) },
         mavenDepends = {
                 @WidMavenDepends(group = "${groupId}",
                         artifact = "${artifactId}",
@@ -74,9 +75,6 @@
                 action = @WidAction(title = "Send payload to a Camel endpoint")))
 public class InOutCamelWorkItemHandler extends AbstractCamelWorkItemHandler {
 
-    private static final String RESPONSE_PARAM = "response";
-    private static final String MESSAGE_PARAM = "message";
-
     public InOutCamelWorkItemHandler() {
         super();
     }
@@ -99,8 +97,8 @@ protected void handleResponse(Exchange responseExchange, WorkItem workItem, Work
 
         Map<String, Object> result = new HashMap<>();
         Object response = outMessage.getBody();
-        result.put(RESPONSE_PARAM, response);
-        result.put(MESSAGE_PARAM, outMessage);
+        result.put(JBPMConstants.RESPONSE_WI_PARAM, response);
+        result.put(JBPMConstants.MESSAGE_WI_PARAM, outMessage);
 
         manager.completeWorkItem(workItem.getId(), result);
     }
diff --git a/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/CamelWorkItemHandlerIntegrationTests.java b/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/CamelWorkItemHandlerIntegrationTests.java
index 39fd86103b320..4e594ddacc698 100644
--- a/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/CamelWorkItemHandlerIntegrationTests.java
+++ b/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/CamelWorkItemHandlerIntegrationTests.java
@@ -23,6 +23,7 @@
 import org.apache.camel.Produce;
 import org.apache.camel.ProducerTemplate;
 import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.jbpm.JBPMConstants;
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.test.junit4.CamelTestSupport;
 import org.drools.core.process.instance.impl.WorkItemImpl;
@@ -50,22 +51,22 @@ public void testSyncInOnly() throws Exception {
             @Override
             public void configure() throws Exception {
                 from("direct:start").routeId(routeId)
-                        .setBody(simple("${body.getParameter(\"request\")}"))
+                        .setBody(simple("${body.getParameter(\"Request\")}"))
                         .to("mock:result");
             }
         };
         context.addRoutes(builder);
         try {
             // Register the Camel Context with the jBPM ServiceRegistry.
-            ServiceRegistry.get().register("GlobalCamelService", context);
+            ServiceRegistry.get().register(JBPMConstants.GLOBAL_CAMEL_CONTEXT_SERVICE_KEY, context);
 
             // Test
             String expectedBody = "helloRequest";
             resultEndpoint.expectedBodiesReceived(expectedBody);
 
             WorkItemImpl workItem = new WorkItemImpl();
-            workItem.setParameter("camel-endpoint-id", "start");
-            workItem.setParameter("request", expectedBody);
+            workItem.setParameter(JBPMConstants.CAMEL_ENDPOINT_ID_WI_PARAM, "start");
+            workItem.setParameter("Request", expectedBody);
 
             TestWorkItemManager manager = new TestWorkItemManager();
 
@@ -90,7 +91,7 @@ public void testSyncInOnlyException() throws Exception {
             @Override
             public void configure() throws Exception {
                 from("direct:start").routeId(routeId)
-                        .setBody(simple("${body.getParameter(\"request\")}"))
+                        .setBody(simple("${body.getParameter(\"Request\")}"))
                         .throwException(new IllegalArgumentException("Illegal contennt!"))
                         .to("mock:result");
             }
@@ -98,15 +99,15 @@ public void configure() throws Exception {
         context.addRoutes(builder);
         try {
             // Register the Camel Context with the jBPM ServiceRegistry.
-            ServiceRegistry.get().register("GlobalCamelService", context);
+            ServiceRegistry.get().register(JBPMConstants.GLOBAL_CAMEL_CONTEXT_SERVICE_KEY, context);
 
             // Test
             String expectedBody = "helloRequest";
             resultEndpoint.expectedBodiesReceived(expectedBody);
 
             WorkItemImpl workItem = new WorkItemImpl();
-            workItem.setParameter("camel-endpoint-id", "start");
-            workItem.setParameter("request", expectedBody);
+            workItem.setParameter(JBPMConstants.CAMEL_ENDPOINT_ID_WI_PARAM, "start");
+            workItem.setParameter("Request", expectedBody);
 
             TestWorkItemManager manager = new TestWorkItemManager();
 
@@ -131,22 +132,22 @@ public void testSyncInOut() throws Exception {
             @Override
             public void configure() throws Exception {
                 from("direct:start").routeId(routeId)
-                        .setBody(simple("${body.getParameter(\"request\")}"))
+                        .setBody(simple("${body.getParameter(\"Request\")}"))
                         .to("mock:result");
             }
         };
         context.addRoutes(builder);
         try {
             // Register the Camel Context with the jBPM ServiceRegistry.
-            ServiceRegistry.get().register("GlobalCamelService", context);
+            ServiceRegistry.get().register(JBPMConstants.GLOBAL_CAMEL_CONTEXT_SERVICE_KEY, context);
 
             // Test
             String expectedBody = "helloRequest";
             resultEndpoint.expectedBodiesReceived(expectedBody);
 
             WorkItemImpl workItem = new WorkItemImpl();
-            workItem.setParameter("camel-endpoint-id", "start");
-            workItem.setParameter("request", expectedBody);
+            workItem.setParameter(JBPMConstants.CAMEL_ENDPOINT_ID_WI_PARAM, "start");
+            workItem.setParameter("Request", expectedBody);
 
             TestWorkItemManager manager = new TestWorkItemManager();
 
@@ -172,7 +173,7 @@ public void testSyncInOutException() throws Exception {
             @Override
             public void configure() throws Exception {
                 from("direct:start").routeId(routeId)
-                        .setBody(simple("${body.getParameter(\"request\")}"))
+                        .setBody(simple("${body.getParameter(\"Request\")}"))
                         .throwException(new IllegalArgumentException("Illegal contennt!"))
                         .to("mock:result");
             }
@@ -180,15 +181,15 @@ public void configure() throws Exception {
         context.addRoutes(builder);
         try {
             // Register the Camel Context with the jBPM ServiceRegistry.
-            ServiceRegistry.get().register("GlobalCamelService", context);
+            ServiceRegistry.get().register(JBPMConstants.GLOBAL_CAMEL_CONTEXT_SERVICE_KEY, context);
 
             // Test
             String expectedBody = "helloRequest";
             resultEndpoint.expectedBodiesReceived(expectedBody);
 
             WorkItemImpl workItem = new WorkItemImpl();
-            workItem.setParameter("camel-endpoint-id", "start");
-            workItem.setParameter("request", expectedBody);
+            workItem.setParameter(JBPMConstants.CAMEL_ENDPOINT_ID_WI_PARAM, "start");
+            workItem.setParameter("Request", expectedBody);
 
             TestWorkItemManager manager = new TestWorkItemManager();
 
diff --git a/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/DeploymentContextCamelCommandTest.java b/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/DeploymentContextCamelCommandTest.java
index b7034568ea751..e1aef21c32adc 100644
--- a/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/DeploymentContextCamelCommandTest.java
+++ b/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/DeploymentContextCamelCommandTest.java
@@ -25,6 +25,7 @@
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
 import org.apache.camel.ProducerTemplate;
+import org.apache.camel.component.jbpm.JBPMConstants;
 import org.drools.core.process.instance.impl.WorkItemImpl;
 import org.jbpm.services.api.service.ServiceRegistry;
 import org.junit.Test;
@@ -76,11 +77,11 @@ public void testExecuteCommandDeploymentCamelContext() throws Exception {
         when(outMessage.getBody()).thenReturn(testReponse);
         
         //Register the RuntimeManager bound camelcontext.
-        ServiceRegistry.get().register(deploymentId + "_CamelService", camelContext);
+        ServiceRegistry.get().register(deploymentId + JBPMConstants.DEPLOYMENT_CAMEL_CONTEXT_SERVICE_KEY_POSTFIX, camelContext);
         
         WorkItemImpl workItem = new WorkItemImpl();
-        workItem.setParameter("camel-endpoint-id", camelEndpointId);
-        workItem.setParameter("request", "someRequest");
+        workItem.setParameter(JBPMConstants.CAMEL_ENDPOINT_ID_WI_PARAM, camelEndpointId);
+        workItem.setParameter("Request", "someRequest");
         
         when(commandContext.getData("workItem")).thenReturn(workItem);
         when(commandContext.getData("deploymentId")).thenReturn(deploymentId);
@@ -90,6 +91,6 @@ public void testExecuteCommandDeploymentCamelContext() throws Exception {
         
         assertNotNull(results);
         assertEquals(2, results.getData().size());
-        assertEquals(testReponse, results.getData().get("response"));
+        assertEquals(testReponse, results.getData().get(JBPMConstants.RESPONSE_WI_PARAM));
     }
 }
diff --git a/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/GlobalContextCamelCommandTest.java b/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/GlobalContextCamelCommandTest.java
index ad36879c04afc..048ec72840aa6 100644
--- a/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/GlobalContextCamelCommandTest.java
+++ b/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/GlobalContextCamelCommandTest.java
@@ -25,6 +25,7 @@
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
 import org.apache.camel.ProducerTemplate;
+import org.apache.camel.component.jbpm.JBPMConstants;
 import org.drools.core.process.instance.impl.WorkItemImpl;
 import org.jbpm.services.api.service.ServiceRegistry;
 import org.junit.Test;
@@ -78,11 +79,11 @@ public void testExecuteGlobalCommand() throws Exception {
     	when(outMessage.getBody()).thenReturn(testReponse);
     	
     	//Register the RuntimeManager bound camelcontext.
-    	ServiceRegistry.get().register("GlobalCamelService", camelContext);
+    	ServiceRegistry.get().register(JBPMConstants.GLOBAL_CAMEL_CONTEXT_SERVICE_KEY, camelContext);
     	
         WorkItemImpl workItem = new WorkItemImpl();
-        workItem.setParameter("camel-endpoint-id", camelEndpointId);
-        workItem.setParameter("request", "someRequest");
+        workItem.setParameter(JBPMConstants.CAMEL_ENDPOINT_ID_WI_PARAM, camelEndpointId);
+        workItem.setParameter("Request", "someRequest");
         
         when(commandContext.getData(anyString())).thenReturn(workItem);
         
@@ -92,6 +93,6 @@ public void testExecuteGlobalCommand() throws Exception {
         
         assertNotNull(results);
         assertEquals(2, results.getData().size());
-        assertEquals(testReponse, results.getData().get("response"));
+        assertEquals(testReponse, results.getData().get(JBPMConstants.RESPONSE_WI_PARAM));
     }
 }
diff --git a/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/InOnlyCamelWorkItemHandlerTest.java b/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/InOnlyCamelWorkItemHandlerTest.java
index 1ad1bf9832d78..a862f2238011e 100644
--- a/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/InOnlyCamelWorkItemHandlerTest.java
+++ b/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/InOnlyCamelWorkItemHandlerTest.java
@@ -26,6 +26,7 @@
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
 import org.apache.camel.ProducerTemplate;
+import org.apache.camel.component.jbpm.JBPMConstants;
 import org.apache.camel.impl.DefaultHeadersMapFactory;
 import org.apache.camel.spi.HeadersMapFactory;
 import org.drools.core.process.instance.impl.WorkItemImpl;
@@ -79,8 +80,8 @@ public void testExecuteInOnlyLocalCamelContext() throws Exception {
         ServiceRegistry.get().register(runtimeManagerId + "_CamelService", camelContext);
 
         WorkItemImpl workItem = new WorkItemImpl();
-        workItem.setParameter("camel-endpoint-id", camelEndpointId);
-        workItem.setParameter("request", "someRequest");
+        workItem.setParameter(JBPMConstants.CAMEL_ENDPOINT_ID_WI_PARAM, camelEndpointId);
+        workItem.setParameter("Request", "someRequest");
         workItem.setDeploymentId("testDeploymentId");
         workItem.setProcessInstanceId(1L);
         workItem.setId(1L);
diff --git a/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/InOutCamelWorkItemHandlerTest.java b/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/InOutCamelWorkItemHandlerTest.java
index e4bc6bab37992..1277f046edf75 100644
--- a/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/InOutCamelWorkItemHandlerTest.java
+++ b/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/InOutCamelWorkItemHandlerTest.java
@@ -28,6 +28,7 @@
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
 import org.apache.camel.ProducerTemplate;
+import org.apache.camel.component.jbpm.JBPMConstants;
 import org.apache.camel.impl.DefaultHeadersMapFactory;
 import org.apache.camel.spi.HeadersMapFactory;
 import org.drools.core.process.instance.impl.WorkItemImpl;
@@ -80,8 +81,8 @@ public void testExecuteInOutGlobalCamelContext() throws Exception {
 
         TestWorkItemManager manager = new TestWorkItemManager();
         WorkItemImpl workItem = new WorkItemImpl();
-        workItem.setParameter("camel-endpoint-id", camelEndpointId);
-        workItem.setParameter("request", "someRequest");
+        workItem.setParameter("CamelEndpointId", camelEndpointId);
+        workItem.setParameter("Request", "someRequest");
         workItem.setDeploymentId("testDeploymentId");
         workItem.setProcessInstanceId(1L);
         workItem.setId(1L);
@@ -95,7 +96,7 @@ public void testExecuteInOutGlobalCamelContext() throws Exception {
         assertThat(manager.getResults().containsKey(workItem.getId()), is(true));
         Map<String, Object> results = manager.getResults(workItem.getId());
         assertThat(results.size(), equalTo(2));
-        assertThat(results.get("response"), equalTo(testReponse));
+        assertThat(results.get("Response"), equalTo(testReponse));
     }
 
     @Test
@@ -124,8 +125,8 @@ public void testExecuteInOutLocalCamelContext() throws Exception {
         ServiceRegistry.get().register(runtimeManagerId + "_CamelService", camelContext);
 
         WorkItemImpl workItem = new WorkItemImpl();
-        workItem.setParameter("camel-endpoint-id", camelEndpointId);
-        workItem.setParameter("request", "someRequest");
+        workItem.setParameter(JBPMConstants.CAMEL_ENDPOINT_ID_WI_PARAM, camelEndpointId);
+        workItem.setParameter("Request", "someRequest");
         workItem.setDeploymentId("testDeploymentId");
         workItem.setProcessInstanceId(1L);
         workItem.setId(1L);
@@ -141,7 +142,7 @@ public void testExecuteInOutLocalCamelContext() throws Exception {
         
         Map<String, Object> results = manager.getResults(workItem.getId());
         assertThat(results.size(), equalTo(2));
-        assertThat(results.get("response"), equalTo(testReponse));
+        assertThat(results.get(JBPMConstants.RESPONSE_WI_PARAM), equalTo(testReponse));
     }
    
 }

From 60010cd789e134f6b8851a8202afaf8a69a74ff7 Mon Sep 17 00:00:00 2001
From: Duncan Doyle <Duncan.Doyle@gmail.com>
Date: Fri, 30 Nov 2018 09:34:22 +0100
Subject: [PATCH 118/125] Removed TODO comments.

---
 .../camel/component/jbpm/workitem/AbstractCamelCommand.java    | 3 +--
 .../component/jbpm/workitem/AbstractCamelWorkItemHandler.java  | 2 --
 .../component/jbpm/workitem/GlobalContextCamelCommand.java     | 1 -
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/AbstractCamelCommand.java b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/AbstractCamelCommand.java
index adfd413136433..a26aa321710e2 100644
--- a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/AbstractCamelCommand.java
+++ b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/AbstractCamelCommand.java
@@ -56,8 +56,7 @@ public AbstractCamelCommand() {
     @Override
     public ExecutionResults execute(CommandContext ctx) throws Exception {
         
-        
-    	WorkItem workItem = (WorkItem) ctx.getData("workItem");
+        WorkItem workItem = (WorkItem) ctx.getData("workItem");
     	
     	String camelEndpointId = (String) workItem.getParameter(JBPMConstants.CAMEL_ENDPOINT_ID_WI_PARAM);
 		
diff --git a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/AbstractCamelWorkItemHandler.java b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/AbstractCamelWorkItemHandler.java
index 743393c38c7ee..23d7a35051e95 100644
--- a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/AbstractCamelWorkItemHandler.java
+++ b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/AbstractCamelWorkItemHandler.java
@@ -69,7 +69,6 @@ public AbstractCamelWorkItemHandler() {
 
     public AbstractCamelWorkItemHandler(String camelEndointId) {
         CamelContext globalCamelContext = (CamelContext) ServiceRegistry.get().service(JBPMConstants.GLOBAL_CAMEL_CONTEXT_SERVICE_KEY);
-        // TODO: Should we allow to set the maximumCacheSize on the producer?
         this.producerTemplate = globalCamelContext.createProducerTemplate();
         this.camelEndpointId = camelEndointId;
     }
@@ -85,7 +84,6 @@ public AbstractCamelWorkItemHandler(RuntimeManager runtimeManager) {
     public AbstractCamelWorkItemHandler(RuntimeManager runtimeManager, String camelEndpointId) {
         String runtimeCamelContextKey = runtimeManager.getIdentifier() + JBPMConstants.DEPLOYMENT_CAMEL_CONTEXT_SERVICE_KEY_POSTFIX;
         CamelContext runtimeCamelContext = (CamelContext) ServiceRegistry.get().service(runtimeCamelContextKey);
-        // TODO: Should we allow to set the maximumCacheSize on the producer?
         this.producerTemplate = runtimeCamelContext.createProducerTemplate();
         this.camelEndpointId = camelEndpointId;
     }
diff --git a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/GlobalContextCamelCommand.java b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/GlobalContextCamelCommand.java
index 10950b3e87901..e129a120a1b13 100644
--- a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/GlobalContextCamelCommand.java
+++ b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/GlobalContextCamelCommand.java
@@ -36,7 +36,6 @@ public class GlobalContextCamelCommand extends AbstractCamelCommand {
     
     public GlobalContextCamelCommand() {
         CamelContext globalCamelContext = (CamelContext) ServiceRegistry.get().service(JBPMConstants.GLOBAL_CAMEL_CONTEXT_SERVICE_KEY);
-        // TODO: Should we allow to set the maximumCacheSize on the producer?
         this.globalContextProducerTemplate = globalCamelContext.createProducerTemplate();
     }
     

From 9201574991b083771ec5bf3ab19e6e08f02c4d48 Mon Sep 17 00:00:00 2001
From: Dmitry Volodin <dmvolod@gmail.com>
Date: Fri, 30 Nov 2018 13:18:23 +0300
Subject: [PATCH 119/125] CAMEL-12964: Fix CS

---
 .../jbpm/server/CamelKieServerExtension.java  | 29 +++++----
 .../jbpm/workitem/AbstractCamelCommand.java   | 60 +++++++++----------
 .../AbstractCamelWorkItemHandler.java         |  1 -
 .../DeploymentContextCamelCommand.java        |  5 +-
 .../workitem/GlobalContextCamelCommand.java   |  8 +--
 .../workitem/InOnlyCamelWorkItemHandler.java  |  1 -
 .../workitem/InOutCamelWorkItemHandler.java   |  1 -
 .../jbpm/JBPMComponentIntegrationTest.java    |  1 -
 .../CamelWorkItemHandlerIntegrationTests.java |  5 +-
 .../DeploymentContextCamelCommandTest.java    |  9 ++-
 .../GlobalContextCamelCommandTest.java        | 59 +++++++++---------
 .../InOnlyCamelWorkItemHandlerTest.java       | 11 ++--
 .../InOutCamelWorkItemHandlerTest.java        | 12 ++--
 13 files changed, 92 insertions(+), 110 deletions(-)

diff --git a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/server/CamelKieServerExtension.java b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/server/CamelKieServerExtension.java
index 659a498c2dba3..1783b04898b75 100644
--- a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/server/CamelKieServerExtension.java
+++ b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/server/CamelKieServerExtension.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.camel.component.jbpm.server;
 
 import java.io.InputStream;
@@ -44,7 +43,7 @@ public class CamelKieServerExtension implements KieServerExtension {
 
     private static final Boolean DISABLED = Boolean.parseBoolean(System.getProperty("org.camel.server.ext.disabled", "false"));
 
-    protected DefaultCamelContext camel;
+    protected DefaultCamelContext camelContext;
 
     protected boolean managedCamel;
 
@@ -54,14 +53,14 @@ public CamelKieServerExtension() {
         this.managedCamel = true;
     }
 
-    public CamelKieServerExtension(DefaultCamelContext camel) {
-        this.camel = camel;
+    public CamelKieServerExtension(DefaultCamelContext camelContext) {
+        this.camelContext = camelContext;
         this.managedCamel = false;
     }
 
     @Override
     public boolean isInitialized() {
-        return camel != null;
+        return camelContext != null;
     }
 
     @Override
@@ -71,31 +70,31 @@ public boolean isActive() {
 
     @Override
     public void init(KieServerImpl kieServer, KieServerRegistry registry) {
-        if (this.managedCamel && this.camel == null) {
-            this.camel = new DefaultCamelContext();
-            this.camel.setName("KIE Server Camel context");
+        if (this.managedCamel && this.camelContext == null) {
+            this.camelContext = new DefaultCamelContext();
+            this.camelContext.setName("KIE Server Camel context");
 
             try (InputStream is = this.getClass().getResourceAsStream("/global-camel-routes.xml")) {
                 if (is != null) {
 
-                    RoutesDefinition routes = camel.loadRoutesDefinition(is);
-                    camel.addRouteDefinitions(routes.getRoutes());
+                    RoutesDefinition routes = camelContext.loadRoutesDefinition(is);
+                    camelContext.addRouteDefinitions(routes.getRoutes());
                 }
             } catch (Exception e) {
                 LOGGER.error("Error while adding Camel context for KIE Server", e);
             }
         }
 
-        ServiceRegistry.get().register(JBPMConstants.GLOBAL_CAMEL_CONTEXT_SERVICE_KEY, this.camel);
+        ServiceRegistry.get().register(JBPMConstants.GLOBAL_CAMEL_CONTEXT_SERVICE_KEY, this.camelContext);
     }
 
     @Override
     public void destroy(KieServerImpl kieServer, KieServerRegistry registry) {
         ServiceRegistry.get().remove("GlobalCamelService");
 
-        if (this.managedCamel && this.camel != null) {
+        if (this.managedCamel && this.camelContext != null) {
             try {
-                this.camel.stop();
+                this.camelContext.stop();
             } catch (Exception e) {
                 LOGGER.error("Failed at stopping KIE Server extension {}", EXTENSION_NAME);
             }
@@ -184,9 +183,9 @@ public Integer getStartOrder() {
 
     @Override
     public void serverStarted() {
-        if (this.managedCamel && this.camel != null && !this.camel.isStarted()) {
+        if (this.managedCamel && this.camelContext != null && !this.camelContext.isStarted()) {
             try {
-                this.camel.start();
+                this.camelContext.start();
             } catch (Exception e) {
                 LOGGER.error("Failed at start Camel context", e);
             }
diff --git a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/AbstractCamelCommand.java b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/AbstractCamelCommand.java
index a26aa321710e2..1900960ed2b33 100644
--- a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/AbstractCamelCommand.java
+++ b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/AbstractCamelCommand.java
@@ -14,20 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.camel.component.jbpm.workitem;
 
-import org.apache.camel.CamelContext;
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
 import org.apache.camel.ProducerTemplate;
 import org.apache.camel.builder.ExchangeBuilder;
 import org.apache.camel.component.jbpm.JBPMConstants;
-import org.jbpm.services.api.service.ServiceRegistry;
 import org.kie.api.executor.Command;
 import org.kie.api.executor.CommandContext;
 import org.kie.api.executor.ExecutionResults;
-import org.kie.api.runtime.manager.RuntimeManager;
 import org.kie.api.runtime.process.WorkItem;
 import org.kie.internal.runtime.Cacheable;
 import org.slf4j.Logger;
@@ -45,41 +41,41 @@
  * {@link Message} is provided via the <code>Message</code> parameter. This gives the user access to more advanced fields like message headers 
  * and attachments.
  */
-public abstract class AbstractCamelCommand implements Command,
-                                          Cacheable {
-
-    private static final Logger logger = LoggerFactory.getLogger(AbstractCamelCommand.class);
+public abstract class AbstractCamelCommand implements Command, Cacheable {
+    private static final Logger LOGGER = LoggerFactory.getLogger(AbstractCamelCommand.class);
 
-	public AbstractCamelCommand() {
-	}
-	
+    public AbstractCamelCommand() {
+    }
+    
     @Override
     public ExecutionResults execute(CommandContext ctx) throws Exception {
         
         WorkItem workItem = (WorkItem) ctx.getData("workItem");
-    	
-    	String camelEndpointId = (String) workItem.getParameter(JBPMConstants.CAMEL_ENDPOINT_ID_WI_PARAM);
-		
-		// We only support direct. We don't need to support more, as direct simply gives us the entrypoint into the actual Camel Routes.
-		String camelUri = "direct://" + camelEndpointId;
-		
-		ProducerTemplate producerTemplate = getProducerTemplate(ctx);
-		Exchange inExchange = ExchangeBuilder.anExchange(producerTemplate.getCamelContext()).withBody(workItem).build();
-		Exchange outExchange = producerTemplate.send(camelUri, inExchange);
-		// producerTemplate.send does not throw exceptions, instead they are set on the returned Exchange.
-		if (outExchange.getException() != null) {
-			throw outExchange.getException();
-		}
-		Message outMessage = outExchange.getOut();
-		
-		ExecutionResults results = new ExecutionResults();
-		Object response = outMessage.getBody();
-		results.setData(JBPMConstants.RESPONSE_WI_PARAM, response);
-		results.setData(JBPMConstants.MESSAGE_WI_PARAM, outMessage);
-    	
+      
+        String camelEndpointId = (String) workItem.getParameter(JBPMConstants.CAMEL_ENDPOINT_ID_WI_PARAM);
+
+        // We only support direct. We don't need to support more, as direct simply gives us the entrypoint into the actual Camel Routes.
+        String camelUri = "direct://" + camelEndpointId;
+        
+        ProducerTemplate producerTemplate = getProducerTemplate(ctx);
+        Exchange inExchange = ExchangeBuilder.anExchange(producerTemplate.getCamelContext()).withBody(workItem).build();
+        Exchange outExchange = producerTemplate.send(camelUri, inExchange);
+
+        // producerTemplate.send does not throw exceptions, instead they are set on the returned Exchange.
+        if (outExchange.getException() != null) {
+            throw outExchange.getException();
+        }
+
+        Message outMessage = outExchange.getOut();
+
+        ExecutionResults results = new ExecutionResults();
+        Object response = outMessage.getBody();
+        results.setData(JBPMConstants.RESPONSE_WI_PARAM, response);
+        results.setData(JBPMConstants.MESSAGE_WI_PARAM, outMessage);
+
         return results;
     }
-    
+
     protected abstract ProducerTemplate getProducerTemplate(CommandContext ctx);
 
 }
\ No newline at end of file
diff --git a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/AbstractCamelWorkItemHandler.java b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/AbstractCamelWorkItemHandler.java
index 23d7a35051e95..d5ea7df9092bb 100644
--- a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/AbstractCamelWorkItemHandler.java
+++ b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/AbstractCamelWorkItemHandler.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.camel.component.jbpm.workitem;
 
 import org.apache.camel.CamelContext;
diff --git a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/DeploymentContextCamelCommand.java b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/DeploymentContextCamelCommand.java
index 009b909468636..69c74ad211d85 100644
--- a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/DeploymentContextCamelCommand.java
+++ b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/DeploymentContextCamelCommand.java
@@ -32,11 +32,10 @@
  * CamelCommand that uses the {@link CamelContext} registered on the {@link ServiceRegistry} for this specific deployment.
  */
 public class DeploymentContextCamelCommand extends AbstractCamelCommand {
+    private static final Logger LOGGER = LoggerFactory.getLogger(DeploymentContextCamelCommand.class);
 
     private final Map<String, ProducerTemplate> templates = new ConcurrentHashMap<>();
 
-    private static final Logger logger = LoggerFactory.getLogger(DeploymentContextCamelCommand.class);
-
     @Override
     protected ProducerTemplate getProducerTemplate(CommandContext ctx) {
         String deploymentId = (String) ctx.getData("deploymentId");
@@ -62,7 +61,7 @@ public void close() {
             try {
                 nextTemplate.stop();
             } catch (Exception e) {
-                logger.warn("Error encountered while closing the Camel Producer Template.", e);
+                LOGGER.warn("Error encountered while closing the Camel Producer Template.", e);
                 // Not much we can do here, so swallowing exception.
             }
         }
diff --git a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/GlobalContextCamelCommand.java b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/GlobalContextCamelCommand.java
index e129a120a1b13..aa46014e81834 100644
--- a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/GlobalContextCamelCommand.java
+++ b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/GlobalContextCamelCommand.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.camel.component.jbpm.workitem;
 
 import org.apache.camel.CamelContext;
@@ -29,10 +28,9 @@
  * CamelCommand that uses the global {@link CamelContext} registered on the {@link ServiceRegistry}.
  */
 public class GlobalContextCamelCommand extends AbstractCamelCommand {
-
-    private final ProducerTemplate globalContextProducerTemplate;
+    private static final Logger LOGGER = LoggerFactory.getLogger(GlobalContextCamelCommand.class);
     
-    private static final Logger logger = LoggerFactory.getLogger(GlobalContextCamelCommand.class);
+    private final ProducerTemplate globalContextProducerTemplate;
     
     public GlobalContextCamelCommand() {
         CamelContext globalCamelContext = (CamelContext) ServiceRegistry.get().service(JBPMConstants.GLOBAL_CAMEL_CONTEXT_SERVICE_KEY);
@@ -49,7 +47,7 @@ public void close() {
         try {
             this.globalContextProducerTemplate.stop();
         } catch (Exception e) {
-            logger.warn("Error encountered while closing the Camel Producer Template.", e);
+            LOGGER.warn("Error encountered while closing the Camel Producer Template.", e);
             // Not much we can do here, so swallowing exception.
         }
     }
diff --git a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/InOnlyCamelWorkItemHandler.java b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/InOnlyCamelWorkItemHandler.java
index b97b0ad415636..b20bcda57221d 100644
--- a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/InOnlyCamelWorkItemHandler.java
+++ b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/InOnlyCamelWorkItemHandler.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.camel.component.jbpm.workitem;
 
 import org.apache.camel.Exchange;
diff --git a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/InOutCamelWorkItemHandler.java b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/InOutCamelWorkItemHandler.java
index a8482dde6d919..6b6ef5f220b84 100644
--- a/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/InOutCamelWorkItemHandler.java
+++ b/components/camel-jbpm/src/main/java/org/apache/camel/component/jbpm/workitem/InOutCamelWorkItemHandler.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.camel.component.jbpm.workitem;
 
 import java.util.HashMap;
diff --git a/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/JBPMComponentIntegrationTest.java b/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/JBPMComponentIntegrationTest.java
index fbab216fb0055..046b118acdd4d 100644
--- a/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/JBPMComponentIntegrationTest.java
+++ b/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/JBPMComponentIntegrationTest.java
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.camel.component.jbpm;
 
 import java.util.HashMap;
diff --git a/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/CamelWorkItemHandlerIntegrationTests.java b/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/CamelWorkItemHandlerIntegrationTests.java
index 4e594ddacc698..67d54fb69bbca 100644
--- a/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/CamelWorkItemHandlerIntegrationTests.java
+++ b/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/CamelWorkItemHandlerIntegrationTests.java
@@ -14,11 +14,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.camel.component.jbpm.workitem;
 
-import static org.hamcrest.CoreMatchers.*;
-
 import org.apache.camel.EndpointInject;
 import org.apache.camel.Produce;
 import org.apache.camel.ProducerTemplate;
@@ -33,6 +30,8 @@
 import org.junit.Test;
 import org.kie.api.runtime.process.WorkItemHandler;
 
+import static org.hamcrest.CoreMatchers.*;
+
 //http://camel.apache.org/using-getin-or-getout-methods-on-exchange.html
 //http://camel.apache.org/async.html
 public class CamelWorkItemHandlerIntegrationTests extends CamelTestSupport {
diff --git a/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/DeploymentContextCamelCommandTest.java b/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/DeploymentContextCamelCommandTest.java
index e1aef21c32adc..b0086b9f602d5 100644
--- a/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/DeploymentContextCamelCommandTest.java
+++ b/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/DeploymentContextCamelCommandTest.java
@@ -14,13 +14,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.camel.component.jbpm.workitem;
 
-import static org.junit.Assert.*;
-import static org.mockito.ArgumentMatchers.*;
-import static org.mockito.Mockito.*;
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
@@ -37,6 +32,10 @@
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 
+import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.*;
+import static org.mockito.Mockito.*;
+
 @RunWith(MockitoJUnitRunner.class)
 public class DeploymentContextCamelCommandTest {
     
diff --git a/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/GlobalContextCamelCommandTest.java b/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/GlobalContextCamelCommandTest.java
index 048ec72840aa6..031bc69e30bd2 100644
--- a/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/GlobalContextCamelCommandTest.java
+++ b/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/GlobalContextCamelCommandTest.java
@@ -14,13 +14,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.camel.component.jbpm.workitem;
 
-import static org.junit.Assert.*;
-import static org.mockito.ArgumentMatchers.*;
-import static org.mockito.Mockito.*;
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
@@ -37,10 +32,14 @@
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 
+import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.*;
+import static org.mockito.Mockito.*;
+
 @RunWith(MockitoJUnitRunner.class)
 public class GlobalContextCamelCommandTest {
 
-	@Mock
+    @Mock
     ProducerTemplate producerTemplate;
 
     @Mock
@@ -61,38 +60,36 @@ public class GlobalContextCamelCommandTest {
     @Test
     public void testExecuteGlobalCommand() throws Exception {
     
-    	String camelEndpointId = "testCamelRoute";
-    	String camelRouteUri = "direct://" + camelEndpointId;
-    	
-    	String testReponse = "testResponse";
-    	
-    	String runtimeManagerId = "testRuntimeManager";
-    	
-    	when(producerTemplate.send(eq(camelRouteUri), any(Exchange.class))).thenReturn(outExchange);
-    	
-    	
-    	when(producerTemplate.getCamelContext()).thenReturn(camelContext);
-    	
-    	when(camelContext.createProducerTemplate()).thenReturn(producerTemplate);
-    	
-    	when(outExchange.getOut()).thenReturn(outMessage);
-    	when(outMessage.getBody()).thenReturn(testReponse);
-    	
-    	//Register the RuntimeManager bound camelcontext.
-    	ServiceRegistry.get().register(JBPMConstants.GLOBAL_CAMEL_CONTEXT_SERVICE_KEY, camelContext);
-    	
+        String camelEndpointId = "testCamelRoute";
+        String camelRouteUri = "direct://" + camelEndpointId;
+
+        String testReponse = "testResponse";
+
+        String runtimeManagerId = "testRuntimeManager";
+
+        when(producerTemplate.send(eq(camelRouteUri), any(Exchange.class))).thenReturn(outExchange);
+
+        when(producerTemplate.getCamelContext()).thenReturn(camelContext);
+
+        when(camelContext.createProducerTemplate()).thenReturn(producerTemplate);
+
+        when(outExchange.getOut()).thenReturn(outMessage);
+        when(outMessage.getBody()).thenReturn(testReponse);
+
+        //Register the RuntimeManager bound camelContext.
+        ServiceRegistry.get().register(JBPMConstants.GLOBAL_CAMEL_CONTEXT_SERVICE_KEY, camelContext);
+
         WorkItemImpl workItem = new WorkItemImpl();
         workItem.setParameter(JBPMConstants.CAMEL_ENDPOINT_ID_WI_PARAM, camelEndpointId);
         workItem.setParameter("Request", "someRequest");
-        
+
         when(commandContext.getData(anyString())).thenReturn(workItem);
-        
+
         Command command = new GlobalContextCamelCommand();
         ExecutionResults results = command.execute(commandContext);
-        
-        
+
         assertNotNull(results);
         assertEquals(2, results.getData().size());
         assertEquals(testReponse, results.getData().get(JBPMConstants.RESPONSE_WI_PARAM));
     }
-}
+}
\ No newline at end of file
diff --git a/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/InOnlyCamelWorkItemHandlerTest.java b/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/InOnlyCamelWorkItemHandlerTest.java
index a862f2238011e..b97822ead63a7 100644
--- a/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/InOnlyCamelWorkItemHandlerTest.java
+++ b/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/InOnlyCamelWorkItemHandlerTest.java
@@ -14,14 +14,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.camel.component.jbpm.workitem;
 
-import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.*;
-import static org.mockito.ArgumentMatchers.*;
-import static org.mockito.Mockito.*;
-
 import org.apache.camel.CamelContext;
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
@@ -39,6 +33,11 @@
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 
+import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.*;
+import static org.mockito.Mockito.*;
+
 @RunWith(MockitoJUnitRunner.class)
 public class InOnlyCamelWorkItemHandlerTest {
 
diff --git a/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/InOutCamelWorkItemHandlerTest.java b/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/InOutCamelWorkItemHandlerTest.java
index 1277f046edf75..578de782f36a6 100644
--- a/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/InOutCamelWorkItemHandlerTest.java
+++ b/components/camel-jbpm/src/test/java/org/apache/camel/component/jbpm/workitem/InOutCamelWorkItemHandlerTest.java
@@ -14,14 +14,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.camel.component.jbpm.workitem;
 
-import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.*;
-import static org.mockito.ArgumentMatchers.*;
-import static org.mockito.Mockito.*;
-
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
@@ -41,6 +35,12 @@
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 
+import static org.hamcrest.CoreMatchers.*;
+import static org.junit.Assert.*;
+import static org.mockito.ArgumentMatchers.*;
+import static org.mockito.Mockito.*;
+
+
 @RunWith(MockitoJUnitRunner.class)
 public class InOutCamelWorkItemHandlerTest {
 

From 6c40047f0c69230fe595858d590933177a303154 Mon Sep 17 00:00:00 2001
From: Andrea Cosentino <ancosen@gmail.com>
Date: Fri, 30 Nov 2018 11:20:28 +0100
Subject: [PATCH 120/125] Upgrade Rabbitmq client to version 5.5.1

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

diff --git a/parent/pom.xml b/parent/pom.xml
index 4ea081ae78098..c1b09047d6f73 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -578,7 +578,7 @@
     <quartz-version-range>[1.8,2)</quartz-version-range>
     <quartz2-version>2.3.0</quartz2-version>
     <quickfixj-version>2.1.0</quickfixj-version>
-    <rabbitmq-amqp-client-version>5.5.0</rabbitmq-amqp-client-version>
+    <rabbitmq-amqp-client-version>5.5.1</rabbitmq-amqp-client-version>
     <reactive-streams-version>1.0.2</reactive-streams-version>
     <reactor-version>3.2.3.RELEASE</reactor-version>
     <reflections-version>0.9.11</reflections-version>

From 1328be84d5add8b9d94d1821155be3b0025242ee Mon Sep 17 00:00:00 2001
From: William Collins <punkhornsw@gmail.com>
Date: Wed, 28 Nov 2018 11:30:54 -0500
Subject: [PATCH 121/125] [CAMEL-12605] Refactoring for compression support.

---
 .../component/as2/api/AS2ClientManager.java   | 122 ++++++++++++++++--
 .../as2/api/AS2CompressionAlgorithm.java      |  44 +++++++
 .../as2/api/AS2MessageStructure.java          |  10 +-
 ...licationPkcs7MimeEnvelopedDataEntity.java} |   9 +-
 .../as2/api/entity/EntityParser.java          |   4 +-
 .../as2/api/util/CompressionUtils.java        |  36 ++++++
 .../component/as2/api/AS2MessageTest.java     |  41 +++---
 .../as2/api/entity/EntityParserTest.java      |   2 +-
 .../src/main/docs/as2-component.adoc          |   3 +-
 .../camel/component/as2/AS2Configuration.java |  17 ++-
 .../as2/AS2ClientManagerIntegrationTest.java  |   6 +-
 .../as2/AS2ServerManagerIntegrationTest.java  |   4 +-
 .../springboot/AS2ComponentConfiguration.java |  14 ++
 13 files changed, 264 insertions(+), 48 deletions(-)
 create mode 100644 components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/AS2CompressionAlgorithm.java
 rename components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/entity/{ApplicationPkcs7MimeEntity.java => ApplicationPkcs7MimeEnvelopedDataEntity.java} (94%)
 create mode 100644 components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/util/CompressionUtils.java

diff --git a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/AS2ClientManager.java b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/AS2ClientManager.java
index ecd1f7a9cd5fc..8e1905cabd950 100644
--- a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/AS2ClientManager.java
+++ b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/AS2ClientManager.java
@@ -21,9 +21,11 @@
 import java.security.cert.Certificate;
 
 import org.apache.camel.component.as2.api.entity.ApplicationEDIEntity;
-import org.apache.camel.component.as2.api.entity.ApplicationPkcs7MimeEntity;
+import org.apache.camel.component.as2.api.entity.ApplicationPkcs7MimeCompressedDataEntity;
+import org.apache.camel.component.as2.api.entity.ApplicationPkcs7MimeEnvelopedDataEntity;
 import org.apache.camel.component.as2.api.entity.EntityParser;
 import org.apache.camel.component.as2.api.entity.MultipartSignedEntity;
+import org.apache.camel.component.as2.api.util.CompressionUtils;
 import org.apache.camel.component.as2.api.util.EncryptingUtils;
 import org.apache.camel.component.as2.api.util.EntityUtils;
 import org.apache.camel.component.as2.api.util.SigningUtils;
@@ -33,7 +35,9 @@
 import org.apache.http.message.BasicHttpEntityEnclosingRequest;
 import org.apache.http.protocol.HttpCoreContext;
 import org.apache.http.util.Args;
+import org.bouncycastle.cms.CMSCompressedDataGenerator;
 import org.bouncycastle.cms.CMSEnvelopedDataGenerator;
+import org.bouncycastle.operator.OutputCompressor;
 import org.bouncycastle.operator.OutputEncryptor;
 
 /**
@@ -156,6 +160,12 @@ public class AS2ClientManager {
      */
     public static final String ENCRYPTING_PRIVATE_KEY = CAMEL_AS2_CLIENT_PREFIX + "encrypting-private-key";
 
+    /**
+     * The HTTP Context Attribute containing the algorithm used to compress EDI
+     * message
+     */
+    public static final String COMPRESSION_ALGORITHM = CAMEL_AS2_CLIENT_PREFIX + "compression-algorithm-name";
+
     /**
      * The HTTP Context Attribute containing the internet e-mail address of
      * sending system requesting a message disposition notification.
@@ -213,6 +223,7 @@ public HttpCoreContext send(String ediMessage,
                                 AS2SignatureAlgorithm signingAlgorithm,
                                 Certificate[] signingCertificateChain,
                                 PrivateKey signingPrivateKey,
+                                AS2CompressionAlgorithm compressionAlgorithm,
                                 String dispositionNotificationTo,
                                 String[] signedReceiptMicAlgorithms,
                                 AS2EncryptionAlgorithm encryptingAlgorithm,
@@ -238,6 +249,7 @@ public HttpCoreContext send(String ediMessage,
         httpContext.setAttribute(AS2ClientManager.SIGNING_ALGORITHM, signingAlgorithm);
         httpContext.setAttribute(AS2ClientManager.SIGNING_CERTIFICATE_CHAIN, signingCertificateChain);
         httpContext.setAttribute(AS2ClientManager.SIGNING_PRIVATE_KEY, signingPrivateKey);
+        httpContext.setAttribute(AS2ClientManager.COMPRESSION_ALGORITHM, compressionAlgorithm);
         httpContext.setAttribute(AS2ClientManager.DISPOSITION_NOTIFICATION_TO, dispositionNotificationTo);
         httpContext.setAttribute(AS2ClientManager.SIGNED_RECEIPT_MIC_ALGORITHMS, signedReceiptMicAlgorithms);
         httpContext.setAttribute(AS2ClientManager.ENCRYPTING_ALGORITHM, encryptingAlgorithm);
@@ -256,35 +268,112 @@ public HttpCoreContext send(String ediMessage,
         }
         switch (as2MessageStructure) {
         case PLAIN: {
+            // Add EDI Entity to main body of request.
             applicationEDIEntity.setMainBody(true);
             EntityUtils.setMessageEntity(request, applicationEDIEntity);
             break;
         }
         case SIGNED: {
-            AS2SignedDataGenerator gen = createSigningGenerator(httpContext);
-            // Create Multipart Signed Entity
-            MultipartSignedEntity multipartSignedEntity = new MultipartSignedEntity(applicationEDIEntity, gen,
+            // Create Multipart Signed Entity containing EDI Entity
+            AS2SignedDataGenerator signingGenrator = createSigningGenerator(httpContext);
+            MultipartSignedEntity multipartSignedEntity = new MultipartSignedEntity(applicationEDIEntity, signingGenrator,
                     AS2Charset.US_ASCII, AS2TransferEncoding.BASE64, true, null);
-            multipartSignedEntity.setMainBody(true);
+            
+            // Add Multipart Signed Entity to main body of request.
             EntityUtils.setMessageEntity(request, multipartSignedEntity);
             break;
         }
         case ENCRYPTED: {
+            // Create Enveloped Entity containing EDI Entity
             CMSEnvelopedDataGenerator envelopedDataGenerator = createEncryptingGenerator(httpContext);
             OutputEncryptor encryptor = createEncryptor(httpContext);
-            ApplicationPkcs7MimeEntity pkcs7MimeEntity = new ApplicationPkcs7MimeEntity(applicationEDIEntity, envelopedDataGenerator, encryptor, AS2TransferEncoding.BASE64, true);
-            EntityUtils.setMessageEntity(request, pkcs7MimeEntity);
+            ApplicationPkcs7MimeEnvelopedDataEntity pkcs7MimeEnvelopedDataEntity = new ApplicationPkcs7MimeEnvelopedDataEntity(
+                    applicationEDIEntity, envelopedDataGenerator, encryptor, AS2TransferEncoding.BASE64, true);
+
+            // Add Multipart Enveloped Entity to main body of request.
+            EntityUtils.setMessageEntity(request, pkcs7MimeEnvelopedDataEntity);
             break;
         }
-        case ENCRYPTED_SIGNED: {
+        case SIGNED_ENCRYPTED: {
+            // Create Multipart Signed Entity containing EDI Entity
             AS2SignedDataGenerator signingGenrator = createSigningGenerator(httpContext);
             MultipartSignedEntity multipartSignedEntity = new MultipartSignedEntity(applicationEDIEntity,
                     signingGenrator, AS2Charset.US_ASCII, AS2TransferEncoding.BASE64, false, null);
              
+            // Create Enveloped Entity containing Multipart Signed Entity
+            CMSEnvelopedDataGenerator envelopedDataGenerator = createEncryptingGenerator(httpContext);
+            OutputEncryptor encryptor = createEncryptor(httpContext);
+            ApplicationPkcs7MimeEnvelopedDataEntity pkcs7MimeEnvelopedDataEntity = new ApplicationPkcs7MimeEnvelopedDataEntity(
+                    multipartSignedEntity, envelopedDataGenerator, encryptor, AS2TransferEncoding.BASE64, true);
+
+            // Add Multipart Enveloped Entity to main body of request.
+            EntityUtils.setMessageEntity(request, pkcs7MimeEnvelopedDataEntity);
+            break;
+        }
+        case PLAIN_COMPRESSED: {
+            // Create Compressed Entity containing EDI Entity
+            CMSCompressedDataGenerator compressedDataGenerator = createCompressorGenerator(httpContext);
+            OutputCompressor compressor = createCompressor(httpContext);
+            ApplicationPkcs7MimeCompressedDataEntity pkcs7MimeCompressedDataEntity = new ApplicationPkcs7MimeCompressedDataEntity(
+                    applicationEDIEntity, compressedDataGenerator, compressor, AS2TransferEncoding.BASE64, false);
+
+            // Add Compressed Entity to main body of request.
+            EntityUtils.setMessageEntity(request, pkcs7MimeCompressedDataEntity);
+            break;
+        }
+        case SIGNED_COMPRESSED: {
+            // Create Multipart Signed Entity containing EDI Entity
+            AS2SignedDataGenerator signingGenrator = createSigningGenerator(httpContext);
+            MultipartSignedEntity multipartSignedEntity = new MultipartSignedEntity(applicationEDIEntity,
+                    signingGenrator, AS2Charset.US_ASCII, AS2TransferEncoding.BASE64, false, null);
+            
+            // Create Compressed Entity containing Multipart Signed Entity
+            CMSCompressedDataGenerator compressedDataGenerator = createCompressorGenerator(httpContext);
+            OutputCompressor compressor = createCompressor(httpContext);
+            ApplicationPkcs7MimeCompressedDataEntity pkcs7MimeCompressedDataEntity = new ApplicationPkcs7MimeCompressedDataEntity(
+                    multipartSignedEntity, compressedDataGenerator, compressor, AS2TransferEncoding.BASE64, false);
+
+            // Add Compressed Entity to main body of request.
+            EntityUtils.setMessageEntity(request, pkcs7MimeCompressedDataEntity);
+            break;
+        }
+        case ENCRYPTED_COMPRESSED: {
+            // Create Compressed Entity containing EDI Entity
+            CMSCompressedDataGenerator compressedDataGenerator = createCompressorGenerator(httpContext);
+            OutputCompressor compressor = createCompressor(httpContext);
+            ApplicationPkcs7MimeCompressedDataEntity pkcs7MimeCompressedDataEntity = new ApplicationPkcs7MimeCompressedDataEntity(
+                    applicationEDIEntity, compressedDataGenerator, compressor, AS2TransferEncoding.BASE64, false);
+            
+            // Create Enveloped Entity containing Compressed Entity
             CMSEnvelopedDataGenerator envelopedDataGenerator = createEncryptingGenerator(httpContext);
             OutputEncryptor encryptor = createEncryptor(httpContext);
-            ApplicationPkcs7MimeEntity pkcs7MimeEntity = new ApplicationPkcs7MimeEntity(multipartSignedEntity, envelopedDataGenerator, encryptor, AS2TransferEncoding.BASE64, true);
-            EntityUtils.setMessageEntity(request, pkcs7MimeEntity);
+            ApplicationPkcs7MimeEnvelopedDataEntity pkcs7MimeEnvelopedDataEntity = new ApplicationPkcs7MimeEnvelopedDataEntity(
+                    pkcs7MimeCompressedDataEntity, envelopedDataGenerator, encryptor, AS2TransferEncoding.BASE64, true);
+            
+            // Add Enveloped Entity to main body of request
+            EntityUtils.setMessageEntity(request, pkcs7MimeEnvelopedDataEntity);
+            break;
+        }
+        case SIGNED_ENCRYPTED_COMPRESSED: {
+            // Create Multipart Signed Entity containing EDI Entity
+            AS2SignedDataGenerator signingGenrator = createSigningGenerator(httpContext);
+            MultipartSignedEntity multipartSignedEntity = new MultipartSignedEntity(applicationEDIEntity, signingGenrator,
+                    AS2Charset.US_ASCII, AS2TransferEncoding.BASE64, true, null);
+            
+            // Create Compressed Entity containing Multipart Signed Entity
+            CMSCompressedDataGenerator compressedDataGenerator = createCompressorGenerator(httpContext);
+            OutputCompressor compressor = createCompressor(httpContext);
+            ApplicationPkcs7MimeCompressedDataEntity pkcs7MimeCompressedDataEntity = new ApplicationPkcs7MimeCompressedDataEntity(
+                    multipartSignedEntity, compressedDataGenerator, compressor, AS2TransferEncoding.BASE64, false);
+
+            // Create Enveloped Entity containing Compressed Entity
+            CMSEnvelopedDataGenerator envelopedDataGenerator = createEncryptingGenerator(httpContext);
+            OutputEncryptor encryptor = createEncryptor(httpContext);
+            ApplicationPkcs7MimeEnvelopedDataEntity pkcs7MimeEnvelopedDataEntity = new ApplicationPkcs7MimeEnvelopedDataEntity(
+                    pkcs7MimeCompressedDataEntity, envelopedDataGenerator, encryptor, AS2TransferEncoding.BASE64, true);
+            
+            // Add Enveloped Entity to main body of request
+            EntityUtils.setMessageEntity(request, pkcs7MimeEnvelopedDataEntity);
             break;
         }
         default:
@@ -335,6 +424,10 @@ public CMSEnvelopedDataGenerator createEncryptingGenerator(HttpCoreContext httpC
 
     }
     
+    public CMSCompressedDataGenerator createCompressorGenerator(HttpCoreContext httpContext) {
+        return CompressionUtils.createCompressedDataGenerator();
+    }
+    
     public OutputEncryptor createEncryptor(HttpCoreContext httpContext) throws HttpException {
         
         AS2EncryptionAlgorithm encryptionAlgorithm = httpContext.getAttribute(ENCRYPTING_ALGORITHM, AS2EncryptionAlgorithm.class);
@@ -344,5 +437,14 @@ public OutputEncryptor createEncryptor(HttpCoreContext httpContext) throws HttpE
 
         return EncryptingUtils.createEncryptor(encryptionAlgorithm);
     }
+    
+    public OutputCompressor createCompressor(HttpCoreContext httpContext) throws HttpException {
+        AS2CompressionAlgorithm compressionAlgorithm = httpContext.getAttribute(COMPRESSION_ALGORITHM, AS2CompressionAlgorithm.class);
+        if (compressionAlgorithm == null) {
+            throw new HttpException("Compression algorithm missing");
+        }
+        
+        return CompressionUtils.createCompressor(compressionAlgorithm);
+    }
 
 }
diff --git a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/AS2CompressionAlgorithm.java b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/AS2CompressionAlgorithm.java
new file mode 100644
index 0000000000000..b08b5ca6f08d3
--- /dev/null
+++ b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/AS2CompressionAlgorithm.java
@@ -0,0 +1,44 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.as2.api;
+
+import org.bouncycastle.asn1.ASN1ObjectIdentifier;
+import org.bouncycastle.cms.jcajce.ZlibCompressor;
+import org.bouncycastle.operator.OutputCompressor;
+
+public enum AS2CompressionAlgorithm {
+    ZLIB(new ZlibCompressor());
+    
+    private OutputCompressor outputCompressor;
+
+    private AS2CompressionAlgorithm(OutputCompressor outputCompressor) {
+        this.outputCompressor = outputCompressor;
+    }
+
+    public String getAlgorithmName() {
+        return this.name();
+    }
+    
+    public ASN1ObjectIdentifier getAlgorithmOID() {
+        return outputCompressor.getAlgorithmIdentifier().getAlgorithm();
+    }
+
+    public OutputCompressor getOutputCompressor() {
+        return outputCompressor;
+    }
+
+}
diff --git a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/AS2MessageStructure.java b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/AS2MessageStructure.java
index 3c8210aa787a9..760d9f069499d 100644
--- a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/AS2MessageStructure.java
+++ b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/AS2MessageStructure.java
@@ -18,9 +18,13 @@
 
 public enum AS2MessageStructure {
     PLAIN(false, false, false),
-    SIGNED(false, false, false),
-    ENCRYPTED(false, false, false),
-    ENCRYPTED_SIGNED(false, false, false);
+    SIGNED(true, false, false),
+    ENCRYPTED(false, true, false),
+    SIGNED_ENCRYPTED(true, true, false),
+    PLAIN_COMPRESSED(false, false, true),
+    SIGNED_COMPRESSED(true, false, true),
+    ENCRYPTED_COMPRESSED(false, true, true),
+    SIGNED_ENCRYPTED_COMPRESSED(true, true, true);
 
     private final boolean isSigned;
     private final boolean isEncrypted;
diff --git a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/entity/ApplicationPkcs7MimeEntity.java b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/entity/ApplicationPkcs7MimeEnvelopedDataEntity.java
similarity index 94%
rename from components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/entity/ApplicationPkcs7MimeEntity.java
rename to components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/entity/ApplicationPkcs7MimeEnvelopedDataEntity.java
index 548705503f004..4bb986686a889 100644
--- a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/entity/ApplicationPkcs7MimeEntity.java
+++ b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/entity/ApplicationPkcs7MimeEnvelopedDataEntity.java
@@ -37,13 +37,13 @@
 import org.bouncycastle.cms.CMSTypedData;
 import org.bouncycastle.operator.OutputEncryptor;
 
-public class ApplicationPkcs7MimeEntity extends MimeEntity {
+public class ApplicationPkcs7MimeEnvelopedDataEntity extends MimeEntity {
     
     private static final String CONTENT_DISPOSITION = "attachment; filename=\"smime.p7m\"";
     
     private byte[] encryptedData;
     
-    public ApplicationPkcs7MimeEntity(MimeEntity entity2Encrypt,
+    public ApplicationPkcs7MimeEnvelopedDataEntity(MimeEntity entity2Encrypt,
                                 CMSEnvelopedDataGenerator dataGenerator,
                                 OutputEncryptor encryptor,
                                 String encryptedContentTransferEncoding,
@@ -61,7 +61,7 @@ public ApplicationPkcs7MimeEntity(MimeEntity entity2Encrypt,
         }
     }
     
-    public ApplicationPkcs7MimeEntity(byte[] encryptedData, String encryptedContentTransferEncoding, boolean isMainBody) {
+    public ApplicationPkcs7MimeEnvelopedDataEntity(byte[] encryptedData, String encryptedContentTransferEncoding, boolean isMainBody) {
         this.encryptedData = Args.notNull(encryptedData, "encryptedData");
         
         setContentType(ContentType.create("application/pkcs7-mime", new BasicNameValuePair("smime-type", "enveloped-datat"),
@@ -101,10 +101,7 @@ public void writeTo(OutputStream outstream) throws IOException {
     }
     
     public MimeEntity getEncryptedEntity(PrivateKey privateKey) throws HttpException {
-        
         return EntityParser.parseEnvelopedEntity(encryptedData, privateKey);
-        
-        
     }
     
     private byte[] createEncryptedData(MimeEntity entity2Encrypt, CMSEnvelopedDataGenerator envelopedDataGenerator, OutputEncryptor encryptor) throws Exception {
diff --git a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/entity/EntityParser.java b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/entity/EntityParser.java
index 4d8a2b2091307..5fb23f41c2933 100644
--- a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/entity/EntityParser.java
+++ b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/entity/EntityParser.java
@@ -882,7 +882,7 @@ public static ApplicationPkcs7SignatureEntity parseApplicationPkcs7SignatureEnti
         }
     }
 
-    public static ApplicationPkcs7MimeEntity parseApplicationPkcs7MimeEntityBody(AS2SessionInputBuffer inbuffer,
+    public static ApplicationPkcs7MimeEnvelopedDataEntity parseApplicationPkcs7MimeEntityBody(AS2SessionInputBuffer inbuffer,
                                                                                       String boundary,
                                                                                       ContentType contentType,
                                                                                       String contentTransferEncoding)
@@ -903,7 +903,7 @@ public static ApplicationPkcs7MimeEntity parseApplicationPkcs7MimeEntityBody(AS2
 
             byte[] encryptedContent = EntityUtils.decode(pkcs7EncryptedBodyContent.getBytes(charset), contentTransferEncoding);
 
-            ApplicationPkcs7MimeEntity applicationPkcs7MimeEntity = new ApplicationPkcs7MimeEntity(
+            ApplicationPkcs7MimeEnvelopedDataEntity applicationPkcs7MimeEntity = new ApplicationPkcs7MimeEnvelopedDataEntity(
                     encryptedContent, contentTransferEncoding, false);
             return applicationPkcs7MimeEntity;
         } catch (Exception e) {
diff --git a/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/util/CompressionUtils.java b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/util/CompressionUtils.java
new file mode 100644
index 0000000000000..89e243f4c13ef
--- /dev/null
+++ b/components/camel-as2/camel-as2-api/src/main/java/org/apache/camel/component/as2/api/util/CompressionUtils.java
@@ -0,0 +1,36 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.as2.api.util;
+
+import org.apache.camel.component.as2.api.AS2CompressionAlgorithm;
+import org.bouncycastle.cms.CMSCompressedDataGenerator;
+import org.bouncycastle.operator.OutputCompressor;
+
+public final class CompressionUtils {
+    
+    private CompressionUtils() {
+    }
+    
+    public static CMSCompressedDataGenerator createCompressedDataGenerator() {
+        return new CMSCompressedDataGenerator();
+    }
+    
+    public static OutputCompressor createCompressor(AS2CompressionAlgorithm compressionAlgorithm) {
+        return compressionAlgorithm.getOutputCompressor();
+    }
+
+}
diff --git a/components/camel-as2/camel-as2-api/src/test/java/org/apache/camel/component/as2/api/AS2MessageTest.java b/components/camel-as2/camel-as2-api/src/test/java/org/apache/camel/component/as2/api/AS2MessageTest.java
index 3cdd384f9d5b6..9a43f10dd62ee 100644
--- a/components/camel-as2/camel-as2-api/src/test/java/org/apache/camel/component/as2/api/AS2MessageTest.java
+++ b/components/camel-as2/camel-as2-api/src/test/java/org/apache/camel/component/as2/api/AS2MessageTest.java
@@ -32,7 +32,7 @@
 import org.apache.camel.component.as2.api.entity.AS2MessageDispositionNotificationEntity;
 import org.apache.camel.component.as2.api.entity.ApplicationEDIEntity;
 import org.apache.camel.component.as2.api.entity.ApplicationEDIFACTEntity;
-import org.apache.camel.component.as2.api.entity.ApplicationPkcs7MimeEntity;
+import org.apache.camel.component.as2.api.entity.ApplicationPkcs7MimeEnvelopedDataEntity;
 import org.apache.camel.component.as2.api.entity.ApplicationPkcs7SignatureEntity;
 import org.apache.camel.component.as2.api.entity.DispositionMode;
 import org.apache.camel.component.as2.api.entity.DispositionNotificationMultipartReportEntity;
@@ -270,7 +270,7 @@ public void plainEDIMessageTest() throws Exception {
 
         HttpCoreContext httpContext = clientManager.send(EDI_MESSAGE, REQUEST_URI, SUBJECT, FROM, AS2_NAME, AS2_NAME,
                 AS2MessageStructure.PLAIN, ContentType.create(AS2MediaType.APPLICATION_EDIFACT, AS2Charset.US_ASCII),
-                null, null, null, null, DISPOSITION_NOTIFICATION_TO, SIGNED_RECEIPT_MIC_ALGORITHMS, null, null, null);
+                null, null, null, null, null, DISPOSITION_NOTIFICATION_TO, SIGNED_RECEIPT_MIC_ALGORITHMS, null, null, null);
 
         HttpRequest request = httpContext.getRequest();
         assertEquals("Unexpected method value", METHOD, request.getRequestLine().getMethod());
@@ -313,8 +313,8 @@ public void multipartSignedMessageTest() throws Exception {
 
         HttpCoreContext httpContext = clientManager.send(EDI_MESSAGE, REQUEST_URI, SUBJECT, FROM, AS2_NAME, AS2_NAME,
                 AS2MessageStructure.SIGNED, ContentType.create(AS2MediaType.APPLICATION_EDIFACT, AS2Charset.US_ASCII),
-                null, AS2SignatureAlgorithm.SHA256WITHRSA, certList.toArray(new Certificate[0]), signingKP.getPrivate(), DISPOSITION_NOTIFICATION_TO,
-                SIGNED_RECEIPT_MIC_ALGORITHMS, null, null, null);
+                null, AS2SignatureAlgorithm.SHA256WITHRSA, certList.toArray(new Certificate[0]), signingKP.getPrivate(),
+                null, DISPOSITION_NOTIFICATION_TO, SIGNED_RECEIPT_MIC_ALGORITHMS, null, null, null);
 
         HttpRequest request = httpContext.getRequest();
         assertEquals("Unexpected method value", METHOD, request.getRequestLine().getMethod());
@@ -472,10 +472,11 @@ public void envelopedMessageTest(AS2EncryptionAlgorithm encryptionAlgorithm) thr
         LOG.info("Key Algoritm: " + signingKP.getPrivate().getAlgorithm());
 
         HttpCoreContext httpContext = clientManager.send(EDI_MESSAGE, REQUEST_URI, SUBJECT, FROM, AS2_NAME, AS2_NAME,
-                AS2MessageStructure.ENCRYPTED, ContentType.create(AS2MediaType.APPLICATION_EDIFACT, AS2Charset.US_ASCII),
-                null, AS2SignatureAlgorithm.SHA256WITHRSA, certList.toArray(new Certificate[0]), signingKP.getPrivate(), DISPOSITION_NOTIFICATION_TO,
-                SIGNED_RECEIPT_MIC_ALGORITHMS, encryptionAlgorithm, certList.toArray(new Certificate[0]),
-                signingKP.getPrivate());
+                AS2MessageStructure.ENCRYPTED,
+                ContentType.create(AS2MediaType.APPLICATION_EDIFACT, AS2Charset.US_ASCII), null,
+                AS2SignatureAlgorithm.SHA256WITHRSA, certList.toArray(new Certificate[0]), signingKP.getPrivate(), null,
+                DISPOSITION_NOTIFICATION_TO, SIGNED_RECEIPT_MIC_ALGORITHMS, encryptionAlgorithm,
+                certList.toArray(new Certificate[0]), signingKP.getPrivate());
 
         HttpRequest request = httpContext.getRequest();
         assertEquals("Unexpected method value", METHOD, request.getRequestLine().getMethod());
@@ -503,8 +504,8 @@ public void envelopedMessageTest(AS2EncryptionAlgorithm encryptionAlgorithm) thr
         assertTrue("Request does not contain entity", request instanceof BasicHttpEntityEnclosingRequest);
         HttpEntity entity = ((BasicHttpEntityEnclosingRequest) request).getEntity();
         assertNotNull("Request does not contain entity", entity);
-        assertTrue("Unexpected request entity type", entity instanceof ApplicationPkcs7MimeEntity);
-        ApplicationPkcs7MimeEntity envelopedEntity = (ApplicationPkcs7MimeEntity) entity;
+        assertTrue("Unexpected request entity type", entity instanceof ApplicationPkcs7MimeEnvelopedDataEntity);
+        ApplicationPkcs7MimeEnvelopedDataEntity envelopedEntity = (ApplicationPkcs7MimeEnvelopedDataEntity) entity;
         assertTrue("Entity not set as main body of request", envelopedEntity.isMainBody());
 
         // Validated enveloped part.
@@ -532,10 +533,11 @@ public void envelopedAndSignedMessageTest(AS2EncryptionAlgorithm encryptionAlgor
         LOG.info("Key Algoritm: " + signingKP.getPrivate().getAlgorithm());
 
         HttpCoreContext httpContext = clientManager.send(EDI_MESSAGE, REQUEST_URI, SUBJECT, FROM, AS2_NAME, AS2_NAME,
-                AS2MessageStructure.ENCRYPTED_SIGNED, ContentType.create(AS2MediaType.APPLICATION_EDIFACT, AS2Charset.US_ASCII),
-                null, AS2SignatureAlgorithm.SHA256WITHRSA, certList.toArray(new Certificate[0]), signingKP.getPrivate(), DISPOSITION_NOTIFICATION_TO,
-                SIGNED_RECEIPT_MIC_ALGORITHMS, encryptionAlgorithm, certList.toArray(new Certificate[0]),
-                signingKP.getPrivate());
+                AS2MessageStructure.SIGNED_ENCRYPTED,
+                ContentType.create(AS2MediaType.APPLICATION_EDIFACT, AS2Charset.US_ASCII), null,
+                AS2SignatureAlgorithm.SHA256WITHRSA, certList.toArray(new Certificate[0]), signingKP.getPrivate(), null,
+                DISPOSITION_NOTIFICATION_TO, SIGNED_RECEIPT_MIC_ALGORITHMS, encryptionAlgorithm,
+                certList.toArray(new Certificate[0]), signingKP.getPrivate());
 
         HttpRequest request = httpContext.getRequest();
         assertEquals("Unexpected method value", METHOD, request.getRequestLine().getMethod());
@@ -563,8 +565,8 @@ public void envelopedAndSignedMessageTest(AS2EncryptionAlgorithm encryptionAlgor
         assertTrue("Request does not contain entity", request instanceof BasicHttpEntityEnclosingRequest);
         HttpEntity entity = ((BasicHttpEntityEnclosingRequest) request).getEntity();
         assertNotNull("Request does not contain entity", entity);
-        assertTrue("Unexpected request entity type", entity instanceof ApplicationPkcs7MimeEntity);
-        ApplicationPkcs7MimeEntity envelopedEntity = (ApplicationPkcs7MimeEntity) entity;
+        assertTrue("Unexpected request entity type", entity instanceof ApplicationPkcs7MimeEnvelopedDataEntity);
+        ApplicationPkcs7MimeEnvelopedDataEntity envelopedEntity = (ApplicationPkcs7MimeEnvelopedDataEntity) entity;
         assertTrue("Entity not set as main body of request", envelopedEntity.isMainBody());
 
         // Validated enveloped part.
@@ -601,8 +603,8 @@ public void signatureVerificationTest() throws Exception {
 
         HttpCoreContext httpContext = clientManager.send(EDI_MESSAGE, REQUEST_URI, SUBJECT, FROM, AS2_NAME, AS2_NAME,
                 AS2MessageStructure.SIGNED, ContentType.create(AS2MediaType.APPLICATION_EDIFACT, AS2Charset.US_ASCII),
-                null, AS2SignatureAlgorithm.SHA256WITHRSA, certList.toArray(new Certificate[0]), signingKP.getPrivate(), DISPOSITION_NOTIFICATION_TO,
-                SIGNED_RECEIPT_MIC_ALGORITHMS, null, null, null);
+                null, AS2SignatureAlgorithm.SHA256WITHRSA, certList.toArray(new Certificate[0]), signingKP.getPrivate(),
+                null, DISPOSITION_NOTIFICATION_TO, SIGNED_RECEIPT_MIC_ALGORITHMS, null, null, null);
 
         HttpRequest request = httpContext.getRequest();
         assertTrue("Request does not contain entity", request instanceof BasicHttpEntityEnclosingRequest);
@@ -630,7 +632,8 @@ public void mdnMessageTest() throws Exception {
 
         HttpCoreContext httpContext = clientManager.send(EDI_MESSAGE, REQUEST_URI, SUBJECT, FROM, AS2_NAME, AS2_NAME,
                 AS2MessageStructure.PLAIN, ContentType.create(AS2MediaType.APPLICATION_EDIFACT, AS2Charset.US_ASCII),
-                null, null, null, null, DISPOSITION_NOTIFICATION_TO, SIGNED_RECEIPT_MIC_ALGORITHMS, null, null, null);
+                null, null, null, null, null, DISPOSITION_NOTIFICATION_TO, SIGNED_RECEIPT_MIC_ALGORITHMS, null, null,
+                null);
 
         HttpResponse response = httpContext.getResponse();
         assertEquals("Unexpected method value", HttpVersion.HTTP_1_1, response.getStatusLine().getProtocolVersion());
diff --git a/components/camel-as2/camel-as2-api/src/test/java/org/apache/camel/component/as2/api/entity/EntityParserTest.java b/components/camel-as2/camel-as2-api/src/test/java/org/apache/camel/component/as2/api/entity/EntityParserTest.java
index cd47c82d9e008..d5b3a0dd646b7 100644
--- a/components/camel-as2/camel-as2-api/src/test/java/org/apache/camel/component/as2/api/entity/EntityParserTest.java
+++ b/components/camel-as2/camel-as2-api/src/test/java/org/apache/camel/component/as2/api/entity/EntityParserTest.java
@@ -317,7 +317,7 @@ public void parseEnvelopedBodyTest() throws Exception {
         // Build Enveloped Entity
         //
         TextPlainEntity textEntity = new TextPlainEntity("This is a super secret messatge!", "US-ASCII", "7bit", false);
-        ApplicationPkcs7MimeEntity applicationPkcs7MimeEntity = new ApplicationPkcs7MimeEntity(textEntity, cmsEnvelopeDataGenerator, contentEncryptor, "binary", true);
+        ApplicationPkcs7MimeEnvelopedDataEntity applicationPkcs7MimeEntity = new ApplicationPkcs7MimeEnvelopedDataEntity(textEntity, cmsEnvelopeDataGenerator, contentEncryptor, "binary", true);
         
         MimeEntity decryptedMimeEntity = applicationPkcs7MimeEntity.getEncryptedEntity(encryptKP.getPrivate());
         assertEquals("Decrypted entity has unexpected content type", "text/plain; charset=US-ASCII", decryptedMimeEntity.getContentTypeValue());
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
index aef14ca744483..11bfb22c8b038 100644
--- 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
@@ -70,7 +70,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (30 parameters):
+==== Query Parameters (31 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -81,6 +81,7 @@ with the following path and query parameters:
 | *as2To* (common) | The value of the AS2To header of AS2 message. |  | String
 | *as2Version* (common) | The version of the AS2 protocol. | 1.1 | String
 | *clientFqdn* (common) | The Client Fully Qualified Domain Name (FQDN). Used in message ids sent by endpoint. | camel.apache.org | String
+| *compressionAlgorithm* (common) | The algorithm used to compress EDI message. |  | AS2Compression Algorithm
 | *dispositionNotificationTo* (common) | The value of the Disposition-Notification-To header. Assigning a value to this parameter requests a message disposition notification (MDN) for the AS2 message. |  | String
 | *ediMessageTransferEncoding* (common) | The transfer encoding of EDI message. |  | String
 | *ediMessageType* (common) | The content type of EDI message. One of application/edifact, application/edi-x12, application/edi-consent |  | ContentType
diff --git a/components/camel-as2/camel-as2-component/src/main/java/org/apache/camel/component/as2/AS2Configuration.java b/components/camel-as2/camel-as2-component/src/main/java/org/apache/camel/component/as2/AS2Configuration.java
index bd5a34746a934..c92b50e2a9f6c 100644
--- a/components/camel-as2/camel-as2-component/src/main/java/org/apache/camel/component/as2/AS2Configuration.java
+++ b/components/camel-as2/camel-as2-component/src/main/java/org/apache/camel/component/as2/AS2Configuration.java
@@ -20,6 +20,7 @@
 import java.security.cert.Certificate;
 
 import org.apache.camel.RuntimeCamelException;
+import org.apache.camel.component.as2.api.AS2CompressionAlgorithm;
 import org.apache.camel.component.as2.api.AS2EncryptionAlgorithm;
 import org.apache.camel.component.as2.api.AS2MessageStructure;
 import org.apache.camel.component.as2.api.AS2SignatureAlgorithm;
@@ -101,6 +102,9 @@ public class AS2Configuration {
     @UriParam
     private PrivateKey signingPrivateKey;
 
+    @UriParam
+    private AS2CompressionAlgorithm compressionAlgorithm;
+
     @UriParam
     private String dispositionNotificationTo;
 
@@ -388,6 +392,17 @@ public void setSigningPrivateKey(PrivateKey signingPrivateKey) {
         this.signingPrivateKey = signingPrivateKey;
     }
 
+    public AS2CompressionAlgorithm getCompressionAlgorithm() {
+        return compressionAlgorithm;
+    }
+
+    /**
+     * The algorithm used to compress EDI message.
+     */
+    public void setCompressionAlgorithm(AS2CompressionAlgorithm compressionAlgorithm) {
+        this.compressionAlgorithm = compressionAlgorithm;
+    }
+
     public String getDispositionNotificationTo() {
         return dispositionNotificationTo;
     }
@@ -415,7 +430,7 @@ public void setSignedReceiptMicAlgorithms(String[] signedReceiptMicAlgorithms) {
         this.signedReceiptMicAlgorithms = signedReceiptMicAlgorithms;
     }
 
-    public AS2EncryptionAlgorithm getEncryptingingAlgorithm() {
+    public AS2EncryptionAlgorithm getEncryptingAlgorithm() {
         return encryptingAlgorithm;
     }
 
diff --git a/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ClientManagerIntegrationTest.java b/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ClientManagerIntegrationTest.java
index ca14bf6f8f4c5..36c038663169f 100644
--- a/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ClientManagerIntegrationTest.java
+++ b/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ClientManagerIntegrationTest.java
@@ -45,7 +45,7 @@
 import org.apache.camel.component.as2.api.entity.AS2DispositionType;
 import org.apache.camel.component.as2.api.entity.AS2MessageDispositionNotificationEntity;
 import org.apache.camel.component.as2.api.entity.ApplicationEDIEntity;
-import org.apache.camel.component.as2.api.entity.ApplicationPkcs7MimeEntity;
+import org.apache.camel.component.as2.api.entity.ApplicationPkcs7MimeEnvelopedDataEntity;
 import org.apache.camel.component.as2.api.entity.ApplicationPkcs7SignatureEntity;
 import org.apache.camel.component.as2.api.entity.DispositionMode;
 import org.apache.camel.component.as2.api.entity.DispositionNotificationMultipartReportEntity;
@@ -326,8 +326,8 @@ public void envelopedMessageSendTest() throws Exception {
         assertTrue("Request does not contain body", request instanceof HttpEntityEnclosingRequest);
         HttpEntity entity = ((HttpEntityEnclosingRequest)request).getEntity();
         assertNotNull("Request body", entity);
-        assertTrue("Request body does not contain ApplicationPkcs7Mime entity", entity instanceof ApplicationPkcs7MimeEntity);
-        MimeEntity envelopeEntity = ((ApplicationPkcs7MimeEntity)entity).getEncryptedEntity(signingKP.getPrivate());
+        assertTrue("Request body does not contain ApplicationPkcs7Mime entity", entity instanceof ApplicationPkcs7MimeEnvelopedDataEntity);
+        MimeEntity envelopeEntity = ((ApplicationPkcs7MimeEnvelopedDataEntity)entity).getEncryptedEntity(signingKP.getPrivate());
         assertTrue("Enveloped entity is not an EDI entity", envelopeEntity instanceof ApplicationEDIEntity);
         String ediMessage = ((ApplicationEDIEntity)envelopeEntity).getEdiMessage();
         assertEquals("EDI message is different", EDI_MESSAGE.replaceAll("[\n\r]", ""), ediMessage.replaceAll("[\n\r]", ""));
diff --git a/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ServerManagerIntegrationTest.java b/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ServerManagerIntegrationTest.java
index 9cb635fcbb89a..0f6b93125caeb 100644
--- a/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ServerManagerIntegrationTest.java
+++ b/components/camel-as2/camel-as2-component/src/test/java/org/apache/camel/component/as2/AS2ServerManagerIntegrationTest.java
@@ -128,7 +128,7 @@ public void receivePlainEDIMessageTest() throws Exception {
 
         clientManager.send(EDI_MESSAGE, REQUEST_URI, SUBJECT, FROM, AS2_NAME, AS2_NAME, AS2MessageStructure.PLAIN,
                 ContentType.create(AS2MediaType.APPLICATION_EDIFACT, AS2Charset.US_ASCII), null, null, null, null,
-                DISPOSITION_NOTIFICATION_TO, SIGNED_RECEIPT_MIC_ALGORITHMS, null, null, null);
+                null, DISPOSITION_NOTIFICATION_TO, SIGNED_RECEIPT_MIC_ALGORITHMS, null, null, null);
 
         MockEndpoint mockEndpoint = getMockEndpoint("mock:as2RcvMsgs");
         mockEndpoint.expectedMinimumMessageCount(1);
@@ -185,7 +185,7 @@ public void receiveMultipartSignedMessageTest() throws Exception {
 
         clientManager.send(EDI_MESSAGE, REQUEST_URI, SUBJECT, FROM, AS2_NAME, AS2_NAME, AS2MessageStructure.SIGNED,
                 ContentType.create(AS2MediaType.APPLICATION_EDIFACT, AS2Charset.US_ASCII), null, AS2SignatureAlgorithm.SHA256WITHRSA,
-                certList.toArray(new Certificate[0]), signingKP.getPrivate(), DISPOSITION_NOTIFICATION_TO,
+                certList.toArray(new Certificate[0]), signingKP.getPrivate(), null, DISPOSITION_NOTIFICATION_TO,
                 SIGNED_RECEIPT_MIC_ALGORITHMS, null, null, null);
 
         MockEndpoint mockEndpoint = getMockEndpoint("mock:as2RcvMsgs");
diff --git a/platforms/spring-boot/components-starter/camel-as2-starter/src/main/java/org/apache/camel/component/as2/springboot/AS2ComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-as2-starter/src/main/java/org/apache/camel/component/as2/springboot/AS2ComponentConfiguration.java
index d5d84d5e9d767..eda444f3b431a 100644
--- a/platforms/spring-boot/components-starter/camel-as2-starter/src/main/java/org/apache/camel/component/as2/springboot/AS2ComponentConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-as2-starter/src/main/java/org/apache/camel/component/as2/springboot/AS2ComponentConfiguration.java
@@ -19,6 +19,7 @@
 import java.security.PrivateKey;
 import java.security.cert.Certificate;
 import javax.annotation.Generated;
+import org.apache.camel.component.as2.api.AS2CompressionAlgorithm;
 import org.apache.camel.component.as2.api.AS2EncryptionAlgorithm;
 import org.apache.camel.component.as2.api.AS2MessageStructure;
 import org.apache.camel.component.as2.api.AS2SignatureAlgorithm;
@@ -166,6 +167,10 @@ public static class AS2ConfigurationNestedConfiguration {
          * The key used to sign the EDI message.
          */
         private PrivateKey signingPrivateKey;
+        /**
+         * The algorithm used to compress EDI message.
+         */
+        private AS2CompressionAlgorithm compressionAlgorithm;
         /**
          * The value of the Disposition-Notification-To header. Assigning a
          * value to this parameter requests a message disposition notification
@@ -362,6 +367,15 @@ public void setSigningPrivateKey(PrivateKey signingPrivateKey) {
             this.signingPrivateKey = signingPrivateKey;
         }
 
+        public AS2CompressionAlgorithm getCompressionAlgorithm() {
+            return compressionAlgorithm;
+        }
+
+        public void setCompressionAlgorithm(
+                AS2CompressionAlgorithm compressionAlgorithm) {
+            this.compressionAlgorithm = compressionAlgorithm;
+        }
+
         public String getDispositionNotificationTo() {
             return dispositionNotificationTo;
         }

From 32a36209840b6823f6e7a72990bf124d44d51a79 Mon Sep 17 00:00:00 2001
From: Christoph Deppisch <cdeppisch@redhat.com>
Date: Fri, 30 Nov 2018 10:42:47 +0100
Subject: [PATCH 122/125] CAMEL-12967 - Adding new option to split value ranges
 to a stream of rows each represented in a separate exchange

---
 .../docs/google-sheets-stream-component.adoc  |  3 +-
 .../stream/GoogleSheetsStreamComponent.java   |  8 +--
 .../GoogleSheetsStreamConfiguration.java      | 18 +++++++
 .../stream/GoogleSheetsStreamConstants.java   |  2 +
 .../stream/GoogleSheetsStreamConsumer.java    | 29 ++++++++---
 .../stream/GoogleSheetsStreamEndpoint.java    | 30 ++++++++---
 .../SheetsStreamConsumerIntegrationTest.java  | 52 +++++++++++++++++++
 ...gleSheetsStreamComponentConfiguration.java | 15 ++++++
 8 files changed, 138 insertions(+), 19 deletions(-)

diff --git a/components/camel-google-sheets/src/main/docs/google-sheets-stream-component.adoc b/components/camel-google-sheets/src/main/docs/google-sheets-stream-component.adoc
index 63555c90bfeca..bc58b0bca953f 100644
--- a/components/camel-google-sheets/src/main/docs/google-sheets-stream-component.adoc
+++ b/components/camel-google-sheets/src/main/docs/google-sheets-stream-component.adoc
@@ -78,7 +78,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (31 parameters):
+==== Query Parameters (32 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -96,6 +96,7 @@ with the following path and query parameters:
 | *refreshToken* (consumer) | OAuth 2 refresh token. Using this, the Google Calendar component can obtain a new accessToken whenever the current one expires - a necessity if the application is long-lived. |  | String
 | *scopes* (consumer) | Specifies the level of permissions you want a sheets application to have to a user account. See https://developers.google.com/identity/protocols/googlescopes for more info. |  | List
 | *sendEmptyMessageWhenIdle* (consumer) | If the polling consumer did not poll any files, you can enable this option to send an empty message (no body) instead. | false | boolean
+| *splitResults* (consumer) | True if value range result should be split into rows or columns to process each of them individually. When true each row or column is represented with a separate exchange in batch processing. Otherwise value range object is used as exchange junk size. | false | boolean
 | *spreadsheetId* (consumer) | Specifies the spreadsheet identifier that is used to identify the target to obtain. |  | String
 | *valueRenderOption* (consumer) | Determines how values should be rendered in the output. | FORMATTED_VALUE | String
 | *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
diff --git a/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamComponent.java b/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamComponent.java
index d4610371b3918..d602326bd6ba1 100644
--- a/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamComponent.java
+++ b/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamComponent.java
@@ -52,9 +52,11 @@ public GoogleSheetsStreamComponent(CamelContext context) {
 
     public Sheets getClient(GoogleSheetsStreamConfiguration endpointConfiguration) {
         if (client == null) {
-            client = getClientFactory().makeClient(endpointConfiguration.getClientId(), endpointConfiguration.getClientSecret(),
-                                                    endpointConfiguration.getApplicationName(), endpointConfiguration.getRefreshToken(),
-                                                    endpointConfiguration.getAccessToken());
+            client = getClientFactory().makeClient(endpointConfiguration.getClientId(),
+                                                endpointConfiguration.getClientSecret(),
+                                                endpointConfiguration.getApplicationName(),
+                                                endpointConfiguration.getRefreshToken(),
+                                                endpointConfiguration.getAccessToken());
         }
         return client;
     }
diff --git a/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamConfiguration.java b/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamConfiguration.java
index e72446ca6de32..4de52222be7d2 100644
--- a/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamConfiguration.java
+++ b/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamConfiguration.java
@@ -66,6 +66,9 @@ public class GoogleSheetsStreamConfiguration implements Cloneable {
     @UriParam
     private boolean includeGridData;
 
+    @UriParam
+    private boolean splitResults;
+
     @UriParam(enums = "ROWS,COLUMNS,DIMENSION_UNSPECIFIED", defaultValue = "ROWS")
     private String majorDimension = "ROWS";
 
@@ -240,6 +243,21 @@ public void setIncludeGridData(boolean includeGridData) {
         this.includeGridData = includeGridData;
     }
 
+    public boolean isSplitResults() {
+        return splitResults;
+    }
+
+    /**
+     * True if value range result should be split into rows or columns to process each of them individually. When true
+     * each row or column is represented with a separate exchange in batch processing. Otherwise value range object is used
+     * as exchange junk size.
+     *
+     * @param splitResults
+     */
+    public void setSplitResults(boolean splitResults) {
+        this.splitResults = splitResults;
+    }
+
     // *************************************************
     //
     // *************************************************
diff --git a/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamConstants.java b/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamConstants.java
index d7215854862bb..65365882def11 100644
--- a/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamConstants.java
+++ b/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamConstants.java
@@ -27,6 +27,8 @@ public final class GoogleSheetsStreamConstants {
     public static final String SPREADSHEET_URL =  PROPERTY_PREFIX + "SpreadsheetUrl";
     public static final String MAJOR_DIMENSION = PROPERTY_PREFIX + "MajorDimension";
     public static final String RANGE = PROPERTY_PREFIX + "Range";
+    public static final String RANGE_INDEX = PROPERTY_PREFIX + "RangeIndex";
+    public static final String VALUE_INDEX = PROPERTY_PREFIX + "ValueIndex";
 
     /**
      * Prevent instantiation.
diff --git a/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamConsumer.java b/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamConsumer.java
index 539dcaf42752d..35b88152dcad6 100644
--- a/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamConsumer.java
+++ b/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamConsumer.java
@@ -20,11 +20,13 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Queue;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 
 import com.google.api.services.sheets.v4.Sheets;
 import com.google.api.services.sheets.v4.model.BatchGetValuesResponse;
 import com.google.api.services.sheets.v4.model.Spreadsheet;
+import com.google.api.services.sheets.v4.model.ValueRange;
 import org.apache.camel.Endpoint;
 import org.apache.camel.Exchange;
 import org.apache.camel.Processor;
@@ -70,8 +72,8 @@ protected int poll() throws Exception {
 
             if (getConfiguration().getRange().contains(",")) {
                 request.setRanges(Arrays.stream(getConfiguration().getRange().split(","))
-                                        .map(String::trim)
-                                        .collect(Collectors.toList()));
+                        .map(String::trim)
+                        .collect(Collectors.toList()));
             } else {
                 request.setRanges(Collections.singletonList(getConfiguration().getRange()));
             }
@@ -79,11 +81,24 @@ protected int poll() throws Exception {
             BatchGetValuesResponse response = request.execute();
 
             if (response.getValueRanges() != null) {
-                response.getValueRanges()
-                        .stream()
-                        .limit(getConfiguration().getMaxResults())
-                        .map(valueRange -> getEndpoint().createExchange(valueRange))
-                        .forEach(answer::add);
+                if (getConfiguration().isSplitResults()) {
+                    for (ValueRange valueRange : response.getValueRanges()) {
+                        AtomicInteger rangeIndex = new AtomicInteger(1);
+                        AtomicInteger valueIndex = new AtomicInteger();
+                        valueRange.getValues().stream()
+                            .limit(getConfiguration().getMaxResults())
+                            .map(values -> getEndpoint().createExchange(rangeIndex.get(), valueIndex.incrementAndGet(), valueRange.getRange(), valueRange.getMajorDimension(), values))
+                            .forEach(answer::add);
+                        rangeIndex.incrementAndGet();
+                    }
+                } else {
+                    AtomicInteger rangeIndex = new AtomicInteger();
+                    response.getValueRanges()
+                            .stream()
+                            .limit(getConfiguration().getMaxResults())
+                            .map(valueRange -> getEndpoint().createExchange(rangeIndex.incrementAndGet(), valueRange))
+                            .forEach(answer::add);
+                }
             }
         } else {
             Sheets.Spreadsheets.Get request = getClient().spreadsheets().get(getConfiguration().getSpreadsheetId());
diff --git a/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamEndpoint.java b/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamEndpoint.java
index 8ae9f896b73f6..6d2adaff15573 100644
--- a/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamEndpoint.java
+++ b/components/camel-google-sheets/src/main/java/org/apache/camel/component/google/sheets/stream/GoogleSheetsStreamEndpoint.java
@@ -16,10 +16,11 @@
  */
 package org.apache.camel.component.google.sheets.stream;
 
+import java.util.List;
+
 import com.google.api.services.sheets.v4.Sheets;
 import com.google.api.services.sheets.v4.model.Spreadsheet;
 import com.google.api.services.sheets.v4.model.ValueRange;
-
 import org.apache.camel.Consumer;
 import org.apache.camel.Exchange;
 import org.apache.camel.Message;
@@ -34,12 +35,12 @@
  * The google-sheets component provides access to Google Sheets.
  */
 @UriEndpoint(firstVersion = "2.23.0",
-             scheme = "google-sheets-stream",
-             title = "Google Sheets Stream",
-             syntax = "google-sheets-stream:apiName",
-             consumerClass = GoogleSheetsStreamConsumer.class,
-             consumerOnly = true,
-             label = "api,cloud,sheets")
+        scheme = "google-sheets-stream",
+        title = "Google Sheets Stream",
+        syntax = "google-sheets-stream:apiName",
+        consumerClass = GoogleSheetsStreamConsumer.class,
+        consumerOnly = true,
+        label = "api,cloud,sheets")
 public class GoogleSheetsStreamEndpoint extends ScheduledPollEndpoint {
 
     @UriParam
@@ -83,16 +84,29 @@ public boolean isSingleton() {
         return true;
     }
 
-    public Exchange createExchange(ValueRange valueRange) {
+    public Exchange createExchange(int rangeIndex, ValueRange valueRange) {
         Exchange exchange = super.createExchange(getExchangePattern());
         Message message = exchange.getIn();
         exchange.getIn().setHeader(GoogleSheetsStreamConstants.SPREADSHEET_ID, configuration.getSpreadsheetId());
         exchange.getIn().setHeader(GoogleSheetsStreamConstants.RANGE, valueRange.getRange());
+        exchange.getIn().setHeader(GoogleSheetsStreamConstants.RANGE_INDEX, rangeIndex);
         exchange.getIn().setHeader(GoogleSheetsStreamConstants.MAJOR_DIMENSION, valueRange.getMajorDimension());
         message.setBody(valueRange);
         return exchange;
     }
 
+    public Exchange createExchange(int rangeIndex, int valueIndex, String range, String majorDimension, List<Object> values) {
+        Exchange exchange = super.createExchange(getExchangePattern());
+        Message message = exchange.getIn();
+        exchange.getIn().setHeader(GoogleSheetsStreamConstants.SPREADSHEET_ID, configuration.getSpreadsheetId());
+        exchange.getIn().setHeader(GoogleSheetsStreamConstants.RANGE_INDEX, rangeIndex);
+        exchange.getIn().setHeader(GoogleSheetsStreamConstants.VALUE_INDEX, valueIndex);
+        exchange.getIn().setHeader(GoogleSheetsStreamConstants.RANGE, range);
+        exchange.getIn().setHeader(GoogleSheetsStreamConstants.MAJOR_DIMENSION, majorDimension);
+        message.setBody(values);
+        return exchange;
+    }
+
     public Exchange createExchange(Spreadsheet spreadsheet) {
         Exchange exchange = super.createExchange(getExchangePattern());
         Message message = exchange.getIn();
diff --git a/components/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/stream/SheetsStreamConsumerIntegrationTest.java b/components/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/stream/SheetsStreamConsumerIntegrationTest.java
index aa7c284c55c1d..9a0a4bd93664b 100644
--- a/components/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/stream/SheetsStreamConsumerIntegrationTest.java
+++ b/components/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/stream/SheetsStreamConsumerIntegrationTest.java
@@ -16,6 +16,8 @@
  */
 package org.apache.camel.component.google.sheets.stream;
 
+import java.util.List;
+
 import com.google.api.services.sheets.v4.model.Spreadsheet;
 import com.google.api.services.sheets.v4.model.ValueRange;
 import org.apache.camel.Exchange;
@@ -26,7 +28,9 @@
 
 import static org.apache.camel.component.google.sheets.stream.GoogleSheetsStreamConstants.MAJOR_DIMENSION;
 import static org.apache.camel.component.google.sheets.stream.GoogleSheetsStreamConstants.RANGE;
+import static org.apache.camel.component.google.sheets.stream.GoogleSheetsStreamConstants.RANGE_INDEX;
 import static org.apache.camel.component.google.sheets.stream.GoogleSheetsStreamConstants.SPREADSHEET_ID;
+import static org.apache.camel.component.google.sheets.stream.GoogleSheetsStreamConstants.VALUE_INDEX;
 
 public class SheetsStreamConsumerIntegrationTest extends AbstractGoogleSheetsStreamTestSupport {
 
@@ -46,9 +50,11 @@ public void testConsumeValueRange() throws Exception {
         Exchange exchange = mock.getReceivedExchanges().get(0);
         Assert.assertTrue(exchange.getIn().getHeaders().containsKey(SPREADSHEET_ID));
         Assert.assertTrue(exchange.getIn().getHeaders().containsKey(RANGE));
+        Assert.assertTrue(exchange.getIn().getHeaders().containsKey(RANGE_INDEX));
         Assert.assertTrue(exchange.getIn().getHeaders().containsKey(MAJOR_DIMENSION));
         Assert.assertEquals(testSheet.getSpreadsheetId(), exchange.getIn().getHeaders().get(SPREADSHEET_ID));
         Assert.assertEquals(TEST_SHEET + "!" + range, exchange.getIn().getHeaders().get(RANGE));
+        Assert.assertEquals(1, exchange.getIn().getHeaders().get(RANGE_INDEX));
         Assert.assertEquals("ROWS", exchange.getIn().getHeaders().get(MAJOR_DIMENSION));
 
         ValueRange values = (ValueRange) exchange.getIn().getBody();
@@ -59,11 +65,57 @@ public void testConsumeValueRange() throws Exception {
         Assert.assertEquals("b2", values.getValues().get(1).get(1));
     }
 
+    @Test
+    public void testConsumeRowValues() throws Exception {
+        Spreadsheet testSheet = getSpreadsheetWithTestData();
+
+        context().addRoutes(createGoogleStreamRouteBuilder(testSheet.getSpreadsheetId()));
+        context().startRoute("google-stream-values-test");
+
+        MockEndpoint mock = getMockEndpoint("mock:rows");
+        mock.expectedMinimumMessageCount(2);
+        assertMockEndpointsSatisfied();
+
+        Exchange exchange = mock.getReceivedExchanges().get(0);
+        Assert.assertTrue(exchange.getIn().getHeaders().containsKey(SPREADSHEET_ID));
+        Assert.assertTrue(exchange.getIn().getHeaders().containsKey(RANGE));
+        Assert.assertTrue(exchange.getIn().getHeaders().containsKey(RANGE_INDEX));
+        Assert.assertTrue(exchange.getIn().getHeaders().containsKey(VALUE_INDEX));
+        Assert.assertTrue(exchange.getIn().getHeaders().containsKey(MAJOR_DIMENSION));
+        Assert.assertEquals(testSheet.getSpreadsheetId(), exchange.getIn().getHeaders().get(SPREADSHEET_ID));
+        Assert.assertEquals(TEST_SHEET + "!" + range, exchange.getIn().getHeaders().get(RANGE));
+        Assert.assertEquals(1, exchange.getIn().getHeaders().get(RANGE_INDEX));
+        Assert.assertEquals(1, exchange.getIn().getHeaders().get(VALUE_INDEX));
+        Assert.assertEquals("ROWS", exchange.getIn().getHeaders().get(MAJOR_DIMENSION));
+
+        List<?> values = (List) exchange.getIn().getBody();
+        Assert.assertEquals(2L, values.size());
+        Assert.assertEquals("a1", values.get(0));
+        Assert.assertEquals("b1", values.get(1));
+
+        exchange = mock.getReceivedExchanges().get(1);
+        Assert.assertTrue(exchange.getIn().getHeaders().containsKey(SPREADSHEET_ID));
+        Assert.assertTrue(exchange.getIn().getHeaders().containsKey(RANGE));
+        Assert.assertTrue(exchange.getIn().getHeaders().containsKey(RANGE_INDEX));
+        Assert.assertTrue(exchange.getIn().getHeaders().containsKey(VALUE_INDEX));
+        Assert.assertTrue(exchange.getIn().getHeaders().containsKey(MAJOR_DIMENSION));
+        Assert.assertEquals(testSheet.getSpreadsheetId(), exchange.getIn().getHeaders().get(SPREADSHEET_ID));
+        Assert.assertEquals(1, exchange.getIn().getHeaders().get(RANGE_INDEX));
+        Assert.assertEquals(2, exchange.getIn().getHeaders().get(VALUE_INDEX));
+
+        values = (List) exchange.getIn().getBody();
+        Assert.assertEquals(2L, values.size());
+        Assert.assertEquals("a2", values.get(0));
+        Assert.assertEquals("b2", values.get(1));
+    }
+
     private RouteBuilder createGoogleStreamRouteBuilder(String spreadsheetId) throws Exception {
         return new RouteBuilder() {
             @Override
             public void configure() {
                 from("google-sheets-stream://data?spreadsheetId=" + spreadsheetId + "&range=" + range + "&delay=2000&maxResults=5").routeId("google-stream-test").to("mock:result");
+
+                from("google-sheets-stream://data?spreadsheetId=" + spreadsheetId + "&range=" + range + "&delay=2000&maxResults=5&splitResults=true").routeId("google-stream-values-test").to("mock:rows");
             }
         };
     }
diff --git a/platforms/spring-boot/components-starter/camel-google-sheets-starter/src/main/java/org/apache/camel/component/google/sheets/stream/springboot/GoogleSheetsStreamComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-google-sheets-starter/src/main/java/org/apache/camel/component/google/sheets/stream/springboot/GoogleSheetsStreamComponentConfiguration.java
index 3dbff38d96966..8df38806adb6c 100644
--- a/platforms/spring-boot/components-starter/camel-google-sheets-starter/src/main/java/org/apache/camel/component/google/sheets/stream/springboot/GoogleSheetsStreamComponentConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-google-sheets-starter/src/main/java/org/apache/camel/component/google/sheets/stream/springboot/GoogleSheetsStreamComponentConfiguration.java
@@ -144,6 +144,13 @@ public static class GoogleSheetsStreamConfigurationNestedConfiguration {
          * True if grid data should be returned.
          */
         private Boolean includeGridData = false;
+        /**
+         * True if value range result should be split into rows or columns to
+         * process each of them individually. When true each row or column is
+         * represented with a separate exchange in batch processing. Otherwise
+         * value range object is used as exchange junk size.
+         */
+        private Boolean splitResults = false;
 
         public String getClientId() {
             return clientId;
@@ -248,5 +255,13 @@ public Boolean getIncludeGridData() {
         public void setIncludeGridData(Boolean includeGridData) {
             this.includeGridData = includeGridData;
         }
+
+        public Boolean getSplitResults() {
+            return splitResults;
+        }
+
+        public void setSplitResults(Boolean splitResults) {
+            this.splitResults = splitResults;
+        }
     }
 }
\ No newline at end of file

From 56887a03b94f449db58ec2b81b93d35312c28c86 Mon Sep 17 00:00:00 2001
From: Andrea Cosentino <ancosen@gmail.com>
Date: Fri, 30 Nov 2018 11:35:24 +0100
Subject: [PATCH 123/125] CAMEL-12967 - Fixed CS

---
 .../sheets/stream/SheetsStreamConsumerIntegrationTest.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/components/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/stream/SheetsStreamConsumerIntegrationTest.java b/components/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/stream/SheetsStreamConsumerIntegrationTest.java
index 9a0a4bd93664b..2aa7c5d666b80 100644
--- a/components/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/stream/SheetsStreamConsumerIntegrationTest.java
+++ b/components/camel-google-sheets/src/test/java/org/apache/camel/component/google/sheets/stream/SheetsStreamConsumerIntegrationTest.java
@@ -115,7 +115,8 @@ private RouteBuilder createGoogleStreamRouteBuilder(String spreadsheetId) throws
             public void configure() {
                 from("google-sheets-stream://data?spreadsheetId=" + spreadsheetId + "&range=" + range + "&delay=2000&maxResults=5").routeId("google-stream-test").to("mock:result");
 
-                from("google-sheets-stream://data?spreadsheetId=" + spreadsheetId + "&range=" + range + "&delay=2000&maxResults=5&splitResults=true").routeId("google-stream-values-test").to("mock:rows");
+                from("google-sheets-stream://data?spreadsheetId=" + spreadsheetId 
+                    + "&range=" + range + "&delay=2000&maxResults=5&splitResults=true").routeId("google-stream-values-test").to("mock:rows");
             }
         };
     }

From 09a57104050e8b5d1695dabdac0ed154d90b0df0 Mon Sep 17 00:00:00 2001
From: Andrea Cosentino <ancosen@gmail.com>
Date: Fri, 30 Nov 2018 12:25:27 +0100
Subject: [PATCH 124/125] Upgrade PAX Exam to version 4.13.0

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

diff --git a/parent/pom.xml b/parent/pom.xml
index c1b09047d6f73..a5924a5fda355 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -560,7 +560,7 @@
     <paho-version>1.2.0</paho-version>
     <paranamer-bundle-version>2.8_1</paranamer-bundle-version>
     <pax-cdi-version>1.0.0</pax-cdi-version>
-    <pax-exam-version>4.12.0</pax-exam-version>
+    <pax-exam-version>4.13.0</pax-exam-version>
     <pax-tiny-bundle-version>1.3.2</pax-tiny-bundle-version>
     <pax-logging-version>1.8.6</pax-logging-version>
     <pdfbox-version>2.0.12</pdfbox-version>

From 5a3eaf10a7302922147f03ee33721240674763a2 Mon Sep 17 00:00:00 2001
From: Zoran Regvart <zregvart@apache.org>
Date: Fri, 30 Nov 2018 14:56:49 +0000
Subject: [PATCH 125/125] Regen

---
 .../camel-as2-component/src/main/docs/as2-component.adoc       | 3 ++-
 .../src/main/docs/google-sheets-stream-component.adoc          | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

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
index 11bfb22c8b038..0c1180cd1c7ad 100644
--- 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
@@ -113,7 +113,7 @@ with the following path and query parameters:
 === Spring Boot Auto-Configuration
 
 
-The component supports 28 options, which are listed below.
+The component supports 29 options, which are listed below.
 
 
 
@@ -126,6 +126,7 @@ The component supports 28 options, which are listed below.
 | *camel.component.as2.configuration.as2-to* | The value of the AS2To header of AS2 message. |  | String
 | *camel.component.as2.configuration.as2-version* | The version of the AS2 protocol. | 1.1 | String
 | *camel.component.as2.configuration.client-fqdn* | The Client Fully Qualified Domain Name (FQDN). Used in message ids sent by endpoint. | camel.apache.org | String
+| *camel.component.as2.configuration.compression-algorithm* | The algorithm used to compress EDI message. |  | AS2Compression Algorithm
 | *camel.component.as2.configuration.disposition-notification-to* | The value of the Disposition-Notification-To header. Assigning a value to this parameter requests a message disposition notification (MDN) for the AS2 message. |  | String
 | *camel.component.as2.configuration.edi-message-transfer-encoding* | The transfer encoding of EDI message. |  | String
 | *camel.component.as2.configuration.edi-message-type* | The content type of EDI message. One of application/edifact, application/edi-x12, application/edi-consent |  | ContentType
diff --git a/components/camel-google-sheets/src/main/docs/google-sheets-stream-component.adoc b/components/camel-google-sheets/src/main/docs/google-sheets-stream-component.adoc
index bc58b0bca953f..ac98fdc00064a 100644
--- a/components/camel-google-sheets/src/main/docs/google-sheets-stream-component.adoc
+++ b/components/camel-google-sheets/src/main/docs/google-sheets-stream-component.adoc
@@ -122,7 +122,7 @@ with the following path and query parameters:
 === Spring Boot Auto-Configuration
 
 
-The component supports 16 options, which are listed below.
+The component supports 17 options, which are listed below.
 
 
 
@@ -141,6 +141,7 @@ The component supports 16 options, which are listed below.
 | *camel.component.google-sheets-stream.configuration.range* | Specifies the range of rows and columns in a sheet to get data from. |  | String
 | *camel.component.google-sheets-stream.configuration.refresh-token* | OAuth 2 refresh token. Using this, the Google Calendar component can obtain a new accessToken whenever the current one expires - a necessity if the application is long-lived. |  | String
 | *camel.component.google-sheets-stream.configuration.scopes* | Specifies the level of permissions you want a sheets application to have to a user account. See https://developers.google.com/identity/protocols/googlescopes for more info. |  | List
+| *camel.component.google-sheets-stream.configuration.split-results* | True if value range result should be split into rows or columns to process each of them individually. When true each row or column is represented with a separate exchange in batch processing. Otherwise value range object is used as exchange junk size. | false | Boolean
 | *camel.component.google-sheets-stream.configuration.spreadsheet-id* | Specifies the spreadsheet identifier that is used to identify the target to obtain. |  | String
 | *camel.component.google-sheets-stream.configuration.value-render-option* | Determines how values should be rendered in the output. | FORMATTED_VALUE | String
 | *camel.component.google-sheets-stream.enabled* | Whether to enable auto configuration of the google-sheets-stream component. This is enabled by default. |  | Boolean