camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cmuel...@apache.org
Subject git commit: upgrade to apache parent pom 14 and removed duplicated plugin dependency management definitions
Date Wed, 09 Apr 2014 05:10:33 GMT
Repository: camel
Updated Branches:
  refs/heads/master ce8844f05 -> ddcb32c5c


upgrade to apache parent pom 14 and removed duplicated plugin dependency management definitions


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ddcb32c5
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ddcb32c5
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ddcb32c5

Branch: refs/heads/master
Commit: ddcb32c5ce06a81ee4550cbfa4559c494d88dc38
Parents: ce8844f
Author: cmueller <cmueller@apache.org>
Authored: Wed Apr 9 07:10:09 2014 +0200
Committer: cmueller <cmueller@apache.org>
Committed: Wed Apr 9 07:10:09 2014 +0200

----------------------------------------------------------------------
 parent/pom.xml | 54 -----------------------------------------------------
 pom.xml        |  6 +-----
 2 files changed, 1 insertion(+), 59 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/ddcb32c5/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 1f63380..b8ef0f4 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -274,29 +274,17 @@
     <maven-antrun-plugin-version>1.6</maven-antrun-plugin-version>
     <maven-archetype-plugin-version>2.0</maven-archetype-plugin-version>
     <maven-archetype-packaging-version>2.0</maven-archetype-packaging-version>
-    <maven-assembly-plugin-version>2.4</maven-assembly-plugin-version>
     <maven-bundle-version>${maven-bundle-plugin-version}</maven-bundle-version>
     <!-- problems by upgrading to maven-bundle-plugin 2.4.0 -->
     <maven-bundle-plugin-version>2.3.7</maven-bundle-plugin-version>
     <!-- maven-checkstyle-plugin 2.10 has problems to validate the license header in properties
files-->
     <maven-checkstyle-plugin-version>2.9.1</maven-checkstyle-plugin-version>
-    <maven-clean-plugin-version>2.5</maven-clean-plugin-version>
-    <maven-compiler-plugin-version>2.5.1</maven-compiler-plugin-version>
-    <maven-dependency-plugin-version>2.8</maven-dependency-plugin-version>
     <maven-eclipse-plugin-version>2.9</maven-eclipse-plugin-version>
-    <maven-failsafe-plugin-version>2.13</maven-failsafe-plugin-version>
-    <maven-install-plugin-version>2.4</maven-install-plugin-version>
-    <maven-jar-plugin-version>2.4</maven-jar-plugin-version>
-    <maven-javadoc-plugin-version>2.9.1</maven-javadoc-plugin-version>
     <maven-jboss-as-maven-plugin-version>7.4.Final</maven-jboss-as-maven-plugin-version>
-    <maven-plugin-plugin-version>3.2</maven-plugin-plugin-version>
     <maven-remote-resources-plugin-version>1.4</maven-remote-resources-plugin-version>
-    <maven-resources-plugin-version>2.6</maven-resources-plugin-version>
     <maven-reporting-api-version>2.2.1</maven-reporting-api-version>
     <maven-reporting-impl-version>2.0.5</maven-reporting-impl-version>
     <maven-shade-plugin-version>2.1</maven-shade-plugin-version>
-    <maven-source-plugin-version>2.2.1</maven-source-plugin-version>
-    <maven-surefire-plugin-version>2.16</maven-surefire-plugin-version>
     <maven-surefire-report-plugin-version>2.13</maven-surefire-report-plugin-version>
     <maven-war-plugin-version>2.4</maven-war-plugin-version>
     <maven-version>2.0</maven-version>
@@ -2268,11 +2256,6 @@
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-assembly-plugin</artifactId>
-          <version>${maven-assembly-plugin-version}</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-checkstyle-plugin</artifactId>
           <version>${maven-checkstyle-plugin-version}</version>
           <dependencies>
@@ -2316,7 +2299,6 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-clean-plugin</artifactId>
-          <version>${maven-clean-plugin-version}</version>
           <configuration>
             <filesets>
               <fileset>
@@ -2330,7 +2312,6 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>${maven-compiler-plugin-version}</version>
           <configuration>
             <source>1.6</source>
             <target>1.6</target>
@@ -2340,11 +2321,6 @@
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-dependency-plugin</artifactId>
-          <version>${maven-dependency-plugin-version}</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-eclipse-plugin</artifactId>
           <configuration>
             <buildcommands>
@@ -2365,23 +2341,7 @@
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-failsafe-plugin</artifactId>
-          <version>${maven-failsafe-plugin-version}</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-install-plugin</artifactId>
-          <version>${maven-install-plugin-version}</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-jar-plugin</artifactId>
-          <version>${maven-jar-plugin-version}</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-javadoc-plugin</artifactId>
-          <version>${maven-javadoc-plugin-version}</version>
           <configuration>
             <attach>true</attach>
             <source>1.6</source>
@@ -2392,20 +2352,9 @@
             <encoding>UTF-8</encoding>
           </configuration>
         </plugin>
-       <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-remote-resources-plugin</artifactId>
-          <version>${maven-remote-resources-plugin-version}</version>
-        </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-resources-plugin</artifactId>
-          <version>${maven-resources-plugin-version}</version>
           <configuration>
             <encoding>UTF-8</encoding>
           </configuration>
@@ -2418,7 +2367,6 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-source-plugin</artifactId>
-          <version>${maven-source-plugin-version}</version>
           <configuration>
             <archive>
               <manifestEntries>
@@ -2652,7 +2600,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>${maven-surefire-plugin-version}</version>
         <configuration>
           <!--forkMode>pertest</forkMode -->
           <forkedProcessTimeoutInSeconds>300</forkedProcessTimeoutInSeconds>
@@ -2722,7 +2669,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
-        <version>${maven-javadoc-plugin-version}</version>
         <configuration>
           <links>
             <link>http://download.oracle.com/javase/6/docs/api/</link>

http://git-wip-us.apache.org/repos/asf/camel/blob/ddcb32c5/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a808e03..be923b0 100755
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
   <parent>
     <groupId>org.apache</groupId>
     <artifactId>apache</artifactId>
-    <version>13</version>
+    <version>14</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
@@ -164,7 +164,6 @@
           <plugin>
             <groupId>org.apache.rat</groupId>
             <artifactId>apache-rat-plugin</artifactId>
-            <version>0.9</version>
             <configuration>
               <excludeSubProjects>false</excludeSubProjects>
               <excludes>
@@ -201,8 +200,6 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-release-plugin</artifactId>
-          <!-- see http://jira.codehaus.org/browse/MRELEASE-812 -->
-          <version>2.4.1</version>
           <configuration>
             <localCheckout>true</localCheckout>
             <pushChanges>true</pushChanges>
@@ -372,7 +369,6 @@
             <plugin>
               <groupId>org.apache.maven.plugins</groupId>
               <artifactId>maven-antrun-plugin</artifactId>
-              <version>1.6</version>
               <dependencies>
                 <dependency>
                   <groupId>com.sun.xml.bind</groupId>


Mime
View raw message