Author: mck
Date: Sun Jun 23 20:20:45 2013
New Revision: 1495885
URL: http://svn.apache.org/r1495885
Log:
- use the enforcer plugin to ensure we use a safe version of java (now
1.7.0-22+)
- make maven-3.0.4 the minimum
- upgrade the UmlGraph doclet so that it works with Java7
- upgrade dependencies
Modified:
tiles/maven/trunk/pom/pom.xml
Modified: tiles/maven/trunk/pom/pom.xml
URL:
http://svn.apache.org/viewvc/tiles/maven/trunk/pom/pom.xml?rev=1495885&r1=1495884&r2=1495885&view=diff
==============================================================================
--- tiles/maven/trunk/pom/pom.xml (original)
+++ tiles/maven/trunk/pom/pom.xml Sun Jun 23 20:20:45 2013
@@ -18,6 +18,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
+ <prerequisites><maven>${maven.version.minimum}</maven></prerequisites>
<parent>
<groupId>org.apache</groupId>
<artifactId>apache</artifactId>
@@ -42,6 +43,10 @@
<url>http://tiles.apache.org/</url>
<inceptionYear>2001</inceptionYear>
+ <properties>
+ <maven.version.minimum>3.0.4</maven.version.minimum>
+ </properties>
+
<mailingLists>
<mailingList>
<name>Tiles User List</name>
@@ -210,13 +215,33 @@
</plugin>
</plugins>
</pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>1.2</version>
+ <executions>
+ <execution>
+ <id>enforce-java</id>
+ <goals><goal>enforce</goal></goals>
+ <configuration>
+ <rules>
+ <requireJavaVersion>
+ <version>[1.7.0-22,1.8)</version>
+ </requireJavaVersion>
+ </rules>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
</build>
<reporting>
<plugins>
<plugin>
<artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.12</version>
+ <version>2.15</version>
</plugin>
<plugin>
<artifactId>maven-checkstyle-plugin</artifactId>
@@ -239,9 +264,9 @@
</plugin>
<plugin>
<artifactId>maven-pmd-plugin</artifactId>
- <version>2.7.1</version>
+ <version>3.0.1</version>
<configuration>
- <targetJdk>1.5</targetJdk>
+ <targetJdk>1.6</targetJdk>
</configuration>
</plugin>
<plugin>
@@ -251,6 +276,7 @@
<reportSet>
<id>aggregated</id>
<configuration>
+ <aggregate>true</aggregate>
<excludePackageNames>org.apache.tiles.test</excludePackageNames>
<links>
<link>http://docs.oracle.com/javase/6/docs/api</link>
@@ -259,11 +285,11 @@
<link>http://commons.apache.org/digester/commons-digester-1.6/docs/api</link>
<link>http://www.slf4j.org/api</link>
</links>
-
<doclet>gr.spinellis.umlgraph.doclet.UmlGraphDoc</doclet>
+ <doclet>org.umlgraph.doclet.UmlGraphDoc</doclet>
<docletArtifact>
- <groupId>gr.spinellis</groupId>
- <artifactId>UmlGraph</artifactId>
- <version>4.6</version>
+ <groupId>org.umlgraph</groupId>
+ <artifactId>umlgraph</artifactId>
+ <version>5.6</version>
</docletArtifact>
<additionalparam>
-inferrel -inferdep -quiet -hide java.*
@@ -296,7 +322,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>cobertura-maven-plugin</artifactId>
- <version>2.5.1</version>
+ <version>2.5.2</version>
</plugin>
</plugins>
</reporting>
