Author: jdonnerstag
Date: Sat Mar 13 18:46:39 2010
New Revision: 922646
URL: http://svn.apache.org/viewvc?rev=922646&view=rev
Log:
WICKET 2682 fixed Maven 3 produces various warnings
Modified:
wicket/trunk/archetypes/quickstart/pom.xml
wicket/trunk/pom.xml
wicket/trunk/wicket/pom.xml
Modified: wicket/trunk/archetypes/quickstart/pom.xml
URL:
http://svn.apache.org/viewvc/wicket/trunk/archetypes/quickstart/pom.xml?rev=922646&r1=922645&r2=922646&view=diff
==============================================================================
--- wicket/trunk/archetypes/quickstart/pom.xml (original)
+++ wicket/trunk/archetypes/quickstart/pom.xml Sat Mar 13 18:46:39 2010
@@ -8,7 +8,7 @@
</parent>
<artifactId>wicket-archetype-quickstart</artifactId>
- <packaging>maven-plugin</packaging>
+ <packaging>jar</packaging>
<name>Wicket Quickstart Archetype</name>
<build>
Modified: wicket/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/wicket/trunk/pom.xml?rev=922646&r1=922645&r2=922646&view=diff
==============================================================================
--- wicket/trunk/pom.xml (original)
+++ wicket/trunk/pom.xml Sat Mar 13 18:46:39 2010
@@ -23,6 +23,10 @@
<packaging>pom</packaging>
<name>Wicket Parent</name>
<description>Wicket is a Java-based open source component web
application framework.</description>
+ <properties>
+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+
<profiles>
<profile>
<id>bamboo</id>
@@ -560,8 +564,8 @@
<inherited>true</inherited>
</plugin>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
-
<artifactId>surefire-report-maven-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+
<artifactId>maven-surefire-report-plugin</artifactId>
<inherited>true</inherited>
</plugin>
<plugin>
@@ -578,6 +582,13 @@
<pluginManagement>
<plugins>
<plugin>
+
<artifactId>maven-resources-plugin</artifactId>
+ <configuration>
+
<encoding>${project.build.sourceEncoding}</encoding>
+ </configuration>
+ </plugin>
+
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.2-beta-2</version>
@@ -629,7 +640,7 @@
<artifactId>maven-war-plugin</artifactId>
<version>2.0.2</version>
<configuration>
-
<warName>${pom.artifactId}</warName>
+
<warName>${project.artifactId}</warName>
</configuration>
</plugin>
<plugin>
@@ -707,6 +718,11 @@
</configuration>
</plugin>
<plugin>
+
<groupId>org.apache.maven.plugins</groupId>
+
<artifactId>maven-surefire-report-plugin</artifactId>
+ <version>2.5</version>
+ </plugin>
+ <plugin>
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty-plugin</artifactId>
<version>6.1.1</version>
@@ -781,6 +797,7 @@
<inherited>true</inherited>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.5</version>
</plugin>
</plugins>
</reporting>
Modified: wicket/trunk/wicket/pom.xml
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/pom.xml?rev=922646&r1=922645&r2=922646&view=diff
==============================================================================
--- wicket/trunk/wicket/pom.xml (original)
+++ wicket/trunk/wicket/pom.xml Sat Mar 13 18:46:39 2010
@@ -63,6 +63,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clover-plugin</artifactId>
+ <version>2.4</version>
<configuration>
<licenseLocation>${basedir}/../../../common/lib/clover.license</licenseLocation>
</configuration>
