maven-wagon-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From strub...@apache.org
Subject svn commit: r1127331 - in /maven/wagon/trunk: ./ wagon-provider-api/ wagon-provider-test/ wagon-providers/wagon-ftp/ wagon-providers/wagon-ssh-common-test/ wagon-providers/wagon-ssh/ wagon-tcks/wagon-tck-http/ wagon-tcks/wagon-tck-http/sample-tck-consu...
Date Tue, 24 May 2011 23:19:32 GMT
Author: struberg
Date: Tue May 24 23:19:31 2011
New Revision: 1127331

URL: http://svn.apache.org/viewvc?rev=1127331&view=rev
Log:
WAGON-329 cleanup pom; upgrade versions; remove cycles

Modified:
    maven/wagon/trunk/pom.xml
    maven/wagon/trunk/wagon-provider-api/pom.xml
    maven/wagon/trunk/wagon-provider-test/pom.xml
    maven/wagon/trunk/wagon-providers/wagon-ftp/pom.xml
    maven/wagon/trunk/wagon-providers/wagon-ssh-common-test/pom.xml
    maven/wagon/trunk/wagon-providers/wagon-ssh/pom.xml
    maven/wagon/trunk/wagon-tcks/wagon-tck-http/pom.xml
    maven/wagon/trunk/wagon-tcks/wagon-tck-http/sample-tck-consumer/pom.xml
    maven/wagon/trunk/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/WagonTestCaseConfigurator.java

Modified: maven/wagon/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/pom.xml?rev=1127331&r1=1127330&r2=1127331&view=diff
==============================================================================
--- maven/wagon/trunk/pom.xml (original)
+++ maven/wagon/trunk/pom.xml Tue May 24 23:19:31 2011
@@ -190,14 +190,7 @@ under the License.
     <system>Jenkins</system>
     <url>https://builds.apache.org/hudson/job/maven-wagon/</url>
   </ciManagement>
-  <!-- TODO: point to ref location
-    <distributionManagement>
-      <site>
-        <id>apache.website</id>
-        <url>scp://people.apache.org/www/maven.apache.org/wagon/</url>
-      </site>
-    </distributionManagement>
-  -->
+
 
   <modules>
     <module>wagon-provider-api</module>
@@ -274,6 +267,36 @@ under the License.
         <artifactId>plexus-utils</artifactId>
         <version>2.0.7</version>
       </dependency>
+
+      <!-- for slf4j -->
+      <dependency>
+        <groupId>ch.qos.logback</groupId>
+        <artifactId>logback-classic</artifactId>
+        <version>0.9.28</version>
+        <scope>test</scope>
+      </dependency>
+
+      <dependency>
+        <groupId>easymock</groupId>
+        <artifactId>easymock</artifactId>
+        <version>1.2_Java1.5</version>
+        <scope>test</scope>
+      </dependency>
+
+      <dependency>
+        <groupId>org.mortbay.jetty</groupId>
+        <artifactId>jetty</artifactId>
+        <version>6.1.26</version>
+      </dependency>
+
+      <dependency>
+        <groupId>junit</groupId>
+        <artifactId>junit</artifactId>
+        <version>4.8.2</version>
+        <scope>test</scope>
+      </dependency>
+
+
     </dependencies>
   </dependencyManagement>
 

Modified: maven/wagon/trunk/wagon-provider-api/pom.xml
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-provider-api/pom.xml?rev=1127331&r1=1127330&r2=1127331&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-provider-api/pom.xml (original)
+++ maven/wagon/trunk/wagon-provider-api/pom.xml Tue May 24 23:19:31 2011
@@ -39,7 +39,6 @@ under the License.
     <dependency>
       <groupId>easymock</groupId>
       <artifactId>easymock</artifactId>
-      <version>1.2_Java1.3</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

Modified: maven/wagon/trunk/wagon-provider-test/pom.xml
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-provider-test/pom.xml?rev=1127331&r1=1127330&r2=1127331&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-provider-test/pom.xml (original)
+++ maven/wagon/trunk/wagon-provider-test/pom.xml Tue May 24 23:19:31 2011
@@ -48,12 +48,11 @@ under the License.
     <dependency>
       <groupId>easymock</groupId>
       <artifactId>easymock</artifactId>
-      <version>1.2_Java1.5</version>
+      <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>org.mortbay.jetty</groupId>
       <artifactId>jetty</artifactId>
-      <version>6.1.11</version>
     </dependency>
   </dependencies>
 </project>

Modified: maven/wagon/trunk/wagon-providers/wagon-ftp/pom.xml
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-ftp/pom.xml?rev=1127331&r1=1127330&r2=1127331&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-ftp/pom.xml (original)
+++ maven/wagon/trunk/wagon-providers/wagon-ftp/pom.xml Tue May 24 23:19:31 2011
@@ -50,6 +50,10 @@ under the License.
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-jdk14</artifactId>
       <version>1.5.2</version>
+    </dependency>
+    <dependency>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>

Modified: maven/wagon/trunk/wagon-providers/wagon-ssh-common-test/pom.xml
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-ssh-common-test/pom.xml?rev=1127331&r1=1127330&r2=1127331&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-ssh-common-test/pom.xml (original)
+++ maven/wagon/trunk/wagon-providers/wagon-ssh-common-test/pom.xml Tue May 24 23:19:31 2011
@@ -47,7 +47,6 @@ under the License.
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>3.8.1</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>

Modified: maven/wagon/trunk/wagon-providers/wagon-ssh/pom.xml
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-providers/wagon-ssh/pom.xml?rev=1127331&r1=1127330&r2=1127331&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-providers/wagon-ssh/pom.xml (original)
+++ maven/wagon/trunk/wagon-providers/wagon-ssh/pom.xml Tue May 24 23:19:31 2011
@@ -52,7 +52,6 @@ under the License.
     <dependency>
       <groupId>org.mortbay.jetty</groupId>
       <artifactId>jetty</artifactId>
-      <version>6.1.11</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

Modified: maven/wagon/trunk/wagon-tcks/wagon-tck-http/pom.xml
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-tcks/wagon-tck-http/pom.xml?rev=1127331&r1=1127330&r2=1127331&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-tcks/wagon-tck-http/pom.xml (original)
+++ maven/wagon/trunk/wagon-tcks/wagon-tck-http/pom.xml Tue May 24 23:19:31 2011
@@ -13,33 +13,24 @@
   <name>Wagon HTTP Test Compatibility Kit</name>
 
   <dependencies>
-    <!-- TODO: Split this out into a sample project that shows how to use this TCK. -->
-    <dependency>
-      <groupId>org.apache.maven.wagon</groupId>
-      <artifactId>wagon-http-lightweight</artifactId>
-      <version>1.0-beta-6</version>
-    </dependency>
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-container-default</artifactId>
-      <version>1.0-alpha-9-stable-1</version>
       <!-- override test scope from parents -->
       <scope>compile</scope>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.8.1</version>
     </dependency>
     <dependency>
       <groupId>org.mortbay.jetty</groupId>
       <artifactId>jetty</artifactId>
-      <version>6.1.21</version>
     </dependency>
     <dependency>
       <groupId>org.apache.maven.wagon</groupId>
       <artifactId>wagon-provider-api</artifactId>
-      <version>1.0-beta-6</version>
+      <version>${project.version}</version>
     </dependency>
     <dependency>
       <groupId>commons-codec</groupId>
@@ -47,19 +38,5 @@
       <version>1.4</version>
     </dependency>
   </dependencies>
-  
-  <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <artifactId>maven-compiler-plugin</artifactId>
-          <version>2.3.1</version>
-          <configuration>
-            <source>1.5</source>
-            <target>1.5</target>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
+
 </project>

Modified: maven/wagon/trunk/wagon-tcks/wagon-tck-http/sample-tck-consumer/pom.xml
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-tcks/wagon-tck-http/sample-tck-consumer/pom.xml?rev=1127331&r1=1127330&r2=1127331&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-tcks/wagon-tck-http/sample-tck-consumer/pom.xml (original)
+++ maven/wagon/trunk/wagon-tcks/wagon-tck-http/sample-tck-consumer/pom.xml Tue May 24 23:19:31
2011
@@ -25,7 +25,6 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>4.5</version>
       <scope>test</scope>
     </dependency>
   </dependencies>

Modified: maven/wagon/trunk/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/WagonTestCaseConfigurator.java
URL: http://svn.apache.org/viewvc/maven/wagon/trunk/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/WagonTestCaseConfigurator.java?rev=1127331&r1=1127330&r2=1127331&view=diff
==============================================================================
--- maven/wagon/trunk/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/WagonTestCaseConfigurator.java
(original)
+++ maven/wagon/trunk/wagon-tcks/wagon-tck-http/src/main/java/org/apache/maven/wagon/tck/http/WagonTestCaseConfigurator.java
Tue May 24 23:19:31 2011
@@ -20,7 +20,7 @@ package org.apache.maven.wagon.tck.http;
  */
 
 import org.apache.maven.wagon.Wagon;
-import org.codehaus.classworlds.ClassRealm;
+import org.codehaus.plexus.classworlds.realm.ClassRealm;
 import org.codehaus.plexus.PlexusConstants;
 import org.codehaus.plexus.PlexusContainer;
 import org.codehaus.plexus.component.configurator.ComponentConfigurationException;



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


Mime
View raw message