Repository: camel Updated Branches: refs/heads/master da8842272 -> edeb90cc6
Polished Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/edeb90cc Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/edeb90cc Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/edeb90cc Branch: refs/heads/master Commit: edeb90cc690807615ad1ce7548d2b4fb190e0dd0 Parents: da88422 Author: Claus Ibsen <davscl...@apache.org> Authored: Thu Dec 15 14:23:17 2016 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Thu Dec 15 14:23:17 2016 +0100 ---------------------------------------------------------------------- .../main/resources/archetype-resources/pom.xml | 2 +- .../main/resources/archetype-resources/pom.xml | 2 +- .../main/resources/archetype-resources/pom.xml | 7 +++--- .../main/resources/archetype-resources/pom.xml | 3 +-- .../main/resources/archetype-resources/pom.xml | 16 ++++++++++--- .../main/resources/archetype-resources/pom.xml | 24 +++++++++++++++++--- .../main/resources/archetype-resources/pom.xml | 7 ++++-- .../main/resources/archetype-resources/pom.xml | 3 ++- .../main/resources/archetype-resources/pom.xml | 3 ++- .../main/resources/archetype-resources/pom.xml | 3 ++- .../main/resources/archetype-resources/pom.xml | 3 ++- .../main/resources/archetype-resources/pom.xml | 3 ++- .../main/resources/archetype-resources/pom.xml | 9 ++++---- .../main/resources/archetype-resources/pom.xml | 2 +- .../main/resources/archetype-resources/pom.xml | 5 ++-- 15 files changed, 64 insertions(+), 28 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/edeb90cc/tooling/archetypes/camel-archetype-activemq/src/main/resources/archetype-resources/pom.xml ---------------------------------------------------------------------- diff --git a/tooling/archetypes/camel-archetype-activemq/src/main/resources/archetype-resources/pom.xml b/tooling/archetypes/camel-archetype-activemq/src/main/resources/archetype-resources/pom.xml index f8e340f..ea4133e 100644 --- a/tooling/archetypes/camel-archetype-activemq/src/main/resources/archetype-resources/pom.xml +++ b/tooling/archetypes/camel-archetype-activemq/src/main/resources/archetype-resources/pom.xml @@ -25,7 +25,6 @@ <version>${version}</version> <name>ActiveMQ embedded with Camel</name> - <url>http://www.myorganization.org</url> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> @@ -34,6 +33,7 @@ <dependencyManagement> <dependencies> + <!-- Camel BOM --> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-parent</artifactId> http://git-wip-us.apache.org/repos/asf/camel/blob/edeb90cc/tooling/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/pom.xml ---------------------------------------------------------------------- diff --git a/tooling/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/pom.xml b/tooling/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/pom.xml index 7bdea7c..7a61b98 100644 --- a/tooling/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/pom.xml +++ b/tooling/archetypes/camel-archetype-api-component/src/main/resources/archetype-resources/pom.xml @@ -25,7 +25,6 @@ <version>${version}</version> <name>Camel ${name} Component Parent</name> - <url>http://www.myorganization.org</url> <description>Parent project for Camel {$name} Component</description> <properties> @@ -39,6 +38,7 @@ <dependencyManagement> <dependencies> + <!-- Camel BOM --> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-parent</artifactId> http://git-wip-us.apache.org/repos/asf/camel/blob/edeb90cc/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/pom.xml ---------------------------------------------------------------------- diff --git a/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/pom.xml b/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/pom.xml index 5b82c89..529ef71 100644 --- a/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/pom.xml +++ b/tooling/archetypes/camel-archetype-blueprint/src/main/resources/archetype-resources/pom.xml @@ -34,6 +34,7 @@ <dependencyManagement> <dependencies> + <!-- Camel BOM --> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-parent</artifactId> @@ -67,17 +68,17 @@ <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-api</artifactId> - <scope>test</scope> + <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-core</artifactId> - <scope>test</scope> + <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-slf4j-impl</artifactId> - <scope>test</scope> + <scope>runtime</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/camel/blob/edeb90cc/tooling/archetypes/camel-archetype-cdi/src/main/resources/archetype-resources/pom.xml ---------------------------------------------------------------------- diff --git a/tooling/archetypes/camel-archetype-cdi/src/main/resources/archetype-resources/pom.xml b/tooling/archetypes/camel-archetype-cdi/src/main/resources/archetype-resources/pom.xml index b8491e9..0acf353 100644 --- a/tooling/archetypes/camel-archetype-cdi/src/main/resources/archetype-resources/pom.xml +++ b/tooling/archetypes/camel-archetype-cdi/src/main/resources/archetype-resources/pom.xml @@ -26,7 +26,6 @@ <version>${version}</version> <name>Camel route using CDI in a standalone Java Container</name> - <url>http://www.myorganization.org</url> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> @@ -35,6 +34,7 @@ <dependencyManagement> <dependencies> + <!-- Camel BOM --> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-parent</artifactId> @@ -61,7 +61,6 @@ <artifactId>camel-cdi</artifactId> </dependency> - <!-- logging --> <dependency> <groupId>org.apache.logging.log4j</groupId> http://git-wip-us.apache.org/repos/asf/camel/blob/edeb90cc/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/pom.xml ---------------------------------------------------------------------- diff --git a/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/pom.xml b/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/pom.xml index 738e7c3..2af80a2 100644 --- a/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/pom.xml +++ b/tooling/archetypes/camel-archetype-component/src/main/resources/archetype-resources/pom.xml @@ -25,18 +25,29 @@ <version>${version}</version> <name>Camel ${name} Component</name> - <url>http://www.myorganization.org</url> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> </properties> + <dependencyManagement> + <dependencies> + <!-- Camel BOM --> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-parent</artifactId> + <version>${camel-version}</version> + <scope>import</scope> + <type>pom</type> + </dependency> + </dependencies> + </dependencyManagement> + <dependencies> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-core</artifactId> - <version>${camel-version}</version> </dependency> <!-- support camel documentation --> @@ -67,7 +78,6 @@ <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-test</artifactId> - <version>${camel-version}</version> <scope>test</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/camel/blob/edeb90cc/tooling/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/pom.xml ---------------------------------------------------------------------- diff --git a/tooling/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/pom.xml b/tooling/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/pom.xml index d4633d5..9bc2b8d 100644 --- a/tooling/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/pom.xml +++ b/tooling/archetypes/camel-archetype-dataformat/src/main/resources/archetype-resources/pom.xml @@ -25,20 +25,39 @@ <version>${version}</version> <name>Camel ${name} Data format</name> - <url>http://www.myorganization.org</url> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> </properties> + <dependencyManagement> + <dependencies> + <!-- Camel BOM --> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-parent</artifactId> + <version>${camel-version}</version> + <scope>import</scope> + <type>pom</type> + </dependency> + </dependencies> + </dependencyManagement> + <dependencies> + <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-core</artifactId> + </dependency> + + <!-- support camel documentation --> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>apt</artifactId> <version>${camel-version}</version> </dependency> - + <!-- logging --> <dependency> <groupId>org.apache.logging.log4j</groupId> @@ -60,7 +79,6 @@ <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-test</artifactId> - <version>${camel-version}</version> <scope>test</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/camel/blob/edeb90cc/tooling/archetypes/camel-archetype-groovy/src/main/resources/archetype-resources/pom.xml ---------------------------------------------------------------------- diff --git a/tooling/archetypes/camel-archetype-groovy/src/main/resources/archetype-resources/pom.xml b/tooling/archetypes/camel-archetype-groovy/src/main/resources/archetype-resources/pom.xml index ff202e5..2327fe9 100644 --- a/tooling/archetypes/camel-archetype-groovy/src/main/resources/archetype-resources/pom.xml +++ b/tooling/archetypes/camel-archetype-groovy/src/main/resources/archetype-resources/pom.xml @@ -25,8 +25,7 @@ <packaging>jar</packaging> <version>${version}</version> - <name>A Camel Route</name> - <url>http://www.myorganization.org</url> + <name>A Groovy Camel Route</name> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> @@ -35,6 +34,7 @@ <dependencyManagement> <dependencies> + <!-- Camel BOM --> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-parent</artifactId> @@ -90,6 +90,7 @@ <defaultGoal>install</defaultGoal> <plugins> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-resources-plugin</artifactId> @@ -98,6 +99,7 @@ <encoding>UTF-8</encoding> </configuration> </plugin> + <plugin> <artifactId>maven-compiler-plugin</artifactId> <version>${maven-compiler-plugin-version}</version> @@ -127,6 +129,7 @@ </dependency> </dependencies> </plugin> + <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-eclipse-plugin</artifactId> http://git-wip-us.apache.org/repos/asf/camel/blob/edeb90cc/tooling/archetypes/camel-archetype-java/src/main/resources/archetype-resources/pom.xml ---------------------------------------------------------------------- diff --git a/tooling/archetypes/camel-archetype-java/src/main/resources/archetype-resources/pom.xml b/tooling/archetypes/camel-archetype-java/src/main/resources/archetype-resources/pom.xml index a40183e..7513eb5 100644 --- a/tooling/archetypes/camel-archetype-java/src/main/resources/archetype-resources/pom.xml +++ b/tooling/archetypes/camel-archetype-java/src/main/resources/archetype-resources/pom.xml @@ -26,7 +26,6 @@ <version>${version}</version> <name>A Camel Route</name> - <url>http://www.myorganization.org</url> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> @@ -35,6 +34,7 @@ <dependencyManagement> <dependencies> + <!-- Camel BOM --> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-parent</artifactId> @@ -46,6 +46,7 @@ </dependencyManagement> <dependencies> + <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-core</artifactId> http://git-wip-us.apache.org/repos/asf/camel/blob/edeb90cc/tooling/archetypes/camel-archetype-java8/src/main/resources/archetype-resources/pom.xml ---------------------------------------------------------------------- diff --git a/tooling/archetypes/camel-archetype-java8/src/main/resources/archetype-resources/pom.xml b/tooling/archetypes/camel-archetype-java8/src/main/resources/archetype-resources/pom.xml index a40183e..7513eb5 100644 --- a/tooling/archetypes/camel-archetype-java8/src/main/resources/archetype-resources/pom.xml +++ b/tooling/archetypes/camel-archetype-java8/src/main/resources/archetype-resources/pom.xml @@ -26,7 +26,6 @@ <version>${version}</version> <name>A Camel Route</name> - <url>http://www.myorganization.org</url> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> @@ -35,6 +34,7 @@ <dependencyManagement> <dependencies> + <!-- Camel BOM --> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-parent</artifactId> @@ -46,6 +46,7 @@ </dependencyManagement> <dependencies> + <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-core</artifactId> http://git-wip-us.apache.org/repos/asf/camel/blob/edeb90cc/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/pom.xml ---------------------------------------------------------------------- diff --git a/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/pom.xml b/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/pom.xml index aade603..69b7933 100644 --- a/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/pom.xml +++ b/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/pom.xml @@ -25,7 +25,6 @@ <version>${version}</version> <name>A Camel Scala Route</name> - <url>http://www.myorganization.org</url> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> @@ -34,6 +33,7 @@ <dependencyManagement> <dependencies> + <!-- Camel BOM --> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-parent</artifactId> @@ -45,6 +45,7 @@ </dependencyManagement> <dependencies> + <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-core</artifactId> http://git-wip-us.apache.org/repos/asf/camel/blob/edeb90cc/tooling/archetypes/camel-archetype-scr/src/main/resources/archetype-resources/pom.xml ---------------------------------------------------------------------- diff --git a/tooling/archetypes/camel-archetype-scr/src/main/resources/archetype-resources/pom.xml b/tooling/archetypes/camel-archetype-scr/src/main/resources/archetype-resources/pom.xml index 61c0389..b817604 100644 --- a/tooling/archetypes/camel-archetype-scr/src/main/resources/archetype-resources/pom.xml +++ b/tooling/archetypes/camel-archetype-scr/src/main/resources/archetype-resources/pom.xml @@ -25,7 +25,7 @@ <version>${version}</version> <packaging>jar</packaging> - <name>A Camel SCR Route</name> + <name>A Camel OSGi SCR Route</name> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> @@ -34,6 +34,7 @@ <dependencyManagement> <dependencies> + <!-- Camel BOM --> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-parent</artifactId> http://git-wip-us.apache.org/repos/asf/camel/blob/edeb90cc/tooling/archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/pom.xml ---------------------------------------------------------------------- diff --git a/tooling/archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/pom.xml b/tooling/archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/pom.xml index 8342c35..872e9b8 100755 --- a/tooling/archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/pom.xml +++ b/tooling/archetypes/camel-archetype-spring-boot/src/main/resources/archetype-resources/pom.xml @@ -26,7 +26,6 @@ <version>${version}</version> <name>A Camel Spring Boot Route</name> - <url>http://www.myorganization.org</url> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> @@ -36,6 +35,7 @@ <dependencyManagement> <dependencies> + <!-- Spring Boot BOM --> <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-dependencies</artifactId> @@ -43,6 +43,7 @@ <type>pom</type> <scope>import</scope> </dependency> + <!-- Camel BOM --> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-spring-boot-dependencies</artifactId> http://git-wip-us.apache.org/repos/asf/camel/blob/edeb90cc/tooling/archetypes/camel-archetype-spring-dm/src/main/resources/archetype-resources/pom.xml ---------------------------------------------------------------------- diff --git a/tooling/archetypes/camel-archetype-spring-dm/src/main/resources/archetype-resources/pom.xml b/tooling/archetypes/camel-archetype-spring-dm/src/main/resources/archetype-resources/pom.xml index 268ccab..0ce241d 100644 --- a/tooling/archetypes/camel-archetype-spring-dm/src/main/resources/archetype-resources/pom.xml +++ b/tooling/archetypes/camel-archetype-spring-dm/src/main/resources/archetype-resources/pom.xml @@ -24,7 +24,7 @@ <version>${version}</version> <packaging>jar</packaging> - <name>A Camel Spring-DM Route</name> + <name>A Camel OSGi Spring-DM Route</name> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> @@ -33,6 +33,7 @@ <dependencyManagement> <dependencies> + <!-- Camel BOM --> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-parent</artifactId> @@ -65,17 +66,17 @@ <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-api</artifactId> - <scope>test</scope> + <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-core</artifactId> - <scope>test</scope> + <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-slf4j-impl</artifactId> - <scope>test</scope> + <scope>runtime</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/camel/blob/edeb90cc/tooling/archetypes/camel-archetype-spring/src/main/resources/archetype-resources/pom.xml ---------------------------------------------------------------------- diff --git a/tooling/archetypes/camel-archetype-spring/src/main/resources/archetype-resources/pom.xml b/tooling/archetypes/camel-archetype-spring/src/main/resources/archetype-resources/pom.xml index de4f103..038fc52 100644 --- a/tooling/archetypes/camel-archetype-spring/src/main/resources/archetype-resources/pom.xml +++ b/tooling/archetypes/camel-archetype-spring/src/main/resources/archetype-resources/pom.xml @@ -25,7 +25,6 @@ <version>${version}</version> <name>A Camel Spring Route</name> - <url>http://www.myorganization.org</url> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> @@ -34,6 +33,7 @@ <dependencyManagement> <dependencies> + <!-- Camel BOM --> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-parent</artifactId> http://git-wip-us.apache.org/repos/asf/camel/blob/edeb90cc/tooling/archetypes/camel-archetype-web/src/main/resources/archetype-resources/pom.xml ---------------------------------------------------------------------- diff --git a/tooling/archetypes/camel-archetype-web/src/main/resources/archetype-resources/pom.xml b/tooling/archetypes/camel-archetype-web/src/main/resources/archetype-resources/pom.xml index c9a9631..564e589 100644 --- a/tooling/archetypes/camel-archetype-web/src/main/resources/archetype-resources/pom.xml +++ b/tooling/archetypes/camel-archetype-web/src/main/resources/archetype-resources/pom.xml @@ -22,12 +22,10 @@ <groupId>${groupId}</groupId> <artifactId>${artifactId}</artifactId> <version>${version}</version> + <packaging>war</packaging> <name>Camel Web Application</name> <description>Camel project that deploys the Camel routes as a WAR</description> - <url>http://www.myorganization.org</url> - - <packaging>war</packaging> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> @@ -36,6 +34,7 @@ <dependencyManagement> <dependencies> + <!-- Camel BOM --> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-parent</artifactId>
