r351 - in trunk: . ant-processor-task maven-processor-plugin - Processor-commits

25 Oct 2010

Author: tchemit
Date: 2010-10-25 08:53:53 +0200 (Mon, 25 Oct 2010)
New Revision: 351

Url: http://nuiton.org/repositories/revision/processor/351

Log:
Evolution #498: Use mavenpom4redmine 2.4
Evolution #500: Use maven-license-plugin 2.4.1
Evolution #725: Use maven-helper-plugin 1.3
Evolution #982: Optimize dependencies
Evolution #983: Use new maven-license-plugin mecanism to update file headers
reformat poms


Modified:
   trunk/ant-processor-task/pom.xml
   trunk/maven-processor-plugin/pom.xml
   trunk/pom.xml

Modified: trunk/ant-processor-task/pom.xml
===================================================================

--- trunk/ant-processor-task/pom.xml	2010-10-17 01:38:42 UTC (rev 350)
+++ trunk/ant-processor-task/pom.xml	2010-10-25 06:53:53 UTC (rev 351)
@@ -24,56 +24,43 @@
   #L%
   -->
 
-<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/xsd/maven-4.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/xsd/maven-4.0.0.xsd">
 
-    <modelVersion>4.0.0</modelVersion>
+  <modelVersion>4.0.0</modelVersion>
 
-    <!-- ************************************************************* -->
-    <!-- *** POM Relationships *************************************** -->
-    <!-- ************************************************************* -->
+  <parent>
+    <groupId>org.nuiton</groupId>
+    <artifactId>processor</artifactId>
+    <version>1.0.4-SNAPSHOT</version>
+  </parent>
 
-    <parent>
-        <groupId>org.nuiton</groupId>
-        <artifactId>processor</artifactId>
-        <version>1.0.4-SNAPSHOT</version>
-    </parent>
+  <groupId>org.nuiton.processor</groupId>
+  <artifactId>ant-processor-task</artifactId>
 
-    <groupId>org.nuiton.processor</groupId>
-    <artifactId>ant-processor-task</artifactId>
+  <dependencies>
 
-    <dependencies>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>nuiton-processor</artifactId>
+      <version>${project.version}</version>
+      <scope>compile</scope>
+    </dependency>
 
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>nuiton-processor</artifactId>
-            <version>${project.version}</version>
-            <scope>compile</scope>
-        </dependency>
+    <dependency>
+      <groupId>org.apache.ant</groupId>
+      <artifactId>ant</artifactId>
+    </dependency>
 
-        <dependency>
-            <groupId>org.apache.ant</groupId>
-            <artifactId>ant</artifactId>
-        </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+    </dependency>
 
-        <!-- tests dependencies -->
+  </dependencies>
 
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-        </dependency>
+  <name>Nuiton Processor :: Ant task</name>
+  <inceptionYear>2009</inceptionYear>
 
-    </dependencies>
-
-    <!-- ************************************************************* -->
-    <!-- *** Project Information ************************************* -->
-    <!-- ************************************************************* -->
-    <name>Nuiton Processor :: Ant task</name>
-    <inceptionYear>2009</inceptionYear>
-   
-    <!-- ************************************************************* -->
-    <!-- *** Build Settings ****************************************** -->
-    <!-- ************************************************************* -->
-
-    <packaging>jar</packaging>
-
 </project>

Modified: trunk/maven-processor-plugin/pom.xml
===================================================================
--- trunk/maven-processor-plugin/pom.xml	2010-10-17 01:38:42 UTC (rev 350)
+++ trunk/maven-processor-plugin/pom.xml	2010-10-25 06:53:53 UTC (rev 351)
@@ -24,80 +24,83 @@
   #L%
   -->
 
-<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/xsd/maven-4.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/xsd/maven-4.0.0.xsd">
 
-    <modelVersion>4.0.0</modelVersion>
+  <modelVersion>4.0.0</modelVersion>
 
-    <!-- ************************************************************* -->
-    <!-- *** POM Relationships *************************************** -->
-    <!-- ************************************************************* -->
+  <!-- ************************************************************* -->
+  <!-- *** POM Relationships *************************************** -->
+  <!-- ************************************************************* -->
 
-    <parent>
-        <groupId>org.nuiton</groupId>
-        <artifactId>processor</artifactId>
-        <version>1.0.4-SNAPSHOT</version>
-    </parent>
+  <parent>
+    <groupId>org.nuiton</groupId>
+    <artifactId>processor</artifactId>
+    <version>1.0.4-SNAPSHOT</version>
+  </parent>
 
-    <groupId>org.nuiton.processor</groupId>
-    <artifactId>maven-processor-plugin</artifactId>
+  <groupId>org.nuiton.processor</groupId>
+  <artifactId>maven-processor-plugin</artifactId>
 
-    <dependencies>
+  <dependencies>
 
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>nuiton-processor</artifactId>
-            <version>${project.version}</version>
-            <scope>compile</scope>
-        </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>nuiton-processor</artifactId>
+      <version>${project.version}</version>
+      <scope>compile</scope>
+    </dependency>
 
-        <dependency>
-            <groupId>org.nuiton</groupId>
-            <artifactId>maven-helper-plugin</artifactId>
-        </dependency>
+    <dependency>
+      <groupId>org.nuiton</groupId>
+      <artifactId>maven-helper-plugin</artifactId>
+    </dependency>
 
-        <!-- FIXME si on ne le rajoute pas, on se retrouve avec la version 1.1 qui ne convient pas -->
-        <dependency>
-            <groupId>org.codehaus.plexus</groupId>
-            <artifactId>plexus-utils</artifactId>
-        </dependency>
+    <!-- FIXME si on ne le rajoute pas, on se retrouve avec la version 1.1 qui ne convient pas -->
+    <!--dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-utils</artifactId>
+      <scope>compile</scope>
+    </dependency-->
 
-        <!-- tests dependencies -->
+    <!-- tests dependencies -->
 
-        <dependency>
-            <groupId>org.nuiton</groupId>
-            <artifactId>maven-helper-plugin</artifactId>
-            <scope>test</scope>
-            <classifier>tests</classifier>
-        </dependency>
+    <dependency>
+      <groupId>org.nuiton</groupId>
+      <artifactId>maven-helper-plugin</artifactId>
+      <scope>test</scope>
+      <classifier>tests</classifier>
+    </dependency>
 
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-        </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+    </dependency>
 
-        <dependency>
-            <groupId>org.apache.maven</groupId>
-            <artifactId>maven-project</artifactId>
-        </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-project</artifactId>
+    </dependency>
 
-        <dependency>
-            <groupId>org.apache.maven</groupId>
-            <artifactId>maven-plugin-api</artifactId>
-        </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-plugin-api</artifactId>
+    </dependency>
 
-    </dependencies>
+  </dependencies>
 
-    <!-- ************************************************************* -->
-    <!-- *** Project Information ************************************* -->
-    <!-- ************************************************************* -->
-    <name>Nuiton Processor :: Maven plugin</name>
-    <inceptionYear>2006</inceptionYear>
+  <!-- ************************************************************* -->
+  <!-- *** Project Information ************************************* -->
+  <!-- ************************************************************* -->
+  <name>Nuiton Processor :: Maven plugin</name>
+  <inceptionYear>2006</inceptionYear>
 
-    <!-- ************************************************************* -->
-    <!-- *** Build Settings ****************************************** -->
-    <!-- ************************************************************* -->
+  <!-- ************************************************************* -->
+  <!-- *** Build Settings ****************************************** -->
+  <!-- ************************************************************* -->
 
-    <packaging>maven-plugin</packaging>
+  <packaging>maven-plugin</packaging>
 
   <profiles>
     <!-- perform only on a release stage when using the maven-release-plugin -->

Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml	2010-10-17 01:38:42 UTC (rev 350)
+++ trunk/pom.xml	2010-10-25 06:53:53 UTC (rev 351)
@@ -23,7 +23,9 @@
   <http://www.gnu.org/licenses/lgpl-3.0.html>.
   #L%
   -->
-<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/xsd/maven-4.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/xsd/maven-4.0.0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
 
@@ -33,7 +35,7 @@
   <parent>
     <groupId>org.nuiton</groupId>
     <artifactId>mavenpom4redmineAndCentral</artifactId>
-    <version>2.3.2</version>
+    <version>2.4-SNAPSHOT</version>
   </parent>
 
   <artifactId>processor</artifactId>
@@ -58,7 +60,7 @@
       <dependency>
         <groupId>org.nuiton</groupId>
         <artifactId>maven-helper-plugin</artifactId>
-        <version>${helper.version}</version>
+        <version>${helperPluginVersion}</version>
         <scope>compile</scope>
         <exclusions>
           <exclusion>
@@ -97,20 +99,10 @@
 
           <exclusion>
             <groupId>plexus</groupId>
-            <artifactId>plexus-mail-sender-simple</artifactId>
-          </exclusion>
-
-          <exclusion>
-            <groupId>plexus</groupId>
             <artifactId>plexus-mail-sender-api</artifactId>
           </exclusion>
 
           <exclusion>
-            <groupId>plexus</groupId>
-            <artifactId>plexus-mail-sender-javamail</artifactId>
-          </exclusion>
-
-          <exclusion>
             <groupId>javax.mail</groupId>
             <artifactId>mail</artifactId>
           </exclusion>
@@ -125,22 +117,16 @@
             <artifactId>plexus-sec-dispatcher</artifactId>
           </exclusion>
 
-
           <exclusion>
             <groupId>org.codehaus.plexus</groupId>
             <artifactId>plexus-container-default</artifactId>
           </exclusion>
 
           <exclusion>
-            <groupId>org.apache.velocity</groupId>
+            <groupId>velocity</groupId>
             <artifactId>velocity</artifactId>
           </exclusion>
 
-          <exclusion>
-            <groupId>org.codehaus.plexus</groupId>
-            <artifactId>plexus-velocity</artifactId>
-          </exclusion>
-
         </exclusions>
       </dependency>
 
@@ -149,7 +135,6 @@
         <groupId>org.codehaus.plexus</groupId>
         <artifactId>plexus-utils</artifactId>
         <version>1.5.15</version>
-        <scope>compile</scope>
       </dependency>
 
       <dependency>
@@ -164,7 +149,7 @@
       <dependency>
         <groupId>org.nuiton</groupId>
         <artifactId>maven-helper-plugin</artifactId>
-        <version>${helper.version}</version>
+        <version>${helperPluginVersion}</version>
         <scope>test</scope>
         <classifier>tests</classifier>
         <exclusions>
@@ -204,20 +189,10 @@
 
           <exclusion>
             <groupId>plexus</groupId>
-            <artifactId>plexus-mail-sender-simple</artifactId>
-          </exclusion>
-
-          <exclusion>
-            <groupId>plexus</groupId>
             <artifactId>plexus-mail-sender-api</artifactId>
           </exclusion>
 
           <exclusion>
-            <groupId>plexus</groupId>
-            <artifactId>plexus-mail-sender-javamail</artifactId>
-          </exclusion>
-
-          <exclusion>
             <groupId>javax.mail</groupId>
             <artifactId>mail</artifactId>
           </exclusion>
@@ -238,15 +213,10 @@
           </exclusion>
 
           <exclusion>
-            <groupId>org.apache.velocity</groupId>
+            <groupId>velocity</groupId>
             <artifactId>velocity</artifactId>
           </exclusion>
 
-          <exclusion>
-            <groupId>org.codehaus.plexus</groupId>
-            <artifactId>plexus-velocity</artifactId>
-          </exclusion>
-
         </exclusions>
       </dependency>
 
@@ -260,21 +230,21 @@
       <dependency>
         <groupId>org.apache.maven</groupId>
         <artifactId>maven-project</artifactId>
-        <version>${maven.version}</version>
+        <version>${mavenVersion}</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>org.apache.maven</groupId>
         <artifactId>maven-plugin-api</artifactId>
-        <version>${maven.version}</version>
+        <version>${mavenVersion}</version>
         <scope>provided</scope>
       </dependency>
 
       <dependency>
         <groupId>log4j</groupId>
         <artifactId>log4j</artifactId>
-        <version>1.2.14</version>
+        <version>1.2.16</version>
       </dependency>
 
     </dependencies>
@@ -298,6 +268,8 @@
     <!-- pour un muli module on doit fixer le projectId -->
     <projectId>processor</projectId>
 
+    <!-- remove this when mavenpom >= 2.4 -->
+    <helperPluginVersion>1.3-SNAPSHOT</helperPluginVersion>
   </properties>
 
   <!-- ************************************************************* -->
@@ -308,7 +280,8 @@
   <scm>
 
     <connection>scm:svn:http://svn.nuiton.org/svn/processor/trunk</connection>
-    <developerConnection>scm:svn:http://svn.nuiton.org/svn/processor/trunk</developerConnection>
+    <developerConnection>scm:svn:http://svn.nuiton.org/svn/processor/trunk
+    </developerConnection>
     <url>http://www.nuiton.org/repositories/browse/processor/trunk</url>
   </scm>

    

r351 - in trunk: . ant-processor-task maven-processor-plugin

tchemit＠users.nuiton.org

tags

participants (1)