You are viewing a plain text version of this content. The canonical link for it is here.
Posted to ftpserver-commits@incubator.apache.org by ng...@apache.org on 2007/12/27 20:58:21 UTC
svn commit: r607121 - in /incubator/ftpserver/trunk: ./ core/
core/src/test/java/ core/src/test/java/org/apache/ftpserver/ssl/
ftplet-api/ ssl-tests/src/test/ ssl-tests/src/test/org/apache/ftpserver/ssl/
Author: ngn
Date: Thu Dec 27 12:58:18 2007
New Revision: 607121
URL: http://svn.apache.org/viewvc?rev=607121&view=rev
Log:
Including commons-net 2.0 in our build
Added:
incubator/ftpserver/trunk/core/src/test/java/client.jks
- copied unchanged from r602563, incubator/ftpserver/trunk/ssl-tests/src/test/client.jks
incubator/ftpserver/trunk/core/src/test/java/ftpserver.jks
- copied unchanged from r602563, incubator/ftpserver/trunk/ssl-tests/src/test/ftpserver.jks
incubator/ftpserver/trunk/core/src/test/java/log4j.properties
- copied unchanged from r602563, incubator/ftpserver/trunk/ssl-tests/src/test/log4j.properties
incubator/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/ExplicitSecurityTestTemplate.java
- copied unchanged from r602563, incubator/ftpserver/trunk/ssl-tests/src/test/org/apache/ftpserver/ssl/ExplicitSecurityTestTemplate.java
incubator/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/IOCipherSuitesTest.java
- copied unchanged from r602564, incubator/ftpserver/trunk/ssl-tests/src/test/org/apache/ftpserver/ssl/IOCipherSuitesTest.java
incubator/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/IOClientAuthTest.java
- copied unchanged from r602563, incubator/ftpserver/trunk/ssl-tests/src/test/org/apache/ftpserver/ssl/IOClientAuthTest.java
incubator/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/IOExplicitSSLTest.java
- copied unchanged from r602563, incubator/ftpserver/trunk/ssl-tests/src/test/org/apache/ftpserver/ssl/IOExplicitSSLTest.java
incubator/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/IOExplicitTLSTest.java
- copied unchanged from r602563, incubator/ftpserver/trunk/ssl-tests/src/test/org/apache/ftpserver/ssl/IOExplicitTLSTest.java
incubator/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/IOImplicitClientAuthTest.java
- copied unchanged from r602563, incubator/ftpserver/trunk/ssl-tests/src/test/org/apache/ftpserver/ssl/IOImplicitClientAuthTest.java
incubator/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/IOImplicitSSLTest.java
- copied unchanged from r602563, incubator/ftpserver/trunk/ssl-tests/src/test/org/apache/ftpserver/ssl/IOImplicitSSLTest.java
incubator/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/IOImplicitTLSTest.java
- copied unchanged from r602563, incubator/ftpserver/trunk/ssl-tests/src/test/org/apache/ftpserver/ssl/IOImplicitTLSTest.java
incubator/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/ImplicitSecurityTestTemplate.java
- copied unchanged from r602563, incubator/ftpserver/trunk/ssl-tests/src/test/org/apache/ftpserver/ssl/ImplicitSecurityTestTemplate.java
incubator/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/MinaCipherSuitesTest.java
- copied unchanged from r602564, incubator/ftpserver/trunk/ssl-tests/src/test/org/apache/ftpserver/ssl/MinaCipherSuitesTest.java
incubator/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/MinaClientAuthTest.java
- copied unchanged from r602563, incubator/ftpserver/trunk/ssl-tests/src/test/org/apache/ftpserver/ssl/MinaClientAuthTest.java
incubator/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/MinaExplicitSSLTest.java
- copied unchanged from r602563, incubator/ftpserver/trunk/ssl-tests/src/test/org/apache/ftpserver/ssl/MinaExplicitSSLTest.java
incubator/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/MinaExplicitTLSTest.java
- copied unchanged from r602563, incubator/ftpserver/trunk/ssl-tests/src/test/org/apache/ftpserver/ssl/MinaExplicitTLSTest.java
incubator/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/MinaImplicitClientAuthTest.java
- copied unchanged from r602563, incubator/ftpserver/trunk/ssl-tests/src/test/org/apache/ftpserver/ssl/MinaImplicitClientAuthTest.java
incubator/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/MinaImplicitSSLTest.java
- copied unchanged from r602563, incubator/ftpserver/trunk/ssl-tests/src/test/org/apache/ftpserver/ssl/MinaImplicitSSLTest.java
incubator/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/MinaImplicitTLSTest.java
- copied unchanged from r602563, incubator/ftpserver/trunk/ssl-tests/src/test/org/apache/ftpserver/ssl/MinaImplicitTLSTest.java
incubator/ftpserver/trunk/core/src/test/java/org/apache/ftpserver/ssl/SSLTestTemplate.java
- copied unchanged from r602563, incubator/ftpserver/trunk/ssl-tests/src/test/org/apache/ftpserver/ssl/SSLTestTemplate.java
incubator/ftpserver/trunk/core/src/test/java/users.gen
- copied unchanged from r602563, incubator/ftpserver/trunk/ssl-tests/src/test/users.gen
Removed:
incubator/ftpserver/trunk/ssl-tests/src/test/client.jks
incubator/ftpserver/trunk/ssl-tests/src/test/ftpserver.jks
incubator/ftpserver/trunk/ssl-tests/src/test/log4j.properties
incubator/ftpserver/trunk/ssl-tests/src/test/org/apache/ftpserver/ssl/ExplicitSecurityTestTemplate.java
incubator/ftpserver/trunk/ssl-tests/src/test/org/apache/ftpserver/ssl/IOCipherSuitesTest.java
incubator/ftpserver/trunk/ssl-tests/src/test/org/apache/ftpserver/ssl/IOClientAuthTest.java
incubator/ftpserver/trunk/ssl-tests/src/test/org/apache/ftpserver/ssl/IOExplicitSSLTest.java
incubator/ftpserver/trunk/ssl-tests/src/test/org/apache/ftpserver/ssl/IOExplicitTLSTest.java
incubator/ftpserver/trunk/ssl-tests/src/test/org/apache/ftpserver/ssl/IOImplicitClientAuthTest.java
incubator/ftpserver/trunk/ssl-tests/src/test/org/apache/ftpserver/ssl/IOImplicitSSLTest.java
incubator/ftpserver/trunk/ssl-tests/src/test/org/apache/ftpserver/ssl/IOImplicitTLSTest.java
incubator/ftpserver/trunk/ssl-tests/src/test/org/apache/ftpserver/ssl/ImplicitSecurityTestTemplate.java
incubator/ftpserver/trunk/ssl-tests/src/test/org/apache/ftpserver/ssl/MinaCipherSuitesTest.java
incubator/ftpserver/trunk/ssl-tests/src/test/org/apache/ftpserver/ssl/MinaClientAuthTest.java
incubator/ftpserver/trunk/ssl-tests/src/test/org/apache/ftpserver/ssl/MinaExplicitSSLTest.java
incubator/ftpserver/trunk/ssl-tests/src/test/org/apache/ftpserver/ssl/MinaExplicitTLSTest.java
incubator/ftpserver/trunk/ssl-tests/src/test/org/apache/ftpserver/ssl/MinaImplicitClientAuthTest.java
incubator/ftpserver/trunk/ssl-tests/src/test/org/apache/ftpserver/ssl/MinaImplicitSSLTest.java
incubator/ftpserver/trunk/ssl-tests/src/test/org/apache/ftpserver/ssl/MinaImplicitTLSTest.java
incubator/ftpserver/trunk/ssl-tests/src/test/org/apache/ftpserver/ssl/SSLTestTemplate.java
incubator/ftpserver/trunk/ssl-tests/src/test/users.gen
Modified:
incubator/ftpserver/trunk/ (props changed)
incubator/ftpserver/trunk/core/pom.xml
incubator/ftpserver/trunk/ftplet-api/pom.xml
incubator/ftpserver/trunk/pom.xml
Propchange: incubator/ftpserver/trunk/
------------------------------------------------------------------------------
--- svn:externals (added)
+++ svn:externals Thu Dec 27 12:58:18 2007
@@ -0,0 +1 @@
+commons-net-2 http://svn.apache.org/repos/asf/commons/proper/net/branches/NET_2_0/
Modified: incubator/ftpserver/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/core/pom.xml?rev=607121&r1=607120&r2=607121&view=diff
==============================================================================
--- incubator/ftpserver/trunk/core/pom.xml (original)
+++ incubator/ftpserver/trunk/core/pom.xml Thu Dec 27 12:58:18 2007
@@ -78,9 +78,10 @@
<scope>test</scope>
</dependency>
<dependency>
+ <!-- Currently has to built from source as no up-to-date binary is available -->
<groupId>commons-net</groupId>
<artifactId>commons-net</artifactId>
- <version>1.4.0</version>
+ <version>2.0.0-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: incubator/ftpserver/trunk/ftplet-api/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/ftplet-api/pom.xml?rev=607121&r1=607120&r2=607121&view=diff
==============================================================================
--- incubator/ftpserver/trunk/ftplet-api/pom.xml (original)
+++ incubator/ftpserver/trunk/ftplet-api/pom.xml Thu Dec 27 12:58:18 2007
@@ -34,7 +34,7 @@
</plugins>
</reporting>
<properties>
- <maven.compile.source>1.3</maven.compile.source>
- <maven.compile.target>1.3</maven.compile.target>
+ <maven.compile.source>1.5</maven.compile.source>
+ <maven.compile.target>1.5</maven.compile.target>
</properties>
</project>
Modified: incubator/ftpserver/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ftpserver/trunk/pom.xml?rev=607121&r1=607120&r2=607121&view=diff
==============================================================================
--- incubator/ftpserver/trunk/pom.xml (original)
+++ incubator/ftpserver/trunk/pom.xml Thu Dec 27 12:58:18 2007
@@ -313,6 +313,8 @@
</profile>
</profiles>
<modules>
+ <!-- Commons Net is built since no snapshot is available in a Maven repos -->
+ <module>commons-net-2</module>
<module>ftplet-api</module>
<module>core</module>
<module>admin-gui</module>
@@ -327,8 +329,8 @@
</distributionManagement>
<properties>
- <maven.compile.source>1.4</maven.compile.source>
- <maven.compile.target>1.4</maven.compile.target>
+ <maven.compile.source>1.5</maven.compile.source>
+ <maven.compile.target>1.5</maven.compile.target>
<mina-version>1.0.7</mina-version>
<slf4j-version>1.4.3</slf4j-version>