From 5174d9495bfd515ee2af9bbfb10eac9a2c79bfec Mon Sep 17 00:00:00 2001
From: amit2103 <amit.pandey2103@gmail.com>
Date: Sun, 16 Dec 2018 17:11:21 +0530
Subject: [PATCH] [BAEL-10840] - Moved FTP related code back to libraries
 module

---
 libraries-apache-commons/README.md                  |  3 +--
 libraries-apache-commons/pom.xml                    |  7 -------
 libraries/README.md                                 |  1 +
 libraries/pom.xml                                   | 13 +++++++++++++
 .../src/main/java/com/baeldung/ftp/FtpClient.java   |  0
 .../com/baeldung/ftp/FtpClientIntegrationTest.java  |  0
 .../baeldung/ftp/JdkFtpClientIntegrationTest.java   |  0
 7 files changed, 15 insertions(+), 9 deletions(-)
 rename {libraries-apache-commons => libraries}/src/main/java/com/baeldung/ftp/FtpClient.java (100%)
 rename {libraries-apache-commons => libraries}/src/test/java/com/baeldung/ftp/FtpClientIntegrationTest.java (100%)
 rename {libraries-apache-commons => libraries}/src/test/java/com/baeldung/ftp/JdkFtpClientIntegrationTest.java (100%)

diff --git a/libraries-apache-commons/README.md b/libraries-apache-commons/README.md
index 66090e3709..01f2379588 100644
--- a/libraries-apache-commons/README.md
+++ b/libraries-apache-commons/README.md
@@ -17,5 +17,4 @@
 - [Apache Commons Collections BidiMap](http://www.baeldung.com/commons-collections-bidi-map)
 - [Apache Commons Collections MapUtils](http://www.baeldung.com/apache-commons-map-utils)
 - [Histograms with Apache Commons Frequency](http://www.baeldung.com/apache-commons-frequency)
-- [An Introduction to Apache Commons Lang 3](https://www.baeldung.com/java-commons-lang-3)
-- [Implementing a FTP-Client in Java](http://www.baeldung.com/java-ftp-client)
\ No newline at end of file
+- [An Introduction to Apache Commons Lang 3](https://www.baeldung.com/java-commons-lang-3)
\ No newline at end of file
diff --git a/libraries-apache-commons/pom.xml b/libraries-apache-commons/pom.xml
index f61a7a4a9a..c7ff918af9 100644
--- a/libraries-apache-commons/pom.xml
+++ b/libraries-apache-commons/pom.xml
@@ -83,12 +83,6 @@
             <version>${org.hamcrest.java-hamcrest.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.mockftpserver</groupId>
-            <artifactId>MockFtpServer</artifactId>
-            <version>${mockftpserver.version}</version>
-            <scope>test</scope>
-        </dependency>
 
     </dependencies>
 
@@ -110,7 +104,6 @@
         <commons-net.version>3.6</commons-net.version>
         <hamcrest-all.version>1.3</hamcrest-all.version>
         <common-math3.version>3.6.1</common-math3.version>
-        <mockftpserver.version>2.7.1</mockftpserver.version>
     </properties>
 
 </project>
diff --git a/libraries/README.md b/libraries/README.md
index 28184c161b..ce2445f3e0 100644
--- a/libraries/README.md
+++ b/libraries/README.md
@@ -65,6 +65,7 @@
 - [Guide to JMapper](http://www.baeldung.com/jmapper)
 - [Exactly Once Processing in Kafka](https://www.baeldung.com/kafka-exactly-once)
 - [An Introduction to SuanShu](https://www.baeldung.com/suanshu)
+- [Implementing a FTP-Client in Java](http://www.baeldung.com/java-ftp-client)
 
 The libraries module contains examples related to small libraries that are relatively easy to use and does not require any separate module of its own.
 
diff --git a/libraries/pom.xml b/libraries/pom.xml
index 16d79a59b1..2ad4871e3f 100644
--- a/libraries/pom.xml
+++ b/libraries/pom.xml
@@ -55,6 +55,11 @@
             <artifactId>commons-lang3</artifactId>
             <version>${commons-lang.version}</version>
         </dependency>
+        <dependency>
+            <groupId>commons-net</groupId>
+            <artifactId>commons-net</artifactId>
+            <version>${commons-net.version}</version>
+        </dependency>
         <dependency>
             <groupId>tec.units</groupId>
             <artifactId>unit-ri</artifactId>
@@ -664,6 +669,12 @@
             <version>${derive4j.version}</version>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>org.mockftpserver</groupId>
+            <artifactId>MockFtpServer</artifactId>
+            <version>${mockftpserver.version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <repositories>
@@ -888,6 +899,8 @@
         <maven-bundle-plugin.version>3.3.0</maven-bundle-plugin.version>
         <maven-jar-plugin.version>3.0.2</maven-jar-plugin.version>
         <derive4j.version>1.1.0</derive4j.version>
+        <mockftpserver.version>2.7.1</mockftpserver.version>
+        <commons-net.version>3.6</commons-net.version>
     </properties>
 
 </project>
diff --git a/libraries-apache-commons/src/main/java/com/baeldung/ftp/FtpClient.java b/libraries/src/main/java/com/baeldung/ftp/FtpClient.java
similarity index 100%
rename from libraries-apache-commons/src/main/java/com/baeldung/ftp/FtpClient.java
rename to libraries/src/main/java/com/baeldung/ftp/FtpClient.java
diff --git a/libraries-apache-commons/src/test/java/com/baeldung/ftp/FtpClientIntegrationTest.java b/libraries/src/test/java/com/baeldung/ftp/FtpClientIntegrationTest.java
similarity index 100%
rename from libraries-apache-commons/src/test/java/com/baeldung/ftp/FtpClientIntegrationTest.java
rename to libraries/src/test/java/com/baeldung/ftp/FtpClientIntegrationTest.java
diff --git a/libraries-apache-commons/src/test/java/com/baeldung/ftp/JdkFtpClientIntegrationTest.java b/libraries/src/test/java/com/baeldung/ftp/JdkFtpClientIntegrationTest.java
similarity index 100%
rename from libraries-apache-commons/src/test/java/com/baeldung/ftp/JdkFtpClientIntegrationTest.java
rename to libraries/src/test/java/com/baeldung/ftp/JdkFtpClientIntegrationTest.java