You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2008/10/01 16:53:59 UTC

svn commit: r700800 - in /maven/components/branches/maven-3.0.x-MNG-3778: maven-distribution/pom.xml maven-embedder/pom.xml pom.xml

Author: jvanzyl
Date: Wed Oct  1 07:53:58 2008
New Revision: 700800

URL: http://svn.apache.org/viewvc?rev=700800&view=rev
Log:
o the distribution now builds with the mercury wagon and all it's dependencies


Modified:
    maven/components/branches/maven-3.0.x-MNG-3778/maven-distribution/pom.xml
    maven/components/branches/maven-3.0.x-MNG-3778/maven-embedder/pom.xml
    maven/components/branches/maven-3.0.x-MNG-3778/pom.xml

Modified: maven/components/branches/maven-3.0.x-MNG-3778/maven-distribution/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-3.0.x-MNG-3778/maven-distribution/pom.xml?rev=700800&r1=700799&r2=700800&view=diff
==============================================================================
--- maven/components/branches/maven-3.0.x-MNG-3778/maven-distribution/pom.xml (original)
+++ maven/components/branches/maven-3.0.x-MNG-3778/maven-distribution/pom.xml Wed Oct  1 07:53:58 2008
@@ -55,8 +55,8 @@
     </dependency>
     <dependency>
       <groupId>org.apache.maven.wagon</groupId>
-      <artifactId>wagon-http-lightweight</artifactId>
-    </dependency>
+      <artifactId>wagon-mercury</artifactId>
+    </dependency>    
     <dependency>
       <groupId>org.apache.maven.wagon</groupId>
       <artifactId>wagon-ssh</artifactId>

Modified: maven/components/branches/maven-3.0.x-MNG-3778/maven-embedder/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-3.0.x-MNG-3778/maven-embedder/pom.xml?rev=700800&r1=700799&r2=700800&view=diff
==============================================================================
--- maven/components/branches/maven-3.0.x-MNG-3778/maven-embedder/pom.xml (original)
+++ maven/components/branches/maven-3.0.x-MNG-3778/maven-embedder/pom.xml Wed Oct  1 07:53:58 2008
@@ -47,19 +47,8 @@
     </dependency>
     <dependency>
       <groupId>org.apache.maven.wagon</groupId>
-      <artifactId>wagon-http-lightweight</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.wagon</groupId>
-      <artifactId>wagon-ssh</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.wagon</groupId>
-      <artifactId>wagon-ssh-external</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.wagon</groupId>
       <artifactId>wagon-file</artifactId>
+      <scope>test</scope>
     </dependency>
     <!-- Needed for compat and cache-control aspects. -->
     <dependency>

Modified: maven/components/branches/maven-3.0.x-MNG-3778/pom.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/maven-3.0.x-MNG-3778/pom.xml?rev=700800&r1=700799&r2=700800&view=diff
==============================================================================
--- maven/components/branches/maven-3.0.x-MNG-3778/pom.xml (original)
+++ maven/components/branches/maven-3.0.x-MNG-3778/pom.xml Wed Oct  1 07:53:58 2008
@@ -287,6 +287,7 @@
     <wagonVersion>1.0-beta-4</wagonVersion>
     <mavenSharedModel>1.0-SNAPSHOT</mavenSharedModel>
     <woodstoxVersion>3.2.6</woodstoxVersion>
+    <mercuryVersion>1.0.0-alpha-1-SNAPSHOT</mercuryVersion>    
   </properties>
 
   <!--start-->
@@ -404,9 +405,9 @@
       </dependency>
       <dependency>
         <groupId>org.apache.maven.wagon</groupId>
-        <artifactId>wagon-http-lightweight</artifactId>
-        <version>${wagonVersion}</version>
-      </dependency>
+        <artifactId>wagon-mercury</artifactId>
+        <version>${mercuryVersion}</version>
+      </dependency>      
       <dependency>
         <groupId>org.apache.maven.wagon</groupId>
         <artifactId>wagon-ssh</artifactId>