Branching for release
git-svn-id: https://svn.apache.org/repos/asf/mina/ftpserver/branches/1.0.3@819857 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/core/pom.xml b/core/pom.xml
index db52aae..56c2815 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -17,13 +17,13 @@
<parent>
<artifactId>ftpserver-parent</artifactId>
<groupId>org.apache.ftpserver</groupId>
- <version>1.0.3</version>
+ <version>1.0.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.ftpserver</groupId>
<artifactId>ftpserver-core</artifactId>
<name>Apache FtpServer Core</name>
- <version>1.0.3</version>
+ <version>1.0.4-SNAPSHOT</version>
<packaging>bundle</packaging>
<scm>
<connection>
diff --git a/core/src/main/java/org/apache/ftpserver/util/DateUtils.java b/core/src/main/java/org/apache/ftpserver/util/DateUtils.java
index e792eda..68b578a 100644
--- a/core/src/main/java/org/apache/ftpserver/util/DateUtils.java
+++ b/core/src/main/java/org/apache/ftpserver/util/DateUtils.java
@@ -66,7 +66,7 @@
}
StringBuffer sb = new StringBuffer(16);
- Calendar cal = new GregorianCalendar(TIME_ZONE_UTC);
+ Calendar cal = new GregorianCalendar();
cal.setTimeInMillis(millis);
// month
@@ -114,7 +114,7 @@
*/
public final static String getISO8601Date(long millis) {
StringBuffer sb = new StringBuffer(19);
- Calendar cal = new GregorianCalendar(TIME_ZONE_UTC);
+ Calendar cal = new GregorianCalendar();
cal.setTimeInMillis(millis);
// year
@@ -168,6 +168,8 @@
*/
public final static String getFtpDate(long millis) {
StringBuffer sb = new StringBuffer(20);
+
+ // MLST should use UTC
Calendar cal = new GregorianCalendar(TIME_ZONE_UTC);
cal.setTimeInMillis(millis);
diff --git a/core/src/test/java/org/apache/ftpserver/clienttests/ListTest.java b/core/src/test/java/org/apache/ftpserver/clienttests/ListTest.java
index 6d9bd37..2414bf0 100644
--- a/core/src/test/java/org/apache/ftpserver/clienttests/ListTest.java
+++ b/core/src/test/java/org/apache/ftpserver/clienttests/ListTest.java
@@ -20,6 +20,7 @@
package org.apache.ftpserver.clienttests;
import java.io.File;
+import java.util.Calendar;
import org.apache.commons.net.ftp.FTPClientConfig;
import org.apache.commons.net.ftp.FTPFile;
@@ -112,6 +113,14 @@
assertEquals("user", file.getUser());
assertTrue(file.isFile());
assertFalse(file.isDirectory());
+
+ Calendar expectedTimestamp = Calendar.getInstance();
+ expectedTimestamp.setTimeInMillis(TEST_FILE1.lastModified());
+ // server does not supply seconds and milliseconds
+ expectedTimestamp.clear(Calendar.SECOND);
+ expectedTimestamp.clear(Calendar.MILLISECOND);
+
+ assertEquals(expectedTimestamp, file.getTimestamp());
}
public void testListFileNoArgument() throws Exception {
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 79e540e..dce9968 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -22,14 +22,14 @@
<parent>
<artifactId>ftpserver-parent</artifactId>
<groupId>org.apache.ftpserver</groupId>
- <version>1.0.3</version>
+ <version>1.0.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.ftpserver</groupId>
<artifactId>ftpserver</artifactId>
<packaging>pom</packaging>
<name>Apache FtpServer</name>
- <version>1.0.3</version>
+ <version>1.0.4-SNAPSHOT</version>
<scm>
<connection>scm:svn:http://svn.apache.org/repos/asf/mina/ftpserver/trunk/distribution</connection>
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/mina/ftpserver/trunk/distribution</developerConnection>
diff --git a/examples/ftpserver-example-spring-war/pom.xml b/examples/ftpserver-example-spring-war/pom.xml
index 5b519bd..6cdc55c 100644
--- a/examples/ftpserver-example-spring-war/pom.xml
+++ b/examples/ftpserver-example-spring-war/pom.xml
@@ -18,7 +18,7 @@
<parent>
<artifactId>ftpserver-parent</artifactId>
<groupId>org.apache.ftpserver</groupId>
- <version>1.0.3</version>
+ <version>1.0.4-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -27,7 +27,7 @@
<artifactId>ftpserver-spring-war</artifactId>
<name>FtpServer Spring web project example</name>
<packaging>war</packaging>
- <version>1.0.3</version>
+ <version>1.0.4-SNAPSHOT</version>
<dependencies>
<dependency>
<groupId>org.springframework</groupId>
diff --git a/examples/ftpserver-osgi-ftplet-service/pom.xml b/examples/ftpserver-osgi-ftplet-service/pom.xml
index 46ba0f4..c98c206 100644
--- a/examples/ftpserver-osgi-ftplet-service/pom.xml
+++ b/examples/ftpserver-osgi-ftplet-service/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>ftpserver-parent</artifactId>
<groupId>org.apache.ftpserver</groupId>
- <version>1.0.3</version>
+ <version>1.0.4-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -27,7 +27,7 @@
<artifactId>ftpserver-osgi-ftplet-service</artifactId>
<name>FtpServer OSGi Ftplet service example</name>
<packaging>bundle</packaging>
- <version>1.0.3</version>
+ <version>1.0.4-SNAPSHOT</version>
<dependencies>
<dependency>
<groupId>org.apache.ftpserver</groupId>
diff --git a/examples/ftpserver-osgi-spring-service/pom.xml b/examples/ftpserver-osgi-spring-service/pom.xml
index af45313..bc902c4 100644
--- a/examples/ftpserver-osgi-spring-service/pom.xml
+++ b/examples/ftpserver-osgi-spring-service/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>ftpserver-parent</artifactId>
<groupId>org.apache.ftpserver</groupId>
- <version>1.0.3</version>
+ <version>1.0.4-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -27,7 +27,7 @@
<artifactId>ftpserver-osgi-spring-service</artifactId>
<name>FtpServer OSGi Spring-DM example</name>
<packaging>bundle</packaging>
- <version>1.0.3</version>
+ <version>1.0.4-SNAPSHOT</version>
<dependencies>
<dependency>
<groupId>org.apache.ftpserver</groupId>
diff --git a/examples/pom.xml b/examples/pom.xml
index fe521a5..b3ecd00 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -21,14 +21,14 @@
<parent>
<artifactId>ftpserver-parent</artifactId>
<groupId>org.apache.ftpserver</groupId>
- <version>1.0.3</version>
+ <version>1.0.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.ftpserver</groupId>r
<artifactId>ftpserver-examples</artifactId>
<packaging>pom</packaging>
<name>Apache FtpServer Examples</name>
- <version>1.0.3</version>
+ <version>1.0.4-SNAPSHOT</version>
<modules>
<module>ftpserver-example-spring-war</module>
<module>ftpserver-osgi-ftplet-service</module>
diff --git a/ftplet-api/pom.xml b/ftplet-api/pom.xml
index 938eeb4..3b002d2 100644
--- a/ftplet-api/pom.xml
+++ b/ftplet-api/pom.xml
@@ -17,12 +17,12 @@
<parent>
<artifactId>ftpserver-parent</artifactId>
<groupId>org.apache.ftpserver</groupId>
- <version>1.0.3</version>
+ <version>1.0.4-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.ftpserver</groupId>
<artifactId>ftplet-api</artifactId>
- <version>1.0.3</version>
+ <version>1.0.4-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Ftplet API</name>
<description> Ftplets are, similar to servlets, an API to plug into the
diff --git a/pom.xml b/pom.xml
index 37a857d..ccc5055 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
<artifactId>ftpserver-parent</artifactId>
<packaging>pom</packaging>
<name>Apache FtpServer Parent</name>
- <version>1.0.3</version>
+ <version>1.0.4-SNAPSHOT</version>
<url>http://mina.apache.org/ftpserver</url>
<issueManagement>
<system>Jira</system>
