From f9843974bc220ee87c646ff3a83bf70557bf161e Mon Sep 17 00:00:00 2001
From: nlevitt <nlevitt@daa5b2f2-a927-0410-8b2d-f5f262fa301a>
Date: Tue, 17 Nov 2009 02:49:57 +0000
Subject: [PATCH] Update commons-net to 2.0 to incorporate fix to this bug -
 http://issues.apache.org/jira/browse/NET-36 - we saw the problem manifest in
 an archive-it crawl. * ClientFTP.java     override buggy
 org.apache.commons.net.ftp.FTP.getReplyStrings() with fixed     version, see
 https://issues.apache.org/jira/browse/NET-257 * .classpath, commons/pom.xml  
   update dependency to 2.0 jar

---
 .classpath                                           | 2 +-
 commons/pom.xml                                      | 2 +-
 commons/src/main/java/org/archive/net/ClientFTP.java | 6 ++++++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/.classpath b/.classpath
index 3c5d7a2c..1e78ebf7 100644
--- a/.classpath
+++ b/.classpath
@@ -30,7 +30,7 @@
 	<classpathentry kind="var" path="M2_REPO/net/java/dev/jets3t/jets3t/0.5.0/jets3t-0.5.0.jar"/>
 	<classpathentry kind="var" path="M2_REPO/org/mortbay/jetty/jetty-util/6.1.14/jetty-util-6.1.14.jar"/>
 	<classpathentry kind="var" path="M2_REPO/tomcat/servlet/4.1.34/servlet-4.1.34.jar"/>
-	<classpathentry kind="var" path="M2_REPO/commons-net/commons-net/1.4.1/commons-net-1.4.1.jar" sourcepath="M2_REPO/commons-net/commons-net/1.4.1/commons-net-1.4.1-sources.jar"/>
+	<classpathentry kind="var" path="M2_REPO/commons-net/commons-net/2.0/commons-net-2.0.jar" sourcepath="/M2_REPO/commons-net/commons-net/2.0/commons-net-2.0-sources.jar"/>
 	<classpathentry kind="var" path="M2_REPO/junit/junit/3.8.2/junit-3.8.2.jar" sourcepath="M2_REPO/junit/junit/3.8.2/junit-3.8.2-sources.jar"/>
 	<classpathentry kind="var" path="M2_REPO/poi/poi-scratchpad/2.5.1-final-20040804/poi-scratchpad-2.5.1-final-20040804.jar"/>
 	<classpathentry kind="var" path="M2_REPO/ant/ant/1.6.5/ant-1.6.5.jar"/>
diff --git a/commons/pom.xml b/commons/pom.xml
index a3a164c5..dc9b6c67 100644
--- a/commons/pom.xml
+++ b/commons/pom.xml
@@ -121,7 +121,7 @@
         <dependency>
              <groupId>commons-net</groupId>
              <artifactId>commons-net</artifactId>
-             <version>1.4.1</version>
+             <version>2.0</version>
              <scope>compile</scope>
         </dependency>
         <dependency>
diff --git a/commons/src/main/java/org/archive/net/ClientFTP.java b/commons/src/main/java/org/archive/net/ClientFTP.java
index 2449d7c3..1c2681f8 100644
--- a/commons/src/main/java/org/archive/net/ClientFTP.java
+++ b/commons/src/main/java/org/archive/net/ClientFTP.java
@@ -153,4 +153,10 @@ public class ClientFTP extends FTPClient implements ProtocolCommandListener {
     private void recordAdditionalInfo(String message) {
         recordControlMessage("* ", message);
     }
+    
+    // XXX see https://issues.apache.org/jira/browse/NET-257
+    @Override
+    public String[] getReplyStrings() {
+        return _replyLines.toArray(new String[0]);
+    }
 }