Repository: camel Updated Branches: refs/heads/master 6b55abd4f -> 87dbfa08d
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/87dbfa08 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/87dbfa08 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/87dbfa08 Branch: refs/heads/master Commit: 87dbfa08d43e698052962959593cd427d172aa39 Parents: 6b55abd Author: Claus Ibsen <davscl...@apache.org> Authored: Tue Dec 1 08:34:27 2015 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Tue Dec 1 08:34:27 2015 +0100 ---------------------------------------------------------------------- .../camel-salesforce-maven-plugin/pom.xml | 17 ++++++++++------ parent/pom.xml | 14 +------------ .../camel-api-component-maven-plugin/pom.xml | 14 +++++++++---- .../pom.xml | 16 +++++++++++---- tooling/maven/camel-maven-plugin/pom.xml | 19 +++++++++--------- .../maven/camel-package-maven-plugin/pom.xml | 14 +++++++++---- tooling/maven/guice-maven-plugin/pom.xml | 12 +++++++++++ tooling/pom.xml | 21 +++++++++++++++++++- 8 files changed, 86 insertions(+), 41 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/87dbfa08/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 64b347b..1370997 100644 --- a/components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml +++ b/components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml @@ -31,7 +31,17 @@ <name>Camel :: Salesforce :: Maven plugin</name> <description>Camel Salesforce Maven plugin</description> - <dependencies> + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>tooling</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> + </dependencyManagement> + + <dependencies> <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-plugin-api</artifactId> @@ -43,11 +53,6 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-utils</artifactId> - <version>3.0.8</version> - </dependency> - <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-salesforce</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/87dbfa08/parent/pom.xml ---------------------------------------------------------------------- diff --git a/parent/pom.xml b/parent/pom.xml index 93260e9..197db7c 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -410,9 +410,7 @@ <pax-tiny-bundle-version>1.3.2</pax-tiny-bundle-version> <pax-logging-version>1.8.4</pax-logging-version> <pdfbox-version>1.8.10</pdfbox-version> - <pgjdbc-ng-driver-version>0.4</pgjdbc-ng-driver-version> - <plexus-container-default-version>1.0-alpha-48</plexus-container-default-version> - <plexus-utils-version>1.5.8</plexus-utils-version> + <pgjdbc-ng-driver-version>0.4</pgjdbc-ng-driver-version> <powermock-version>1.6.1</powermock-version> <protobuf-version>2.6.1</protobuf-version> <qpid-bundle-version>0.28_1</qpid-bundle-version> @@ -2537,16 +2535,6 @@ <version>${exec-maven-plugin-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.apache.maven.reporting</groupId> <artifactId>maven-reporting-api</artifactId> <version>${maven-reporting-api-version}</version> http://git-wip-us.apache.org/repos/asf/camel/blob/87dbfa08/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 d3c836f..effdd3d 100644 --- a/tooling/maven/camel-api-component-maven-plugin/pom.xml +++ b/tooling/maven/camel-api-component-maven-plugin/pom.xml @@ -29,6 +29,16 @@ <name>Camel :: Maven Plugins :: Camel API Component Plugin</name> <description>Maven plugin to generate code for Camel Components based on third party APIs</description> + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>tooling</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> + </dependencyManagement> + <dependencies> <dependency> <groupId>org.apache.camel</groupId> @@ -44,10 +54,6 @@ <artifactId>maven-reporting-impl</artifactId> </dependency> <dependency> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-utils</artifactId> - </dependency> - <dependency> <groupId>org.apache.maven.plugin-tools</groupId> <artifactId>maven-plugin-annotations</artifactId> <version>3.3</version> http://git-wip-us.apache.org/repos/asf/camel/blob/87dbfa08/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 beb72d0..b2e1da5 100644 --- a/tooling/maven/camel-eip-documentation-enricher-maven-plugin/pom.xml +++ b/tooling/maven/camel-eip-documentation-enricher-maven-plugin/pom.xml @@ -28,7 +28,19 @@ <packaging>maven-plugin</packaging> <name>Camel :: Maven Plugins :: Camel EIP Documentation Enricher Plugin</name> <description>Adds documentation to camel xsd schema</description> + + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>tooling</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> + </dependencyManagement> + <dependencies> + <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-core</artifactId> @@ -43,10 +55,6 @@ <artifactId>maven-reporting-impl</artifactId> </dependency> <dependency> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-utils</artifactId> - </dependency> - <dependency> <groupId>org.apache.maven.plugin-tools</groupId> <artifactId>maven-plugin-annotations</artifactId> <version>3.3</version> http://git-wip-us.apache.org/repos/asf/camel/blob/87dbfa08/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 9e8fbc1..e15243e 100644 --- a/tooling/maven/camel-maven-plugin/pom.xml +++ b/tooling/maven/camel-maven-plugin/pom.xml @@ -29,6 +29,16 @@ <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> <dependency> <groupId>org.apache.camel</groupId> @@ -58,15 +68,6 @@ <artifactId>exec-maven-plugin</artifactId> </dependency> <dependency> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-utils</artifactId> - </dependency> - <dependency> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-container-default</artifactId> - </dependency> - - <dependency> <groupId>org.apache.maven.reporting</groupId> <artifactId>maven-reporting-api</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/camel/blob/87dbfa08/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 c626678..fd28ebf 100644 --- a/tooling/maven/camel-package-maven-plugin/pom.xml +++ b/tooling/maven/camel-package-maven-plugin/pom.xml @@ -29,12 +29,18 @@ <name>Camel :: Maven Plugins :: Camel Maven Package</name> <description>Maven plugin to help package Camel components and plugins</description> + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.apache.camel</groupId> + <artifactId>tooling</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> + </dependencyManagement> + <dependencies> <dependency> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-utils</artifactId> - </dependency> - <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-core</artifactId> <scope>provided</scope> http://git-wip-us.apache.org/repos/asf/camel/blob/87dbfa08/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 50d72e1..2c25f92 100644 --- a/tooling/maven/guice-maven-plugin/pom.xml +++ b/tooling/maven/guice-maven-plugin/pom.xml @@ -29,6 +29,16 @@ <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> <dependency> <groupId>org.apache.camel</groupId> @@ -46,10 +56,12 @@ <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> http://git-wip-us.apache.org/repos/asf/camel/blob/87dbfa08/tooling/pom.xml ---------------------------------------------------------------------- diff --git a/tooling/pom.xml b/tooling/pom.xml index d134b7e..886ef0f 100644 --- a/tooling/pom.xml +++ b/tooling/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> @@ -30,6 +31,24 @@ <description>Camel Tooling</description> <packaging>pom</packaging> + <properties> + <plexus-container-default-version>1.6</plexus-container-default-version> + <plexus-utils-version>3.0.22</plexus-utils-version> + </properties> + + <dependencies> + <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> + </dependencies> + <modules> <module>spi-annotations</module> <module>apt</module>
