- Revision
- 254
- Author
- mauro
- Date
- 2007-07-13 03:56:11 -0500 (Fri, 13 Jul 2007)
Log Message
Moved maven-war-plugin configuration to parent pluginManagement.
Modified Paths
- trunk/examples/freemarker-example/pom.xml
- trunk/examples/jruby-example/pom.xml
- trunk/examples/migration-example/pom.xml
- trunk/examples/mydvds-example/pom.xml
- trunk/examples/paranamer-example/pom.xml
- trunk/pom.xml
Diff
Modified: trunk/examples/freemarker-example/pom.xml (253 => 254)
--- trunk/examples/freemarker-example/pom.xml 2007-07-13 08:43:59 UTC (rev 253) +++ trunk/examples/freemarker-example/pom.xml 2007-07-13 08:56:11 UTC (rev 254) @@ -43,7 +43,6 @@ <plugin> <groupId>com.thoughtworks.paranamer</groupId> <artifactId>paranamer-maven-plugin</artifactId> - <version>1.1-SNAPSHOT</version> <configuration> <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory> <outputDirectory>${project.build.outputDirectory}</outputDirectory> @@ -61,15 +60,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-war-plugin</artifactId> - <version>2.0</version> - <configuration> - <warName>${pom.artifactId}</warName> - <webResources> - <resource> - <directory>${basedir}/resources</directory> - </resource> - </webResources> - </configuration> </plugin> <plugin> <artifactId>maven-antrun-plugin</artifactId>
Modified: trunk/examples/jruby-example/pom.xml (253 => 254)
--- trunk/examples/jruby-example/pom.xml 2007-07-13 08:43:59 UTC (rev 253) +++ trunk/examples/jruby-example/pom.xml 2007-07-13 08:56:11 UTC (rev 254) @@ -66,15 +66,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-war-plugin</artifactId> - <version>2.0</version> - <configuration> - <warName>${pom.artifactId}</warName> - <webResources> - <resource> - <directory>${basedir}/resources</directory> - </resource> - </webResources> - </configuration> </plugin> <plugin> <artifactId>maven-antrun-plugin</artifactId>
Modified: trunk/examples/migration-example/pom.xml (253 => 254)
--- trunk/examples/migration-example/pom.xml 2007-07-13 08:43:59 UTC (rev 253) +++ trunk/examples/migration-example/pom.xml 2007-07-13 08:56:11 UTC (rev 254) @@ -48,7 +48,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-war-plugin</artifactId> - <version>2.0</version> <configuration> <webXml>${basedir}/src/main/webapp/WEB-INF/${framework}-web.xml</webXml> <warName>waffle-migration-example-${framework}</warName>
Modified: trunk/examples/mydvds-example/pom.xml (253 => 254)
--- trunk/examples/mydvds-example/pom.xml 2007-07-13 08:43:59 UTC (rev 253) +++ trunk/examples/mydvds-example/pom.xml 2007-07-13 08:56:11 UTC (rev 254) @@ -6,9 +6,9 @@ <artifactId>waffle-parent</artifactId> <version>1.0-SNAPSHOT</version> </parent> - <artifactId>waffle-mydvds</artifactId> + <artifactId>waffle-mydvds-example</artifactId> <packaging>war</packaging> - <name>Waffle Complete Example</name> + <name>Waffle MyDvds Example</name> <dependencies> <dependency> @@ -70,15 +70,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-war-plugin</artifactId> - <version>2.0</version> - <configuration> - <!--<warName>${pom.artifactId}</warName>--> - <webResources> - <resource> - <directory>${basedir}/resources</directory> - </resource> - </webResources> - </configuration> </plugin> <plugin> <groupId>org.mortbay.jetty</groupId> @@ -96,7 +87,7 @@ <configuration> <tasks> <echo>Deploying webapp</echo> - <copy file="target/${pom.artifactId}-${pom.version}.war" todir="${webapp.deploy.dir}" verbose="true" + <copy file="target/${pom.artifactId}.war" todir="${webapp.deploy.dir}" verbose="true" overwrite="true"/> </tasks> </configuration>
Modified: trunk/examples/paranamer-example/pom.xml (253 => 254)
--- trunk/examples/paranamer-example/pom.xml 2007-07-13 08:43:59 UTC (rev 253) +++ trunk/examples/paranamer-example/pom.xml 2007-07-13 08:56:11 UTC (rev 254) @@ -43,7 +43,6 @@ <plugin> <groupId>com.thoughtworks.paranamer</groupId> <artifactId>paranamer-maven-plugin</artifactId> - <version>1.1-SNAPSHOT</version> <configuration> <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory> <outputDirectory>${basedir}/src/main/resources</outputDirectory> @@ -60,15 +59,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-war-plugin</artifactId> - <version>2.0</version> - <configuration> - <warName>${pom.artifactId}</warName> - <webResources> - <resource> - <directory>${basedir}/resources</directory> - </resource> - </webResources> - </configuration> </plugin> <plugin> <artifactId>maven-antrun-plugin</artifactId>
Modified: trunk/pom.xml (253 => 254)
--- trunk/pom.xml 2007-07-13 08:43:59 UTC (rev 253) +++ trunk/pom.xml 2007-07-13 08:56:11 UTC (rev 254) @@ -203,6 +203,19 @@ </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> + <version>2.0.2</version> + <configuration> + <warName>${pom.artifactId}</warName> + <webResources> + <resource> + <directory>${basedir}/resources</directory> + </resource> + </webResources> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-release-plugin</artifactId> <version>2.0-beta-5</version> <configuration>
To unsubscribe from this list please visit:
