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/07f15940 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/07f15940 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/07f15940 Branch: refs/heads/master Commit: 07f15940d968d407894cdd8f1cd14461b32f03a2 Parents: ccfa2de Author: Claus Ibsen <davscl...@apache.org> Authored: Thu Dec 10 08:20:39 2015 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Thu Dec 10 08:22:08 2015 +0100 ---------------------------------------------------------------------- .../camel-salesforce-maven-plugin/pom.xml | 2 +- tooling/apt/pom.xml | 30 ++++----- tooling/maven/pom.xml | 70 ++++++++++++++++++++ tooling/pom.xml | 70 -------------------- 4 files changed, 85 insertions(+), 87 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/07f15940/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 99ab3b8..40997ba 100644 --- a/components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml +++ b/components/camel-salesforce/camel-salesforce-maven-plugin/pom.xml @@ -35,7 +35,7 @@ <dependencies> <dependency> <groupId>org.apache.camel</groupId> - <artifactId>tooling</artifactId> + <artifactId>maven-plugins</artifactId> <version>${project.version}</version> </dependency> </dependencies> http://git-wip-us.apache.org/repos/asf/camel/blob/07f15940/tooling/apt/pom.xml ---------------------------------------------------------------------- diff --git a/tooling/apt/pom.xml b/tooling/apt/pom.xml index 9b8f16c..f67abd0 100644 --- a/tooling/apt/pom.xml +++ b/tooling/apt/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> @@ -61,21 +62,18 @@ <build> - <plugins> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>${jdk.version}</source> - <target>${jdk.version}</target> - <!-- Disable annotation processing for ourselves. --> - <proc>none</proc> - <verbose>false</verbose> -<!-- - <compilerArgument>-proc:none</compilerArgument> ---> - </configuration> - </plugin> - </plugins> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>${jdk.version}</source> + <target>${jdk.version}</target> + <!-- Disable annotation processing for ourselves. --> + <proc>none</proc> + <verbose>false</verbose> + </configuration> + </plugin> + </plugins> </build> </project> http://git-wip-us.apache.org/repos/asf/camel/blob/07f15940/tooling/maven/pom.xml ---------------------------------------------------------------------- diff --git a/tooling/maven/pom.xml b/tooling/maven/pom.xml index b64789c..a4a5b9e 100644 --- a/tooling/maven/pom.xml +++ b/tooling/maven/pom.xml @@ -29,6 +29,76 @@ <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/07f15940/tooling/pom.xml ---------------------------------------------------------------------- diff --git a/tooling/pom.xml b/tooling/pom.xml index ed49475..d5d2622 100644 --- a/tooling/pom.xml +++ b/tooling/pom.xml @@ -31,76 +31,6 @@ <description>Camel Tooling</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>spi-annotations</module> <module>apt</module>
