Author: hboutemy Date: Sun Sep 4 09:53:13 2011 New Revision: 1164982 URL: http://svn.apache.org/viewvc?rev=1164982&view=rev Log: upgraded parent pom
Modified: maven/maven-3/trunk/pom.xml Modified: maven/maven-3/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/pom.xml?rev=1164982&r1=1164981&r2=1164982&view=diff ============================================================================== --- maven/maven-3/trunk/pom.xml (original) +++ maven/maven-3/trunk/pom.xml Sun Sep 4 09:53:13 2011 @@ -16,7 +16,7 @@ <parent> <groupId>org.apache.maven</groupId> <artifactId>maven-parent</artifactId> - <version>19</version> + <version>21</version> <relativePath>../pom/maven/pom.xml</relativePath> </parent> @@ -396,15 +396,6 @@ </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.3.2</version> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-release-plugin</artifactId> <configuration> <tagBase>https://svn.apache.org/repos/asf/maven/maven-3/tags</tagBase> @@ -414,7 +405,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>2.8.1</version> <configuration> <argLine>-Xmx256m</argLine> </configuration> @@ -423,9 +413,6 @@ <groupId>org.codehaus.modello</groupId> <artifactId>modello-maven-plugin</artifactId> <version>${modelloVersion}</version> - <configuration> - <useJava5>true</useJava5> - </configuration> <executions> <execution> <id>site-docs</id> @@ -455,33 +442,6 @@ <artifactId>maven-assembly-plugin</artifactId> <version>2.2-beta-5</version> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <version>2.8</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-resources-plugin</artifactId> - <version>2.4.2</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-remote-resources-plugin</artifactId> - <version>1.1</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-site-plugin</artifactId> - <version>3.0</version> - <dependencies> - <dependency> - <groupId>org.apache.maven.wagon</groupId> - <artifactId>wagon-ssh</artifactId> - <version>1.0</version> - </dependency> - </dependencies> - </plugin> </plugins> </pluginManagement> <plugins> @@ -536,7 +496,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> - <version>2.8</version> <configuration> <linksource>true</linksource> <links combine.children="append"> @@ -563,7 +522,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jxr-plugin</artifactId> - <version>2.3</version> <reportSets> <reportSet> <id>non-aggregate</id> @@ -582,19 +540,11 @@ </reportSets> </plugin> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-pmd-plugin</artifactId> - <configuration> - <targetJdk>1.5</targetJdk> - </configuration> - </plugin> - <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>cobertura-maven-plugin</artifactId> - <version>2.2</version> <reportSets> <reportSet> - <!-- Disabled at it kills the site generation via a NoClassDefFoundError --> + <!--Disabled at it kills the site generation via a NoClassDefFoundError--> <reports /> </reportSet> </reportSets>