Author: carlos
Date: Sat Jul 1 08:10:53 2006
New Revision: 418485
URL: http://svn.apache.org/viewvc?rev=418485&view=rev
Log:
Merging 418483 from trunk. Upgrade versions of parent and wagon api
Modified:
maven/components/branches/maven-2.0.x/pom.xml
Modified: maven/components/branches/maven-2.0.x/pom.xml
URL:
http://svn.apache.org/viewvc/maven/components/branches/maven-2.0.x/pom.xml?rev=418485&r1=418484&r2=418485&view=diff
==============================================================================
--- maven/components/branches/maven-2.0.x/pom.xml (original)
+++ maven/components/branches/maven-2.0.x/pom.xml Sat Jul 1 08:10:53 2006
@@ -3,7 +3,7 @@
<parent>
<groupId>org.apache.maven</groupId>
<artifactId>maven-parent</artifactId>
- <version>1</version>
+ <version>2</version>
<relativePath>../pom/maven/pom.xml</relativePath>
</parent>
<artifactId>maven</artifactId>
@@ -104,37 +104,6 @@
<scope>test</scope>
</dependency>
</dependencies>
- <reporting>
- <plugins>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <configuration>
- <links>
- <link>http://java.sun.com/j2ee/1.4/docs/api</link>
- <link>http://java.sun.com/j2se/1.5.0/docs/api</link>
-
<link>http://jakarta.apache.org/commons/collections/apidocs-COLLECTIONS_3_0/</link>
- <link>http://jakarta.apache.org/commons/dbcp/apidocs/</link>
- <link>http://jakarta.apache.org/commons/fileupload/apidocs/</link>
- <link>http://jakarta.apache.org/commons/httpclient/apidocs/</link>
- <link>http://jakarta.apache.org/commons/logging/apidocs/</link>
- <link>http://jakarta.apache.org/commons/pool/apidocs/</link>
- <link>http://www.junit.org/junit/javadoc/</link>
- <link>http://logging.apache.org/log4j/docs/api/</link>
- <link>http://jakarta.apache.org/regexp/apidocs/</link>
- <link>http://jakarta.apache.org/velocity/api/</link>
- </links>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jxr-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>taglist-maven-plugin</artifactId>
- </plugin>
- </plugins>
- </reporting>
<dependencyManagement>
<dependencies>
<dependency>
@@ -150,7 +119,7 @@
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-provider-api</artifactId>
- <version>1.0-beta-1-SNAPSHOT</version>
+ <version>1.0-beta-1</version>
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
