You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2021/03/10 11:05:46 UTC
[camel] 06/06: CAMEL-16322 - Have a middle folder for google
components
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.git
commit fd3e4d04f64e5084e89bda91497544e0c83c146e
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Mar 10 12:00:04 2021 +0100
CAMEL-16322 - Have a middle folder for google components
---
bom/camel-bom/pom.xml | 10 +++++-----
.../modules/ROOT/pages/google-bigquery-component.adoc | 2 +-
.../modules/ROOT/pages/google-bigquery-sql-component.adoc | 2 +-
.../modules/ROOT/pages/google-calendar-component.adoc | 2 +-
.../modules/ROOT/pages/google-calendar-stream-component.adoc | 2 +-
docs/components/modules/ROOT/pages/google-drive-component.adoc | 2 +-
docs/components/modules/ROOT/pages/google-mail-component.adoc | 2 +-
.../modules/ROOT/pages/google-mail-stream-component.adoc | 2 +-
.../components/modules/ROOT/pages/google-pubsub-component.adoc | 2 +-
.../components/modules/ROOT/pages/google-sheets-component.adoc | 2 +-
.../modules/ROOT/pages/google-sheets-stream-component.adoc | 2 +-
.../modules/ROOT/pages/google-storage-component.adoc | 2 +-
docs/components/modules/ROOT/pages/google-summary.adoc | 2 +-
parent/pom.xml | 10 +++++-----
.../org/apache/camel/maven/packaging/PrepareCatalogMojo.java | 5 +++--
15 files changed, 25 insertions(+), 24 deletions(-)
diff --git a/bom/camel-bom/pom.xml b/bom/camel-bom/pom.xml
index 42dc0f3..c7d733a 100644
--- a/bom/camel-bom/pom.xml
+++ b/bom/camel-bom/pom.xml
@@ -754,11 +754,6 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-google-parent</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
<artifactId>camel-google-bigquery</artifactId>
<version>${project.version}</version>
</dependency>
@@ -779,6 +774,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-google-parent</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-google-pubsub</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/docs/components/modules/ROOT/pages/google-bigquery-component.adoc b/docs/components/modules/ROOT/pages/google-bigquery-component.adoc
index 04ac665..aba856f 100644
--- a/docs/components/modules/ROOT/pages/google-bigquery-component.adoc
+++ b/docs/components/modules/ROOT/pages/google-bigquery-component.adoc
@@ -1,7 +1,7 @@
[[google-bigquery-component]]
= Google BigQuery Component
//THIS FILE IS COPIED: EDIT THE SOURCE FILE:
-:page-source: components/camel-google-bigquery/src/main/docs/google-bigquery-component.adoc
+:page-source: components/camel-google/camel-google-bigquery/src/main/docs/google-bigquery-component.adoc
:docTitle: Google BigQuery
:artifactId: camel-google-bigquery
:description: Google BigQuery data warehouse for analytics.
diff --git a/docs/components/modules/ROOT/pages/google-bigquery-sql-component.adoc b/docs/components/modules/ROOT/pages/google-bigquery-sql-component.adoc
index 1aae6e9..3a57298 100644
--- a/docs/components/modules/ROOT/pages/google-bigquery-sql-component.adoc
+++ b/docs/components/modules/ROOT/pages/google-bigquery-sql-component.adoc
@@ -1,7 +1,7 @@
[[google-bigquery-sql-component]]
= Google BigQuery Standard SQL Component
//THIS FILE IS COPIED: EDIT THE SOURCE FILE:
-:page-source: components/camel-google-bigquery/src/main/docs/google-bigquery-sql-component.adoc
+:page-source: components/camel-google/camel-google-bigquery/src/main/docs/google-bigquery-sql-component.adoc
:docTitle: Google BigQuery Standard SQL
:artifactId: camel-google-bigquery
:description: Access Google Cloud BigQuery service using SQL queries.
diff --git a/docs/components/modules/ROOT/pages/google-calendar-component.adoc b/docs/components/modules/ROOT/pages/google-calendar-component.adoc
index fca0411..9077236 100644
--- a/docs/components/modules/ROOT/pages/google-calendar-component.adoc
+++ b/docs/components/modules/ROOT/pages/google-calendar-component.adoc
@@ -1,7 +1,7 @@
[[google-calendar-component]]
= Google Calendar Component
//THIS FILE IS COPIED: EDIT THE SOURCE FILE:
-:page-source: components/camel-google-calendar/src/main/docs/google-calendar-component.adoc
+:page-source: components/camel-google/camel-google-calendar/src/main/docs/google-calendar-component.adoc
:docTitle: Google Calendar
:artifactId: camel-google-calendar
:description: Perform various operations on a Google Calendar.
diff --git a/docs/components/modules/ROOT/pages/google-calendar-stream-component.adoc b/docs/components/modules/ROOT/pages/google-calendar-stream-component.adoc
index 90f917c..c1a503c 100644
--- a/docs/components/modules/ROOT/pages/google-calendar-stream-component.adoc
+++ b/docs/components/modules/ROOT/pages/google-calendar-stream-component.adoc
@@ -1,7 +1,7 @@
[[google-calendar-stream-component]]
= Google Calendar Stream Component
//THIS FILE IS COPIED: EDIT THE SOURCE FILE:
-:page-source: components/camel-google-calendar/src/main/docs/google-calendar-stream-component.adoc
+:page-source: components/camel-google/camel-google-calendar/src/main/docs/google-calendar-stream-component.adoc
:docTitle: Google Calendar Stream
:artifactId: camel-google-calendar
:description: Poll for changes in a Google Calendar.
diff --git a/docs/components/modules/ROOT/pages/google-drive-component.adoc b/docs/components/modules/ROOT/pages/google-drive-component.adoc
index 91358a5..fd84b67 100644
--- a/docs/components/modules/ROOT/pages/google-drive-component.adoc
+++ b/docs/components/modules/ROOT/pages/google-drive-component.adoc
@@ -1,7 +1,7 @@
[[google-drive-component]]
= Google Drive Component
//THIS FILE IS COPIED: EDIT THE SOURCE FILE:
-:page-source: components/camel-google-drive/src/main/docs/google-drive-component.adoc
+:page-source: components/camel-google/camel-google-drive/src/main/docs/google-drive-component.adoc
:docTitle: Google Drive
:artifactId: camel-google-drive
:description: Manage files in Google Drive.
diff --git a/docs/components/modules/ROOT/pages/google-mail-component.adoc b/docs/components/modules/ROOT/pages/google-mail-component.adoc
index a11786a..b5fe1cb 100644
--- a/docs/components/modules/ROOT/pages/google-mail-component.adoc
+++ b/docs/components/modules/ROOT/pages/google-mail-component.adoc
@@ -1,7 +1,7 @@
[[google-mail-component]]
= Google Mail Component
//THIS FILE IS COPIED: EDIT THE SOURCE FILE:
-:page-source: components/camel-google-mail/src/main/docs/google-mail-component.adoc
+:page-source: components/camel-google/camel-google-mail/src/main/docs/google-mail-component.adoc
:docTitle: Google Mail
:artifactId: camel-google-mail
:description: Manage messages in Google Mail.
diff --git a/docs/components/modules/ROOT/pages/google-mail-stream-component.adoc b/docs/components/modules/ROOT/pages/google-mail-stream-component.adoc
index 28329c9..5e74ef3 100644
--- a/docs/components/modules/ROOT/pages/google-mail-stream-component.adoc
+++ b/docs/components/modules/ROOT/pages/google-mail-stream-component.adoc
@@ -1,7 +1,7 @@
[[google-mail-stream-component]]
= Google Mail Stream Component
//THIS FILE IS COPIED: EDIT THE SOURCE FILE:
-:page-source: components/camel-google-mail/src/main/docs/google-mail-stream-component.adoc
+:page-source: components/camel-google/camel-google-mail/src/main/docs/google-mail-stream-component.adoc
:docTitle: Google Mail Stream
:artifactId: camel-google-mail
:description: Poll for incoming messages in Google Mail.
diff --git a/docs/components/modules/ROOT/pages/google-pubsub-component.adoc b/docs/components/modules/ROOT/pages/google-pubsub-component.adoc
index 38f69d7..2226576 100644
--- a/docs/components/modules/ROOT/pages/google-pubsub-component.adoc
+++ b/docs/components/modules/ROOT/pages/google-pubsub-component.adoc
@@ -1,7 +1,7 @@
[[google-pubsub-component]]
= Google Pubsub Component
//THIS FILE IS COPIED: EDIT THE SOURCE FILE:
-:page-source: components/camel-google-pubsub/src/main/docs/google-pubsub-component.adoc
+:page-source: components/camel-google/camel-google-pubsub/src/main/docs/google-pubsub-component.adoc
:docTitle: Google Pubsub
:artifactId: camel-google-pubsub
:description: Send and receive messages to/from Google Cloud Platform PubSub Service.
diff --git a/docs/components/modules/ROOT/pages/google-sheets-component.adoc b/docs/components/modules/ROOT/pages/google-sheets-component.adoc
index d2fc606..5233469 100644
--- a/docs/components/modules/ROOT/pages/google-sheets-component.adoc
+++ b/docs/components/modules/ROOT/pages/google-sheets-component.adoc
@@ -1,7 +1,7 @@
[[google-sheets-component]]
= Google Sheets Component
//THIS FILE IS COPIED: EDIT THE SOURCE FILE:
-:page-source: components/camel-google-sheets/src/main/docs/google-sheets-component.adoc
+:page-source: components/camel-google/camel-google-sheets/src/main/docs/google-sheets-component.adoc
:docTitle: Google Sheets
:artifactId: camel-google-sheets
:description: Manage spreadsheets in Google Sheets.
diff --git a/docs/components/modules/ROOT/pages/google-sheets-stream-component.adoc b/docs/components/modules/ROOT/pages/google-sheets-stream-component.adoc
index ccd37e9..ae38149 100644
--- a/docs/components/modules/ROOT/pages/google-sheets-stream-component.adoc
+++ b/docs/components/modules/ROOT/pages/google-sheets-stream-component.adoc
@@ -1,7 +1,7 @@
[[google-sheets-stream-component]]
= Google Sheets Stream Component
//THIS FILE IS COPIED: EDIT THE SOURCE FILE:
-:page-source: components/camel-google-sheets/src/main/docs/google-sheets-stream-component.adoc
+:page-source: components/camel-google/camel-google-sheets/src/main/docs/google-sheets-stream-component.adoc
:docTitle: Google Sheets Stream
:artifactId: camel-google-sheets
:description: Poll for changes in Google Sheets.
diff --git a/docs/components/modules/ROOT/pages/google-storage-component.adoc b/docs/components/modules/ROOT/pages/google-storage-component.adoc
index b0f432e..a731692 100644
--- a/docs/components/modules/ROOT/pages/google-storage-component.adoc
+++ b/docs/components/modules/ROOT/pages/google-storage-component.adoc
@@ -1,7 +1,7 @@
[[google-storage-component]]
= Google Storage Component
//THIS FILE IS COPIED: EDIT THE SOURCE FILE:
-:page-source: components/camel-google-storage/src/main/docs/google-storage-component.adoc
+:page-source: components/camel-google/camel-google-storage/src/main/docs/google-storage-component.adoc
:docTitle: Google Storage
:artifactId: camel-google-storage
:description: Store and retrieve objects from Google Cloud Storage Service using the google-cloud-storage library.
diff --git a/docs/components/modules/ROOT/pages/google-summary.adoc b/docs/components/modules/ROOT/pages/google-summary.adoc
index ff6525a..bfdd18c 100644
--- a/docs/components/modules/ROOT/pages/google-summary.adoc
+++ b/docs/components/modules/ROOT/pages/google-summary.adoc
@@ -1,6 +1,6 @@
= Google Component
//THIS FILE IS COPIED: EDIT THE SOURCE FILE:
-:page-source: components/camel-google-bigquery/src/main/docs/google-summary.adoc
+:page-source: components/camel-google/camel-google-bigquery/src/main/docs/google-summary.adoc
//attributes written by hand, not generated
:docTitle: Google
diff --git a/parent/pom.xml b/parent/pom.xml
index 80f474e..dcdff32 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1386,11 +1386,6 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-google-parent</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
<artifactId>camel-google-bigquery</artifactId>
<version>${project.version}</version>
</dependency>
@@ -1411,6 +1406,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-google-parent</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-google-pubsub</artifactId>
<version>${project.version}</version>
</dependency>
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 5f7ede0..db97e1a 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
@@ -1173,8 +1173,9 @@ public class PrepareCatalogMojo extends AbstractMojo {
dir.resolve("camel-azure-storage-queue"));
case "camel-google":
return Arrays.asList(dir.resolve("camel-google-bigquery"), dir.resolve("camel-google-calendar"),
- dir.resolve("camel-google-drive"), dir.resolve("camel-google-mail"), dir.resolve("camel-google-pubsub"), dir.resolve("camel-google-sheets"),
- dir.resolve("camel-google-storage"));
+ dir.resolve("camel-google-drive"), dir.resolve("camel-google-mail"), dir.resolve("camel-google-pubsub"),
+ dir.resolve("camel-google-sheets"),
+ dir.resolve("camel-google-storage"));
case "camel-aws":
return Arrays.asList(dir.resolve("camel-aws2-athena"), dir.resolve("camel-aws2-cw"),
dir.resolve("camel-aws2-ddb"), dir.resolve("camel-aws2-ec2"),