commit ee5fe48419e2b788962fd3e1fd3dfa152025c33b
author Benjamin Bentmann <bentmann@apache.org> Sat Dec 26 12:22:23 2009 +0000
committer Benjamin Bentmann <bentmann@apache.org> Sat Dec 26 12:22:23 2009 +0000
tree 1313116a795abb8b1d91ac1b3990b9675332c0ba
parent 5386d9f20fe10ea9219ee78deb8c09c905fcddce
parent e62104076ddd487afc4a4cf41e2f90e56492ef19

[maven-scm] copy for tag apache-7

git-svn-id: https://svn.apache.org/repos/asf/maven/pom/tags/apache-7@893967 13f79535-47bb-0310-9956-ffa450edef68

pom.xml

diff --git a/pom.xml b/pom.xml
index 1155b64..6f992bd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -111,7 +111,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-assembly-plugin</artifactId>
-          <version>2.2-beta-4</version>
+          <version>2.2-beta-5</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -131,7 +131,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-deploy-plugin</artifactId>
-          <version>2.4</version>
+          <version>2.5</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -161,7 +161,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-jar-plugin</artifactId>
-          <version>2.2</version>
+          <version>2.3</version>
           <configuration>
             <archive>
               <manifest>
@@ -174,7 +174,8 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-javadoc-plugin</artifactId>
-          <version>2.6.1</version>
+          <!-- NOTE: 2.6.x is generally unusuable due to MJAVADOC-275 -->
+          <version>2.5</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -288,13 +289,7 @@
               <dependency>
                 <groupId>org.apache.apache.resources</groupId>
                 <artifactId>apache-source-release-assembly-descriptor</artifactId>
-                <version>1.0.1</version>
-              </dependency>
-              <dependency>
-                <!-- NOTE: The fix for PLXUTILS-120 is crucial for the new assembly descriptor -->
-                <groupId>org.codehaus.plexus</groupId>
-                <artifactId>plexus-utils</artifactId>
-                <version>2.0.1</version>
+                <version>1.0.2</version>
               </dependency>
             </dependencies>
             <executions>