This is an automated email from the ASF dual-hosted git repository. acosentino 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 de0c9ab [create-pull-request] automated change de0c9ab is described below commit de0c9ab0c611ad17f29ae4f40f0630188714a5b6 Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> AuthorDate: Sat Jun 6 01:11:58 2020 +0000 [create-pull-request] automated change --- .../camel/springboot/catalog/components/bean-validator.json | 3 ++- .../src/main/docs/bean-validator-starter.adoc | 4 ++-- .../springboot/BeanValidatorComponentConfiguration.java | 13 +++++++++++++ components-starter/camel-corda-starter/pom.xml | 12 ------------ components-starter/camel-iota-starter/pom.xml | 12 ------------ docs/modules/ROOT/pages/bean-validator-starter.adoc | 4 ++-- tooling/camel-spring-boot-dependencies/pom.xml | 2 +- 7 files changed, 20 insertions(+), 30 deletions(-) diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/bean-validator.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/bean-validator.json index 01e9c20..0bd47a0 100644 --- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/bean-validator.json +++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/bean-validator.json @@ -27,7 +27,8 @@ "constraintValidatorFactory": { "kind": "property", "displayName": "Constraint Validator Factory", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "javax.validation.ConstraintValidatorFactory", "deprecated": false, "secret": false, "description": "To use a custom ConstraintValidatorFactory" }, "messageInterpolator": { "kind": "property", "displayName": "Message Interpolator", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "javax.validation.MessageInterpolator", "deprecated": false, "secret": false, "description": "To use a custom MessageInterpolator" }, "traversableResolver": { "kind": "property", "displayName": "Traversable Resolver", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "javax.validation.TraversableResolver", "deprecated": false, "secret": false, "description": "To use a custom TraversableResolver" }, - "validationProviderResolver": { "kind": "property", "displayName": "Validation Provider Resolver", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "javax.validation.ValidationProviderResolver", "deprecated": false, "secret": false, "description": "To use a a custom ValidationProviderResolver" } + "validationProviderResolver": { "kind": "property", "displayName": "Validation Provider Resolver", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "javax.validation.ValidationProviderResolver", "deprecated": false, "secret": false, "description": "To use a a custom ValidationProviderResolver" }, + "validatorFactory": { "kind": "property", "displayName": "Validator Factory", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "javax.validation.ValidatorFactory", "deprecated": false, "secret": false, "description": "To use a custom ValidatorFactory" } }, "properties": { "label": { "kind": "path", "displayName": "Label", "group": "producer", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "secret": false, "description": "Where label is an arbitrary text value describing the endpoint" }, diff --git a/components-starter/camel-bean-validator-starter/src/main/docs/bean-validator-starter.adoc b/components-starter/camel-bean-validator-starter/src/main/docs/bean-validator-starter.adoc index a975bfc..1bc7e21 100644 --- a/components-starter/camel-bean-validator-starter/src/main/docs/bean-validator-starter.adoc +++ b/components-starter/camel-bean-validator-starter/src/main/docs/bean-validator-starter.adoc @@ -17,7 +17,7 @@ When using bean-validator with Spring Boot make sure to use the following Maven ---- -The component supports 8 options, which are listed below. +The component supports 9 options, which are listed below. @@ -32,6 +32,6 @@ The component supports 8 options, which are listed below. | *camel.component.bean-validator.message-interpolator* | To use a custom MessageInterpolator. The option is a javax.validation.MessageInterpolator type. | | String | *camel.component.bean-validator.traversable-resolver* | To use a custom TraversableResolver. The option is a javax.validation.TraversableResolver type. | | String | *camel.component.bean-validator.validation-provider-resolver* | To use a a custom ValidationProviderResolver. The option is a javax.validation.ValidationProviderResolver type. | | String +| *camel.component.bean-validator.validator-factory* | To use a custom ValidatorFactory. The option is a javax.validation.ValidatorFactory type. | | String |=== - // spring-boot-auto-configure options: END diff --git a/components-starter/camel-bean-validator-starter/src/main/java/org/apache/camel/component/bean/validator/springboot/BeanValidatorComponentConfiguration.java b/components-starter/camel-bean-validator-starter/src/main/java/org/apache/camel/component/bean/validator/springboot/BeanValidatorComponentConfiguration.java index 9fa5dbd..1a7109a 100644 --- a/components-starter/camel-bean-validator-starter/src/main/java/org/apache/camel/component/bean/validator/springboot/BeanValidatorComponentConfiguration.java +++ b/components-starter/camel-bean-validator-starter/src/main/java/org/apache/camel/component/bean/validator/springboot/BeanValidatorComponentConfiguration.java @@ -76,6 +76,11 @@ public class BeanValidatorComponentConfiguration * javax.validation.ValidationProviderResolver type. */ private String validationProviderResolver; + /** + * To use a custom ValidatorFactory. The option is a + * javax.validation.ValidatorFactory type. + */ + private String validatorFactory; public Boolean getIgnoreXmlConfiguration() { return ignoreXmlConfiguration; @@ -132,4 +137,12 @@ public class BeanValidatorComponentConfiguration public void setValidationProviderResolver(String validationProviderResolver) { this.validationProviderResolver = validationProviderResolver; } + + public String getValidatorFactory() { + return validatorFactory; + } + + public void setValidatorFactory(String validatorFactory) { + this.validatorFactory = validatorFactory; + } } \ No newline at end of file diff --git a/components-starter/camel-corda-starter/pom.xml b/components-starter/camel-corda-starter/pom.xml index 9ae10f6..8559a29 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/components-starter/camel-iota-starter/pom.xml b/components-starter/camel-iota-starter/pom.xml index 45084aa..0ccac9f 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/docs/modules/ROOT/pages/bean-validator-starter.adoc b/docs/modules/ROOT/pages/bean-validator-starter.adoc index a975bfc..1bc7e21 100644 --- a/docs/modules/ROOT/pages/bean-validator-starter.adoc +++ b/docs/modules/ROOT/pages/bean-validator-starter.adoc @@ -17,7 +17,7 @@ When using bean-validator with Spring Boot make sure to use the following Maven ---- -The component supports 8 options, which are listed below. +The component supports 9 options, which are listed below. @@ -32,6 +32,6 @@ The component supports 8 options, which are listed below. | *camel.component.bean-validator.message-interpolator* | To use a custom MessageInterpolator. The option is a javax.validation.MessageInterpolator type. | | String | *camel.component.bean-validator.traversable-resolver* | To use a custom TraversableResolver. The option is a javax.validation.TraversableResolver type. | | String | *camel.component.bean-validator.validation-provider-resolver* | To use a a custom ValidationProviderResolver. The option is a javax.validation.ValidationProviderResolver type. | | String +| *camel.component.bean-validator.validator-factory* | To use a custom ValidatorFactory. The option is a javax.validation.ValidatorFactory type. | | String |=== - // spring-boot-auto-configure options: END diff --git a/tooling/camel-spring-boot-dependencies/pom.xml b/tooling/camel-spring-boot-dependencies/pom.xml index 6910de8..72dced4 100644 --- a/tooling/camel-spring-boot-dependencies/pom.xml +++ b/tooling/camel-spring-boot-dependencies/pom.xml @@ -4149,7 +4149,7 @@ <dependency> <groupId>org.dizitart</groupId> <artifactId>nitrite</artifactId> - <version>3.4.1</version> + <version>3.4.2</version> </dependency> <dependency> <groupId>org.eclipse.rdf4j</groupId>