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 0b5e717 Regen
0b5e717 is described below
commit 0b5e71746e6ac45a57babd3a3f72ee5e69c4be7f
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Fri Apr 3 09:34:38 2020 +0200
Regen
---
.../camel/springboot/catalog/dataformats/jaxb.json | 1 +
components-starter/camel-corda-starter/pom.xml | 12 ++++++++++++
.../src/main/docs/jaxb-starter.adoc | 4 ++--
.../jaxb/springboot/JaxbDataFormatConfiguration.java | 13 +++++++++++++
components-starter/camel-spring-boot-starter/pom.xml | 16 ++++++++++++++++
.../camel-spring-cloud-consul-starter/pom.xml | 20 ++++++++++++++++++++
.../camel-spring-cloud-netflix-starter/pom.xml | 20 ++++++++++++++++++++
.../camel-spring-cloud-starter/pom.xml | 20 ++++++++++++++++++++
.../camel-spring-cloud-zookeeper-starter/pom.xml | 20 ++++++++++++++++++++
docs/modules/ROOT/pages/jaxb-starter.adoc | 4 ++--
10 files changed, 126 insertions(+), 4 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/jaxb.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/jaxb.json
index 24c68b7..4f840ae 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/jaxb.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/jaxb.json
@@ -17,6 +17,7 @@
},
"properties": {
"contextPath": { "kind": "attribute", "displayName": "Context Path",
"required": true, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "secret": false, "description": "Package name where your
JAXB classes are located." },
+ "contextPathIsClassName": { "kind": "attribute", "displayName": "Context
Path Is Class Name", "required": false, "type": "boolean", "javaType":
"java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue":
false, "description": "This can be set to true to mark that the contextPath is
referring to a classname and not a package name." },
"schema": { "kind": "attribute", "displayName": "Schema", "required":
false, "type": "string", "javaType": "java.lang.String", "deprecated": false,
"secret": false, "description": "To validate against an existing schema. Your
can use the prefix classpath:, file: or http: to specify how the resource
should by resolved. You can separate multiple schema files by using the ','
character." },
"schemaSeverityLevel": { "kind": "attribute", "displayName": "Schema
Severity Level", "required": false, "type": "enum", "javaType":
"java.lang.Integer", "enum": [ "0", "1", "2" ], "deprecated": false, "secret":
false, "defaultValue": "0", "description": "Sets the schema severity level to
use when validating against a schema. This level determines the minimum
severity error that triggers JAXB to stop continue parsing. The default value
of 0 (warning) means that any error (warning, er [...]
"prettyPrint": { "kind": "attribute", "displayName": "Pretty Print",
"required": false, "type": "boolean", "javaType": "java.lang.Boolean",
"deprecated": false, "secret": false, "defaultValue": false, "description": "To
enable pretty printing output nicely formatted. Is by default false." },
diff --git a/components-starter/camel-corda-starter/pom.xml
b/components-starter/camel-corda-starter/pom.xml
index 61d6d32..cba8670 100644
--- a/components-starter/camel-corda-starter/pom.xml
+++ b/components-starter/camel-corda-starter/pom.xml
@@ -38,6 +38,18 @@
<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-jaxb-starter/src/main/docs/jaxb-starter.adoc
b/components-starter/camel-jaxb-starter/src/main/docs/jaxb-starter.adoc
index b26462a..c4ecfdd 100644
--- a/components-starter/camel-jaxb-starter/src/main/docs/jaxb-starter.adoc
+++ b/components-starter/camel-jaxb-starter/src/main/docs/jaxb-starter.adoc
@@ -17,7 +17,7 @@ When using jaxb with Spring Boot make sure to use the
following Maven dependency
----
-The component supports 19 options, which are listed below.
+The component supports 20 options, which are listed below.
@@ -26,6 +26,7 @@ The component supports 19 options, which are listed below.
| Name | Description | Default | Type
| *camel.dataformat.jaxb.content-type-header* | Whether the data format should
set the Content-Type header with the type from the data format if the data
format is capable of doing so. For example application/xml for data formats
marshalling to XML, or application/json for data formats marshalling to JSon
etc. | false | Boolean
| *camel.dataformat.jaxb.context-path* | Package name where your JAXB classes
are located. | | String
+| *camel.dataformat.jaxb.context-path-is-class-name* | This can be set to true
to mark that the contextPath is referring to a classname and not a package
name. | false | Boolean
| *camel.dataformat.jaxb.enabled* | Whether to enable auto configuration of
the jaxb data format. This is enabled by default. | | Boolean
| *camel.dataformat.jaxb.encoding* | To overrule and use a specific encoding |
| String
| *camel.dataformat.jaxb.filter-non-xml-chars* | To ignore non xml
characheters and replace them with an empty space. | false | Boolean
@@ -44,5 +45,4 @@ The component supports 19 options, which are listed below.
| *camel.dataformat.jaxb.schema-severity-level* | Sets the schema severity
level to use when validating against a schema. This level determines the
minimum severity error that triggers JAXB to stop continue parsing. The default
value of 0 (warning) means that any error (warning, error or fatal error) will
trigger JAXB to stop. There are the following three levels: 0=warning, 1=error,
2=fatal error. | 0 | Integer
| *camel.dataformat.jaxb.xml-stream-writer-wrapper* | To use a custom xml
stream writer. | | String
|===
-
// spring-boot-auto-configure options: END
diff --git
a/components-starter/camel-jaxb-starter/src/main/java/org/apache/camel/converter/jaxb/springboot/JaxbDataFormatConfiguration.java
b/components-starter/camel-jaxb-starter/src/main/java/org/apache/camel/converter/jaxb/springboot/JaxbDataFormatConfiguration.java
index a277c35..0a40dbd 100644
---
a/components-starter/camel-jaxb-starter/src/main/java/org/apache/camel/converter/jaxb/springboot/JaxbDataFormatConfiguration.java
+++
b/components-starter/camel-jaxb-starter/src/main/java/org/apache/camel/converter/jaxb/springboot/JaxbDataFormatConfiguration.java
@@ -42,6 +42,11 @@ public class JaxbDataFormatConfiguration
*/
private String contextPath;
/**
+ * This can be set to true to mark that the contextPath is referring to a
+ * classname and not a package name.
+ */
+ private Boolean contextPathIsClassName = false;
+ /**
* To validate against an existing schema. Your can use the prefix
* classpath:, file: or http: to specify how the resource should by
* resolved. You can separate multiple schema files by using the ','
@@ -145,6 +150,14 @@ public class JaxbDataFormatConfiguration
this.contextPath = contextPath;
}
+ public Boolean getContextPathIsClassName() {
+ return contextPathIsClassName;
+ }
+
+ public void setContextPathIsClassName(Boolean contextPathIsClassName) {
+ this.contextPathIsClassName = contextPathIsClassName;
+ }
+
public String getSchema() {
return schema;
}
diff --git a/components-starter/camel-spring-boot-starter/pom.xml
b/components-starter/camel-spring-boot-starter/pom.xml
index 5760e35..c1ca9d2 100644
--- a/components-starter/camel-spring-boot-starter/pom.xml
+++ b/components-starter/camel-spring-boot-starter/pom.xml
@@ -48,6 +48,22 @@
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</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-spring-cloud-consul-starter/pom.xml
b/components-starter/camel-spring-cloud-consul-starter/pom.xml
index 65392d9..31e9a5e 100644
--- a/components-starter/camel-spring-cloud-consul-starter/pom.xml
+++ b/components-starter/camel-spring-cloud-consul-starter/pom.xml
@@ -38,6 +38,26 @@
<groupId>org.apache.camel.springboot</groupId>
<artifactId>camel-spring-cloud-consul</artifactId>
<version>${project.version}</version>
+ <!--START OF GENERATED CODE-->
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</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>
<!--START OF GENERATED CODE-->
<dependency>
diff --git a/components-starter/camel-spring-cloud-netflix-starter/pom.xml
b/components-starter/camel-spring-cloud-netflix-starter/pom.xml
index 6792135..7b038ab 100644
--- a/components-starter/camel-spring-cloud-netflix-starter/pom.xml
+++ b/components-starter/camel-spring-cloud-netflix-starter/pom.xml
@@ -38,6 +38,26 @@
<groupId>org.apache.camel.springboot</groupId>
<artifactId>camel-spring-cloud-netflix</artifactId>
<version>${project.version}</version>
+ <!--START OF GENERATED CODE-->
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</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>
<!--START OF GENERATED CODE-->
<dependency>
diff --git a/components-starter/camel-spring-cloud-starter/pom.xml
b/components-starter/camel-spring-cloud-starter/pom.xml
index ce02d1e..480eeec 100644
--- a/components-starter/camel-spring-cloud-starter/pom.xml
+++ b/components-starter/camel-spring-cloud-starter/pom.xml
@@ -38,6 +38,26 @@
<groupId>org.apache.camel.springboot</groupId>
<artifactId>camel-spring-cloud</artifactId>
<version>${project.version}</version>
+ <!--START OF GENERATED CODE-->
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</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>
<!--START OF GENERATED CODE-->
<dependency>
diff --git a/components-starter/camel-spring-cloud-zookeeper-starter/pom.xml
b/components-starter/camel-spring-cloud-zookeeper-starter/pom.xml
index e70dbf9..5f3927a 100644
--- a/components-starter/camel-spring-cloud-zookeeper-starter/pom.xml
+++ b/components-starter/camel-spring-cloud-zookeeper-starter/pom.xml
@@ -38,6 +38,26 @@
<groupId>org.apache.camel.springboot</groupId>
<artifactId>camel-spring-cloud-zookeeper</artifactId>
<version>${project.version}</version>
+ <!--START OF GENERATED CODE-->
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</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>
<!--START OF GENERATED CODE-->
<dependency>
diff --git a/docs/modules/ROOT/pages/jaxb-starter.adoc
b/docs/modules/ROOT/pages/jaxb-starter.adoc
index b26462a..c4ecfdd 100644
--- a/docs/modules/ROOT/pages/jaxb-starter.adoc
+++ b/docs/modules/ROOT/pages/jaxb-starter.adoc
@@ -17,7 +17,7 @@ When using jaxb with Spring Boot make sure to use the
following Maven dependency
----
-The component supports 19 options, which are listed below.
+The component supports 20 options, which are listed below.
@@ -26,6 +26,7 @@ The component supports 19 options, which are listed below.
| Name | Description | Default | Type
| *camel.dataformat.jaxb.content-type-header* | Whether the data format should
set the Content-Type header with the type from the data format if the data
format is capable of doing so. For example application/xml for data formats
marshalling to XML, or application/json for data formats marshalling to JSon
etc. | false | Boolean
| *camel.dataformat.jaxb.context-path* | Package name where your JAXB classes
are located. | | String
+| *camel.dataformat.jaxb.context-path-is-class-name* | This can be set to true
to mark that the contextPath is referring to a classname and not a package
name. | false | Boolean
| *camel.dataformat.jaxb.enabled* | Whether to enable auto configuration of
the jaxb data format. This is enabled by default. | | Boolean
| *camel.dataformat.jaxb.encoding* | To overrule and use a specific encoding |
| String
| *camel.dataformat.jaxb.filter-non-xml-chars* | To ignore non xml
characheters and replace them with an empty space. | false | Boolean
@@ -44,5 +45,4 @@ The component supports 19 options, which are listed below.
| *camel.dataformat.jaxb.schema-severity-level* | Sets the schema severity
level to use when validating against a schema. This level determines the
minimum severity error that triggers JAXB to stop continue parsing. The default
value of 0 (warning) means that any error (warning, error or fatal error) will
trigger JAXB to stop. There are the following three levels: 0=warning, 1=error,
2=fatal error. | 0 | Integer
| *camel.dataformat.jaxb.xml-stream-writer-wrapper* | To use a custom xml
stream writer. | | String
|===
-
// spring-boot-auto-configure options: END
