r1056 - in trunk: . mavenpom4labs mavenpom4redmine mavenpom4redmine/mavenpom4redmineAndCentral src/site/apt - Mavenpom-commits

10 Feb 2011

Author: tchemit
Date: 2011-02-10 11:08:24 +0100 (Thu, 10 Feb 2011)
New Revision: 1056

Url: http://nuiton.org/repositories/revision/mavenpom/1056

Log:
Anomalie #1314: We should use repo type license
Evolution #1310: Updates to m-plugin-p 2.7
Evolution #1311: Updates to m-changes-p 2.4
Evolution #1312: Every version of library or plugin must be inheritable
Evolution #1313: Updates to jrst 1.2


Modified:
   trunk/mavenpom4labs/pom.xml
   trunk/mavenpom4redmine/mavenpom4redmineAndCentral/pom.xml
   trunk/mavenpom4redmine/pom.xml
   trunk/pom.xml
   trunk/src/site/apt/index.apt

Modified: trunk/mavenpom4labs/pom.xml
===================================================================

--- trunk/mavenpom4labs/pom.xml	2011-02-09 07:56:03 UTC (rev 1055)
+++ trunk/mavenpom4labs/pom.xml	2011-02-10 10:08:24 UTC (rev 1056)
@@ -34,7 +34,7 @@
   <parent>
     <groupId>org.nuiton</groupId>
     <artifactId>mavenpom</artifactId>
-    <version>2.4.5-SNAPSHOT</version>
+    <version>2.5-SNAPSHOT</version>
   </parent>
 
   <artifactId>mavenpom4labs</artifactId>
@@ -62,8 +62,8 @@
   <licenses>
     <license>
       <name>General Public License (GPL) v 3.0</name>
-      <url>${maven.license.file}</url>
-      <distribution>local</distribution>
+      <url>$http://www.gnu.org/licenses/gpl-3.0.html</url>
+      <distribution>repo</distribution>
     </license>
   </licenses>
 
@@ -168,7 +168,7 @@
           <plugin>
             <groupId>org.codehaus.sonar-plugins</groupId>
             <artifactId>maven-report</artifactId>
-            <version>0.1</version>
+            <version>${sonarReportPluginVersion}</version>
           </plugin>
         </plugins>
       </reporting>

Modified: trunk/mavenpom4redmine/mavenpom4redmineAndCentral/pom.xml
===================================================================
--- trunk/mavenpom4redmine/mavenpom4redmineAndCentral/pom.xml	2011-02-09 07:56:03 UTC (rev 1055)
+++ trunk/mavenpom4redmine/mavenpom4redmineAndCentral/pom.xml	2011-02-10 10:08:24 UTC (rev 1056)
@@ -34,7 +34,7 @@
   <parent>
     <groupId>org.nuiton</groupId>
     <artifactId>mavenpom4redmine</artifactId>
-    <version>2.4.5-SNAPSHOT</version>
+    <version>2.5-SNAPSHOT</version>
   </parent>
 
   <artifactId>mavenpom4redmineAndCentral</artifactId>

Modified: trunk/mavenpom4redmine/pom.xml
===================================================================
--- trunk/mavenpom4redmine/pom.xml	2011-02-09 07:56:03 UTC (rev 1055)
+++ trunk/mavenpom4redmine/pom.xml	2011-02-10 10:08:24 UTC (rev 1056)
@@ -34,7 +34,7 @@
   <parent>
     <groupId>org.nuiton</groupId>
     <artifactId>mavenpom</artifactId>
-    <version>2.4.5-SNAPSHOT</version>
+    <version>2.5-SNAPSHOT</version>
   </parent>
 
   <artifactId>mavenpom4redmine</artifactId>
@@ -188,7 +188,7 @@
           <plugin>
             <groupId>org.codehaus.sonar-plugins</groupId>
             <artifactId>maven-report</artifactId>
-            <version>0.1</version>
+            <version>${sonarReportPluginVersion}</version>
             <!--configuration>
               <sonar.host.url>http://hudson.${platform}/sonar</sonar.host.url>
             </configuration-->
@@ -217,7 +217,7 @@
 
           <plugin>
             <artifactId>maven-changes-plugin</artifactId>
-            <version>2.3</version>
+            <version>${changesPluginVersion}</version>
             <configuration>
               <issueLinkTemplatePerSystem>
                 <redmine>${redmine.issueLinkTemplate}</redmine>

Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml	2011-02-09 07:56:03 UTC (rev 1055)
+++ trunk/pom.xml	2011-02-10 10:08:24 UTC (rev 1056)
@@ -33,7 +33,7 @@
 
   <groupId>org.nuiton</groupId>
   <artifactId>mavenpom</artifactId>
-  <version>2.4.5-SNAPSHOT</version>
+  <version>2.5-SNAPSHOT</version>
 
   <modules>
     <module>mavenpom4redmine</module>
@@ -55,8 +55,8 @@
   <licenses>
     <license>
       <name>Lesser General Public License (LGPL) v 3.0</name>
-      <url>${maven.license.file}</url>
-      <distribution>local</distribution>
+      <url>http://www.gnu.org/licenses/lgpl-3.0.html</url>
+      <distribution>repo</distribution>
     </license>
   </licenses>
 
@@ -214,14 +214,50 @@
     <!-- le fichier de license du projet -->
     <maven.license.file>${project.basedir}/LICENSE.txt</maven.license.file>
 
-    <helperPluginVersion>1.2.10</helperPluginVersion>
+    <!-- our plugins (+ skin)  version -->
+    <helperPluginVersion>1.2.11</helperPluginVersion>
     <jredminePluginVersion>1.1.4</jredminePluginVersion>
     <licensePluginVersion>3.0</licensePluginVersion>
-    <jrstPluginVersion>1.1.1</jrstPluginVersion>
+    <jrstPluginVersion>1.2</jrstPluginVersion>
     <nuitonSkinVersion>1.0.4</nuitonSkinVersion>
+
+    <!-- maven plugins version -->
+    <cleanPluginVersion>2.4.1</cleanPluginVersion>
+    <enforcerPluginVersion>1.0-beta-1</enforcerPluginVersion>
+    <resourcesPluginVersion>2.4.3</resourcesPluginVersion>
+    <compilerPluginVersion>2.3.2</compilerPluginVersion>
+    <surefirePluginVersion>2.7.2</surefirePluginVersion>
+    <jarPluginVersion>2.3.1</jarPluginVersion>
+    <warPluginVersion>2.1.1</warPluginVersion>
+    <earPluginVersion>2.4.2</earPluginVersion>
+    <ejbPluginVersion>2.3</ejbPluginVersion>
+    <installPluginVersion>2.3.1</installPluginVersion>
+    <deployPluginVersion>2.5</deployPluginVersion>
+    <sourcePluginVersion>2.1.2</sourcePluginVersion>
     <javadocPluginVersion>2.7</javadocPluginVersion>
     <webstartPluginVersion>1.0-alpha-2-cl_20100511</webstartPluginVersion>
-    <surefirePluginVersion>2.7.2</surefirePluginVersion>
+    <assemblyPluginVersion>2.2</assemblyPluginVersion>
+    <pluginPluginVersion>2.7</pluginPluginVersion>
+    <releasePluginVersion>2.1</releasePluginVersion>
+    <dependencyPluginVersion>2.1</dependencyPluginVersion>
+    <antRunPluginVersion>1.6</antRunPluginVersion>
+    <gpgPluginVersion>1.1</gpgPluginVersion>
+    <invokerPluginVersion>1.5</invokerPluginVersion>
+    <execPluginVersion>1.1.1</execPluginVersion>
+    <plexusComponentPluginVersion>1.5.2</plexusComponentPluginVersion>
+    <jettyPluginVersion>6.1.22</jettyPluginVersion>
+
+    <site2PluginVersion>2.1.1</site2PluginVersion>
+    <site3PluginVersion>3.0-beta-3</site3PluginVersion>
+
+    <!-- report plugins version -->
+    <changesPluginVersion>2.4</changesPluginVersion>
+    <projectInfoReportsPluginVersion>2.3.1</projectInfoReportsPluginVersion>
+    <changelogPluginVersion>2.2</changelogPluginVersion>
+    <jrxPluginVersion>2.1</jrxPluginVersion>
+    <sonarReportPluginVersion>0.1</sonarReportPluginVersion>
+    
+    
     <mavenVersion>2.2.1</mavenVersion>
     <antVersion>1.8.2</antVersion>
 
@@ -236,6 +272,9 @@
     <commonsPrimitivesVersion>1.0</commonsPrimitivesVersion>
     <junitVersion>4.8.2</junitVersion>
     <log4jVersion>1.2.16</log4jVersion>
+    
+    <!-- to deploy with scpexe for maven 3 -->
+    <wagonSshExternalVersion>1.0-beta-7</wagonSshExternalVersion>
 
     <!-- versions of javadoc tagglets -->
     <mavenPluginToolsJavadocVersion>2.5.1</mavenPluginToolsJavadocVersion>
@@ -387,7 +426,7 @@
       <extension>
         <groupId>org.apache.maven.wagon</groupId>
          <artifactId>wagon-ssh-external</artifactId>
-         <version>1.0-beta-7</version>
+         <version>${wagonSshExternalVersion}</version>
       </extension>
     </extensions>
     
@@ -430,12 +469,12 @@
 
         <plugin>
           <artifactId>maven-enforcer-plugin</artifactId>
-          <version>1.0-beta-1</version>
+          <version>${enforcerPluginVersion}</version>
         </plugin>
 
         <plugin>
           <artifactId>maven-resources-plugin</artifactId>
-          <version>2.4.3</version>
+          <version>${resourcesPluginVersion}</version>
           <!-- WORKAROUND for : http://jira.codehaus.org/browse/MRESOURCES-104 -->
           <configuration>
             <delimiters>
@@ -447,17 +486,17 @@
 
         <plugin>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>2.3.2</version>
+          <version>${compilerPluginVersion}</version>
         </plugin>
 
         <plugin>
           <artifactId>maven-deploy-plugin</artifactId>
-          <version>2.5</version>
+          <version>${deployPluginVersion}</version>
         </plugin>
 
         <plugin>
           <artifactId>maven-install-plugin</artifactId>
-          <version>2.3.1</version>
+          <version>${installPluginVersion}</version>
         </plugin>
 
         <plugin>
@@ -472,12 +511,12 @@
 
         <plugin>
           <artifactId>maven-dependency-plugin</artifactId>
-          <version>2.1</version>
+          <version>${dependencyPluginVersion}</version>
         </plugin>
 
         <plugin>
           <artifactId>maven-war-plugin</artifactId>
-          <version>2.1.1</version>
+          <version>${warPluginVersion}</version>
           <configuration>
             <warSourceDirectory>${maven.src.dir}/main/webapp</warSourceDirectory>
           </configuration>
@@ -485,7 +524,7 @@
 
         <plugin>
           <artifactId>maven-jar-plugin</artifactId>
-          <version>2.3.1</version>
+          <version>${jarPluginVersion}</version>
           <inherited>true</inherited>
 
           <configuration>
@@ -505,12 +544,12 @@
 
         <plugin>
           <artifactId>maven-ear-plugin</artifactId>
-          <version>2.4.2</version>
+          <version>${earPluginVersion}</version>
         </plugin>
 
         <plugin>
           <artifactId>maven-source-plugin</artifactId>
-          <version>2.1.2</version>
+          <version>${sourcePluginVersion}</version>
         </plugin>
 
         <plugin>
@@ -540,7 +579,7 @@
         
         <plugin>
           <artifactId>maven-site-plugin</artifactId>
-          <version>2.1.1</version>
+          <version>${site2PluginVersion}</version>
           <dependencies>
             <dependency>
               <groupId>org.nuiton</groupId>
@@ -552,17 +591,17 @@
 
         <plugin>
           <artifactId>maven-release-plugin</artifactId>
-          <version>2.1</version>
+          <version>${releasePluginVersion}</version>
         </plugin>
 
         <plugin>
           <artifactId>maven-plugin-plugin</artifactId>
-          <version>2.5.1</version>
+          <version>${pluginPluginVersion}</version>
         </plugin>
 
         <plugin>
           <artifactId>maven-assembly-plugin</artifactId>
-          <version>2.2</version>
+          <version>${assemblyPluginVersion}</version>
           <dependencies>
             <dependency>
               <groupId>org.nuiton</groupId>
@@ -574,22 +613,22 @@
 
         <plugin>
           <artifactId>maven-antrun-plugin</artifactId>
-          <version>1.6</version>
+          <version>${antRunPluginVersion}</version>
         </plugin>
 
         <plugin>
           <artifactId>maven-clean-plugin</artifactId>
-          <version>2.4.1</version>
+          <version>${cleanPluginVersion}</version>
         </plugin>
 
         <plugin>
           <artifactId>maven-gpg-plugin</artifactId>
-          <version>1.1</version>
+          <version>${gpgPluginVersion}</version>
         </plugin>
         
         <plugin>
           <artifactId>maven-ejb-plugin</artifactId>
-          <version>2.3</version>
+          <version>${ejbPluginVersion}</version>
         </plugin>
 
         <plugin>
@@ -624,25 +663,25 @@
 
         <plugin>
           <artifactId>maven-invoker-plugin</artifactId>
-          <version>1.5</version>
+          <version>${invokerPluginVersion}</version>
         </plugin>
 
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>exec-maven-plugin</artifactId>
-          <version>1.1.1</version>
+          <version>${execPluginVersion}</version>
         </plugin>
 
         <plugin>
           <groupId>org.codehaus.plexus</groupId>
           <artifactId>plexus-component-metadata</artifactId>
-          <version>1.5.2</version>
+          <version>${plexusComponentPluginVersion}</version>
         </plugin>
 
         <plugin>
           <groupId>org.mortbay.jetty</groupId>
           <artifactId>maven-jetty-plugin</artifactId>
-          <version>6.1.22</version>
+          <version>${jettyPluginVersion}</version>
         </plugin>
 
         <plugin>
@@ -906,7 +945,7 @@
           -->
           <plugin>
             <artifactId>maven-project-info-reports-plugin</artifactId>
-            <version>2.3.1</version>
+            <version>${projectInfoReportsPluginVersion}</version>
             <reportSets>
               <reportSet>
                 <reports>
@@ -968,7 +1007,7 @@
           in report, trunk url are prefix with tag/xxx-releaseNumber !-->
           <plugin>
             <artifactId>maven-changelog-plugin</artifactId>
-            <version>2.2</version>
+            <version>${changelogPluginVersion}</version>
             <!--configuration>
                 <displayFileDetailUrl>http://svn.${platform}/svn/${projectId}%FILE%</displayFileDetailUrl>
             </configuration-->
@@ -976,7 +1015,7 @@
 
           <plugin>
             <artifactId>maven-jxr-plugin</artifactId>
-            <version>2.1</version>
+            <version>${jrxPluginVersion}</version>
           </plugin>
 
           <plugin>
@@ -1395,7 +1434,7 @@
 
           <plugin>
             <artifactId>maven-changes-plugin</artifactId>
-            <version>2.3</version>
+            <version>${changesPluginVersion}</version>
             <configuration>
               <issueLinkTemplatePerSystem>
                 <redmine>${redmine.issueLinkTemplate}</redmine>
@@ -1640,7 +1679,7 @@
           <plugins>
             <plugin>
               <artifactId>maven-site-plugin</artifactId>
-              <version>3.0-beta-3</version>
+              <version>${site3PluginVersion}</version>
               <dependencies>
                 <dependency>
                   <groupId>org.nuiton</groupId>

Modified: trunk/src/site/apt/index.apt
===================================================================
--- trunk/src/site/apt/index.apt	2011-02-09 07:56:03 UTC (rev 1055)
+++ trunk/src/site/apt/index.apt	2011-02-10 10:08:24 UTC (rev 1056)
@@ -35,6 +35,28 @@
   Le projet <mavenpom> est un pom de type <Corporate> dont héritent tous les
   projets {{{http://www.codelutin.com}code Lutin}}.
 
+* Nouveautés de la version 2.5
+
+  Depuis la version <<2.5>>, chaque librairie ou plugin utilisé dans le mavenpom
+  ou un de ses fils est configurable via une propriété, il s'agit d'une
+  généralisation de ce qui était déjà fait sur nos propres plugins et les
+  librairies.
+
+  Cela permet de pouvoir dans un projet utilisant un des mavenpom de pouvoir
+  changer les versions de librairies ou plugins sans avoir à redéfinir les
+  dépendances.
+
+
+** Mise à jour plugins
+
+  * {{{http://maven-site.nuiton.org/maven-helper-plugin}maven-helper-plugin 1.2.11}}
+  
+  * {{{http://maven-site.nuiton.org/jrst}jrst 1.2}}
+
+  * {{{http://maven.apache.org/plugins/maven-plugin-plugin/}maven-plugin-plugin 2.7}}
+
+  * {{{http://maven.apache.org/plugins/maven-changes-plugin/}maven-changes-plugin 2.4}}
+
 * Nouveautés de la version 2.4
 
   Depuis la version <<2.4>>, on introduit on gère les librairies les plus souvent
@@ -82,7 +104,7 @@
 
 ** Mise à jour plugins
 
-  * {{{http://maven-site.nuiton.org/maven-license-plugin/fr}maven-helper-plugin 1.2.6}}
+  * {{{http://maven-site.nuiton.org/maven-helper-plugin}maven-helper-plugin 1.2.6}}
   
   * {{{http://maven-site.nuiton.org/maven-license-plugin/fr}maven-license-plugin 2.3.1}}

    

r1056 - in trunk: . mavenpom4labs mavenpom4redmine mavenpom4redmine/mavenpom4redmineAndCentral src/site/apt

tchemit＠users.nuiton.org

tags

participants (1)