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 2408af3 Regen 2408af3 is described below commit 2408af3fa04e2f77a604917710363bce59661317 Author: Claus Ibsen <claus.ib...@gmail.com> AuthorDate: Mon Feb 17 14:38:49 2020 +0100 Regen --- .../apache/camel/springboot/catalog/components/aws2-ses.json | 2 +- components-starter/README.adoc | 5 ++++- .../src/main/docs/aws2-ses-starter.adoc | 3 +-- .../aws2/ses/springboot/Ses2ComponentConfiguration.java | 8 ++++---- components-starter/camel-corda-starter/pom.xml | 12 ------------ .../camel/spring/boot/CamelConfigurationProperties.java | 10 ++++++++++ docs/modules/ROOT/pages/aws2-ses-starter.adoc | 3 +-- docs/modules/ROOT/pages/list.adoc | 5 ++++- 8 files changed, 25 insertions(+), 23 deletions(-) diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-ses.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-ses.json index 85bc450..8f5a2bc 100644 --- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-ses.json +++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-ses.json @@ -33,7 +33,7 @@ "proxyHost": { "kind": "parameter", "displayName": "Proxy Host", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.ses.Ses2Configuration", "configurationField": "configuration", "description": "To define a proxy host when instantiating the SES client" }, "proxyPort": { "kind": "parameter", "displayName": "Proxy Port", "group": "producer", "label": "", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.ses.Ses2Configuration", "configurationField": "configuration", "description": "To define a proxy port when instantiating the SES client" }, "proxyProtocol": { "kind": "parameter", "displayName": "Proxy Protocol", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "software.amazon.awssdk.core.Protocol", "enum": [ "HTTP", "HTTPS" ], "deprecated": false, "secret": false, "defaultValue": "HTTPS", "configurationClass": "org.apache.camel.component.aws2.ses.Ses2Configuration", "configurationField": "configuration", "description": "To define a proxy protocol when instantiating the SES client" }, - "region": { "kind": "parameter", "displayName": "Region", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.ses.Ses2Configuration", "configurationField": "configuration", "description": "The region in which SES client needs to work. When using this parameter, the configuration will expect the capitalized name of the region (for example AP_E [...] + "region": { "kind": "parameter", "displayName": "Region", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.ses.Ses2Configuration", "configurationField": "configuration", "description": "The region in which ECS client needs to work. When using this parameter, the configuration will expect the lowercase name of the region (for example ap-eas [...] "replyToAddresses": { "kind": "parameter", "displayName": "Reply To Addresses", "group": "producer", "label": "", "required": false, "type": "array", "javaType": "java.util.List<java.lang.String>", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.ses.Ses2Configuration", "configurationField": "configuration", "description": "List of reply-to email address(es) for the message, override it using 'CamelAwsSesReplyToAddresses' header." }, "returnPath": { "kind": "parameter", "displayName": "Return Path", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.ses.Ses2Configuration", "configurationField": "configuration", "description": "The email address to which bounce notifications are to be forwarded, override it using 'CamelAwsSesReturnPath' header." }, "subject": { "kind": "parameter", "displayName": "Subject", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.ses.Ses2Configuration", "configurationField": "configuration", "description": "The subject which is used if the message header 'CamelAwsSesSubject' is not present." }, diff --git a/components-starter/README.adoc b/components-starter/README.adoc index 0a5645f..60e3aa9 100644 --- a/components-starter/README.adoc +++ b/components-starter/README.adoc @@ -5,7 +5,7 @@ Apache Camel Spring Boot supports the following Camel artifacts as Spring Boot S == Camel Components // components: START -Number of Camel components: 322 in 256 JAR artifacts (1 deprecated) +Number of Camel components: 323 in 257 JAR artifacts (1 deprecated) [width="100%",cols="4,1,5",options="header"] |=== @@ -98,6 +98,9 @@ Number of Camel components: 322 in 256 JAR artifacts (1 deprecated) | link:https://camel.apache.org/components/latest/aws2-sns-component.html[AWS 2 Simple Notification System] (camel-aws2-sns-starter) + `aws2-sns:topicNameOrArn` | 3.1 | The aws2-sns component is used for sending messages to an Amazon Simple Notification Topic. +| link:https://camel.apache.org/components/latest/aws2-sqs-component.html[AWS 2 Simple Queue Service] (camel-aws2-sqs-starter) + +`aws2-sqs:queueNameOrArn` | 3.1 | The aws2-sqs component is used for sending and receiving messages to Amazon's SQS service. + | link:https://camel.apache.org/components/latest/aws2-translate-component.html[AWS 2 Translate] (camel-aws2-translate-starter) + `aws2-translate:label` | 3.1 | The aws2-translate component is used for managing Amazon Translate diff --git a/components-starter/camel-aws2-ses-starter/src/main/docs/aws2-ses-starter.adoc b/components-starter/camel-aws2-ses-starter/src/main/docs/aws2-ses-starter.adoc index 431dfa0..8b15c30 100644 --- a/components-starter/camel-aws2-ses-starter/src/main/docs/aws2-ses-starter.adoc +++ b/components-starter/camel-aws2-ses-starter/src/main/docs/aws2-ses-starter.adoc @@ -32,7 +32,7 @@ The component supports 18 options, which are listed below. | *camel.component.aws2-ses.configuration.proxy-host* | To define a proxy host when instantiating the SES client | | String | *camel.component.aws2-ses.configuration.proxy-port* | To define a proxy port when instantiating the SES client | | Integer | *camel.component.aws2-ses.configuration.proxy-protocol* | To define a proxy protocol when instantiating the SES client | | Protocol -| *camel.component.aws2-ses.configuration.region* | The region in which SES client needs to work. When using this parameter, the configuration will expect the capitalized name of the region (for example AP_EAST_1) You'll need to use the name Regions.EU_WEST_1.name() | | String +| *camel.component.aws2-ses.configuration.region* | The region in which ECS client needs to work. When using this parameter, the configuration will expect the lowercase name of the region (for example ap-east-1) You'll need to use the name Region.EU_WEST_1.id() | | String | *camel.component.aws2-ses.configuration.reply-to-addresses* | List of reply-to email address(es) for the message, override it using 'CamelAwsSesReplyToAddresses' header. | | List | *camel.component.aws2-ses.configuration.return-path* | The email address to which bounce notifications are to be forwarded, override it using 'CamelAwsSesReturnPath' header. | | String | *camel.component.aws2-ses.configuration.secret-key* | Amazon AWS Secret Key | | String @@ -43,5 +43,4 @@ The component supports 18 options, which are listed below. | *camel.component.aws2-ses.region* | The region in which SES client needs to work | | String | *camel.component.aws2-ses.secret-key* | Amazon AWS Secret Key | | String |=== - // spring-boot-auto-configure options: END diff --git a/components-starter/camel-aws2-ses-starter/src/main/java/org/apache/camel/component/aws2/ses/springboot/Ses2ComponentConfiguration.java b/components-starter/camel-aws2-ses-starter/src/main/java/org/apache/camel/component/aws2/ses/springboot/Ses2ComponentConfiguration.java index 01180e5..79c4406 100644 --- a/components-starter/camel-aws2-ses-starter/src/main/java/org/apache/camel/component/aws2/ses/springboot/Ses2ComponentConfiguration.java +++ b/components-starter/camel-aws2-ses-starter/src/main/java/org/apache/camel/component/aws2/ses/springboot/Ses2ComponentConfiguration.java @@ -148,10 +148,10 @@ public class Ses2ComponentConfiguration */ private Protocol proxyProtocol = Protocol.HTTPS; /** - * The region in which SES client needs to work. When using this - * parameter, the configuration will expect the capitalized name of the - * region (for example AP_EAST_1) You'll need to use the name - * Regions.EU_WEST_1.name() + * The region in which ECS client needs to work. When using this + * parameter, the configuration will expect the lowercase name of the + * region (for example ap-east-1) You'll need to use the name + * Region.EU_WEST_1.id() */ private String region; /** diff --git a/components-starter/camel-corda-starter/pom.xml b/components-starter/camel-corda-starter/pom.xml index d834111..47eae69 100644 --- a/components-starter/camel-corda-starter/pom.xml +++ b/components-starter/camel-corda-starter/pom.xml @@ -38,18 +38,6 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-corda</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/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelConfigurationProperties.java b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelConfigurationProperties.java index 7242257..56caf08 100644 --- a/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelConfigurationProperties.java +++ b/core/camel-spring-boot/src/main/java/org/apache/camel/spring/boot/CamelConfigurationProperties.java @@ -390,6 +390,16 @@ public class CamelConfigurationProperties extends DefaultConfigurationProperties private boolean useBreadcrumb; /** + * Whether its allowed to add new routes after Camel has been started. + * This is enabled by default. + * Setting this to false allows Camel to do some internal optimizations to reduce memory footprint. + * <p/> + * This should only be done on a JVM with a single Camel application (microservice like camel-main, camel-quarkus, camel-spring-boot). + * As this affects the entire JVM where Camel JARs are on the classpath. + */ + private boolean allowAddingNewRoutes = true; + + /** * Sets the JMX statistics level * The level can be set to Extended to gather additional information * diff --git a/docs/modules/ROOT/pages/aws2-ses-starter.adoc b/docs/modules/ROOT/pages/aws2-ses-starter.adoc index 431dfa0..8b15c30 100644 --- a/docs/modules/ROOT/pages/aws2-ses-starter.adoc +++ b/docs/modules/ROOT/pages/aws2-ses-starter.adoc @@ -32,7 +32,7 @@ The component supports 18 options, which are listed below. | *camel.component.aws2-ses.configuration.proxy-host* | To define a proxy host when instantiating the SES client | | String | *camel.component.aws2-ses.configuration.proxy-port* | To define a proxy port when instantiating the SES client | | Integer | *camel.component.aws2-ses.configuration.proxy-protocol* | To define a proxy protocol when instantiating the SES client | | Protocol -| *camel.component.aws2-ses.configuration.region* | The region in which SES client needs to work. When using this parameter, the configuration will expect the capitalized name of the region (for example AP_EAST_1) You'll need to use the name Regions.EU_WEST_1.name() | | String +| *camel.component.aws2-ses.configuration.region* | The region in which ECS client needs to work. When using this parameter, the configuration will expect the lowercase name of the region (for example ap-east-1) You'll need to use the name Region.EU_WEST_1.id() | | String | *camel.component.aws2-ses.configuration.reply-to-addresses* | List of reply-to email address(es) for the message, override it using 'CamelAwsSesReplyToAddresses' header. | | List | *camel.component.aws2-ses.configuration.return-path* | The email address to which bounce notifications are to be forwarded, override it using 'CamelAwsSesReturnPath' header. | | String | *camel.component.aws2-ses.configuration.secret-key* | Amazon AWS Secret Key | | String @@ -43,5 +43,4 @@ The component supports 18 options, which are listed below. | *camel.component.aws2-ses.region* | The region in which SES client needs to work | | String | *camel.component.aws2-ses.secret-key* | Amazon AWS Secret Key | | String |=== - // spring-boot-auto-configure options: END diff --git a/docs/modules/ROOT/pages/list.adoc b/docs/modules/ROOT/pages/list.adoc index 0a5645f..60e3aa9 100644 --- a/docs/modules/ROOT/pages/list.adoc +++ b/docs/modules/ROOT/pages/list.adoc @@ -5,7 +5,7 @@ Apache Camel Spring Boot supports the following Camel artifacts as Spring Boot S == Camel Components // components: START -Number of Camel components: 322 in 256 JAR artifacts (1 deprecated) +Number of Camel components: 323 in 257 JAR artifacts (1 deprecated) [width="100%",cols="4,1,5",options="header"] |=== @@ -98,6 +98,9 @@ Number of Camel components: 322 in 256 JAR artifacts (1 deprecated) | link:https://camel.apache.org/components/latest/aws2-sns-component.html[AWS 2 Simple Notification System] (camel-aws2-sns-starter) + `aws2-sns:topicNameOrArn` | 3.1 | The aws2-sns component is used for sending messages to an Amazon Simple Notification Topic. +| link:https://camel.apache.org/components/latest/aws2-sqs-component.html[AWS 2 Simple Queue Service] (camel-aws2-sqs-starter) + +`aws2-sqs:queueNameOrArn` | 3.1 | The aws2-sqs component is used for sending and receiving messages to Amazon's SQS service. + | link:https://camel.apache.org/components/latest/aws2-translate-component.html[AWS 2 Translate] (camel-aws2-translate-starter) + `aws2-translate:label` | 3.1 | The aws2-translate component is used for managing Amazon Translate