This is an automated email from the ASF dual-hosted git repository.
nferraro pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new fed060f7 chore: update documentation generator for new dataformats
fed060f7 is described below
commit fed060f7152e517e3af5208cf05dc9d0a2eb2544
Author: nicolaferraro <[email protected]>
AuthorDate: Fri May 14 17:09:18 2021 +0200
chore: update documentation generator for new dataformats
---
.../org/apache/camel/catalog/docs/avro-jackson-dataformat.adoc | 10 +++++-----
.../apache/camel/catalog/docs/protobuf-jackson-dataformat.adoc | 10 +++++-----
.../org/apache/camel/component/jackson/avro/avro-jackson.json | 6 +++---
.../src/main/docs/avro-jackson-dataformat.adoc | 10 +++++-----
.../camel/component/jackson/protobuf/protobuf-jackson.json | 6 +++---
.../src/main/docs/protobuf-jackson-dataformat.adoc | 10 +++++-----
.../modules/dataformats/pages/avro-jackson-dataformat.adoc | 10 +++++-----
.../modules/dataformats/pages/protobuf-jackson-dataformat.adoc | 10 +++++-----
.../apache/camel/maven/packaging/PackageDataFormatMojo.java | 8 ++++++++
9 files changed, 44 insertions(+), 36 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/avro-jackson-dataformat.adoc
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/avro-jackson-dataformat.adoc
index 95a9514..b103851 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/avro-jackson-dataformat.adoc
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/avro-jackson-dataformat.adoc
@@ -1,10 +1,10 @@
[[avro-jackson-dataformat]]
-= Avro DataFormat
-:docTitle: Avro
+= Avro Jackson DataFormat
+:docTitle: Avro Jackson
:artifactId: camel-jackson-avro
:description: Marshal POJOs to Avro and back using Jackson.
-:since: 2.14
-:supportLevel: Stable
+:since: 3.10
+:supportLevel: Preview
include::{cq-version}@camel-quarkus:ROOT:partial$reference/dataformats/avro-jackson.adoc[opts=optional]
*Since Camel {since}*
@@ -39,7 +39,7 @@ Or you can explicitly specify the reference to a custom
SchemaResolver.
== Avro Jackson Options
// dataformat options: START
-The Avro dataformat supports 18 options, which are listed below.
+The Avro Jackson dataformat supports 18 options, which are listed below.
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/protobuf-jackson-dataformat.adoc
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/protobuf-jackson-dataformat.adoc
index d536741..7b56114 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/protobuf-jackson-dataformat.adoc
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/protobuf-jackson-dataformat.adoc
@@ -1,10 +1,10 @@
[[protobuf-jackson-dataformat]]
-= Protobuf DataFormat
-:docTitle: Protobuf
+= Protobuf Jackson DataFormat
+:docTitle: Protobuf Jackson
:artifactId: camel-jackson-protobuf
:description: Marshal POJOs to Protobuf and back using Jackson.
-:since: 2.2
-:supportLevel: Stable
+:since: 3.10
+:supportLevel: Preview
include::{cq-version}@camel-quarkus:ROOT:partial$reference/dataformats/protobuf-jackson.adoc[opts=optional]
*Since Camel {since}*
@@ -39,7 +39,7 @@ Or you can explicitly specify the reference to a custom
SchemaResolver.
== Protobuf Jackson Options
// dataformat options: START
-The Protobuf dataformat supports 18 options, which are listed below.
+The Protobuf Jackson dataformat supports 18 options, which are listed below.
diff --git
a/components/camel-jackson-avro/src/generated/resources/org/apache/camel/component/jackson/avro/avro-jackson.json
b/components/camel-jackson-avro/src/generated/resources/org/apache/camel/component/jackson/avro/avro-jackson.json
index 5edff28..f79ab7a 100644
---
a/components/camel-jackson-avro/src/generated/resources/org/apache/camel/component/jackson/avro/avro-jackson.json
+++
b/components/camel-jackson-avro/src/generated/resources/org/apache/camel/component/jackson/avro/avro-jackson.json
@@ -2,13 +2,13 @@
"dataformat": {
"kind": "dataformat",
"name": "avro-jackson",
- "title": "Avro",
+ "title": "Avro Jackson",
"description": "Marshal POJOs to Avro and back using Jackson.",
"deprecated": false,
- "firstVersion": "2.14.0",
+ "firstVersion": "3.10.0",
"label": "dataformat,transformation",
"javaType":
"org.apache.camel.component.jackson.avro.JacksonAvroDataFormat",
- "supportLevel": "Stable",
+ "supportLevel": "Preview",
"groupId": "org.apache.camel",
"artifactId": "camel-jackson-avro",
"version": "3.10.0-SNAPSHOT",
diff --git
a/components/camel-jackson-avro/src/main/docs/avro-jackson-dataformat.adoc
b/components/camel-jackson-avro/src/main/docs/avro-jackson-dataformat.adoc
index 95a9514..b103851 100644
--- a/components/camel-jackson-avro/src/main/docs/avro-jackson-dataformat.adoc
+++ b/components/camel-jackson-avro/src/main/docs/avro-jackson-dataformat.adoc
@@ -1,10 +1,10 @@
[[avro-jackson-dataformat]]
-= Avro DataFormat
-:docTitle: Avro
+= Avro Jackson DataFormat
+:docTitle: Avro Jackson
:artifactId: camel-jackson-avro
:description: Marshal POJOs to Avro and back using Jackson.
-:since: 2.14
-:supportLevel: Stable
+:since: 3.10
+:supportLevel: Preview
include::{cq-version}@camel-quarkus:ROOT:partial$reference/dataformats/avro-jackson.adoc[opts=optional]
*Since Camel {since}*
@@ -39,7 +39,7 @@ Or you can explicitly specify the reference to a custom
SchemaResolver.
== Avro Jackson Options
// dataformat options: START
-The Avro dataformat supports 18 options, which are listed below.
+The Avro Jackson dataformat supports 18 options, which are listed below.
diff --git
a/components/camel-jackson-protobuf/src/generated/resources/org/apache/camel/component/jackson/protobuf/protobuf-jackson.json
b/components/camel-jackson-protobuf/src/generated/resources/org/apache/camel/component/jackson/protobuf/protobuf-jackson.json
index 61396d1..35b2003 100644
---
a/components/camel-jackson-protobuf/src/generated/resources/org/apache/camel/component/jackson/protobuf/protobuf-jackson.json
+++
b/components/camel-jackson-protobuf/src/generated/resources/org/apache/camel/component/jackson/protobuf/protobuf-jackson.json
@@ -2,13 +2,13 @@
"dataformat": {
"kind": "dataformat",
"name": "protobuf-jackson",
- "title": "Protobuf",
+ "title": "Protobuf Jackson",
"description": "Marshal POJOs to Protobuf and back using Jackson.",
"deprecated": false,
- "firstVersion": "2.2.0",
+ "firstVersion": "3.10.0",
"label": "dataformat,transformation",
"javaType":
"org.apache.camel.component.jackson.protobuf.JacksonProtobufDataFormat",
- "supportLevel": "Stable",
+ "supportLevel": "Preview",
"groupId": "org.apache.camel",
"artifactId": "camel-jackson-protobuf",
"version": "3.10.0-SNAPSHOT",
diff --git
a/components/camel-jackson-protobuf/src/main/docs/protobuf-jackson-dataformat.adoc
b/components/camel-jackson-protobuf/src/main/docs/protobuf-jackson-dataformat.adoc
index d536741..7b56114 100644
---
a/components/camel-jackson-protobuf/src/main/docs/protobuf-jackson-dataformat.adoc
+++
b/components/camel-jackson-protobuf/src/main/docs/protobuf-jackson-dataformat.adoc
@@ -1,10 +1,10 @@
[[protobuf-jackson-dataformat]]
-= Protobuf DataFormat
-:docTitle: Protobuf
+= Protobuf Jackson DataFormat
+:docTitle: Protobuf Jackson
:artifactId: camel-jackson-protobuf
:description: Marshal POJOs to Protobuf and back using Jackson.
-:since: 2.2
-:supportLevel: Stable
+:since: 3.10
+:supportLevel: Preview
include::{cq-version}@camel-quarkus:ROOT:partial$reference/dataformats/protobuf-jackson.adoc[opts=optional]
*Since Camel {since}*
@@ -39,7 +39,7 @@ Or you can explicitly specify the reference to a custom
SchemaResolver.
== Protobuf Jackson Options
// dataformat options: START
-The Protobuf dataformat supports 18 options, which are listed below.
+The Protobuf Jackson dataformat supports 18 options, which are listed below.
diff --git
a/docs/components/modules/dataformats/pages/avro-jackson-dataformat.adoc
b/docs/components/modules/dataformats/pages/avro-jackson-dataformat.adoc
index c1cafae..b22f7b7 100644
--- a/docs/components/modules/dataformats/pages/avro-jackson-dataformat.adoc
+++ b/docs/components/modules/dataformats/pages/avro-jackson-dataformat.adoc
@@ -1,12 +1,12 @@
[[avro-jackson-dataformat]]
-= Avro DataFormat
+= Avro Jackson DataFormat
//THIS FILE IS COPIED: EDIT THE SOURCE FILE:
:page-source:
components/camel-jackson-avro/src/main/docs/avro-jackson-dataformat.adoc
-:docTitle: Avro
+:docTitle: Avro Jackson
:artifactId: camel-jackson-avro
:description: Marshal POJOs to Avro and back using Jackson.
-:since: 2.14
-:supportLevel: Stable
+:since: 3.10
+:supportLevel: Preview
include::{cq-version}@camel-quarkus:ROOT:partial$reference/dataformats/avro-jackson.adoc[opts=optional]
*Since Camel {since}*
@@ -41,7 +41,7 @@ Or you can explicitly specify the reference to a custom
SchemaResolver.
== Avro Jackson Options
// dataformat options: START
-The Avro dataformat supports 18 options, which are listed below.
+The Avro Jackson dataformat supports 18 options, which are listed below.
diff --git
a/docs/components/modules/dataformats/pages/protobuf-jackson-dataformat.adoc
b/docs/components/modules/dataformats/pages/protobuf-jackson-dataformat.adoc
index d3dc6c8..f582a61 100644
--- a/docs/components/modules/dataformats/pages/protobuf-jackson-dataformat.adoc
+++ b/docs/components/modules/dataformats/pages/protobuf-jackson-dataformat.adoc
@@ -1,12 +1,12 @@
[[protobuf-jackson-dataformat]]
-= Protobuf DataFormat
+= Protobuf Jackson DataFormat
//THIS FILE IS COPIED: EDIT THE SOURCE FILE:
:page-source:
components/camel-jackson-protobuf/src/main/docs/protobuf-jackson-dataformat.adoc
-:docTitle: Protobuf
+:docTitle: Protobuf Jackson
:artifactId: camel-jackson-protobuf
:description: Marshal POJOs to Protobuf and back using Jackson.
-:since: 2.2
-:supportLevel: Stable
+:since: 3.10
+:supportLevel: Preview
include::{cq-version}@camel-quarkus:ROOT:partial$reference/dataformats/protobuf-jackson.adoc[opts=optional]
*Since Camel {since}*
@@ -41,7 +41,7 @@ Or you can explicitly specify the reference to a custom
SchemaResolver.
== Protobuf Jackson Options
// dataformat options: START
-The Protobuf dataformat supports 18 options, which are listed below.
+The Protobuf Jackson dataformat supports 18 options, which are listed below.
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java
index 1c1e782..b58a78d 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PackageDataFormatMojo.java
@@ -454,6 +454,10 @@ public class PackageDataFormatMojo extends
AbstractGeneratorMojo {
return "2.0.0";
case "json-fastjson":
return "2.20.0";
+ case "avro-jackson":
+ return "3.10.0";
+ case "protobuf-jackson":
+ return "3.10.0";
default:
return firstVersion;
}
@@ -466,6 +470,10 @@ public class PackageDataFormatMojo extends
AbstractGeneratorMojo {
return "JSON Gson";
} else if ("json-jackson".equals(name)) {
return "JSON Jackson";
+ } else if ("avro-jackson".equals(name)) {
+ return "Avro Jackson";
+ } else if ("protobuf-jackson".equals(name)) {
+ return "Protobuf Jackson";
} else if ("json-johnzon".equals(name)) {
return "JSON Johnzon";
} else if ("json-jsonb".equals(name)) {