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/11/05 17:54:47 UTC
[camel] branch camel-2.x updated: Regen
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch camel-2.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-2.x by this push:
new f9b92c4 Regen
f9b92c4 is described below
commit f9b92c452d3a865734d1124728977b0331d888bf
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Nov 5 18:54:22 2019 +0100
Regen
---
components/camel-netty4-http/src/main/docs/netty4-http-component.adoc | 4 +++-
components/camel-netty4/src/main/docs/netty4-component.adoc | 4 +++-
docs/components/modules/ROOT/pages/mongodb3-component.adoc | 4 +++-
docs/components/modules/ROOT/pages/netty4-component.adoc | 4 +++-
docs/components/modules/ROOT/pages/netty4-http-component.adoc | 4 +++-
.../spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml | 2 +-
6 files changed, 16 insertions(+), 6 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 e01eb46..b6f6864 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
@@ -1,6 +1,8 @@
+[[netty4-http-component]]
= Netty4 HTTP Component
*Available as of Camel version 2.14*
+
*Available as of Camel version 2.14*
@@ -582,4 +584,4 @@ below:
<from uri="netty4-http:http://0.0.0.0:{{port}}/foo?matchOnUriPrefix=true&securityConfiguration.realm=karaf&securityConfiguration.securityConstraint=#constraint"/>
...
</route>
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
\ No newline at end of file
diff --git a/components/camel-netty4/src/main/docs/netty4-component.adoc b/components/camel-netty4/src/main/docs/netty4-component.adoc
index fba12c2..de26c00 100644
--- a/components/camel-netty4/src/main/docs/netty4-component.adoc
+++ b/components/camel-netty4/src/main/docs/netty4-component.adoc
@@ -1,6 +1,8 @@
+[[netty4-component]]
= Netty4 Component
*Available as of Camel version 2.14*
+
*Available as of Camel version 2.14*
@@ -796,4 +798,4 @@ NOTE: We recommend extending the `TimeoutCorrelationManagerSupport` when you bui
This provides support for timeout and other complexities you otherwise would need to implement as well.
You can find an example with the Apache Camel source code in the examples directory
-under the `camel-example-netty-custom-correlation` directory.
+under the `camel-example-netty-custom-correlation` directory.
\ No newline at end of file
diff --git a/docs/components/modules/ROOT/pages/mongodb3-component.adoc b/docs/components/modules/ROOT/pages/mongodb3-component.adoc
index 54c117e..58715f8 100644
--- a/docs/components/modules/ROOT/pages/mongodb3-component.adoc
+++ b/docs/components/modules/ROOT/pages/mongodb3-component.adoc
@@ -1,7 +1,9 @@
+[[mongodb3-component]]
= MongoDB Component
:page-source: components/camel-mongodb3/src/main/docs/mongodb3-component.adoc
*Available as of Camel version 2.19*
+
*Available as of Camel version 2.19*
@@ -993,4 +995,4 @@ object to a `Map`, which is in turn used to initialise a new
|=======================================================================
This type converter is auto-discovered, so you don't need to configure
-anything manually.
+anything manually.
\ No newline at end of file
diff --git a/docs/components/modules/ROOT/pages/netty4-component.adoc b/docs/components/modules/ROOT/pages/netty4-component.adoc
index 6ec36d6..d927c33 100644
--- a/docs/components/modules/ROOT/pages/netty4-component.adoc
+++ b/docs/components/modules/ROOT/pages/netty4-component.adoc
@@ -1,7 +1,9 @@
+[[netty4-component]]
= Netty4 Component
:page-source: components/camel-netty4/src/main/docs/netty4-component.adoc
*Available as of Camel version 2.14*
+
*Available as of Camel version 2.14*
@@ -797,4 +799,4 @@ NOTE: We recommend extending the `TimeoutCorrelationManagerSupport` when you bui
This provides support for timeout and other complexities you otherwise would need to implement as well.
You can find an example with the Apache Camel source code in the examples directory
-under the `camel-example-netty-custom-correlation` directory.
+under the `camel-example-netty-custom-correlation` directory.
\ No newline at end of file
diff --git a/docs/components/modules/ROOT/pages/netty4-http-component.adoc b/docs/components/modules/ROOT/pages/netty4-http-component.adoc
index ff91c6a..b74ccab 100644
--- a/docs/components/modules/ROOT/pages/netty4-http-component.adoc
+++ b/docs/components/modules/ROOT/pages/netty4-http-component.adoc
@@ -1,7 +1,9 @@
+[[netty4-http-component]]
= Netty4 HTTP Component
:page-source: components/camel-netty4-http/src/main/docs/netty4-http-component.adoc
*Available as of Camel version 2.14*
+
*Available as of Camel version 2.14*
@@ -583,4 +585,4 @@ below:
<from uri="netty4-http:http://0.0.0.0:{{port}}/foo?matchOnUriPrefix=true&securityConfiguration.realm=karaf&securityConfiguration.securityConstraint=#constraint"/>
...
</route>
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
\ 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 a8a4325..cf0e7af 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
@@ -149,7 +149,7 @@
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
- <version>1.4.11</version>
+ <version>1.4.11.1</version>
</dependency>
<dependency>
<groupId>commons-httpclient</groupId>