This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
The following commit(s) were added to refs/heads/master by this push:
new d9325fe Polished and regen
d9325fe is described below
commit d9325fe0ae8e1d8bfe358f37e47f8deeaa06e279
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Wed Dec 9 10:08:00 2020 +0100
Polished and regen
---
.../src/main/docs/spring-boot.adoc | 2 +-
.../CamelRouteTemplateConfigurationProperties.java | 6 +--
docs/modules/ROOT/pages/spring-boot.adoc | 19 ++++----
tooling/camel-spring-boot-dependencies/pom.xml | 56 +++++++++++-----------
4 files changed, 42 insertions(+), 41 deletions(-)
diff --git a/core/camel-spring-boot/src/main/docs/spring-boot.adoc
b/core/camel-spring-boot/src/main/docs/spring-boot.adoc
index 21d142c..1deda09 100644
--- a/core/camel-spring-boot/src/main/docs/spring-boot.adoc
+++ b/core/camel-spring-boot/src/main/docs/spring-boot.adoc
@@ -146,7 +146,7 @@ The component supports 160 options, which are listed below.
| *camel.health.registry-enabled* | Whether registry health check is enabled
Is default enabled | | Boolean
| *camel.health.routes-enabled* | Whether routes health check is enabled Is
default enabled | | Boolean
| *camel.language.enabled* | Global option to enable/disable language
auto-configuration, default is true. | true | Boolean
-| *camel.routetemplate.config* | | | List
+| *camel.routetemplate.config* | Route template configurations | | List
| *camel.springboot.allow-use-original-message* | Sets whether to allow access
to the original message from Camel's error handler, or from
org.apache.camel.spi.UnitOfWork.getOriginalInMessage(). Turning this off can
optimize performance, as defensive copy of the original message is not needed.
Default is false. | false | Boolean
| *camel.springboot.auto-startup* | Sets whether the object should
automatically start when Camel starts. Important: Currently only routes can be
disabled, as CamelContext's are always started. Note: When setting auto startup
false on CamelContext then that takes precedence and no routes is started. You
would need to start CamelContext explicit using the
org.apache.camel.CamelContext.start() method, to start the context, and then
you would need to start the routes manually using Camelcon [...]
| *camel.springboot.autowired-enabled* | Whether autowiring is enabled. This
is used for automatic autowiring options (the option must be marked as
autowired) by looking up in the registry to find if there is a single instance
of matching type, which then gets configured on the component. This can be used
for automatic configuring JDBC data sources, JMS connection factories, AWS
Clients, etc. Default is true. | true | Boolean
diff --git
a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/routetemplate/CamelRouteTemplateConfigurationProperties.java
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/routetemplate/CamelRouteTemplateConfigurationProperties.java
index 6c7936b..b4cfc44 100644
---
a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/routetemplate/CamelRouteTemplateConfigurationProperties.java
+++
b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/routetemplate/CamelRouteTemplateConfigurationProperties.java
@@ -24,15 +24,15 @@ import
org.springframework.boot.context.properties.ConfigurationProperties;
@ConfigurationProperties(prefix = "camel.routetemplate")
public class CamelRouteTemplateConfigurationProperties {
+ /**
+ * Route template configurations
+ */
private List<Map<String, String>> config;
public List<Map<String, String>> getConfig() {
return config;
}
- /**
- * Route template configurations
- */
public void setConfig(List<Map<String, String>> config) {
this.config = config;
}
diff --git a/docs/modules/ROOT/pages/spring-boot.adoc
b/docs/modules/ROOT/pages/spring-boot.adoc
index ad90287..21d142c 100644
--- a/docs/modules/ROOT/pages/spring-boot.adoc
+++ b/docs/modules/ROOT/pages/spring-boot.adoc
@@ -92,7 +92,7 @@ When using spring-boot with Spring Boot make sure to use the
following Maven dep
----
-The component supports 159 options, which are listed below.
+The component supports 160 options, which are listed below.
@@ -137,23 +137,16 @@ The component supports 159 options, which are listed
below.
| *camel.component.properties.system-properties-mode* | Sets the JVM system
property mode (0 = never, 1 = fallback, 2 = override). The default mode
(override) is to use system properties if present, and override any existing
properties. OS environment variable mode is checked before JVM system property
mode | 2 | Integer
| *camel.dataformat.enabled* | Global option to enable/disable dataformat
auto-configuration, default is true. | true | Boolean
| *camel.health.config* | Additional health check properties for fine grained
configuration of health checks. | | Map
-| *camel.health.config.allow-core-thread-time-out* | Sets whether to allow
core threads to timeout | | Boolean
| *camel.health.config.enabled* | Set if the check associated to this
configuration is enabled or not. Is default enabled. | | Boolean
| *camel.health.config.failure-threshold* | Set the number of failure before
reporting the service as un-healthy. | | Integer
-| *camel.health.config.id* | Sets the id of this thread pool | | String
| *camel.health.config.interval* | Set the check interval in milli seconds. |
| Long
-| *camel.health.config.keep-alive-time* | Sets the keep alive time for
inactive threads | | Long
-| *camel.health.config.max-pool-size* | Sets the maximum pool size | | Integer
-| *camel.health.config.max-queue-size* | Sets the maximum number of tasks in
the work queue. Use -1 or an unbounded queue | | Integer
| *camel.health.config.parent* | The id of the health check such as routes or
registry (can use * as wildcard) | | String
-| *camel.health.config.pool-size* | Sets the core pool size (threads to keep
minimum in pool) | | Integer
-| *camel.health.config.rejected-policy* | Sets the handler for tasks which
cannot be executed by the thread pool. | | ThreadPoolRejectedPolicy
-| *camel.health.config.time-unit* | Sets the time unit used for keep alive
time | | TimeUnit
| *camel.health.context-enabled* | Whether context health check is enabled Is
default enabled | | Boolean
| *camel.health.enabled* | Whether health check is enabled globally | |
Boolean
| *camel.health.registry-enabled* | Whether registry health check is enabled
Is default enabled | | Boolean
| *camel.health.routes-enabled* | Whether routes health check is enabled Is
default enabled | | Boolean
| *camel.language.enabled* | Global option to enable/disable language
auto-configuration, default is true. | true | Boolean
+| *camel.routetemplate.config* | | | List
| *camel.springboot.allow-use-original-message* | Sets whether to allow access
to the original message from Camel's error handler, or from
org.apache.camel.spi.UnitOfWork.getOriginalInMessage(). Turning this off can
optimize performance, as defensive copy of the original message is not needed.
Default is false. | false | Boolean
| *camel.springboot.auto-startup* | Sets whether the object should
automatically start when Camel starts. Important: Currently only routes can be
disabled, as CamelContext's are always started. Note: When setting auto startup
false on CamelContext then that takes precedence and no routes is started. You
would need to start CamelContext explicit using the
org.apache.camel.CamelContext.start() method, to start the context, and then
you would need to start the routes manually using Camelcon [...]
| *camel.springboot.autowired-enabled* | Whether autowiring is enabled. This
is used for automatic autowiring options (the option must be marked as
autowired) by looking up in the registry to find if there is a single instance
of matching type, which then gets configured on the component. This can be used
for automatic configuring JDBC data sources, JMS connection factories, AWS
Clients, etc. Default is true. | true | Boolean
@@ -244,6 +237,14 @@ The component supports 159 options, which are listed below.
| *camel.ssl.trust-managers* | The optional trust manager configuration for
creating the TrustManager used in constructing an SSLContext. | |
TrustManagersParameters
| *camel.threadpool.allow-core-thread-time-out* | Sets default whether to
allow core threads to timeout | | Boolean
| *camel.threadpool.config* | Adds a configuration for a specific thread pool
profile (inherits default values) | | Map
+| *camel.threadpool.config.allow-core-thread-time-out* | Sets whether to allow
core threads to timeout | | Boolean
+| *camel.threadpool.config.id* | Sets the id of this thread pool | | String
+| *camel.threadpool.config.keep-alive-time* | Sets the keep alive time for
inactive threads | | Long
+| *camel.threadpool.config.max-pool-size* | Sets the maximum pool size | |
Integer
+| *camel.threadpool.config.max-queue-size* | Sets the maximum number of tasks
in the work queue. Use -1 or an unbounded queue | | Integer
+| *camel.threadpool.config.pool-size* | Sets the core pool size (threads to
keep minimum in pool) | | Integer
+| *camel.threadpool.config.rejected-policy* | Sets the handler for tasks which
cannot be executed by the thread pool. | | ThreadPoolRejectedPolicy
+| *camel.threadpool.config.time-unit* | Sets the time unit used for keep alive
time | | TimeUnit
| *camel.threadpool.keep-alive-time* | Sets the default keep alive time for
inactive threads | | Long
| *camel.threadpool.max-pool-size* | Sets the default maximum pool size | |
Integer
| *camel.threadpool.max-queue-size* | Sets the default maximum number of tasks
in the work queue. Use -1 or an unbounded queue | | Integer
diff --git a/tooling/camel-spring-boot-dependencies/pom.xml
b/tooling/camel-spring-boot-dependencies/pom.xml
index dd27657..9239cb3 100644
--- a/tooling/camel-spring-boot-dependencies/pom.xml
+++ b/tooling/camel-spring-boot-dependencies/pom.xml
@@ -4045,142 +4045,142 @@
<dependency>
<groupId>org.apache.cxf.services.sts</groupId>
<artifactId>cxf-services-sts-core</artifactId>
- <version>3.4.0</version>
+ <version>3.4.1</version>
</dependency>
<dependency>
<groupId>org.apache.cxf.services.ws-discovery</groupId>
<artifactId>cxf-services-ws-discovery-api</artifactId>
- <version>3.4.0</version>
+ <version>3.4.1</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-core</artifactId>
- <version>3.4.0</version>
+ <version>3.4.1</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-bindings-soap</artifactId>
- <version>3.4.0</version>
+ <version>3.4.1</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-bindings-xml</artifactId>
- <version>3.4.0</version>
+ <version>3.4.1</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-databinding-jaxb</artifactId>
- <version>3.4.0</version>
+ <version>3.4.1</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-features-clustering</artifactId>
- <version>3.4.0</version>
+ <version>3.4.1</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-features-logging</artifactId>
- <version>3.4.0</version>
+ <version>3.4.1</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxrs</artifactId>
- <version>3.4.0</version>
+ <version>3.4.1</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
- <version>3.4.0</version>
+ <version>3.4.1</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-simple</artifactId>
- <version>3.4.0</version>
+ <version>3.4.1</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-management</artifactId>
- <version>3.4.0</version>
+ <version>3.4.1</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-client</artifactId>
- <version>3.4.0</version>
+ <version>3.4.1</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-extension-providers</artifactId>
- <version>3.4.0</version>
+ <version>3.4.1</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-security-oauth2</artifactId>
- <version>3.4.0</version>
+ <version>3.4.1</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-rs-service-description-swagger</artifactId>
- <version>3.4.0</version>
+ <version>3.4.1</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
- <version>3.4.0</version>
+ <version>3.4.1</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http-jetty</artifactId>
- <version>3.4.0</version>
+ <version>3.4.1</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-jms</artifactId>
- <version>3.4.0</version>
+ <version>3.4.1</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-local</artifactId>
- <version>3.4.0</version>
+ <version>3.4.1</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-addr</artifactId>
- <version>3.4.0</version>
+ <version>3.4.1</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-mex</artifactId>
- <version>3.4.0</version>
+ <version>3.4.1</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-policy</artifactId>
- <version>3.4.0</version>
+ <version>3.4.1</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-rm</artifactId>
- <version>3.4.0</version>
+ <version>3.4.1</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-security</artifactId>
- <version>3.4.0</version>
+ <version>3.4.1</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-ws-security-oauth2</artifactId>
- <version>3.4.0</version>
+ <version>3.4.1</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-wsdl</artifactId>
- <version>3.4.0</version>
+ <version>3.4.1</version>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-testutils</artifactId>
- <version>3.4.0</version>
+ <version>3.4.1</version>
</dependency>
<dependency>
<groupId>org.apache.ftpserver</groupId>
