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 61f229e [create-pull-request] automated change
61f229e is described below
commit 61f229e5e320871cdcec8c835db6bb4c16613bc8
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Fri Oct 16 01:12:25 2020 +0000
[create-pull-request] automated change
---
.../org/apache/camel/springboot/catalog/components/couchbase.json | 2 +-
.../apache/camel/springboot/catalog/dataformats/json-johnzon.json | 2 +-
.../camel-johnzon-starter/src/main/docs/johnzon-starter.adoc | 2 +-
.../component/johnzon/springboot/JohnzonDataFormatConfiguration.java | 3 +--
docs/modules/ROOT/pages/johnzon-starter.adoc | 2 +-
tooling/camel-spring-boot-dependencies/pom.xml | 5 +++++
6 files changed, 10 insertions(+), 6 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/couchbase.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/couchbase.json
index 6ac06ce..a4dd789 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/couchbase.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/couchbase.json
@@ -30,7 +30,7 @@
"protocol": { "kind": "path", "displayName": "Protocol", "group":
"common", "label": "", "required": true, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "deprecationNote": "", "secret":
false, "description": "The protocol to use" },
"hostname": { "kind": "path", "displayName": "Hostname", "group":
"common", "label": "", "required": true, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "deprecationNote": "", "secret":
false, "description": "The hostname to use" },
"port": { "kind": "path", "displayName": "Port", "group": "common",
"label": "", "required": false, "type": "integer", "javaType": "int",
"deprecated": false, "secret": false, "defaultValue": 8091, "description": "The
port number to use" },
- "bucket": { "kind": "parameter", "displayName": "Bucket", "group":
"common", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "secret": false, "description": "The
bucket to use" },
+ "bucket": { "kind": "parameter", "displayName": "Bucket", "group":
"common", "label": "", "required": true, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "deprecationNote": "", "secret":
false, "description": "The bucket to use" },
"collection": { "kind": "parameter", "displayName": "Collection", "group":
"common", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "secret": false, "description": "The
collection to use" },
"key": { "kind": "parameter", "displayName": "Key", "group": "common",
"label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "secret": false, "description": "The
key to use" },
"scope": { "kind": "parameter", "displayName": "Scope", "group": "common",
"label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "secret": false, "description": "The
scope to use" },
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/json-johnzon.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/json-johnzon.json
index a25d6dd..130cd7a 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/json-johnzon.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats/json-johnzon.json
@@ -16,7 +16,7 @@
"modelJavaType": "org.apache.camel.model.dataformat.JsonDataFormat"
},
"properties": {
- "objectMapper": { "kind": "attribute", "displayName": "Object Mapper",
"required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "secret": false, "description": "Lookup and use the
existing ObjectMapper with the given id when using Jackson." },
+ "objectMapper": { "kind": "attribute", "displayName": "Mapper",
"required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "secret": false, "description": "Lookup and use the
existing Mapper with the given id." },
"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." },
"unmarshalTypeName": { "kind": "attribute", "displayName": "Unmarshal Type
Name", "required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "secret": false, "description": "Class name of the java
type to use when unmarshalling" }
}
diff --git
a/components-starter/camel-johnzon-starter/src/main/docs/johnzon-starter.adoc
b/components-starter/camel-johnzon-starter/src/main/docs/johnzon-starter.adoc
index a21fa86..e7ff16b 100644
---
a/components-starter/camel-johnzon-starter/src/main/docs/johnzon-starter.adoc
+++
b/components-starter/camel-johnzon-starter/src/main/docs/johnzon-starter.adoc
@@ -25,7 +25,7 @@ The component supports 4 options, which are listed below.
|===
| Name | Description | Default | Type
| *camel.dataformat.json-johnzon.enabled* | Whether to enable auto
configuration of the json-johnzon data format. This is enabled by default. | |
Boolean
-| *camel.dataformat.json-johnzon.object-mapper* | Lookup and use the existing
ObjectMapper with the given id when using Jackson. | | String
+| *camel.dataformat.json-johnzon.object-mapper* | Lookup and use the existing
Mapper with the given id. | | String
| *camel.dataformat.json-johnzon.pretty-print* | To enable pretty printing
output nicely formatted. Is by default false. | false | Boolean
| *camel.dataformat.json-johnzon.unmarshal-type-name* | Class name of the java
type to use when unmarshalling | | String
|===
diff --git
a/components-starter/camel-johnzon-starter/src/main/java/org/apache/camel/component/johnzon/springboot/JohnzonDataFormatConfiguration.java
b/components-starter/camel-johnzon-starter/src/main/java/org/apache/camel/component/johnzon/springboot/JohnzonDataFormatConfiguration.java
index 81bf5bf..12f9f73 100644
---
a/components-starter/camel-johnzon-starter/src/main/java/org/apache/camel/component/johnzon/springboot/JohnzonDataFormatConfiguration.java
+++
b/components-starter/camel-johnzon-starter/src/main/java/org/apache/camel/component/johnzon/springboot/JohnzonDataFormatConfiguration.java
@@ -37,8 +37,7 @@ public class JohnzonDataFormatConfiguration
*/
private Boolean enabled;
/**
- * Lookup and use the existing ObjectMapper with the given id when using
- * Jackson.
+ * Lookup and use the existing Mapper with the given id.
*/
private String objectMapper;
/**
diff --git a/docs/modules/ROOT/pages/johnzon-starter.adoc
b/docs/modules/ROOT/pages/johnzon-starter.adoc
index a21fa86..e7ff16b 100644
--- a/docs/modules/ROOT/pages/johnzon-starter.adoc
+++ b/docs/modules/ROOT/pages/johnzon-starter.adoc
@@ -25,7 +25,7 @@ The component supports 4 options, which are listed below.
|===
| Name | Description | Default | Type
| *camel.dataformat.json-johnzon.enabled* | Whether to enable auto
configuration of the json-johnzon data format. This is enabled by default. | |
Boolean
-| *camel.dataformat.json-johnzon.object-mapper* | Lookup and use the existing
ObjectMapper with the given id when using Jackson. | | String
+| *camel.dataformat.json-johnzon.object-mapper* | Lookup and use the existing
Mapper with the given id. | | String
| *camel.dataformat.json-johnzon.pretty-print* | To enable pretty printing
output nicely formatted. Is by default false. | false | Boolean
| *camel.dataformat.json-johnzon.unmarshal-type-name* | Class name of the java
type to use when unmarshalling | | String
|===
diff --git a/tooling/camel-spring-boot-dependencies/pom.xml
b/tooling/camel-spring-boot-dependencies/pom.xml
index 3c89533..ae2949a 100644
--- a/tooling/camel-spring-boot-dependencies/pom.xml
+++ b/tooling/camel-spring-boot-dependencies/pom.xml
@@ -2004,6 +2004,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-atlasmap</artifactId>
+ <version>3.6.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-atmos</artifactId>
<version>3.6.0-SNAPSHOT</version>
</dependency>
