Author: jdonnerstag
Date: Sun Jan 24 21:11:55 2010
New Revision: 902646
URL: http://svn.apache.org/viewvc?rev=902646&view=rev
Log:
WICKET-2682 maven 3 produces various warnings
Modified:
wicket/branches/wicket-1.4.x/archetypes/quickstart/pom.xml
wicket/branches/wicket-1.4.x/pom.xml
wicket/branches/wicket-1.4.x/wicket/pom.xml
Modified: wicket/branches/wicket-1.4.x/archetypes/quickstart/pom.xml
URL:
http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/archetypes/quickstart/pom.xml?rev=902646&r1=902645&r2=902646&view=diff
==============================================================================
--- wicket/branches/wicket-1.4.x/archetypes/quickstart/pom.xml (original)
+++ wicket/branches/wicket-1.4.x/archetypes/quickstart/pom.xml Sun Jan 24
21:11:55 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/branches/wicket-1.4.x/pom.xml
URL:
http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/pom.xml?rev=902646&r1=902645&r2=902646&view=diff
==============================================================================
--- wicket/branches/wicket-1.4.x/pom.xml (original)
+++ wicket/branches/wicket-1.4.x/pom.xml Sun Jan 24 21:11:55 2010
@@ -23,6 +23,9 @@
<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>
@@ -541,8 +544,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>
@@ -558,6 +561,12 @@
</plugins>
<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>
@@ -610,7 +619,7 @@
<artifactId>maven-war-plugin</artifactId>
<version>2.0.2</version>
<configuration>
-
<warName>${pom.artifactId}</warName>
+
<warName>${project.artifactId}</warName>
</configuration>
</plugin>
<plugin>
@@ -687,6 +696,11 @@
</includes>
</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>
@@ -762,6 +776,7 @@
<inherited>true</inherited>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.5</version>
</plugin>
</plugins>
</reporting>
Modified: wicket/branches/wicket-1.4.x/wicket/pom.xml
URL:
http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket/pom.xml?rev=902646&r1=902645&r2=902646&view=diff
==============================================================================
--- wicket/branches/wicket-1.4.x/wicket/pom.xml (original)
+++ wicket/branches/wicket-1.4.x/wicket/pom.xml Sun Jan 24 21:11:55 2010
@@ -52,6 +52,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>
