CAMEL-9379: Camel BOM should not include tooling depdencies. Introduce a tooling-parent BOM
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/577d8d11 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/577d8d11 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/577d8d11 Branch: refs/heads/master Commit: 577d8d11f80b04ca97856c4a26765dd9646a7796 Parents: 74b9e98 Author: Claus Ibsen <davscl...@apache.org> Authored: Thu Dec 10 09:07:43 2015 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Thu Dec 10 09:07:43 2015 +0100 ---------------------------------------------------------------------- .../camel-salesforce-maven-plugin/pom.xml | 59 ++++++++- parent/pom.xml | 1 - .../camel-api-component-maven-plugin/pom.xml | 63 ++++++++-- .../camel/maven/AbstractGeneratorMojo.java | 7 +- .../src/test/resources/log4j.properties | 37 ++++++ .../pom.xml | 47 +++++++- tooling/maven/camel-maven-plugin/pom.xml | 23 ++-- .../maven/camel-package-maven-plugin/pom.xml | 37 +++++- tooling/maven/guice-maven-plugin/pom.xml | 27 ++--- tooling/maven/pom.xml | 70 ----------- tooling/parent/pom.xml | 119 +++++++++++++++++++ tooling/pom.xml | 1 + 12 files changed, 369 insertions(+), 122 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/577d8d11/components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml ---------------------------------------------------------------------- diff --git a/components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml b/components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml index 40997ba..76bacfe 100644 --- a/components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml +++ b/components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml @@ -15,7 +15,8 @@ See the License for the specific language governing permissions and 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";> +<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";> <modelVersion>4.0.0</modelVersion> @@ -35,13 +36,63 @@ <dependencies> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>maven-plugins</artifactId> + <artifactId>tooling-parent</artifactId> <version>${project.version}</version> + <type>pom</type> + <scope>import</scope> </dependency> </dependencies> </dependencyManagement> - <dependencies> + <dependencies> + + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-core</artifactId> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-jdk14</artifactId> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>jcl-over-slf4j</artifactId> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-nop</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-artifact</artifactId> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-plugin-api</artifactId> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-plugin-descriptor</artifactId> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-project</artifactId> + </dependency> + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-container-default</artifactId> + </dependency> + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-utils</artifactId> + </dependency> + <dependency> + <groupId>org.sonatype.plexus</groupId> + <artifactId>plexus-build-api</artifactId> + </dependency> + <dependency> <groupId>org.apache.maven.plugin-tools</groupId> <artifactId>maven-plugin-annotations</artifactId> @@ -131,7 +182,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-invoker-plugin</artifactId> - <version>1.7</version> + <version>1.8</version> <configuration> <debug>true</debug> <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo> http://git-wip-us.apache.org/repos/asf/camel/blob/577d8d11/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 68f6a62..9c97425 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -367,7 +367,6 @@ <maven-shade-plugin-version>2.4.1</maven-shade-plugin-version> <maven-surefire-report-plugin-version>2.13</maven-surefire-report-plugin-version> <maven-war-plugin-version>2.6</maven-war-plugin-version> - <maven-version>2.0</maven-version> <metrics-version>3.1.2</metrics-version> <mina-bundle-version>1.1.7_6</mina-bundle-version> <mina-version>1.1.7</mina-version> http://git-wip-us.apache.org/repos/asf/camel/blob/577d8d11/tooling/maven/camel-api-component-maven-plugin/pom.xml ---------------------------------------------------------------------- diff --git a/tooling/maven/camel-api-component-maven-plugin/pom.xml b/tooling/maven/camel-api-component-maven-plugin/pom.xml index 7d7807a..f6797da 100644 --- a/tooling/maven/camel-api-component-maven-plugin/pom.xml +++ b/tooling/maven/camel-api-component-maven-plugin/pom.xml @@ -34,16 +34,61 @@ <dependencies> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>tooling</artifactId> + <artifactId>tooling-parent</artifactId> <version>${project.version}</version> + <type>pom</type> + <scope>import</scope> </dependency> </dependencies> </dependencyManagement> <dependencies> + <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-core</artifactId> + <groupId>org.apache.maven</groupId> + <artifactId>maven-core</artifactId> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-jdk14</artifactId> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>jcl-over-slf4j</artifactId> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-nop</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-artifact</artifactId> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-plugin-api</artifactId> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-plugin-descriptor</artifactId> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-project</artifactId> + </dependency> + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-container-default</artifactId> + </dependency> + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-utils</artifactId> + </dependency> + <dependency> + <groupId>org.sonatype.plexus</groupId> + <artifactId>plexus-build-api</artifactId> </dependency> <dependency> @@ -64,6 +109,10 @@ </dependency> <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-core</artifactId> + </dependency> + <dependency> <groupId>org.apache.velocity</groupId> <artifactId>velocity</artifactId> <version>${velocity-version}</version> @@ -76,12 +125,12 @@ </dependency> <dependency> <groupId>org.slf4j</groupId> - <artifactId>log4j-over-slf4j</artifactId> - <version>${slf4j-version}</version> + <artifactId>slf4j-log4j12</artifactId> + <scope>test</scope> </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> <scope>test</scope> </dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/577d8d11/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/AbstractGeneratorMojo.java ---------------------------------------------------------------------- diff --git a/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/AbstractGeneratorMojo.java b/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/AbstractGeneratorMojo.java index 30e67dd..e21f573 100644 --- a/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/AbstractGeneratorMojo.java +++ b/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/AbstractGeneratorMojo.java @@ -28,7 +28,6 @@ import java.util.Iterator; import java.util.List; import java.util.Properties; -import org.apache.log4j.Logger; import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugins.annotations.Parameter; @@ -40,6 +39,8 @@ import org.apache.velocity.exception.VelocityException; import org.apache.velocity.runtime.RuntimeConstants; import org.apache.velocity.runtime.log.Log4JLogChute; import org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Base class for API based generation MOJOs. @@ -56,7 +57,7 @@ public abstract class AbstractGeneratorMojo extends AbstractMojo { private static boolean sharedProjectState; // used for velocity logging, to avoid creating velocity.log - protected final Logger log = Logger.getLogger(this.getClass()); + protected final Logger log = LoggerFactory.getLogger(this.getClass()); @Parameter(defaultValue = OUT_PACKAGE) protected String outPackage; @@ -94,7 +95,7 @@ public abstract class AbstractGeneratorMojo extends AbstractMojo { velocityProperties.setProperty(RuntimeConstants.RESOURCE_LOADER, "cloader"); velocityProperties.setProperty("cloader.resource.loader.class", ClasspathResourceLoader.class.getName()); velocityProperties.setProperty(RuntimeConstants.RUNTIME_LOG_LOGSYSTEM_CLASS, Log4JLogChute.class.getName()); - final Logger velocityLogger = Logger.getLogger("org.apache.camel.maven.Velocity"); + final Logger velocityLogger = LoggerFactory.getLogger("org.apache.camel.maven.Velocity"); velocityProperties.setProperty(Log4JLogChute.RUNTIME_LOG_LOG4J_LOGGER, velocityLogger.getName()); engine = new VelocityEngine(velocityProperties); engine.init(); http://git-wip-us.apache.org/repos/asf/camel/blob/577d8d11/tooling/maven/camel-api-component-maven-plugin/src/test/resources/log4j.properties ---------------------------------------------------------------------- diff --git a/tooling/maven/camel-api-component-maven-plugin/src/test/resources/log4j.properties b/tooling/maven/camel-api-component-maven-plugin/src/test/resources/log4j.properties new file mode 100644 index 0000000..a910991 --- /dev/null +++ b/tooling/maven/camel-api-component-maven-plugin/src/test/resources/log4j.properties @@ -0,0 +1,37 @@ +## ------------------------------------------------------------------------ +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## ------------------------------------------------------------------------ + +# +# The logging properties used for testing. +# +log4j.rootLogger=INFO, file + +# uncomment the following to enable debugging +#log4j.logger.org.apache.camel.maven=DEBUG +#log4j.logger.org.apache.maven=DEBUG + +# CONSOLE appender not used by default +log4j.appender.out=org.apache.log4j.ConsoleAppender +log4j.appender.out.layout=org.apache.log4j.PatternLayout +#log4j.appender.out.layout.ConversionPattern=[%30.30t] %-30.30c{1} %-5p %m%n +log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n + +# File appender +log4j.appender.file=org.apache.log4j.FileAppender +log4j.appender.file.layout=org.apache.log4j.PatternLayout +log4j.appender.file.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n +log4j.appender.file.file=target/camel-api-component-maven-plugin-test.log http://git-wip-us.apache.org/repos/asf/camel/blob/577d8d11/tooling/maven/camel-eip-documentation-enricher-maven-plugin/pom.xml ---------------------------------------------------------------------- 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 e7b7958..b2478e3 100644 --- a/tooling/maven/camel-eip-documentation-enricher-maven-plugin/pom.xml +++ b/tooling/maven/camel-eip-documentation-enricher-maven-plugin/pom.xml @@ -34,8 +34,10 @@ <dependencies> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>tooling</artifactId> + <artifactId>tooling-parent</artifactId> <version>${project.version}</version> + <type>pom</type> + <scope>import</scope> </dependency> </dependencies> </dependencyManagement> @@ -43,8 +45,36 @@ <dependencies> <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>camel-core</artifactId> + <groupId>org.apache.maven</groupId> + <artifactId>maven-core</artifactId> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-artifact</artifactId> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-plugin-api</artifactId> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-plugin-descriptor</artifactId> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-project</artifactId> + </dependency> + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-container-default</artifactId> + </dependency> + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-utils</artifactId> + </dependency> + <dependency> + <groupId>org.sonatype.plexus</groupId> + <artifactId>plexus-build-api</artifactId> </dependency> <dependency> @@ -53,10 +83,15 @@ <version>3.3</version> <scope>provided</scope> </dependency> + + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>camel-core</artifactId> + </dependency> <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> - <version>${commons-lang3-version}</version> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>${commons-lang-version}</version> </dependency> <!-- add some logging to the classpath --> http://git-wip-us.apache.org/repos/asf/camel/blob/577d8d11/tooling/maven/camel-maven-plugin/pom.xml ---------------------------------------------------------------------- diff --git a/tooling/maven/camel-maven-plugin/pom.xml b/tooling/maven/camel-maven-plugin/pom.xml index 653e4b2..09574a2 100644 --- a/tooling/maven/camel-maven-plugin/pom.xml +++ b/tooling/maven/camel-maven-plugin/pom.xml @@ -29,17 +29,14 @@ <name>Camel :: Maven Plugins :: Camel Maven Run</name> <description>Maven plugin to run Camel standalone</description> - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>tooling</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> - </dependencyManagement> - <dependencies> + + <!-- we extend the exec-maven-plugin for this camel maven plugin --> + <dependency> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + </dependency> + <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-core</artifactId> @@ -63,10 +60,6 @@ <artifactId>camel-cdi</artifactId> </dependency> - <dependency> - <groupId>org.codehaus.mojo</groupId> - <artifactId>exec-maven-plugin</artifactId> - </dependency> <!-- add some logging to the classpath --> <dependency> @@ -77,5 +70,7 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> </dependency> + </dependencies> + </project> http://git-wip-us.apache.org/repos/asf/camel/blob/577d8d11/tooling/maven/camel-package-maven-plugin/pom.xml ---------------------------------------------------------------------- diff --git a/tooling/maven/camel-package-maven-plugin/pom.xml b/tooling/maven/camel-package-maven-plugin/pom.xml index cbb40b5..1129663 100644 --- a/tooling/maven/camel-package-maven-plugin/pom.xml +++ b/tooling/maven/camel-package-maven-plugin/pom.xml @@ -33,8 +33,10 @@ <dependencies> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>tooling</artifactId> + <artifactId>tooling-parent</artifactId> <version>${project.version}</version> + <type>pom</type> + <scope>import</scope> </dependency> </dependencies> </dependencyManagement> @@ -42,6 +44,39 @@ <dependencies> <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-core</artifactId> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-artifact</artifactId> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-plugin-api</artifactId> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-plugin-descriptor</artifactId> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-project</artifactId> + </dependency> + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-container-default</artifactId> + </dependency> + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-utils</artifactId> + </dependency> + <dependency> + <groupId>org.sonatype.plexus</groupId> + <artifactId>plexus-build-api</artifactId> + </dependency> + + <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/577d8d11/tooling/maven/guice-maven-plugin/pom.xml ---------------------------------------------------------------------- diff --git a/tooling/maven/guice-maven-plugin/pom.xml b/tooling/maven/guice-maven-plugin/pom.xml index 6c07696..aa7fa21 100644 --- a/tooling/maven/guice-maven-plugin/pom.xml +++ b/tooling/maven/guice-maven-plugin/pom.xml @@ -15,7 +15,8 @@ See the License for the specific language governing permissions and 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";> +<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";> <modelVersion>4.0.0</modelVersion> <parent> @@ -29,17 +30,14 @@ <name>Camel :: Maven Plugins :: Camel Maven Guice</name> <description>Maven plugin to run Camel with Guice</description> - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.apache.camel</groupId> - <artifactId>tooling</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> - </dependencyManagement> - <dependencies> + + <!-- we extend the exec-maven-plugin for this camel maven plugin --> + <dependency> + <groupId>org.codehaus.mojo</groupId> + <artifactId>exec-maven-plugin</artifactId> + </dependency> + <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-core</artifactId> @@ -49,11 +47,6 @@ <artifactId>camel-guice</artifactId> </dependency> - <dependency> - <groupId>org.codehaus.mojo</groupId> - <artifactId>exec-maven-plugin</artifactId> - </dependency> - <!-- add some logging to the classpath --> <dependency> <groupId>log4j</groupId> @@ -63,5 +56,7 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> </dependency> + </dependencies> + </project> http://git-wip-us.apache.org/repos/asf/camel/blob/577d8d11/tooling/maven/pom.xml ---------------------------------------------------------------------- diff --git a/tooling/maven/pom.xml b/tooling/maven/pom.xml index a4a5b9e..b64789c 100644 --- a/tooling/maven/pom.xml +++ b/tooling/maven/pom.xml @@ -29,76 +29,6 @@ <description>Camel Maven Plugins</description> <packaging>pom</packaging> - <properties> - <maven-version>2.2.1</maven-version> - <maven-maven-plugin-descriptor-version>2.2.1</maven-maven-plugin-descriptor-version> - <maven-project-version>2.2.1</maven-project-version> - <maven-reporting-api-version>2.2.1</maven-reporting-api-version> - <maven-reporting-impl-version>2.4</maven-reporting-impl-version> - <plexus-build-api-version>0.0.7</plexus-build-api-version> - <plexus-container-default-version>1.6</plexus-container-default-version> - <plexus-utils-version>3.0.22</plexus-utils-version> - </properties> - - <dependencies> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-core</artifactId> - <version>${maven-version}</version> - </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-artifact</artifactId> - <version>${maven-version}</version> - </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-plugin-api</artifactId> - <version>${maven-version}</version> - </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-plugin-descriptor</artifactId> - <version>${maven-maven-plugin-descriptor-version}</version> - <exclusions> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-project</artifactId> - <version>${maven-project-version}</version> - </dependency> - <dependency> - <groupId>org.apache.maven.reporting</groupId> - <artifactId>maven-reporting-api</artifactId> - <version>${maven-reporting-api-version}</version> - </dependency> - <dependency> - <groupId>org.apache.maven.reporting</groupId> - <artifactId>maven-reporting-impl</artifactId> - <version>${maven-reporting-impl-version}</version> - </dependency> - <dependency> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-container-default</artifactId> - <version>${plexus-container-default-version}</version> - </dependency> - <dependency> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-utils</artifactId> - <version>${plexus-utils-version}</version> - </dependency> - <dependency> - <groupId>org.sonatype.plexus</groupId> - <artifactId>plexus-build-api</artifactId> - <version>${plexus-build-api-version}</version> - </dependency> - </dependencies> - <modules> <module>camel-package-maven-plugin</module> <module>camel-maven-plugin</module> http://git-wip-us.apache.org/repos/asf/camel/blob/577d8d11/tooling/parent/pom.xml ---------------------------------------------------------------------- diff --git a/tooling/parent/pom.xml b/tooling/parent/pom.xml new file mode 100644 index 0000000..aefcf52 --- /dev/null +++ b/tooling/parent/pom.xml @@ -0,0 +1,119 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + 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";> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.apache.camel</groupId> + <artifactId>tooling</artifactId> + <version>2.17-SNAPSHOT</version> + </parent> + + <artifactId>tooling-parent</artifactId> + <name>Camel :: Tooling Parent</name> + <description>Camel Tooling Parent POM</description> + <packaging>pom</packaging> + + <properties> + <maven-version>2.2.1</maven-version> + <maven-maven-plugin-descriptor-version>2.2.1</maven-maven-plugin-descriptor-version> + <maven-project-version>2.2.1</maven-project-version> + <maven-reporting-api-version>2.2.1</maven-reporting-api-version> + <maven-reporting-impl-version>2.4</maven-reporting-impl-version> + <plexus-build-api-version>0.0.7</plexus-build-api-version> + <plexus-container-default-version>1.6</plexus-container-default-version> + <plexus-utils-version>3.0.22</plexus-utils-version> + </properties> + + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-core</artifactId> + <version>${maven-version}</version> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-jdk14</artifactId> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>jcl-over-slf4j</artifactId> + </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-nop</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-artifact</artifactId> + <version>${maven-version}</version> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-plugin-api</artifactId> + <version>${maven-version}</version> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-plugin-descriptor</artifactId> + <version>${maven-maven-plugin-descriptor-version}</version> + <exclusions> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-project</artifactId> + <version>${maven-project-version}</version> + </dependency> + <dependency> + <groupId>org.apache.maven.reporting</groupId> + <artifactId>maven-reporting-api</artifactId> + <version>${maven-reporting-api-version}</version> + </dependency> + <dependency> + <groupId>org.apache.maven.reporting</groupId> + <artifactId>maven-reporting-impl</artifactId> + <version>${maven-reporting-impl-version}</version> + </dependency> + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-container-default</artifactId> + <version>${plexus-container-default-version}</version> + </dependency> + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-utils</artifactId> + <version>${plexus-utils-version}</version> + </dependency> + <dependency> + <groupId>org.sonatype.plexus</groupId> + <artifactId>plexus-build-api</artifactId> + <version>${plexus-build-api-version}</version> + </dependency> + </dependencies> + </dependencyManagement> + +</project> http://git-wip-us.apache.org/repos/asf/camel/blob/577d8d11/tooling/pom.xml ---------------------------------------------------------------------- diff --git a/tooling/pom.xml b/tooling/pom.xml index d5d2622..7aa405b 100644 --- a/tooling/pom.xml +++ b/tooling/pom.xml @@ -32,6 +32,7 @@ <packaging>pom</packaging> <modules> + <module>parent</module> <module>spi-annotations</module> <module>apt</module> <module>maven</module>
