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 2020/02/07 09:13:13 UTC
[camel] 03/03: CAMEL-14515: Cleaned up in poms
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 232f33a126fd8d0f4c36641513bf27562d615987
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Feb 7 10:11:36 2020 +0100
CAMEL-14515: Cleaned up in poms
---
.../__artifactId__-component/pom.xml | 26 +++-------------------
components/camel-as2/camel-as2-component/pom.xml | 7 ------
components/camel-box/camel-box-component/pom.xml | 7 ------
components/camel-google-calendar/pom.xml | 8 -------
components/camel-google-drive/pom.xml | 8 -------
components/camel-google-mail/pom.xml | 8 -------
components/camel-google-sheets/pom.xml | 8 -------
components/camel-jira/pom.xml | 8 -------
.../camel-olingo2/camel-olingo2-component/pom.xml | 8 -------
components/camel-twilio/pom.xml | 10 +--------
.../maven/camel-api-component-maven-plugin/pom.xml | 7 ------
.../pom.xml | 7 ------
12 files changed, 4 insertions(+), 108 deletions(-)
diff --git a/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/pom.xml b/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/pom.xml
index 922fe39..19732ea 100644
--- a/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/pom.xml
+++ b/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/__artifactId__-component/pom.xml
@@ -42,7 +42,7 @@
<dependencies>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-core</artifactId>
+ <artifactId>camel-support</artifactId>
</dependency>
<dependency>
<groupId>${groupId}</groupId>
@@ -50,19 +50,6 @@
<version>${version}</version>
</dependency>
- <!-- support camel documentation -->
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>apt</artifactId>
- </dependency>
-
- <!-- Camel annotations in provided scope to avoid compile errors in IDEs -->
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>spi-annotations</artifactId>
- <scope>provided</scope>
- </dependency>
-
<!-- Component API javadoc in provided scope to read API signatures -->
<dependency>
<groupId>${groupId}</groupId>
@@ -237,19 +224,12 @@
<version>${camelVersion}</version>
<executions>
<execution>
- <id>prepare</id>
+ <id>generate</id>
<goals>
- <goal>prepare-components</goal>
+ <goal>generate-component</goal>
</goals>
<phase>generate-resources</phase>
</execution>
- <execution>
- <id>validate</id>
- <goals>
- <goal>validate-components</goal>
- </goals>
- <phase>prepare-package</phase>
- </execution>
</executions>
</plugin>
diff --git a/components/camel-as2/camel-as2-component/pom.xml b/components/camel-as2/camel-as2-component/pom.xml
index 0204c6c..c1733f7 100644
--- a/components/camel-as2/camel-as2-component/pom.xml
+++ b/components/camel-as2/camel-as2-component/pom.xml
@@ -53,13 +53,6 @@
<version>${project.version}</version>
</dependency>
- <!-- Camel annotations in provided scope to avoid compile errors in IDEs -->
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>spi-annotations</artifactId>
- <scope>provided</scope>
- </dependency>
-
<!-- Component API javadoc in provided scope to read API signatures -->
<dependency>
<groupId>org.apache.camel</groupId>
diff --git a/components/camel-box/camel-box-component/pom.xml b/components/camel-box/camel-box-component/pom.xml
index 9795c48..3f8040a 100644
--- a/components/camel-box/camel-box-component/pom.xml
+++ b/components/camel-box/camel-box-component/pom.xml
@@ -70,13 +70,6 @@
<version>${jsoup-version}</version>
</dependency>
- <!-- Camel annotations in provided scope to avoid compile errors in IDEs -->
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>spi-annotations</artifactId>
- <scope>provided</scope>
- </dependency>
-
<!-- Component API javadoc in provided scope to read API signatures -->
<dependency>
<groupId>org.apache.camel</groupId>
diff --git a/components/camel-google-calendar/pom.xml b/components/camel-google-calendar/pom.xml
index 09ab235..985df1e 100644
--- a/components/camel-google-calendar/pom.xml
+++ b/components/camel-google-calendar/pom.xml
@@ -66,14 +66,6 @@
<version>${google-api-services-calendar-version}</version>
</dependency>
- <!-- Camel annotations in provided scope to avoid compile errors in IDEs -->
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>spi-annotations</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
-
<!-- Component API javadoc in provided scope to read API signatures -->
<dependency>
<groupId>com.google.apis</groupId>
diff --git a/components/camel-google-drive/pom.xml b/components/camel-google-drive/pom.xml
index 5ca9fed..82d2c38 100644
--- a/components/camel-google-drive/pom.xml
+++ b/components/camel-google-drive/pom.xml
@@ -70,14 +70,6 @@
<version>${google-api-services-drive-version}</version>
</dependency>
- <!-- Camel annotations in provided scope to avoid compile errors in IDEs -->
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>spi-annotations</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
-
<!-- Component API javadoc in provided scope to read API signatures -->
<dependency>
<groupId>com.google.apis</groupId>
diff --git a/components/camel-google-mail/pom.xml b/components/camel-google-mail/pom.xml
index cc9c030..c5eaacf 100644
--- a/components/camel-google-mail/pom.xml
+++ b/components/camel-google-mail/pom.xml
@@ -85,14 +85,6 @@
</exclusions>
</dependency>
- <!-- Camel annotations in provided scope to avoid compile errors in IDEs -->
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>spi-annotations</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
-
<!-- Component API javadoc in provided scope to read API signatures -->
<dependency>
<groupId>com.google.apis</groupId>
diff --git a/components/camel-google-sheets/pom.xml b/components/camel-google-sheets/pom.xml
index 0f027c0..350d9ed 100644
--- a/components/camel-google-sheets/pom.xml
+++ b/components/camel-google-sheets/pom.xml
@@ -110,14 +110,6 @@
<version>${google-api-services-sheets-version}</version>
</dependency>
- <!-- Camel annotations in provided scope to avoid compile errors in IDEs -->
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>spi-annotations</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
-
<!-- Component API javadoc in provided scope to read API signatures -->
<dependency>
<groupId>com.google.apis</groupId>
diff --git a/components/camel-jira/pom.xml b/components/camel-jira/pom.xml
index 5854cda..b3f8056 100644
--- a/components/camel-jira/pom.xml
+++ b/components/camel-jira/pom.xml
@@ -51,14 +51,6 @@
<version>${jira-guava-version}</version>
</dependency>
- <!-- Camel annotations in provided scope to avoid compile errors in IDEs -->
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>spi-annotations</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
-
<!-- atlassian jira dependencies -->
<dependency>
<groupId>com.atlassian.jira</groupId>
diff --git a/components/camel-olingo2/camel-olingo2-component/pom.xml b/components/camel-olingo2/camel-olingo2-component/pom.xml
index 0952281..097f654 100644
--- a/components/camel-olingo2/camel-olingo2-component/pom.xml
+++ b/components/camel-olingo2/camel-olingo2-component/pom.xml
@@ -57,14 +57,6 @@
<version>${commons-lang3-version}</version>
</dependency>
- <!-- Camel annotations in provided scope to avoid compile errors in IDEs -->
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>spi-annotations</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
-
<!-- Component API javadoc in provided scope to read API signatures -->
<dependency>
<groupId>org.apache.camel</groupId>
diff --git a/components/camel-twilio/pom.xml b/components/camel-twilio/pom.xml
index 2e11d00..6da1df0 100644
--- a/components/camel-twilio/pom.xml
+++ b/components/camel-twilio/pom.xml
@@ -54,15 +54,7 @@
<version>${twilio-version}</version>
</dependency>
- <!-- Camel annotations in provided scope to avoid compile errors in IDEs -->
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>spi-annotations</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <!-- Component API javadoc in provided scope to read API signatures -->
+ <!-- Component API javadoc in provided scope to read API signatures -->
<dependency>
<groupId>com.twilio.sdk</groupId>
<artifactId>twilio</artifactId>
diff --git a/tooling/maven/camel-api-component-maven-plugin/pom.xml b/tooling/maven/camel-api-component-maven-plugin/pom.xml
index 143327b..8f018af 100644
--- a/tooling/maven/camel-api-component-maven-plugin/pom.xml
+++ b/tooling/maven/camel-api-component-maven-plugin/pom.xml
@@ -157,13 +157,6 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
- <!-- Camel annotations in provided scope to avoid compile errors in IDEs -->
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>spi-annotations</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
<!-- VelocityEngine javadoc for testing -->
<dependency>
<groupId>org.apache.velocity</groupId>
diff --git a/tooling/maven/camel-eip-documentation-enricher-maven-plugin/pom.xml b/tooling/maven/camel-eip-documentation-enricher-maven-plugin/pom.xml
index a338d38..b0ae661 100644
--- a/tooling/maven/camel-eip-documentation-enricher-maven-plugin/pom.xml
+++ b/tooling/maven/camel-eip-documentation-enricher-maven-plugin/pom.xml
@@ -143,13 +143,6 @@
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
- <!-- Camel annotations in provided scope to avoid compile errors in IDEs -->
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>spi-annotations</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
</dependencies>
<build>