Repository: camel Updated Branches: refs/heads/master ff085260d -> f1286916d
CAMEL-9801: Camel Archetypes - Add Camel BOM as dependency management Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/f1286916 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/f1286916 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/f1286916 Branch: refs/heads/master Commit: f1286916ddb525e8f2a20b41c1130217996613f7 Parents: ff08526 Author: Claus Ibsen <davscl...@apache.org> Authored: Fri Apr 8 08:33:53 2016 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Fri Apr 8 08:33:53 2016 +0200 ---------------------------------------------------------------------- .../META-INF/maven/archetype-metadata.xml | 6 - .../main/resources/archetype-resources/pom.xml | 19 +- .../META-INF/maven/archetype-metadata.xml | 6 - .../main/resources/archetype-resources/pom.xml | 24 +- .../META-INF/maven/archetype-metadata.xml | 6 - .../main/resources/archetype-resources/pom.xml | 16 +- .../META-INF/maven/archetype-metadata.xml | 6 - .../main/resources/archetype-resources/pom.xml | 221 ++++++++++--------- .../META-INF/maven/archetype-metadata.xml | 6 - .../main/resources/archetype-resources/pom.xml | 18 +- .../META-INF/maven/archetype-metadata.xml | 6 - .../main/resources/archetype-resources/pom.xml | 18 +- .../META-INF/maven/archetype-metadata.xml | 6 - .../main/resources/archetype-resources/pom.xml | 22 +- .../META-INF/maven/archetype-metadata.xml | 6 - .../main/resources/archetype-resources/pom.xml | 27 ++- .../META-INF/maven/archetype-metadata.xml | 6 - .../main/resources/archetype-resources/pom.xml | 18 +- .../META-INF/maven/archetype-metadata.xml | 6 - .../main/resources/archetype-resources/pom.xml | 19 +- 20 files changed, 224 insertions(+), 238 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/f1286916/tooling/archetypes/camel-archetype-activemq/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml ---------------------------------------------------------------------- diff --git a/tooling/archetypes/camel-archetype-activemq/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml b/tooling/archetypes/camel-archetype-activemq/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml index adab307..ede5546 100644 --- a/tooling/archetypes/camel-archetype-activemq/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml +++ b/tooling/archetypes/camel-archetype-activemq/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml @@ -27,18 +27,12 @@ <requiredProperty key="camel-version"> <defaultValue>${project.version}</defaultValue> </requiredProperty> - <requiredProperty key="log4j-version"> - <defaultValue>${log4j-version}</defaultValue> - </requiredProperty> <requiredProperty key="maven-compiler-plugin-version"> <defaultValue>${maven-compiler-plugin-version}</defaultValue> </requiredProperty> <requiredProperty key="maven-resources-plugin-version"> <defaultValue>${maven-resources-plugin-version}</defaultValue> </requiredProperty> - <requiredProperty key="slf4j-version"> - <defaultValue>${slf4j-version}</defaultValue> - </requiredProperty> <requiredProperty key="spring-version"> <defaultValue>${spring-version}</defaultValue> </requiredProperty> http://git-wip-us.apache.org/repos/asf/camel/blob/f1286916/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 1b691b3..d8b5883 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 @@ -32,21 +32,30 @@ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> </properties> + <dependencyManagement> + <dependencies> + <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> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-jms</artifactId> - <version>${camel-version}</version> </dependency> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-spring</artifactId> - <version>${camel-version}</version> </dependency> <!-- the ActiveMQ client with connection pooling --> @@ -97,24 +106,20 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <version>${slf4j-version}</version> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> - <version>${slf4j-version}</version> </dependency> <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> - <version>${log4j-version}</version> </dependency> <!-- testing --> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-test-spring</artifactId> - <version>${camel-version}</version> <scope>test</scope> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/camel/blob/f1286916/tooling/archetypes/camel-archetype-blueprint/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml ---------------------------------------------------------------------- diff --git a/tooling/archetypes/camel-archetype-blueprint/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml b/tooling/archetypes/camel-archetype-blueprint/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml index 55c6c36..7732ef9 100644 --- a/tooling/archetypes/camel-archetype-blueprint/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml +++ b/tooling/archetypes/camel-archetype-blueprint/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml @@ -24,9 +24,6 @@ <requiredProperty key="camel-version"> <defaultValue>${project.version}</defaultValue> </requiredProperty> - <requiredProperty key="log4j-version"> - <defaultValue>${log4j-version}</defaultValue> - </requiredProperty> <requiredProperty key="maven-compiler-plugin-version"> <defaultValue>${maven-compiler-plugin-version}</defaultValue> </requiredProperty> @@ -39,9 +36,6 @@ <requiredProperty key="maven-jar-plugin-version"> <defaultValue>${maven-jar-plugin-version}</defaultValue> </requiredProperty> - <requiredProperty key="slf4j-version"> - <defaultValue>${slf4j-version}</defaultValue> - </requiredProperty> </requiredProperties> <fileSets> <fileSet filtered="true" packaged="true" encoding="UTF-8"> http://git-wip-us.apache.org/repos/asf/camel/blob/f1286916/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 c089534..52f3fe1 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 @@ -30,44 +30,46 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - - <camel-version>${camel-version}</camel-version> - - <slf4j-version>${slf4j-version}</slf4j-version> - <log4j-version>${log4j-version}</log4j-version> </properties> + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-parent</artifactId> + <version>${camel-version}</version> + <scope>import</scope> + <type>pom</type> + </dependency> + </dependencies> + </dependencyManagement> + <dependencies> <!-- Camel --> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-core</artifactId> - <version>\${camel-version}</version> </dependency> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-blueprint</artifactId> - <version>\${camel-version}</version> </dependency> <!-- Testing --> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-test-blueprint</artifactId> - <version>\${camel-version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> - <version>\${slf4j-version}</version> <scope>test</scope> </dependency> <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> - <version>\${log4j-version}</version> <scope>test</scope> </dependency> @@ -127,7 +129,7 @@ <plugin> <groupId>org.apache.camel</groupId> <artifactId>camel-maven-plugin</artifactId> - <version>\${camel-version}</version> + <version>${camel-version}</version> </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/camel/blob/f1286916/tooling/archetypes/camel-archetype-cdi/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml ---------------------------------------------------------------------- diff --git a/tooling/archetypes/camel-archetype-cdi/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml b/tooling/archetypes/camel-archetype-cdi/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml index 970a5b6..2adbaf1 100644 --- a/tooling/archetypes/camel-archetype-cdi/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml +++ b/tooling/archetypes/camel-archetype-cdi/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml @@ -42,12 +42,6 @@ <requiredProperty key="exec-maven-plugin-version"> <defaultValue>${exec-maven-plugin-version}</defaultValue> </requiredProperty> - <requiredProperty key="slf4j-version"> - <defaultValue>${slf4j-version}</defaultValue> - </requiredProperty> - <requiredProperty key="log4j-version"> - <defaultValue>${log4j-version}</defaultValue> - </requiredProperty> </requiredProperties> <fileSets> <fileSet filtered="true" packaged="true" encoding="UTF-8"> http://git-wip-us.apache.org/repos/asf/camel/blob/f1286916/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 3820aae..a6bd22d 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 @@ -33,6 +33,18 @@ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> </properties> + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-parent</artifactId> + <version>${camel-version}</version> + <scope>import</scope> + <type>pom</type> + </dependency> + </dependencies> + </dependencyManagement> + <dependencies> <!-- CDI API --> @@ -47,20 +59,17 @@ <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-cdi</artifactId> - <version>${camel-version}</version> </dependency> <!-- logging --> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> - <version>${slf4j-version}</version> <scope>runtime</scope> </dependency> <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> - <version>${log4j-version}</version> <scope>runtime</scope> </dependency> @@ -68,7 +77,6 @@ <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-test</artifactId> - <version>${camel-version}</version> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/f1286916/tooling/archetypes/camel-archetype-groovy/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml ---------------------------------------------------------------------- diff --git a/tooling/archetypes/camel-archetype-groovy/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml b/tooling/archetypes/camel-archetype-groovy/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml index 7d806d7..139d71b 100644 --- a/tooling/archetypes/camel-archetype-groovy/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml +++ b/tooling/archetypes/camel-archetype-groovy/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml @@ -27,9 +27,6 @@ <requiredProperty key="exec-maven-plugin-version"> <defaultValue>${exec-maven-plugin-version}</defaultValue> </requiredProperty> - <requiredProperty key="log4j-version"> - <defaultValue>${log4j-version}</defaultValue> - </requiredProperty> <requiredProperty key="maven-compiler-plugin-version"> <defaultValue>${maven-compiler-plugin-version}</defaultValue> </requiredProperty> @@ -42,9 +39,6 @@ <requiredProperty key="gmaven-plugin-version"> <defaultValue>${gmaven-plugin-version}</defaultValue> </requiredProperty> - <requiredProperty key="slf4j-version"> - <defaultValue>${slf4j-version}</defaultValue> - </requiredProperty> </requiredProperties> <fileSets> <fileSet filtered="true" packaged="true" encoding="UTF-8"> http://git-wip-us.apache.org/repos/asf/camel/blob/f1286916/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 6b53a53..c8b10d5 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 @@ -16,126 +16,131 @@ ## limitations under the License. ## ------------------------------------------------------------------------ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion> - <groupId>${groupId}</groupId> - <artifactId>${artifactId}</artifactId> - <packaging>jar</packaging> - <version>${version}</version> + <groupId>${groupId}</groupId> + <artifactId>${artifactId}</artifactId> + <packaging>jar</packaging> + <version>${version}</version> - <name>A Camel Route</name> - <url>http://www.myorganization.org</url> + <name>A Camel Route</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> + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> + </properties> - <dependencies> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-core</artifactId> - <version>${camel-version}</version> - </dependency> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-groovy</artifactId> - <version>${camel-version}</version> - </dependency> + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-parent</artifactId> + <version>${camel-version}</version> + <scope>import</scope> + <type>pom</type> + </dependency> + </dependencies> + </dependencyManagement> - <!-- used for jetty --> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-jetty</artifactId> - <version>${camel-version}</version> - </dependency> + <dependencies> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-core</artifactId> + </dependency> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-groovy</artifactId> + </dependency> - <!-- logging --> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - <version>${slf4j-version}</version> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>${slf4j-version}</version> - </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>${log4j-version}</version> - </dependency> + <!-- used for jetty --> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-jetty</artifactId> + </dependency> - <!-- testing --> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-test</artifactId> - <version>${camel-version}</version> - <scope>test</scope> - </dependency> - </dependencies> + <!-- logging --> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </dependency> - <build> - <defaultGoal>install</defaultGoal> + <!-- testing --> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-test</artifactId> + <scope>test</scope> + </dependency> + </dependencies> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-resources-plugin</artifactId> - <version>${maven-resources-plugin-version}</version> - <configuration> - <encoding>UTF-8</encoding> - </configuration> - </plugin> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <version>${maven-compiler-plugin-version}</version> - <configuration> - <source>1.8</source> - <target>1.8</target> - <compilerId>groovy-eclipse-compiler</compilerId> - <!-- set verbose to be true if you want lots of uninteresting messages --> - <!-- <verbose>true</verbose> --> - </configuration> - <dependencies> - <dependency> - <groupId>org.codehaus.groovy</groupId> - <artifactId>groovy-eclipse-compiler</artifactId> - <version>2.7.0-01</version> - </dependency> - </dependencies> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-eclipse-plugin</artifactId> - <version>${maven-eclipse-plugin-version}</version> - <configuration> - <additionalProjectnatures> - <projectnature>org.eclipse.jdt.groovy.core.groovyNature</projectnature> - </additionalProjectnatures> - <classpathContainers> - <classpathContainer>org.eclipse.jdt.launching.JRE_CONTAINER</classpathContainer> - <classpathContainer>GROOVY_DSL_SUPPORT</classpathContainer> - </classpathContainers> - </configuration> - </plugin> + <build> + <defaultGoal>install</defaultGoal> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-resources-plugin</artifactId> + <version>${maven-resources-plugin-version}</version> + <configuration> + <encoding>UTF-8</encoding> + </configuration> + </plugin> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <version>${maven-compiler-plugin-version}</version> + <configuration> + <source>1.8</source> + <target>1.8</target> + <compilerId>groovy-eclipse-compiler</compilerId> + <!-- set verbose to be true if you want lots of uninteresting messages --> + <!-- <verbose>true</verbose> --> + </configuration> + <dependencies> + <dependency> + <groupId>org.codehaus.groovy</groupId> + <artifactId>groovy-eclipse-compiler</artifactId> + <version>2.7.0-01</version> + </dependency> + </dependencies> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-eclipse-plugin</artifactId> + <version>${maven-eclipse-plugin-version}</version> + <configuration> + <additionalProjectnatures> + <projectnature>org.eclipse.jdt.groovy.core.groovyNature</projectnature> + </additionalProjectnatures> + <classpathContainers> + <classpathContainer>org.eclipse.jdt.launching.JRE_CONTAINER</classpathContainer> + <classpathContainer>GROOVY_DSL_SUPPORT</classpathContainer> + </classpathContainers> + </configuration> + </plugin> - <!-- Allows the example to be run via 'mvn compile exec:java' --> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>exec-maven-plugin</artifactId> - <version>${exec-maven-plugin-version}</version> - <configuration> - <mainClass>${package}.MainApp</mainClass> - <includePluginDependencies>false</includePluginDependencies> - </configuration> - </plugin> - </plugins> - </build> + <!-- Allows the example to be run via 'mvn compile exec:java' --> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + <version>${exec-maven-plugin-version}</version> + <configuration> + <mainClass>${package}.MainApp</mainClass> + <includePluginDependencies>false</includePluginDependencies> + </configuration> + </plugin> + + </plugins> + </build> </project> http://git-wip-us.apache.org/repos/asf/camel/blob/f1286916/tooling/archetypes/camel-archetype-java/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml ---------------------------------------------------------------------- diff --git a/tooling/archetypes/camel-archetype-java/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml b/tooling/archetypes/camel-archetype-java/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml index 99401b8..4c0f0ee 100644 --- a/tooling/archetypes/camel-archetype-java/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml +++ b/tooling/archetypes/camel-archetype-java/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml @@ -27,18 +27,12 @@ <requiredProperty key="exec-maven-plugin-version"> <defaultValue>${exec-maven-plugin-version}</defaultValue> </requiredProperty> - <requiredProperty key="log4j-version"> - <defaultValue>${log4j-version}</defaultValue> - </requiredProperty> <requiredProperty key="maven-compiler-plugin-version"> <defaultValue>${maven-compiler-plugin-version}</defaultValue> </requiredProperty> <requiredProperty key="maven-resources-plugin-version"> <defaultValue>${maven-resources-plugin-version}</defaultValue> </requiredProperty> - <requiredProperty key="slf4j-version"> - <defaultValue>${slf4j-version}</defaultValue> - </requiredProperty> </requiredProperties> <fileSets> <fileSet filtered="true" packaged="true" encoding="UTF-8"> http://git-wip-us.apache.org/repos/asf/camel/blob/f1286916/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 9f3ec61..7f0a325 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 @@ -33,34 +33,42 @@ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> </properties> + <dependencyManagement> + <dependencies> + <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> + <!-- logging --> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <version>${slf4j-version}</version> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> - <version>${slf4j-version}</version> </dependency> <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> - <version>${log4j-version}</version> </dependency> <!-- testing --> <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/f1286916/tooling/archetypes/camel-archetype-scala/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml ---------------------------------------------------------------------- diff --git a/tooling/archetypes/camel-archetype-scala/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml b/tooling/archetypes/camel-archetype-scala/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml index 7df63dc..a8a5eb1 100644 --- a/tooling/archetypes/camel-archetype-scala/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml +++ b/tooling/archetypes/camel-archetype-scala/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml @@ -24,9 +24,6 @@ <requiredProperty key="camel-version"> <defaultValue>${project.version}</defaultValue> </requiredProperty> - <requiredProperty key="log4j-version"> - <defaultValue>${log4j-version}</defaultValue> - </requiredProperty> <requiredProperty key="maven-compiler-plugin-version"> <defaultValue>${maven-compiler-plugin-version}</defaultValue> </requiredProperty> @@ -48,9 +45,6 @@ <requiredProperty key="scala-maven-plugin-version"> <defaultValue>${scala-maven-plugin-version}</defaultValue> </requiredProperty> - <requiredProperty key="slf4j-version"> - <defaultValue>${slf4j-version}</defaultValue> - </requiredProperty> </requiredProperties> <fileSets> <fileSet filtered="true" packaged="true" encoding="UTF-8"> http://git-wip-us.apache.org/repos/asf/camel/blob/f1286916/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 98e759b..3545e05 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 @@ -32,16 +32,26 @@ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> </properties> + <dependencyManagement> + <dependencies> + <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> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-scala</artifactId> - <version>${camel-version}</version> </dependency> <!-- scala --> @@ -60,24 +70,20 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <version>${slf4j-version}</version> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> - <version>${slf4j-version}</version> </dependency> <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> - <version>${log4j-version}</version> </dependency> <!-- testing --> <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/f1286916/tooling/archetypes/camel-archetype-scr/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml ---------------------------------------------------------------------- diff --git a/tooling/archetypes/camel-archetype-scr/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml b/tooling/archetypes/camel-archetype-scr/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml index 9dfd796..21cf579 100644 --- a/tooling/archetypes/camel-archetype-scr/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml +++ b/tooling/archetypes/camel-archetype-scr/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml @@ -25,9 +25,6 @@ <requiredProperty key="camel-version"> <defaultValue>${project.version}</defaultValue> </requiredProperty> - <requiredProperty key="log4j-version"> - <defaultValue>${log4j-version}</defaultValue> - </requiredProperty> <requiredProperty key="maven-bundle-plugin-version"> <defaultValue>${maven-bundle-plugin-version}</defaultValue> </requiredProperty> @@ -43,9 +40,6 @@ <requiredProperty key="maven-resources-plugin-version"> <defaultValue>${maven-resources-plugin-version}</defaultValue> </requiredProperty> - <requiredProperty key="slf4j-version"> - <defaultValue>${slf4j-version}</defaultValue> - </requiredProperty> </requiredProperties> <fileSets> <fileSet filtered="true" packaged="true" encoding="UTF-8"> http://git-wip-us.apache.org/repos/asf/camel/blob/f1286916/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 3a1f799..d030193 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 @@ -30,44 +30,46 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - - <camel-version>${camel-version}</camel-version> - - <slf4j-version>${slf4j-version}</slf4j-version> - <log4j-version>${log4j-version}</log4j-version> </properties> + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-parent</artifactId> + <version>${camel-version}</version> + <scope>import</scope> + <type>pom</type> + </dependency> + </dependencies> + </dependencyManagement> + <dependencies> <!-- Camel --> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-core</artifactId> - <version>\${camel-version}</version> </dependency> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-scr</artifactId> - <version>\${camel-version}</version> </dependency> <!-- Testing --> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-test</artifactId> - <version>\${camel-version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> - <version>\${slf4j-version}</version> <scope>test</scope> </dependency> <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> - <version>\${log4j-version}</version> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/f1286916/tooling/archetypes/camel-archetype-spring-dm/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml ---------------------------------------------------------------------- diff --git a/tooling/archetypes/camel-archetype-spring-dm/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml b/tooling/archetypes/camel-archetype-spring-dm/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml index 55c6c36..7732ef9 100644 --- a/tooling/archetypes/camel-archetype-spring-dm/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml +++ b/tooling/archetypes/camel-archetype-spring-dm/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml @@ -24,9 +24,6 @@ <requiredProperty key="camel-version"> <defaultValue>${project.version}</defaultValue> </requiredProperty> - <requiredProperty key="log4j-version"> - <defaultValue>${log4j-version}</defaultValue> - </requiredProperty> <requiredProperty key="maven-compiler-plugin-version"> <defaultValue>${maven-compiler-plugin-version}</defaultValue> </requiredProperty> @@ -39,9 +36,6 @@ <requiredProperty key="maven-jar-plugin-version"> <defaultValue>${maven-jar-plugin-version}</defaultValue> </requiredProperty> - <requiredProperty key="slf4j-version"> - <defaultValue>${slf4j-version}</defaultValue> - </requiredProperty> </requiredProperties> <fileSets> <fileSet filtered="true" packaged="true" encoding="UTF-8"> http://git-wip-us.apache.org/repos/asf/camel/blob/f1286916/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 55f11d7..0e7e5f7 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 @@ -29,45 +29,44 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> - - <camel-version>${camel-version}</camel-version> - - <slf4j-version>${slf4j-version}</slf4j-version> - <log4j-version>${log4j-version}</log4j-version> </properties> + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-parent</artifactId> + <version>${camel-version}</version> + <scope>import</scope> + <type>pom</type> + </dependency> + </dependencies> + </dependencyManagement> + <dependencies> <!-- Camel --> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-core</artifactId> - <version>\${camel-version}</version> </dependency> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-spring</artifactId> - <version>\${camel-version}</version> </dependency> <!-- Testing --> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-test-spring</artifactId> - <version>\${camel-version}</version> - <scope>test</scope> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> - <version>\${slf4j-version}</version> - <scope>test</scope> </dependency> <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> - <version>\${log4j-version}</version> - <scope>test</scope> </dependency> </dependencies> @@ -126,7 +125,7 @@ <plugin> <groupId>org.apache.camel</groupId> <artifactId>camel-maven-plugin</artifactId> - <version>\${camel-version}</version> + <version>${camel-version}</version> </plugin> </plugins> </build> http://git-wip-us.apache.org/repos/asf/camel/blob/f1286916/tooling/archetypes/camel-archetype-spring/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml ---------------------------------------------------------------------- diff --git a/tooling/archetypes/camel-archetype-spring/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml b/tooling/archetypes/camel-archetype-spring/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml index 46e3a2b..c797399 100644 --- a/tooling/archetypes/camel-archetype-spring/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml +++ b/tooling/archetypes/camel-archetype-spring/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml @@ -24,18 +24,12 @@ <requiredProperty key="camel-version"> <defaultValue>${project.version}</defaultValue> </requiredProperty> - <requiredProperty key="log4j-version"> - <defaultValue>${log4j-version}</defaultValue> - </requiredProperty> <requiredProperty key="maven-compiler-plugin-version"> <defaultValue>${maven-compiler-plugin-version}</defaultValue> </requiredProperty> <requiredProperty key="maven-resources-plugin-version"> <defaultValue>${maven-resources-plugin-version}</defaultValue> </requiredProperty> - <requiredProperty key="slf4j-version"> - <defaultValue>${slf4j-version}</defaultValue> - </requiredProperty> </requiredProperties> <fileSets> <fileSet filtered="true" packaged="true" encoding="UTF-8"> http://git-wip-us.apache.org/repos/asf/camel/blob/f1286916/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 026a9c8..88e50c2 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 @@ -32,40 +32,46 @@ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> </properties> + <dependencyManagement> + <dependencies> + <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> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-spring</artifactId> - <version>${camel-version}</version> </dependency> <!-- logging --> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <version>${slf4j-version}</version> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> - <version>${slf4j-version}</version> </dependency> <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> - <version>${log4j-version}</version> </dependency> <!-- testing --> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-test-spring</artifactId> - <version>${camel-version}</version> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/f1286916/tooling/archetypes/camel-archetype-web/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml ---------------------------------------------------------------------- diff --git a/tooling/archetypes/camel-archetype-web/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml b/tooling/archetypes/camel-archetype-web/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml index df1964f..c9f7378 100644 --- a/tooling/archetypes/camel-archetype-web/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml +++ b/tooling/archetypes/camel-archetype-web/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml @@ -30,9 +30,6 @@ <requiredProperty key="jetty-plugin-version"> <defaultValue>${jetty-plugin-version}</defaultValue> </requiredProperty> - <requiredProperty key="log4j-version"> - <defaultValue>${log4j-version}</defaultValue> - </requiredProperty> <requiredProperty key="maven-compiler-plugin-version"> <defaultValue>${maven-compiler-plugin-version}</defaultValue> </requiredProperty> @@ -42,9 +39,6 @@ <requiredProperty key="maven-jboss-as-maven-plugin-version"> <defaultValue>${maven-jboss-as-maven-plugin-version}</defaultValue> </requiredProperty> - <requiredProperty key="slf4j-version"> - <defaultValue>${slf4j-version}</defaultValue> - </requiredProperty> <requiredProperty key="spring-version"> <defaultValue>${spring-version}</defaultValue> </requiredProperty> http://git-wip-us.apache.org/repos/asf/camel/blob/f1286916/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 0ba1e8c..460f863 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 @@ -34,23 +34,32 @@ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> </properties> + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-parent</artifactId> + <version>${camel-version}</version> + <scope>import</scope> + <type>pom</type> + </dependency> + </dependencies> + </dependencyManagement> + <dependencies> <!-- Camel Dependencies --> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-core</artifactId> - <version>${camel-version}</version> </dependency> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-spring</artifactId> - <version>${camel-version}</version> </dependency> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-servlet</artifactId> - <version>${camel-version}</version> </dependency> <!-- Spring Web --> @@ -64,24 +73,20 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <version>${slf4j-version}</version> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> - <version>${slf4j-version}</version> </dependency> <dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId> - <version>${log4j-version}</version> </dependency> <!-- testing --> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-test-spring</artifactId> - <version>${camel-version}</version> <scope>test</scope> </dependency> </dependencies>
