This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
The following commit(s) were added to refs/heads/main by this push:
new bcb9e91 Regen
bcb9e91 is described below
commit bcb9e919ec50621937e52263608fda6413e70d24
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Mon Jan 10 07:01:58 2022 +0100
Regen
---
.../camel/springboot/catalog/components/quartz.json | 8 ++++----
.../camel/springboot/catalog/dataformats/beanio.json | 2 +-
components-starter/camel-any23-starter/pom.xml | 8 ++++++++
.../camel-quartz-starter/src/main/docs/quartz.json | 8 ++++----
.../quartz/springboot/QuartzComponentConfiguration.java | 16 ++++++++--------
core/camel-spring-boot/src/main/docs/spring-boot.json | 5 +++++
tooling/camel-spring-boot-dependencies/pom.xml | 16 +++++++++++++---
7 files changed, 43 insertions(+), 20 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/quartz.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/quartz.json
index 5390dc4..4382efe 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/quartz.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/quartz.json
@@ -23,16 +23,16 @@
},
"componentProperties": {
"bridgeErrorHandler": { "kind": "property", "displayName": "Bridge Error
Handler", "group": "consumer", "label": "consumer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "description": "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 me [...]
- "enableJmx": { "kind": "property", "displayName": "Enable Jmx", "group":
"consumer", "label": "", "required": false, "type": "boolean", "javaType":
"boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": true, "description": "Whether to enable Quartz JMX which allows
to manage the Quartz scheduler from JMX. <p\/> This options is default true" },
- "prefixInstanceName": { "kind": "property", "displayName": "Prefix
Instance Name", "group": "consumer", "label": "", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": true, "description": "Whether to prefix the
Quartz Scheduler instance name with the CamelContext name. <p\/> This is
enabled by default, to let each CamelContext use its own Quartz scheduler
instance by default. You can set this option [...]
- "prefixJobNameWithEndpointId": { "kind": "property", "displayName":
"Prefix Job Name With Endpoint Id", "group": "consumer", "label": "",
"required": false, "type": "boolean", "javaType": "boolean", "deprecated":
false, "autowired": false, "secret": false, "defaultValue": false,
"description": "Whether to prefix the quartz job with the endpoint id. <p\/>
This option is default false." },
+ "enableJmx": { "kind": "property", "displayName": "Enable Jmx", "group":
"consumer", "label": "", "required": false, "type": "boolean", "javaType":
"boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": true, "description": "Whether to enable Quartz JMX which allows
to manage the Quartz scheduler from JMX. This options is default true" },
+ "prefixInstanceName": { "kind": "property", "displayName": "Prefix
Instance Name", "group": "consumer", "label": "", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": true, "description": "Whether to prefix the
Quartz Scheduler instance name with the CamelContext name. This is enabled by
default, to let each CamelContext use its own Quartz scheduler instance by
default. You can set this option to fal [...]
+ "prefixJobNameWithEndpointId": { "kind": "property", "displayName":
"Prefix Job Name With Endpoint Id", "group": "consumer", "label": "",
"required": false, "type": "boolean", "javaType": "boolean", "deprecated":
false, "autowired": false, "secret": false, "defaultValue": false,
"description": "Whether to prefix the quartz job with the endpoint id. This
option is default false." },
"properties": { "kind": "property", "displayName": "Properties", "group":
"consumer", "label": "", "required": false, "type": "object", "javaType":
"java.util.Map", "deprecated": false, "autowired": false, "secret": false,
"description": "Properties to configure the Quartz scheduler." },
"propertiesFile": { "kind": "property", "displayName": "Properties File",
"group": "consumer", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "File name of the properties to load from the
classpath" },
"propertiesRef": { "kind": "property", "displayName": "Properties Ref",
"group": "consumer", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "description": "References to an existing Properties or Map to
lookup in the registry to use for configuring quartz." },
"autowiredEnabled": { "kind": "property", "displayName": "Autowired
Enabled", "group": "advanced", "label": "advanced", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": true, "description": "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 t [...]
"scheduler": { "kind": "property", "displayName": "Scheduler", "group":
"advanced", "label": "advanced", "required": false, "type": "object",
"javaType": "org.quartz.Scheduler", "deprecated": false, "autowired": false,
"secret": false, "description": "To use the custom configured Quartz scheduler,
instead of creating a new Scheduler." },
"schedulerFactory": { "kind": "property", "displayName": "Scheduler
Factory", "group": "advanced", "label": "advanced", "required": false, "type":
"object", "javaType": "org.quartz.SchedulerFactory", "deprecated": false,
"autowired": false, "secret": false, "description": "To use the custom
SchedulerFactory which is used to create the Scheduler." },
- "autoStartScheduler": { "kind": "property", "displayName": "Auto Start
Scheduler", "group": "scheduler", "label": "scheduler", "required": false,
"type": "boolean", "javaType": "boolean", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": true, "description": "Whether or not
the scheduler should be auto started. <p\/> This options is default true" },
+ "autoStartScheduler": { "kind": "property", "displayName": "Auto Start
Scheduler", "group": "scheduler", "label": "scheduler", "required": false,
"type": "boolean", "javaType": "boolean", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": true, "description": "Whether or not
the scheduler should be auto started. This options is default true" },
"interruptJobsOnShutdown": { "kind": "property", "displayName": "Interrupt
Jobs On Shutdown", "group": "scheduler", "label": "scheduler", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false, "description":
"Whether to interrupt jobs on shutdown which forces the scheduler to shutdown
quicker and attempt to interrupt any running jobs. If this is enabled then any
running jobs can fail due to being i [...]
},
"properties": {
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/beanio.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/beanio.json
index 963cd10..2d9910b 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/beanio.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/beanio.json
@@ -4,7 +4,7 @@
"name": "beanio",
"title": "BeanIO",
"description": "Marshal and unmarshal Java beans to and from flat files
(such as CSV, delimited, or fixed length formats).",
- "deprecated": false,
+ "deprecated": true,
"firstVersion": "2.10.0",
"label": "dataformat,transformation,csv",
"javaType": "org.apache.camel.dataformat.beanio.BeanIODataFormat",
diff --git a/components-starter/camel-any23-starter/pom.xml
b/components-starter/camel-any23-starter/pom.xml
index 7c41963..994a94a 100644
--- a/components-starter/camel-any23-starter/pom.xml
+++ b/components-starter/camel-any23-starter/pom.xml
@@ -44,6 +44,14 @@
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ </exclusion>
</exclusions>
<!--END OF GENERATED CODE-->
</dependency>
diff --git a/components-starter/camel-quartz-starter/src/main/docs/quartz.json
b/components-starter/camel-quartz-starter/src/main/docs/quartz.json
index 19e20b5..6c4e950 100644
--- a/components-starter/camel-quartz-starter/src/main/docs/quartz.json
+++ b/components-starter/camel-quartz-starter/src/main/docs/quartz.json
@@ -16,7 +16,7 @@
{
"name": "camel.component.quartz.auto-start-scheduler",
"type": "java.lang.Boolean",
- "description": "Whether or not the scheduler should be auto started.
<p\/> This options is default true",
+ "description": "Whether or not the scheduler should be auto started.
This options is default true",
"sourceType":
"org.apache.camel.component.quartz.springboot.QuartzComponentConfiguration",
"defaultValue": true
},
@@ -42,7 +42,7 @@
{
"name": "camel.component.quartz.enable-jmx",
"type": "java.lang.Boolean",
- "description": "Whether to enable Quartz JMX which allows to manage the
Quartz scheduler from JMX. <p\/> This options is default true",
+ "description": "Whether to enable Quartz JMX which allows to manage the
Quartz scheduler from JMX. This options is default true",
"sourceType":
"org.apache.camel.component.quartz.springboot.QuartzComponentConfiguration",
"defaultValue": true
},
@@ -62,14 +62,14 @@
{
"name": "camel.component.quartz.prefix-instance-name",
"type": "java.lang.Boolean",
- "description": "Whether to prefix the Quartz Scheduler instance name
with the CamelContext name. <p\/> This is enabled by default, to let each
CamelContext use its own Quartz scheduler instance by default. You can set this
option to <tt>false to reuse Quartz scheduler instances between multiple
CamelContext's.",
+ "description": "Whether to prefix the Quartz Scheduler instance name
with the CamelContext name. This is enabled by default, to let each
CamelContext use its own Quartz scheduler instance by default. You can set this
option to false to reuse Quartz scheduler instances between multiple
CamelContext's.",
"sourceType":
"org.apache.camel.component.quartz.springboot.QuartzComponentConfiguration",
"defaultValue": true
},
{
"name": "camel.component.quartz.prefix-job-name-with-endpoint-id",
"type": "java.lang.Boolean",
- "description": "Whether to prefix the quartz job with the endpoint id.
<p\/> This option is default false.",
+ "description": "Whether to prefix the quartz job with the endpoint id.
This option is default false.",
"sourceType":
"org.apache.camel.component.quartz.springboot.QuartzComponentConfiguration",
"defaultValue": false
},
diff --git
a/components-starter/camel-quartz-starter/src/main/java/org/apache/camel/component/quartz/springboot/QuartzComponentConfiguration.java
b/components-starter/camel-quartz-starter/src/main/java/org/apache/camel/component/quartz/springboot/QuartzComponentConfiguration.java
index 2b50ab7..802d51a 100644
---
a/components-starter/camel-quartz-starter/src/main/java/org/apache/camel/component/quartz/springboot/QuartzComponentConfiguration.java
+++
b/components-starter/camel-quartz-starter/src/main/java/org/apache/camel/component/quartz/springboot/QuartzComponentConfiguration.java
@@ -50,20 +50,20 @@ public class QuartzComponentConfiguration
private Boolean bridgeErrorHandler = false;
/**
* Whether to enable Quartz JMX which allows to manage the Quartz scheduler
- * from JMX. <p/> This options is default true
+ * from JMX. This options is default true
*/
private Boolean enableJmx = true;
/**
* Whether to prefix the Quartz Scheduler instance name with the
- * CamelContext name. <p/> This is enabled by default, to let each
- * CamelContext use its own Quartz scheduler instance by default. You can
- * set this option to <tt>false to reuse Quartz scheduler instances between
- * multiple CamelContext's.
+ * CamelContext name. This is enabled by default, to let each CamelContext
+ * use its own Quartz scheduler instance by default. You can set this
option
+ * to false to reuse Quartz scheduler instances between multiple
+ * CamelContext's.
*/
private Boolean prefixInstanceName = true;
/**
- * Whether to prefix the quartz job with the endpoint id. <p/> This option
- * is default false.
+ * Whether to prefix the quartz job with the endpoint id. This option is
+ * default false.
*/
private Boolean prefixJobNameWithEndpointId = false;
/**
@@ -99,7 +99,7 @@ public class QuartzComponentConfiguration
*/
private SchedulerFactory schedulerFactory;
/**
- * Whether or not the scheduler should be auto started. <p/> This options
is
+ * Whether or not the scheduler should be auto started. This options is
* default true
*/
private Boolean autoStartScheduler = true;
diff --git a/core/camel-spring-boot/src/main/docs/spring-boot.json
b/core/camel-spring-boot/src/main/docs/spring-boot.json
index 1735db6..ba3c24f 100644
--- a/core/camel-spring-boot/src/main/docs/spring-boot.json
+++ b/core/camel-spring-boot/src/main/docs/spring-boot.json
@@ -1078,6 +1078,11 @@
"defaultValue": false
},
{
+ "name": "camel.springboot.tracing-logging-format",
+ "type": "java.lang.String",
+ "sourceType": "org.apache.camel.spring.boot.CamelConfigurationProperties"
+ },
+ {
"name": "camel.springboot.tracing-pattern",
"type": "java.lang.String",
"description": "Tracing pattern to match which node EIPs to trace. For
example to match all To EIP nodes, use to*. The pattern matches by node and
route id's Multiple patterns can be separated by comma.",
diff --git a/tooling/camel-spring-boot-dependencies/pom.xml
b/tooling/camel-spring-boot-dependencies/pom.xml
index 17dee4b..63e13fe 100644
--- a/tooling/camel-spring-boot-dependencies/pom.xml
+++ b/tooling/camel-spring-boot-dependencies/pom.xml
@@ -177,6 +177,11 @@
<version>1.0</version>
</dependency>
<dependency>
+ <groupId>javax.xml.soap</groupId>
+ <artifactId>javax.xml.soap-api</artifactId>
+ <version>1.4.0</version>
+ </dependency>
+ <dependency>
<groupId>net.sf.saxon</groupId>
<artifactId>Saxon-HE</artifactId>
<version>9.9.1-8</version>
@@ -194,7 +199,7 @@
<dependency>
<groupId>org.apache.any23</groupId>
<artifactId>apache-any23-core</artifactId>
- <version>2.4</version>
+ <version>2.6</version>
</dependency>
<dependency>
<groupId>org.apache.avro</groupId>
@@ -4409,6 +4414,11 @@
<version>1.1.1</version>
</dependency>
<dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
+ <version>1.1.3</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.mina</groupId>
<artifactId>mina-core</artifactId>
<version>2.1.4</version>
@@ -4517,12 +4527,12 @@
<dependency>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-model</artifactId>
- <version>3.7.2</version>
+ <version>3.7.4</version>
</dependency>
<dependency>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-rio-api</artifactId>
- <version>3.7.2</version>
+ <version>3.7.4</version>
</dependency>
<dependency>
<groupId>org.knowm.xchange</groupId>
