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 2fe6b65 Regen 2fe6b65 is described below commit 2fe6b65b46bf4f6efeac17b5780d42e0c63764fc Author: Claus Ibsen <claus.ib...@gmail.com> AuthorDate: Tue Dec 15 06:47:18 2020 +0100 Regen --- .../apache/camel/springboot/catalog/components/dataset.json | 2 +- .../apache/camel/springboot/catalog/components/jclouds.json | 2 +- .../org/apache/camel/springboot/catalog/components/sip.json | 2 +- .../org/apache/camel/springboot/catalog/components/sips.json | 2 +- components-starter/README.adoc | 4 ++-- components-starter/camel-corda-starter/pom.xml | 8 -------- .../dataset/springboot/DataSetComponentConfiguration.java | 2 +- components-starter/camel-iota-starter/pom.xml | 12 ------------ .../jclouds/springboot/JcloudsComponentConfiguration.java | 2 +- docs/modules/ROOT/pages/list.adoc | 4 ++-- tooling/camel-spring-boot-dependencies/pom.xml | 2 +- 11 files changed, 11 insertions(+), 31 deletions(-) diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/dataset.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/dataset.json index d339d9a2..c74d054 100644 --- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/dataset.json +++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/dataset.json @@ -3,7 +3,7 @@ "kind": "component", "name": "dataset", "title": "Dataset", - "description": "Provide data for load & soak testing of your Camel application.", + "description": "Provide data for load and soak testing of your Camel application.", "deprecated": false, "firstVersion": "1.3.0", "label": "core,testing", diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jclouds.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jclouds.json index 6dce320..7f05be5 100644 --- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jclouds.json +++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jclouds.json @@ -3,7 +3,7 @@ "kind": "component", "name": "jclouds", "title": "JClouds", - "description": "Interact with jclouds compute & blobstore service.", + "description": "Interact with jclouds compute and blobstore service.", "deprecated": false, "firstVersion": "2.9.0", "label": "api,cloud,compute", diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/sip.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/sip.json index f2a3573..06a3ba5 100644 --- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/sip.json +++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/sip.json @@ -46,7 +46,7 @@ "transport": { "kind": "parameter", "displayName": "Transport", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "tcp", "udp" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "tcp", "configurationClass": "org.apache.camel.component.sip.SipConfiguration", "configurationField": "configuration", "description": "Setting for choice of transport protocol. Valid choices are tcp or udp." }, "bridgeErrorHandler": { "kind": "parameter", "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 m [...] "consumer": { "kind": "parameter", "displayName": "Consumer", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.sip.SipConfiguration", "configurationField": "configuration", "description": "This setting is used to determine whether the kind of header (FromHeader,ToHeader etc) that needs to be created fo [...] - "presenceAgent": { "kind": "parameter", "displayName": "Presence Agent", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.sip.SipConfiguration", "configurationField": "configuration", "description": "This setting is used to distinguish between a Presence Agent & a consumer. This is due to the fact that [...] + "presenceAgent": { "kind": "parameter", "displayName": "Presence Agent", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.sip.SipConfiguration", "configurationField": "configuration", "description": "This setting is used to distinguish between a Presence Agent and a consumer. This is due to the fact th [...] "exceptionHandler": { "kind": "parameter", "displayName": "Exception Handler", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.spi.ExceptionHandler", "optionalPrefix": "consumer.", "deprecated": false, "autowired": false, "secret": false, "description": "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 con [...] "exchangePattern": { "kind": "parameter", "displayName": "Exchange Pattern", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.ExchangePattern", "enum": [ "InOnly", "InOut", "InOptionalOut" ], "deprecated": false, "autowired": false, "secret": false, "description": "Sets the exchange pattern when the consumer creates an exchange." }, "lazyStartProducer": { "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during sta [...] diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/sips.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/sips.json index 8c93324..a77bb93 100644 --- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/sips.json +++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/sips.json @@ -46,7 +46,7 @@ "transport": { "kind": "parameter", "displayName": "Transport", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "tcp", "udp" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "tcp", "configurationClass": "org.apache.camel.component.sip.SipConfiguration", "configurationField": "configuration", "description": "Setting for choice of transport protocol. Valid choices are tcp or udp." }, "bridgeErrorHandler": { "kind": "parameter", "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 m [...] "consumer": { "kind": "parameter", "displayName": "Consumer", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.sip.SipConfiguration", "configurationField": "configuration", "description": "This setting is used to determine whether the kind of header (FromHeader,ToHeader etc) that needs to be created fo [...] - "presenceAgent": { "kind": "parameter", "displayName": "Presence Agent", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.sip.SipConfiguration", "configurationField": "configuration", "description": "This setting is used to distinguish between a Presence Agent & a consumer. This is due to the fact that [...] + "presenceAgent": { "kind": "parameter", "displayName": "Presence Agent", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.sip.SipConfiguration", "configurationField": "configuration", "description": "This setting is used to distinguish between a Presence Agent and a consumer. This is due to the fact th [...] "exceptionHandler": { "kind": "parameter", "displayName": "Exception Handler", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.spi.ExceptionHandler", "optionalPrefix": "consumer.", "deprecated": false, "autowired": false, "secret": false, "description": "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 con [...] "exchangePattern": { "kind": "parameter", "displayName": "Exchange Pattern", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.ExchangePattern", "enum": [ "InOnly", "InOut", "InOptionalOut" ], "deprecated": false, "autowired": false, "secret": false, "description": "Sets the exchange pattern when the consumer creates an exchange." }, "lazyStartProducer": { "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during sta [...] diff --git a/components-starter/README.adoc b/components-starter/README.adoc index 9f7b3dd..358dd65 100644 --- a/components-starter/README.adoc +++ b/components-starter/README.adoc @@ -197,7 +197,7 @@ Number of Camel components: 342 in 274 JAR artifacts (3 deprecated) | xref:latest@components::dataformat-component.adoc[Data Format] | camel-dataformat-starter | Stable | 2.12 | Use a Camel Data Format as a regular Camel Component. -| xref:latest@components::dataset-component.adoc[Dataset] | camel-dataset-starter | Stable | 1.3 | Provide data for load & soak testing of your Camel application. +| xref:latest@components::dataset-component.adoc[Dataset] | camel-dataset-starter | Stable | 1.3 | Provide data for load and soak testing of your Camel application. | xref:latest@components::dataset-test-component.adoc[DataSet Test] | camel-dataset-starter | Stable | 1.3 | Extends the mock component by pulling messages from another endpoint on startup to set the expected message bodies. @@ -363,7 +363,7 @@ Number of Camel components: 342 in 274 JAR artifacts (3 deprecated) | xref:latest@components::jcache-component.adoc[JCache] | camel-jcache-starter | Stable | 2.17 | Perform caching operations against JSR107/JCache. -| xref:latest@components::jclouds-component.adoc[JClouds] | camel-jclouds-starter | Stable | 2.9 | Interact with jclouds compute & blobstore service. +| xref:latest@components::jclouds-component.adoc[JClouds] | camel-jclouds-starter | Stable | 2.9 | Interact with jclouds compute and blobstore service. | xref:latest@components::jcr-component.adoc[JCR] | camel-jcr-starter | Stable | 1.3 | Read and write nodes to/from a JCR compliant content repository. diff --git a/components-starter/camel-corda-starter/pom.xml b/components-starter/camel-corda-starter/pom.xml index 252daab..5ad677a 100644 --- a/components-starter/camel-corda-starter/pom.xml +++ b/components-starter/camel-corda-starter/pom.xml @@ -41,14 +41,6 @@ <!--START OF GENERATED CODE--> <exclusions> <exclusion> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> - </exclusion> - <exclusion> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-core</artifactId> - </exclusion> - <exclusion> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-core</artifactId> </exclusion> diff --git a/components-starter/camel-dataset-starter/src/main/java/org/apache/camel/component/dataset/springboot/DataSetComponentConfiguration.java b/components-starter/camel-dataset-starter/src/main/java/org/apache/camel/component/dataset/springboot/DataSetComponentConfiguration.java index 29ebb23..33b6a8a 100644 --- a/components-starter/camel-dataset-starter/src/main/java/org/apache/camel/component/dataset/springboot/DataSetComponentConfiguration.java +++ b/components-starter/camel-dataset-starter/src/main/java/org/apache/camel/component/dataset/springboot/DataSetComponentConfiguration.java @@ -21,7 +21,7 @@ import org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon; import org.springframework.boot.context.properties.ConfigurationProperties; /** - * Provide data for load & soak testing of your Camel application. + * Provide data for load and soak testing of your Camel application. * * Generated by camel-package-maven-plugin - do not edit this file! */ diff --git a/components-starter/camel-iota-starter/pom.xml b/components-starter/camel-iota-starter/pom.xml index 0f60048..a8484cc 100644 --- a/components-starter/camel-iota-starter/pom.xml +++ b/components-starter/camel-iota-starter/pom.xml @@ -38,18 +38,6 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-iota</artifactId> <version>${camel-version}</version> - <!--START OF GENERATED CODE--> - <exclusions> - <exclusion> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-classic</artifactId> - </exclusion> - <exclusion> - <groupId>ch.qos.logback</groupId> - <artifactId>logback-core</artifactId> - </exclusion> - </exclusions> - <!--END OF GENERATED CODE--> </dependency> <!--START OF GENERATED CODE--> <dependency> diff --git a/components-starter/camel-jclouds-starter/src/main/java/org/apache/camel/component/jclouds/springboot/JcloudsComponentConfiguration.java b/components-starter/camel-jclouds-starter/src/main/java/org/apache/camel/component/jclouds/springboot/JcloudsComponentConfiguration.java index 5f2fa7d..3d7a75c 100644 --- a/components-starter/camel-jclouds-starter/src/main/java/org/apache/camel/component/jclouds/springboot/JcloudsComponentConfiguration.java +++ b/components-starter/camel-jclouds-starter/src/main/java/org/apache/camel/component/jclouds/springboot/JcloudsComponentConfiguration.java @@ -24,7 +24,7 @@ import org.jclouds.compute.ComputeService; import org.springframework.boot.context.properties.ConfigurationProperties; /** - * Interact with jclouds compute & blobstore service. + * Interact with jclouds compute and blobstore service. * * Generated by camel-package-maven-plugin - do not edit this file! */ diff --git a/docs/modules/ROOT/pages/list.adoc b/docs/modules/ROOT/pages/list.adoc index 9f7b3dd..358dd65 100644 --- a/docs/modules/ROOT/pages/list.adoc +++ b/docs/modules/ROOT/pages/list.adoc @@ -197,7 +197,7 @@ Number of Camel components: 342 in 274 JAR artifacts (3 deprecated) | xref:latest@components::dataformat-component.adoc[Data Format] | camel-dataformat-starter | Stable | 2.12 | Use a Camel Data Format as a regular Camel Component. -| xref:latest@components::dataset-component.adoc[Dataset] | camel-dataset-starter | Stable | 1.3 | Provide data for load & soak testing of your Camel application. +| xref:latest@components::dataset-component.adoc[Dataset] | camel-dataset-starter | Stable | 1.3 | Provide data for load and soak testing of your Camel application. | xref:latest@components::dataset-test-component.adoc[DataSet Test] | camel-dataset-starter | Stable | 1.3 | Extends the mock component by pulling messages from another endpoint on startup to set the expected message bodies. @@ -363,7 +363,7 @@ Number of Camel components: 342 in 274 JAR artifacts (3 deprecated) | xref:latest@components::jcache-component.adoc[JCache] | camel-jcache-starter | Stable | 2.17 | Perform caching operations against JSR107/JCache. -| xref:latest@components::jclouds-component.adoc[JClouds] | camel-jclouds-starter | Stable | 2.9 | Interact with jclouds compute & blobstore service. +| xref:latest@components::jclouds-component.adoc[JClouds] | camel-jclouds-starter | Stable | 2.9 | Interact with jclouds compute and blobstore service. | xref:latest@components::jcr-component.adoc[JCR] | camel-jcr-starter | Stable | 1.3 | Read and write nodes to/from a JCR compliant content repository. diff --git a/tooling/camel-spring-boot-dependencies/pom.xml b/tooling/camel-spring-boot-dependencies/pom.xml index 031fdb4..bb7089f 100644 --- a/tooling/camel-spring-boot-dependencies/pom.xml +++ b/tooling/camel-spring-boot-dependencies/pom.xml @@ -4331,7 +4331,7 @@ <dependency> <groupId>org.dizitart</groupId> <artifactId>nitrite</artifactId> - <version>3.4.2</version> + <version>3.4.3</version> </dependency> <dependency> <groupId>org.eclipse.rdf4j</groupId>