Author: fdesbois Date: 2012-03-23 11:36:40 +0100 (Fri, 23 Mar 2012) New Revision: 1232 Url: http://nuiton.org/repositories/revision/mavenpom/1232 Log: fixes #2029: Add apache tomcat6-m-p and tomcat7-m-p (replace old codehaus tomcat-m-p) Modified: trunk/pom.xml trunk/src/site/apt/properties.apt.vm Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-03-22 10:13:48 UTC (rev 1231) +++ trunk/pom.xml 2012-03-23 10:36:40 UTC (rev 1232) @@ -265,7 +265,7 @@ <findbugsPluginVersion>2.4.0</findbugsPluginVersion> <gwtPluginVersion>2.4.0</gwtPluginVersion> <licensePluginVersion>1.0</licensePluginVersion> - <tomcatPluginVersion>1.1</tomcatPluginVersion> + <tomcatPluginVersion>2.0-beta-1</tomcatPluginVersion> <versionsPluginVersion>1.3.1</versionsPluginVersion> <wagonPluginVersion>1.0-beta-3</wagonPluginVersion> <webstartPluginVersion>1.0-beta-3</webstartPluginVersion> @@ -767,12 +767,6 @@ <plugin> <groupId>org.codehaus.mojo</groupId> - <artifactId>tomcat-maven-plugin</artifactId> - <version>${tomcatPluginVersion}</version> - </plugin> - - <plugin> - <groupId>org.codehaus.mojo</groupId> <artifactId>versions-maven-plugin</artifactId> <version>${versionsPluginVersion}</version> <configuration> @@ -857,6 +851,18 @@ <artifactId>jetty-maven-plugin</artifactId> <version>${jettyPluginVersion}</version> </plugin> + + <plugin> + <groupId>org.apache.tomcat.maven</groupId> + <artifactId>tomcat6-maven-plugin</artifactId> + <version>${tomcatPluginVersion}</version> + </plugin> + + <plugin> + <groupId>org.apache.tomcat.maven</groupId> + <artifactId>tomcat7-maven-plugin</artifactId> + <version>${tomcatPluginVersion}</version> + </plugin> <plugin> <groupId>net.sf</groupId> Modified: trunk/src/site/apt/properties.apt.vm =================================================================== --- trunk/src/site/apt/properties.apt.vm 2012-03-22 10:13:48 UTC (rev 1231) +++ trunk/src/site/apt/properties.apt.vm 2012-03-23 10:36:40 UTC (rev 1232) @@ -205,8 +205,6 @@ *-------------------------------+--------------------------------------------------------------------------+ | {{licensePluginVersion}} | {{{http://mojo.codehaus.org/license-maven-plugin}<<codehaus.mojo:license-maven-plugin:${licensePluginVersion}>>}} | *-------------------------------+--------------------------------------------------------------------------+ -| {{tomcatPluginVersion}} | {{{http://mojo.codehaus.org/tomcat-maven-plugin}<<org.codehaus.mojo:tomcat-maven-plugin:${tomcatPluginVersion}>>}} | -*-------------------------------+--------------------------------------------------------------------------+ | {{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}>>}} | @@ -231,10 +229,14 @@ *-------------------------------------+------------------------------------------------------------------------------------------------+ | {{androidPluginVersion}} | <<com.jayway.maven.plugins.android.generation2:maven-android-plugin:${androidPluginVersion}>> | *-------------------------------------+------------------------------------------------------------------------------------------------+ -| {{jettyPluginVersion}} | {{{http://mojo.codehaus.org/jetty-maven-plugin}<<org.mortbay.jetty:jetty-maven-plugin:${jettyPluginVersion}>>}} | +| {{jettyPluginVersion}} | {{{http://mojo.codehaus.org/jetty-maven-plugin}<<org.mortbay.jetty:jetty-maven-plugin:${jettyPluginVersion}>>}} | *-------------------------------------+------------------------------------------------------------------------------------------------+ -| {{statScmPluginVersion}} | {{{http://stat-scm.sourceforge.net}<<net.sf:stat-scm:${statScmPluginVersion}>>}} | +| {{tomcatPluginVersion}} | {{{http://tomcat.apache.org/maven-plugin-${tomcatPluginVersion}/}<<org.apache.tomcat.maven:tomcat6-maven-plugin:${tomcatPluginVersion}>>}} | *-------------------------------------+------------------------------------------------------------------------------------------------+ +| {{tomcatPluginVersion}} | {{{http://tomcat.apache.org/maven-plugin-${tomcatPluginVersion}/}<<org.apache.tomcat.maven:tomcat7-maven-plugin:${tomcatPluginVersion}>>}} | +*-------------------------------------+------------------------------------------------------------------------------------------------+ +| {{statScmPluginVersion}} | {{{http://stat-scm.sourceforge.net}<<net.sf:stat-scm:${statScmPluginVersion}>>}} | +*-------------------------------------+------------------------------------------------------------------------------------------------+ ** Plugins de report