You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2019/12/17 08:03:59 UTC

[camel] branch master updated (4645a51 -> 6c9f5e5)

This is an automated email from the ASF dual-hosted git repository.

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


    from 4645a51  Camel-Stomp: Fixed CS
     new 7900a39  Regen
     new 6c9f5e5  CAMEL-14292 - Removed guava as dependency in google-pubsub Karaf feature

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


Summary of changes:
 docs/components/modules/ROOT/pages/stomp-component.adoc  | 3 ++-
 platforms/karaf/features/src/main/resources/features.xml | 1 -
 2 files changed, 2 insertions(+), 2 deletions(-)


[camel] 01/02: Regen

Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 7900a39a93208ac3ac8d8a975e9b65cf77b7430b
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Dec 17 08:59:01 2019 +0100

    Regen
---
 docs/components/modules/ROOT/pages/stomp-component.adoc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/components/modules/ROOT/pages/stomp-component.adoc b/docs/components/modules/ROOT/pages/stomp-component.adoc
index e700322..6b44bfa 100644
--- a/docs/components/modules/ROOT/pages/stomp-component.adoc
+++ b/docs/components/modules/ROOT/pages/stomp-component.adoc
@@ -86,13 +86,14 @@ with the following path and query parameters:
 |===
 
 
-=== Query Parameters (13 parameters):
+=== Query Parameters (14 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
 | *brokerURL* (common) | *Required* The URI of the Stomp broker to connect to | tcp://localhost:61613 | String
+| *customHeaders* (common) | To set custom headers |  | Properties
 | *host* (common) | The virtual host name |  | String
 | *version* (common) | The stomp version (1.1, or 1.2) |  | 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


[camel] 02/02: CAMEL-14292 - Removed guava as dependency in google-pubsub Karaf feature

Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 6c9f5e57bde95f3c8ce07f71121ec57801f093ae
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Dec 17 09:00:05 2019 +0100

    CAMEL-14292 - Removed guava as dependency in google-pubsub Karaf feature
---
 platforms/karaf/features/src/main/resources/features.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index 352db7b..759ceaa 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -1141,7 +1141,6 @@
     <bundle dependency='true'>mvn:org.apache.httpcomponents/httpcore-osgi/${httpcore4-version}</bundle>
     <bundle dependency='true'>mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient4-version}</bundle>
     <bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax-servlet-api-version}</bundle>
-    <bundle dependency='true'>mvn:com.google.guava/guava/${google-guava-version}</bundle>
     <bundle>mvn:org.apache.camel/camel-google-pubsub/${project.version}</bundle>
   </feature>
   <feature name='camel-grape' version='${project.version}' start-level='50'>