You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2023/06/02 05:08:25 UTC
[camel] branch main updated (7eafb4d1901 -> 5d4a2ed8a2e)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
from 7eafb4d1901 Add camel-catalog as dependency to prevent parallel build failures (#10255)
new 13799ba7c0d prepare catalog should skip inactive folders
new 5d4a2ed8a2e CAMEL-13573 : create parquet-avro dataformat
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../src/main/{doc => docs}/parquetAvro-dataformat.adoc | 10 +++++-----
docs/components/modules/dataformats/nav.adoc | 1 +
.../modules/dataformats/pages/parquetAvro-dataformat.adoc | 1 +
.../org/apache/camel/maven/packaging/PrepareCatalogMojo.java | 5 +++++
4 files changed, 12 insertions(+), 5 deletions(-)
rename components/camel-parquet-avro/src/main/{doc => docs}/parquetAvro-dataformat.adoc (91%)
create mode 120000 docs/components/modules/dataformats/pages/parquetAvro-dataformat.adoc
[camel] 02/02: CAMEL-13573 : create parquet-avro dataformat
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 5d4a2ed8a2ef98fd637af1ea8538c6cc35ccb539
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Jun 2 07:08:08 2023 +0200
CAMEL-13573 : create parquet-avro dataformat
---
.../src/main/{doc => docs}/parquetAvro-dataformat.adoc | 10 +++++-----
docs/components/modules/dataformats/nav.adoc | 1 +
.../modules/dataformats/pages/parquetAvro-dataformat.adoc | 1 +
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/components/camel-parquet-avro/src/main/doc/parquetAvro-dataformat.adoc b/components/camel-parquet-avro/src/main/docs/parquetAvro-dataformat.adoc
similarity index 91%
rename from components/camel-parquet-avro/src/main/doc/parquetAvro-dataformat.adoc
rename to components/camel-parquet-avro/src/main/docs/parquetAvro-dataformat.adoc
index 54e21dc4f04..641d3b61a35 100644
--- a/components/camel-parquet-avro/src/main/doc/parquetAvro-dataformat.adoc
+++ b/components/camel-parquet-avro/src/main/docs/parquetAvro-dataformat.adoc
@@ -1,10 +1,10 @@
-= ParquetAvro File DataFormat
-:doctitle: ParquetAvro Format
+= Parquet File DataFormat
+:doctitle: Parquet File
:shortname: parquetAvro
:artifactid: camel-parquet-avro
-:description: Unmarshal and marshal parquet format using avro (de)/serializers
+:description: Parquet Avro serialization and de-serialization.
:since: 4.0
-:supportlevel: Unstable
+:supportlevel: Preview
:tabs-sync-option:
//Manually maintained attributes
:camel-spring-boot-name: parquet-avro
@@ -59,4 +59,4 @@ the download page for the latest versions).
----------------------------------------------------------
-include::spring-boot:partial$starter.adoc[]
\ No newline at end of file
+include::spring-boot:partial$starter.adoc[]
diff --git a/docs/components/modules/dataformats/nav.adoc b/docs/components/modules/dataformats/nav.adoc
index 653cb46bc87..0d8ae1b3eaf 100644
--- a/docs/components/modules/dataformats/nav.adoc
+++ b/docs/components/modules/dataformats/nav.adoc
@@ -27,6 +27,7 @@
** xref:jsonApi-dataformat.adoc[JSonApi]
** xref:lzf-dataformat.adoc[LZF Deflate Compression]
** xref:mimeMultipart-dataformat.adoc[MIME Multipart]
+** xref:parquetAvro-dataformat.adoc[Parquet File]
** xref:pgp-dataformat.adoc[PGP]
** xref:protobuf-dataformat.adoc[Protobuf]
** xref:protobufJackson-dataformat.adoc[Protobuf Jackson]
diff --git a/docs/components/modules/dataformats/pages/parquetAvro-dataformat.adoc b/docs/components/modules/dataformats/pages/parquetAvro-dataformat.adoc
new file mode 120000
index 00000000000..9c2185bfbcd
--- /dev/null
+++ b/docs/components/modules/dataformats/pages/parquetAvro-dataformat.adoc
@@ -0,0 +1 @@
+../../../../../components/camel-parquet-avro/src/main/docs/parquetAvro-dataformat.adoc
\ No newline at end of file
[camel] 01/02: prepare catalog should skip inactive folders
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 13799ba7c0d7a0390e45a7a1068514c4b5f3023b
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Jun 2 07:05:58 2023 +0200
prepare catalog should skip inactive folders
---
.../java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java
index 15ed57e98ae..c47d8f8c01d 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java
@@ -730,6 +730,11 @@ public class PrepareCatalogMojo extends AbstractMojo {
String n = dir.getFileName().toString();
boolean isDir = dir.toFile().isDirectory();
boolean valid = isDir && !n.startsWith(".") && !n.endsWith("-base") && !n.endsWith("-common") && !n.equals("src");
+ if (valid) {
+ // the dir must be active (inactive can be removed component from old branch)
+ String[] poms = dir.toFile().list((dir1, name) -> "pom.xml".equals(name));
+ valid = poms != null && poms.length == 1;
+ }
if (valid) {
missingAdocFiles.add(dir);
}