Repository: camel Updated Branches: refs/heads/master 8cde32a69 -> fb84a1fed
CAMEL-9379: Camel BOM should not include tooling depdencies Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/fb84a1fe Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/fb84a1fe Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/fb84a1fe Branch: refs/heads/master Commit: fb84a1fedfbb6fe0b439b7a24d1ceed3802cfd72 Parents: 8cde32a Author: Claus Ibsen <davscl...@apache.org> Authored: Wed Dec 9 10:19:33 2015 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Wed Dec 9 10:20:05 2015 +0100 ---------------------------------------------------------------------- .../camel-salesforce-maven-plugin/pom.xml | 4 -- parent/pom.xml | 25 +--------- .../camel-api-component-maven-plugin/pom.xml | 41 ++++++--------- .../camel/maven/DocumentGeneratorMojo.java | 2 +- .../pom.xml | 33 ++----------- tooling/maven/camel-maven-plugin/pom.xml | 8 --- .../maven/camel-package-maven-plugin/pom.xml | 38 ++------------ tooling/maven/guice-maven-plugin/pom.xml | 19 ------- tooling/maven/pom.xml | 36 -------------- tooling/pom.xml | 52 ++++++++++++++++++++ 10 files changed, 78 insertions(+), 180 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/fb84a1fe/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 1370997..99ab3b8 100644 --- a/components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml +++ b/components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml @@ -43,10 +43,6 @@ <dependencies> <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-plugin-api</artifactId> - </dependency> - <dependency> <groupId>org.apache.maven.plugin-tools</groupId> <artifactId>maven-plugin-annotations</artifactId> <version>3.2</version> http://git-wip-us.apache.org/repos/asf/camel/blob/fb84a1fe/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 8718a99..c5b5330 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -2520,33 +2520,13 @@ <version>${axiom-version}</version> </dependency> - <!-- Tooling dependencies --> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-plugin-api</artifactId> - <version>${maven-version}</version> - </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-project</artifactId> - <version>${maven-version}</version> - </dependency> + <!-- Maven exec-plugin dependencies --> <dependency> <groupId>org.codehaus.mojo</groupId> <artifactId>exec-maven-plugin</artifactId> <version>${exec-maven-plugin-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> - + <!-- optional misc --> <dependency> <groupId>com.google.code.scriptengines</groupId> @@ -2666,7 +2646,6 @@ <version>${zookeeper-version}</version> </dependency> - <!-- optional krati dependency --> <dependency> <groupId>com.sna-projects.krati</groupId> http://git-wip-us.apache.org/repos/asf/camel/blob/fb84a1fe/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 effdd3d..7d7807a 100644 --- a/tooling/maven/camel-api-component-maven-plugin/pom.xml +++ b/tooling/maven/camel-api-component-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> @@ -46,35 +47,22 @@ </dependency> <dependency> - <groupId>org.apache.maven.reporting</groupId> - <artifactId>maven-reporting-api</artifactId> - </dependency> - <dependency> - <groupId>org.apache.maven.reporting</groupId> - <artifactId>maven-reporting-impl</artifactId> - </dependency> - <dependency> <groupId>org.apache.maven.plugin-tools</groupId> <artifactId>maven-plugin-annotations</artifactId> <version>3.3</version> <scope>provided</scope> </dependency> <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-plugin-descriptor</artifactId> - <version>2.2.1</version> - <exclusions> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - </exclusions> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-module-xhtml</artifactId> + <version>1.6</version> </dependency> <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-artifact</artifactId> - <version>2.2.1</version> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-site-renderer</artifactId> + <version>1.6</version> </dependency> + <dependency> <groupId>org.apache.velocity</groupId> <artifactId>velocity</artifactId> @@ -139,17 +127,17 @@ <execution> <id>mojo-descriptor</id> <goals> - <goal>descriptor</goal> + <goal>descriptor</goal> </goals> </execution> <execution> <id>help-goal</id> <goals> - <goal>helpmojo</goal> + <goal>helpmojo</goal> </goals> </execution> </executions> - </plugin> + </plugin> </plugins> </pluginManagement> <plugins> @@ -167,7 +155,8 @@ <configuration> <encoding>UTF-8</encoding> <overwrite>true</overwrite> - <outputDirectory>${project.build.directory}/it/all-it/src/main/java/org/apache/camel/component/test</outputDirectory> + <outputDirectory>${project.build.directory}/it/all-it/src/main/java/org/apache/camel/component/test + </outputDirectory> <resources> <resource> <directory>src/test/java/org/apache/camel/component/test</directory> @@ -252,8 +241,8 @@ </executions> </plugin> </plugins> - </build> </profile> </profiles> + </project> http://git-wip-us.apache.org/repos/asf/camel/blob/fb84a1fe/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/DocumentGeneratorMojo.java ---------------------------------------------------------------------- diff --git a/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/DocumentGeneratorMojo.java b/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/DocumentGeneratorMojo.java index ff155ca..f1f9881 100644 --- a/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/DocumentGeneratorMojo.java +++ b/tooling/maven/camel-api-component-maven-plugin/src/main/java/org/apache/camel/maven/DocumentGeneratorMojo.java @@ -38,7 +38,7 @@ import org.apache.camel.util.component.ApiMethod; import org.apache.camel.util.component.ApiMethodHelper; import org.apache.camel.util.component.ApiName; import org.apache.commons.lang.ClassUtils; -import org.apache.maven.doxia.module.xhtml.decoration.render.RenderingContext; +import org.apache.maven.doxia.siterenderer.RenderingContext; import org.apache.maven.doxia.siterenderer.sink.SiteRendererSink; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoFailureException; http://git-wip-us.apache.org/repos/asf/camel/blob/fb84a1fe/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 b2e1da5..e7b7958 100644 --- a/tooling/maven/camel-eip-documentation-enricher-maven-plugin/pom.xml +++ b/tooling/maven/camel-eip-documentation-enricher-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> @@ -47,36 +48,12 @@ </dependency> <dependency> - <groupId>org.apache.maven.reporting</groupId> - <artifactId>maven-reporting-api</artifactId> - </dependency> - <dependency> - <groupId>org.apache.maven.reporting</groupId> - <artifactId>maven-reporting-impl</artifactId> - </dependency> - <dependency> <groupId>org.apache.maven.plugin-tools</groupId> <artifactId>maven-plugin-annotations</artifactId> <version>3.3</version> <scope>provided</scope> </dependency> <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-plugin-descriptor</artifactId> - <version>2.2.1</version> - <exclusions> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-artifact</artifactId> - <version>2.2.1</version> - </dependency> - <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> <version>${commons-lang3-version}</version> @@ -145,17 +122,17 @@ <execution> <id>mojo-descriptor</id> <goals> - <goal>descriptor</goal> + <goal>descriptor</goal> </goals> </execution> <execution> <id>help-goal</id> <goals> - <goal>helpmojo</goal> + <goal>helpmojo</goal> </goals> </execution> </executions> - </plugin> + </plugin> </plugins> </pluginManagement> <plugins> http://git-wip-us.apache.org/repos/asf/camel/blob/fb84a1fe/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 e15243e..653e4b2 100644 --- a/tooling/maven/camel-maven-plugin/pom.xml +++ b/tooling/maven/camel-maven-plugin/pom.xml @@ -67,14 +67,6 @@ <groupId>org.codehaus.mojo</groupId> <artifactId>exec-maven-plugin</artifactId> </dependency> - <dependency> - <groupId>org.apache.maven.reporting</groupId> - <artifactId>maven-reporting-api</artifactId> - </dependency> - <dependency> - <groupId>org.apache.maven.reporting</groupId> - <artifactId>maven-reporting-impl</artifactId> - </dependency> <!-- add some logging to the classpath --> <dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/fb84a1fe/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 fd28ebf..cbb40b5 100644 --- a/tooling/maven/camel-package-maven-plugin/pom.xml +++ b/tooling/maven/camel-package-maven-plugin/pom.xml @@ -40,42 +40,10 @@ </dependencyManagement> <dependencies> + <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-core</artifactId> - <scope>provided</scope> - <version>2.2.1</version> - </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-artifact</artifactId> - <scope>provided</scope> - <version>2.2.1</version> - </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-plugin-api</artifactId> - <scope>provided</scope> - <version>2.2.1</version> - </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-project</artifactId> - <scope>provided</scope> - <version>2.2.1</version> - </dependency> - <dependency> - <groupId>org.sonatype.plexus</groupId> - <artifactId>plexus-build-api</artifactId> - <version>0.0.7</version> - </dependency> - <dependency> - <groupId>org.apache.maven.reporting</groupId> - <artifactId>maven-reporting-api</artifactId> - </dependency> - <dependency> - <groupId>org.apache.maven.reporting</groupId> - <artifactId>maven-reporting-impl</artifactId> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> </dependency> <!-- add some logging to the classpath --> http://git-wip-us.apache.org/repos/asf/camel/blob/fb84a1fe/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 2c25f92..6c07696 100644 --- a/tooling/maven/guice-maven-plugin/pom.xml +++ b/tooling/maven/guice-maven-plugin/pom.xml @@ -53,25 +53,6 @@ <groupId>org.codehaus.mojo</groupId> <artifactId>exec-maven-plugin</artifactId> </dependency> - <dependency> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-utils</artifactId> - <version>${plexus-utils-version}</version> - </dependency> - <dependency> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-container-default</artifactId> - <version>${plexus-container-default-version}</version> - </dependency> - - <dependency> - <groupId>org.apache.maven.reporting</groupId> - <artifactId>maven-reporting-api</artifactId> - </dependency> - <dependency> - <groupId>org.apache.maven.reporting</groupId> - <artifactId>maven-reporting-impl</artifactId> - </dependency> <!-- add some logging to the classpath --> <dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/fb84a1fe/tooling/maven/pom.xml ---------------------------------------------------------------------- diff --git a/tooling/maven/pom.xml b/tooling/maven/pom.xml index 21a7988..b64789c 100644 --- a/tooling/maven/pom.xml +++ b/tooling/maven/pom.xml @@ -37,40 +37,4 @@ <module>camel-api-component-maven-plugin</module> </modules> - <dependencies> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-plugin-api</artifactId> - </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-project</artifactId> - </dependency> - </dependencies> - - <reporting> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-plugin-plugin</artifactId> - <version>${maven-plugin-plugin-version}</version> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <links> - <link>http://download.oracle.com/javase/6/docs/api/</link> - <link>http://download.oracle.com/javaee/6/api/</link> - <link>http://static.springsource.org/spring/docs/${spring-version}/javadoc-api/</link> - </links> - <stylesheetfile>${basedir}/../../../etc/css/stylesheet.css</stylesheetfile> - <linksource>true</linksource> - <maxmemory>900m</maxmemory> - <source>${jdk.version}</source> - </configuration> - </plugin> - </plugins> - </reporting> </project> http://git-wip-us.apache.org/repos/asf/camel/blob/fb84a1fe/tooling/pom.xml ---------------------------------------------------------------------- diff --git a/tooling/pom.xml b/tooling/pom.xml index 886ef0f..ed49475 100644 --- a/tooling/pom.xml +++ b/tooling/pom.xml @@ -32,12 +32,59 @@ <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> @@ -47,6 +94,11 @@ <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>
