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
commit c8dc72341c7645970eb473d901d2da79ea9ed179 Author: Andrea Cosentino <[email protected]> AuthorDate: Tue May 5 16:37:04 2020 +0200 Fixed build after camel-dependencies add and regen --- .../camel/springboot/catalog/components/freemarker.json | 1 + .../src/main/docs/freemarker-starter.adoc | 4 ++-- .../springboot/FreemarkerComponentConfiguration.java | 15 +++++++++++++++ components-starter/camel-kubernetes-starter/pom.xml | 8 ++++++++ pom.xml | 2 ++ .../org/apache/camel/itest/springboot/CamelJpaTest.java | 2 +- 6 files changed, 29 insertions(+), 3 deletions(-) diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/freemarker.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/freemarker.json index 7c83f3d..08fdcee 100644 --- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/freemarker.json +++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/freemarker.json @@ -21,6 +21,7 @@ "lenientProperties": false }, "componentProperties": { + "allowTemplateFromHeader": { "kind": "property", "displayName": "Allow Template From Header", "group": "producer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "false", "description": "Whether to allow to use resource template from header or not (default false). Enabling this allows to specify dynamic templates via message header. However this can be seen as a potential security vulnerability if the he [...] "lazyStartProducer": { "kind": "property", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": 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 starting and cause the r [...] "basicPropertyBinding": { "kind": "property", "displayName": "Basic Property Binding", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities" }, "configuration": { "kind": "property", "displayName": "Configuration", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "freemarker.template.Configuration", "deprecated": false, "secret": false, "description": "To use an existing freemarker.template.Configuration instance as the configuration." } diff --git a/components-starter/camel-freemarker-starter/src/main/docs/freemarker-starter.adoc b/components-starter/camel-freemarker-starter/src/main/docs/freemarker-starter.adoc index 1a047bf..189b15e 100644 --- a/components-starter/camel-freemarker-starter/src/main/docs/freemarker-starter.adoc +++ b/components-starter/camel-freemarker-starter/src/main/docs/freemarker-starter.adoc @@ -17,17 +17,17 @@ When using freemarker with Spring Boot make sure to use the following Maven depe ---- -The component supports 4 options, which are listed below. +The component supports 5 options, which are listed below. [width="100%",cols="2,5,^1,2",options="header"] |=== | Name | Description | Default | Type +| *camel.component.freemarker.allow-template-from-header* | Whether to allow to use resource template from header or not (default false). Enabling this allows to specify dynamic templates via message header. However this can be seen as a potential security vulnerability if the header is coming from a malicious user, so use this with care. | false | Boolean | *camel.component.freemarker.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean | *camel.component.freemarker.configuration* | To use an existing freemarker.template.Configuration instance as the configuration. The option is a freemarker.template.Configuration type. | | String | *camel.component.freemarker.enabled* | Whether to enable auto configuration of the freemarker component. This is enabled by default. | | Boolean | *camel.component.freemarker.lazy-start-producer* | 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 starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed [...] |=== - // spring-boot-auto-configure options: END diff --git a/components-starter/camel-freemarker-starter/src/main/java/org/apache/camel/component/freemarker/springboot/FreemarkerComponentConfiguration.java b/components-starter/camel-freemarker-starter/src/main/java/org/apache/camel/component/freemarker/springboot/FreemarkerComponentConfiguration.java index 89a7bbc..61d07b5 100644 --- a/components-starter/camel-freemarker-starter/src/main/java/org/apache/camel/component/freemarker/springboot/FreemarkerComponentConfiguration.java +++ b/components-starter/camel-freemarker-starter/src/main/java/org/apache/camel/component/freemarker/springboot/FreemarkerComponentConfiguration.java @@ -37,6 +37,13 @@ public class FreemarkerComponentConfiguration */ private Boolean enabled; /** + * Whether to allow to use resource template from header or not (default + * false). Enabling this allows to specify dynamic templates via message + * header. However this can be seen as a potential security vulnerability if + * the header is coming from a malicious user, so use this with care. + */ + private Boolean allowTemplateFromHeader = false; + /** * 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 starting @@ -58,6 +65,14 @@ public class FreemarkerComponentConfiguration */ private String configuration; + public Boolean getAllowTemplateFromHeader() { + return allowTemplateFromHeader; + } + + public void setAllowTemplateFromHeader(Boolean allowTemplateFromHeader) { + this.allowTemplateFromHeader = allowTemplateFromHeader; + } + public Boolean getLazyStartProducer() { return lazyStartProducer; } diff --git a/components-starter/camel-kubernetes-starter/pom.xml b/components-starter/camel-kubernetes-starter/pom.xml index 401a191..02fd826 100644 --- a/components-starter/camel-kubernetes-starter/pom.xml +++ b/components-starter/camel-kubernetes-starter/pom.xml @@ -38,6 +38,14 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-kubernetes</artifactId> <version>${camel-version}</version> + <!--START OF GENERATED CODE--> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + </exclusions> + <!--END OF GENERATED CODE--> </dependency> <dependency> <groupId>org.hibernate.validator</groupId> diff --git a/pom.xml b/pom.xml index 9286d78..165a1d1 100644 --- a/pom.xml +++ b/pom.xml @@ -119,6 +119,7 @@ <arquillian-container-se-managed-version>1.0.2.Final</arquillian-container-se-managed-version> <arquillian-version>1.6.0.Final</arquillian-version> <asciidoctorj-version>2.1.0</asciidoctorj-version> + <avro-version>1.8.1</avro-version> <glassfish-jaxb-runtime-version>${jakarta-jaxb-version}</glassfish-jaxb-runtime-version> <groovy-version>3.0.3</groovy-version> <hadoop2-version>2.7.4</hadoop2-version> @@ -131,6 +132,7 @@ <maven-surefire-plugin-version>3.0.0-M4</maven-surefire-plugin-version> <mycila-license-version>3.0</mycila-license-version> <reactor-version>3.2.15.RELEASE</reactor-version> + <roaster-version>2.20.1.Final</roaster-version> <spring-cloud-commons-version>2.2.2.RELEASE</spring-cloud-commons-version> <spring-cloud-consul-version>2.2.2.RELEASE</spring-cloud-consul-version> <spring-cloud-netflix-version>2.2.2.RELEASE</spring-cloud-netflix-version> diff --git a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelJpaTest.java b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelJpaTest.java index e0e49aa..131d415 100644 --- a/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelJpaTest.java +++ b/tests/camel-itest-spring-boot/src/test/java/org/apache/camel/itest/springboot/CamelJpaTest.java @@ -36,7 +36,7 @@ public class CamelJpaTest extends AbstractSpringBootTestSupport { public static ITestConfig createTestConfig() { return new ITestConfigBuilder() .module(inferModuleName(CamelJpaTest.class)) - .dependency("org.apache.openjpa:openjpa:" + DependencyResolver.resolveParentProperty("${openjpa-version}")) + .dependency("org.apache.openjpa:openjpa:3.1.1") .dependency("org.apache.openjpa:openjpa-persistence-jdbc") .exclusion("org.apache.geronimo.specs:geronimo-jpa_2.0_spec") // Exclude tests which require build time enhancement of @Entity annotated classes
