You are viewing a plain text version of this content. The canonical link for it is here.
Posted to wagon-commits@maven.apache.org by ca...@apache.org on 2007/05/18 02:58:07 UTC

svn commit: r539202 - in /maven/wagon/branches/wagon-1.x: pom.xml wagon-provider-test/pom.xml wagon-providers/pom.xml wagon-providers/wagon-ftp/pom.xml wagon-providers/wagon-ssh-common-test/pom.xml

Author: carlos
Date: Thu May 17 17:58:06 2007
New Revision: 539202

URL: http://svn.apache.org/viewvc?view=rev&rev=539202
Log:
Reduce differences with trunk

Modified:
    maven/wagon/branches/wagon-1.x/pom.xml
    maven/wagon/branches/wagon-1.x/wagon-provider-test/pom.xml
    maven/wagon/branches/wagon-1.x/wagon-providers/pom.xml
    maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ftp/pom.xml
    maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh-common-test/pom.xml

Modified: maven/wagon/branches/wagon-1.x/pom.xml
URL: http://svn.apache.org/viewvc/maven/wagon/branches/wagon-1.x/pom.xml?view=diff&rev=539202&r1=539201&r2=539202
==============================================================================
--- maven/wagon/branches/wagon-1.x/pom.xml (original)
+++ maven/wagon/branches/wagon-1.x/pom.xml Thu May 17 17:58:06 2007
@@ -78,7 +78,6 @@
     <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/wagon/branches/wagon-1.x</developerConnection>
     <url>https://svn.apache.org/repos/asf/maven/wagon/branches/wagon-1.x</url>
   </scm>
-
   <build>
     <pluginManagement>
       <plugins>
@@ -162,6 +161,10 @@
             <artifactId>plexus-utils</artifactId>
           </exclusion>
           <exclusion>
+            <groupId>org.codehaus.plexus</groupId>
+            <artifactId>plexus-container-default</artifactId>
+          </exclusion>
+          <exclusion>
             <groupId>classworlds</groupId>
             <artifactId>classworlds</artifactId>
           </exclusion>
@@ -170,7 +173,8 @@
       <dependency>
         <groupId>org.codehaus.plexus</groupId>
         <artifactId>plexus-container-default</artifactId>
-        <version>1.0-alpha-8</version>
+        <version>1.0-alpha-9</version>
+        <scope>test</scope>
       </dependency>
       <dependency>
         <groupId>org.codehaus.plexus</groupId>

Modified: maven/wagon/branches/wagon-1.x/wagon-provider-test/pom.xml
URL: http://svn.apache.org/viewvc/maven/wagon/branches/wagon-1.x/wagon-provider-test/pom.xml?view=diff&rev=539202&r1=539201&r2=539202
==============================================================================
--- maven/wagon/branches/wagon-1.x/wagon-provider-test/pom.xml (original)
+++ maven/wagon/branches/wagon-1.x/wagon-provider-test/pom.xml Thu May 17 17:58:06 2007
@@ -43,6 +43,7 @@
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-container-default</artifactId>
+      <scope>compile</scope>
     </dependency>
   </dependencies>
 </project>

Modified: maven/wagon/branches/wagon-1.x/wagon-providers/pom.xml
URL: http://svn.apache.org/viewvc/maven/wagon/branches/wagon-1.x/wagon-providers/pom.xml?view=diff&rev=539202&r1=539201&r2=539202
==============================================================================
--- maven/wagon/branches/wagon-1.x/wagon-providers/pom.xml (original)
+++ maven/wagon/branches/wagon-1.x/wagon-providers/pom.xml Thu May 17 17:58:06 2007
@@ -48,12 +48,12 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.maven.wagon</groupId>
-      <artifactId>wagon-provider-test</artifactId>
-      <scope>test</scope>
+      <artifactId>wagon-provider-api</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.wagon</groupId>
-      <artifactId>wagon-provider-api</artifactId>
+      <artifactId>wagon-provider-test</artifactId>
+      <scope>test</scope>
     </dependency>
   </dependencies>
 </project>

Modified: maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ftp/pom.xml
URL: http://svn.apache.org/viewvc/maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ftp/pom.xml?view=diff&rev=539202&r1=539201&r2=539202
==============================================================================
--- maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ftp/pom.xml (original)
+++ maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ftp/pom.xml Thu May 17 17:58:06 2007
@@ -50,6 +50,12 @@
       <artifactId>plexus-ftpd</artifactId>
       <version>1.0-alpha-1</version>
       <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>plexus</groupId>
+          <artifactId>plexus-container-default</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
   </dependencies>
 </project>

Modified: maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh-common-test/pom.xml
URL: http://svn.apache.org/viewvc/maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh-common-test/pom.xml?view=diff&rev=539202&r1=539201&r2=539202
==============================================================================
--- maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh-common-test/pom.xml (original)
+++ maven/wagon/branches/wagon-1.x/wagon-providers/wagon-ssh-common-test/pom.xml Thu May 17 17:58:06 2007
@@ -40,6 +40,7 @@
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-container-default</artifactId>
+      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
@@ -53,6 +54,7 @@
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <version>3.8.1</version>
+      <scope>compile</scope>
     </dependency>
   </dependencies>
 </project>



---------------------------------------------------------------------
To unsubscribe, e-mail: wagon-commits-unsubscribe@maven.apache.org
For additional commands, e-mail: wagon-commits-help@maven.apache.org