Author: tchemit Date: 2012-01-13 15:44:30 +0100 (Fri, 13 Jan 2012) New Revision: 1202 Url: http://nuiton.org/repositories/revision/mavenpom/1202 Log: T?\195?\162che #1903: Updates to helper-maven-plugin 1.4 T?\195?\162che #1904: Add wagon-m-p (1.0-beta-3) T?\195?\162che #1905: Updates to jetty-m-p 8.1.0.RC2 Update docs Modified: trunk/mavenpom4labs/pom.xml trunk/mavenpom4redmine/mavenpom4redmineAndCentral/pom.xml trunk/mavenpom4redmine/pom.xml trunk/pom.xml trunk/src/site/apt/index.apt trunk/src/site/apt/properties.apt.vm Modified: trunk/mavenpom4labs/pom.xml =================================================================== --- trunk/mavenpom4labs/pom.xml 2012-01-04 17:18:58 UTC (rev 1201) +++ trunk/mavenpom4labs/pom.xml 2012-01-13 14:44:30 UTC (rev 1202) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>3.0.8-SNAPSHOT</version> + <version>3.1-SNAPSHOT</version> </parent> <artifactId>mavenpom4labs</artifactId> @@ -311,7 +311,7 @@ --> <plugin> <groupId>org.nuiton</groupId> - <artifactId>maven-helper-plugin</artifactId> + <artifactId>helper-maven-plugin</artifactId> <executions> <execution> <id>send-release-email</id> Modified: trunk/mavenpom4redmine/mavenpom4redmineAndCentral/pom.xml =================================================================== --- trunk/mavenpom4redmine/mavenpom4redmineAndCentral/pom.xml 2012-01-04 17:18:58 UTC (rev 1201) +++ trunk/mavenpom4redmine/mavenpom4redmineAndCentral/pom.xml 2012-01-13 14:44:30 UTC (rev 1202) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.0.8-SNAPSHOT</version> + <version>3.1-SNAPSHOT</version> </parent> <artifactId>mavenpom4redmineAndCentral</artifactId> @@ -102,7 +102,7 @@ <plugins> <plugin> <groupId>org.nuiton</groupId> - <artifactId>maven-helper-plugin</artifactId> + <artifactId>helper-maven-plugin</artifactId> <executions> <execution> <id>check-central-safe</id> Modified: trunk/mavenpom4redmine/pom.xml =================================================================== --- trunk/mavenpom4redmine/pom.xml 2012-01-04 17:18:58 UTC (rev 1201) +++ trunk/mavenpom4redmine/pom.xml 2012-01-13 14:44:30 UTC (rev 1202) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>3.0.8-SNAPSHOT</version> + <version>3.1-SNAPSHOT</version> </parent> <artifactId>mavenpom4redmine</artifactId> @@ -231,7 +231,7 @@ --> <plugin> <groupId>org.nuiton</groupId> - <artifactId>maven-helper-plugin</artifactId> + <artifactId>helper-maven-plugin</artifactId> <executions> <execution> <id>get-redmine-login</id> @@ -332,7 +332,7 @@ --> <plugin> <groupId>org.nuiton</groupId> - <artifactId>maven-helper-plugin</artifactId> + <artifactId>helper-maven-plugin</artifactId> <executions> <execution> <id>get-redmine-login</id> @@ -423,7 +423,7 @@ --> <plugin> <groupId>org.nuiton</groupId> - <artifactId>maven-helper-plugin</artifactId> + <artifactId>helper-maven-plugin</artifactId> <executions> <execution> <id>get-redmine-login</id> @@ -535,7 +535,7 @@ --> <plugin> <groupId>org.nuiton</groupId> - <artifactId>maven-helper-plugin</artifactId> + <artifactId>helper-maven-plugin</artifactId> <executions> <execution> <id>get-redmine-login</id> @@ -606,7 +606,7 @@ --> <plugin> <groupId>org.nuiton</groupId> - <artifactId>maven-helper-plugin</artifactId> + <artifactId>helper-maven-plugin</artifactId> <executions> <execution> <id>get-redmine-login</id> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-01-04 17:18:58 UTC (rev 1201) +++ trunk/pom.xml 2012-01-13 14:44:30 UTC (rev 1202) @@ -33,7 +33,7 @@ <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>3.0.8-SNAPSHOT</version> + <version>3.1-SNAPSHOT</version> <modules> <module>mavenpom4redmine</module> @@ -229,7 +229,7 @@ <antVersion>1.8.2</antVersion> <!-- our plugins (+ skin) version --> - <helperPluginVersion>1.3</helperPluginVersion> + <helperPluginVersion>1.4</helperPluginVersion> <jredminePluginVersion>1.2.2</jredminePluginVersion> <jrstPluginVersion>1.4</jrstPluginVersion> <nuitonSkinVersion>1.1.1</nuitonSkinVersion> @@ -265,9 +265,10 @@ <execPluginVersion>1.2.1</execPluginVersion> <findbugsPluginVersion>2.3.3</findbugsPluginVersion> <gwtPluginVersion>2.4.0</gwtPluginVersion> + <licensePluginVersion>1.0</licensePluginVersion> <tomcatPluginVersion>1.1</tomcatPluginVersion> + <wagonPluginVersion>1.0-beta-3</wagonPluginVersion> <webstartPluginVersion>1.0-beta-2</webstartPluginVersion> - <licensePluginVersion>1.0</licensePluginVersion> <!-- codehaus plexus plugins --> <plexusPluginVersion>1.3.8</plexusPluginVersion> @@ -276,7 +277,8 @@ <!-- others plugins --> <androidPluginVersion>2.8.4</androidPluginVersion> - <jettyPluginVersion>8.0.4.v20111024</jettyPluginVersion> + <jettyPluginVersion>8.1.0.RC2</jettyPluginVersion> + <!--<jettyPluginVersion>8.0.4.v20111024</jettyPluginVersion>--> <statScmPluginVersion>1.2.0</statScmPluginVersion> <!-- report plugins version --> @@ -552,7 +554,7 @@ <dependencies> <dependency> <groupId>org.nuiton</groupId> - <artifactId>maven-helper-plugin</artifactId> + <artifactId>helper-maven-plugin</artifactId> <version>${helperPluginVersion}</version> </dependency> </dependencies> @@ -707,15 +709,6 @@ </plugin> <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>versions-maven-plugin</artifactId> - <version>${versionsPluginVersion}</version> - <configuration> - <generateBackupPoms>false</generateBackupPoms> - </configuration> - </plugin> - - <plugin> <artifactId>maven-war-plugin</artifactId> <version>${warPluginVersion}</version> <configuration> @@ -759,6 +752,11 @@ <version>${gwtPluginVersion}</version> </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>license-maven-plugin</artifactId> + <version>${licensePluginVersion}</version> + </plugin> <plugin> <groupId>org.codehaus.mojo</groupId> @@ -766,38 +764,19 @@ <version>${tomcatPluginVersion}</version> </plugin> - <!-- Plugins version from codehaus plexus --> - <plugin> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-component-metadata</artifactId> - <version>${plexusComponentMetadataPluginVersion}</version> + <groupId>org.codehaus.mojo</groupId> + <artifactId>versions-maven-plugin</artifactId> + <version>${versionsPluginVersion}</version> + <configuration> + <generateBackupPoms>false</generateBackupPoms> + </configuration> </plugin> <plugin> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-maven-plugin</artifactId> - <version>${plexusPluginVersion}</version> - </plugin> - - <!-- Plugins version from nuiton --> - - <plugin> - <groupId>org.nuiton</groupId> - <artifactId>maven-helper-plugin</artifactId> - <version>${helperPluginVersion}</version> - </plugin> - - <plugin> - <groupId>org.nuiton.jredmine</groupId> - <artifactId>maven-jredmine-plugin</artifactId> - <version>${jredminePluginVersion}</version> - </plugin> - - <plugin> <groupId>org.codehaus.mojo</groupId> - <artifactId>license-maven-plugin</artifactId> - <version>${licensePluginVersion}</version> + <artifactId>wagon-maven-plugin</artifactId> + <version>${wagonPluginVersion}</version> </plugin> <plugin> @@ -829,7 +808,35 @@ </configuration> </plugin> - + + <!-- Plugins version from codehaus plexus --> + + <plugin> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-component-metadata</artifactId> + <version>${plexusComponentMetadataPluginVersion}</version> + </plugin> + + <plugin> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-maven-plugin</artifactId> + <version>${plexusPluginVersion}</version> + </plugin> + + <!-- Plugins version from nuiton --> + + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>helper-maven-plugin</artifactId> + <version>${helperPluginVersion}</version> + </plugin> + + <plugin> + <groupId>org.nuiton.jredmine</groupId> + <artifactId>maven-jredmine-plugin</artifactId> + <version>${jredminePluginVersion}</version> + </plugin> + <!-- Plugins version from others --> <plugin> @@ -1059,7 +1066,7 @@ <plugins> <plugin> <groupId>org.nuiton</groupId> - <artifactId>maven-helper-plugin</artifactId> + <artifactId>helper-maven-plugin</artifactId> <executions> <execution> <id>check-central-safe</id> @@ -1207,7 +1214,7 @@ <plugins> <plugin> <groupId>org.nuiton</groupId> - <artifactId>maven-helper-plugin</artifactId> + <artifactId>helper-maven-plugin</artifactId> <executions> <execution> <id>get-pgp-passphrase</id> @@ -1379,7 +1386,7 @@ <plugin> <groupId>org.nuiton</groupId> - <artifactId>maven-helper-plugin</artifactId> + <artifactId>helper-maven-plugin</artifactId> <executions> <execution> <id>get-keystore</id> @@ -1433,7 +1440,7 @@ <plugin> <groupId>org.nuiton</groupId> - <artifactId>maven-helper-plugin</artifactId> + <artifactId>helper-maven-plugin</artifactId> <executions> <execution> <id>get-keystore</id> @@ -1545,7 +1552,7 @@ --> <plugin> <groupId>org.nuiton</groupId> - <artifactId>maven-helper-plugin</artifactId> + <artifactId>helper-maven-plugin</artifactId> <executions> <execution> <id>get-redmine-login</id> @@ -1676,7 +1683,7 @@ --> <plugin> <groupId>org.nuiton</groupId> - <artifactId>maven-helper-plugin</artifactId> + <artifactId>helper-maven-plugin</artifactId> <executions> <execution> <id>get-redmine-login</id> @@ -1760,7 +1767,7 @@ --> <plugin> <groupId>org.nuiton</groupId> - <artifactId>maven-helper-plugin</artifactId> + <artifactId>helper-maven-plugin</artifactId> <executions> <execution> <id>get-redmine-login</id> Modified: trunk/src/site/apt/index.apt =================================================================== --- trunk/src/site/apt/index.apt 2012-01-04 17:18:58 UTC (rev 1201) +++ trunk/src/site/apt/index.apt 2012-01-13 14:44:30 UTC (rev 1202) @@ -35,7 +35,14 @@ 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 3.1 +** Changement du maven-helper-plugin + + Depuis la version 1.4, maven-helper-plugin devien helper-maven-plugin (tout du + moins son GAV). Le site du projet reste bien (pour le moment) + {{http://maven-site.nuiton.org/maven-helper-plugin}}. + * Nouveautés de la version 3.0.3 ** Correction des déployements de site Modified: trunk/src/site/apt/properties.apt.vm =================================================================== --- trunk/src/site/apt/properties.apt.vm 2012-01-04 17:18:58 UTC (rev 1201) +++ trunk/src/site/apt/properties.apt.vm 2012-01-13 14:44:30 UTC (rev 1202) @@ -127,14 +127,12 @@ *-------------------------------+--------------------------------------------------------------------------+ | <<Propriété (plugins nuton)>> | <<GAV>> | *-------------------------------+--------------------------------------------------------------------------+ -| {{helperPluginVersion}} | {{{http://maven-site.nuiton.org/maven-helper-plugin} <<org.nuiton:maven-helper-plugin:${helperPluginVersion}>>}} | +| {{helperPluginVersion}} | {{{http://maven-site.nuiton.org/maven-helper-plugin} <<org.nuiton:helper-maven-plugin:${helperPluginVersion}>>}} | *-------------------------------+--------------------------------------------------------------------------+ | {{jredminePluginVersion}} | {{{http://maven-site.nuiton.org/jredmine/maven-jredmine-plugin} <<org.nuiton.jredmine:maven-jredmine-plugin:${jredminePluginVersion}>>}} | *-------------------------------+--------------------------------------------------------------------------+ | {{jrstPluginVersion}} | {{{http://maven-site.nuiton.org/jrst/doxia-module-jrst} <<org.nuiton.jrst:doxia-module-jrst:${jrstPluginVersion}>>}} | *-------------------------------+--------------------------------------------------------------------------+ -| {{webstartPluginVersion}} | <<org.nuiton.thirdparty:webstart-maven-plugin:${webstartPluginVersion}>> | -*-------------------------------+--------------------------------------------------------------------------+ ** Plugins maven @@ -209,6 +207,10 @@ *-------------------------------+--------------------------------------------------------------------------+ | {{versionsPluginVersion}} | {{{http://mojo.codehaus.org/versions-maven-plugin}<<org.codehaus.mojo:versions-maven-plugin:${versionsPluginVersion}>>}} | *-------------------------------+--------------------------------------------------------------------------+ +| {{wagonPluginVersion}} | {{{http://mojo.codehaus.org/wagon-maven-plugin}<<org.codehaus.mojo:wagon-maven-plugin:${wagonPluginVersion}>>}} | +*-------------------------------+--------------------------------------------------------------------------+ +| {{webstartPluginVersion}} | {{{http://mojo.codehaus.org/webstart/webstart-maven-plugin}<<org.codehaus.mojo.webstart:webstart-maven-plugin:${webstartPluginVersion}>>}} | +*-------------------------------+--------------------------------------------------------------------------+ ** Plugins plexus (mojo)