diff --git a/core/pom.xml b/core/pom.xml
index 9472d19..1a0c498 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -159,6 +159,7 @@
       <groupId>org.apache.mina</groupId>
       <artifactId>mina-core</artifactId>
     </dependency>
+    
     <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
diff --git a/distribution/pom.xml b/distribution/pom.xml
index d36596f..f4d39ec 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -17,52 +17,51 @@
     <groupId>org.apache.ftpserver</groupId>
     <version>1.1.2-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.1.2-SNAPSHOT</version>
 
   <build>
-    <finalName>apache-${project.artifactId}-${project.version}</finalName>
+    <finalName>apache-ftpserver-${project.version}</finalName>
     <plugins>
       <plugin>
         <artifactId>maven-assembly-plugin</artifactId>
-        <version>2.2-beta-2</version>
         <executions>
           <execution>
             <id>bin</id>
             <phase>package</phase>
-            <goals>
-              <goal>attached</goal>
-            </goals>
             <configuration>
               <descriptors>
                 <descriptor>src/main/assemblies/bin.xml</descriptor>
               </descriptors>
               <tarLongFileMode>gnu</tarLongFileMode>
             </configuration>
+            <goals>
+              <goal>single</goal>
+            </goals>
           </execution>
+          
           <execution>
             <id>src</id>
             <phase>package</phase>
-            <goals>
-              <goal>attached</goal>
-            </goals>
             <configuration>
               <descriptors>
                 <descriptor>src/main/assemblies/src.xml</descriptor>
               </descriptors>
               <tarLongFileMode>gnu</tarLongFileMode>
             </configuration>
+            <goals>
+              <goal>single</goal>
+            </goals>
           </execution>
         </executions>
       </plugin>
+
       <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>rat-maven-plugin</artifactId>
-        <version>1.0-alpha-3</version>
+        <groupId>org.apache.rat</groupId>
+        <artifactId>apache-rat-plugin</artifactId>
         <configuration>
           <excludes>
             <exclude>LICENSE.slf4j.txt</exclude>
@@ -76,12 +75,12 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.ftpserver</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>ftplet-api</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>org.apache.ftpserver</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>ftpserver-core</artifactId>
     </dependency>
 
diff --git a/distribution/src/main/assemblies/bin.xml b/distribution/src/main/assemblies/bin.xml
index 61b7a3b..5086379 100644
--- a/distribution/src/main/assemblies/bin.xml
+++ b/distribution/src/main/assemblies/bin.xml
@@ -18,7 +18,7 @@
 -->
 
 <assembly>
-    <id></id>
+    <id>bin</id>
     <formats>
         <format>zip</format>
         <format>tar.gz</format>
diff --git a/distribution/src/main/assemblies/src.xml b/distribution/src/main/assemblies/src.xml
index 2e9b233..e552b53 100644
--- a/distribution/src/main/assemblies/src.xml
+++ b/distribution/src/main/assemblies/src.xml
@@ -24,6 +24,7 @@
     <format>tar.gz</format>
     <format>tar.bz2</format>
   </formats>
+  
   <fileSets>
     <fileSet>
         <!-- Include license and notices generated by the remote resources plugin -->
diff --git a/ftplet-api/pom.xml b/ftplet-api/pom.xml
index 80f80b1..107bd57 100644
--- a/ftplet-api/pom.xml
+++ b/ftplet-api/pom.xml
@@ -21,9 +21,7 @@
   </parent>
   
   <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.ftpserver</groupId>
   <artifactId>ftplet-api</artifactId>
-  <version>1.1.2-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <name>Apache Ftplet API</name>
   
@@ -72,7 +70,7 @@
   </reporting>
   
   <properties>
-    <maven.compile.source>1.7</maven.compile.source>
-    <maven.compile.target>1.7</maven.compile.target>
+    <maven.compile.source>1.8</maven.compile.source>
+    <maven.compile.target>1.8</maven.compile.target>
   </properties>
 </project>
diff --git a/pom.xml b/pom.xml
index 51f6945..4f638c0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,6 +16,7 @@
     <groupId>org.apache</groupId>
     <version>24</version>
   </parent>
+  
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ftpserver</groupId>
   <artifactId>ftpserver-parent</artifactId>
@@ -23,10 +24,12 @@
   <name>Apache FtpServer Parent</name>
   <version>1.1.2-SNAPSHOT</version>
   <url>https://mina.apache.org/ftpserverproject</url>
+  
   <issueManagement>
     <system>Jira</system>
     <url>https://issues.apache.org/jira/browse/FTPSERVER</url>
   </issueManagement>
+  
   <inceptionYear>2003</inceptionYear>
 
   <licenses>
@@ -49,7 +52,6 @@
     </repository>
   </repositories>
 
-
   <mailingLists>
     <mailingList>
       <name>FtpServer Users mailing list</name>
@@ -58,6 +60,7 @@
       <post>ftpserver-users@mina.apache.org</post>
       <archive>https://mail-archives.apache.org/mod_mbox/mina-ftpserver-users/</archive>
     </mailingList>
+    
     <mailingList>
       <name>MINA Development mailing list</name>
       <subscribe>dev-subscribe@mina.apache.org</subscribe>
@@ -68,6 +71,7 @@
         <otherArchive>http://www.nabble.com/Apache-MINA-f16868.html</otherArchive>
       </otherArchives>
     </mailingList>
+    
     <mailingList>
       <name>MINA Commit mailing list</name>
       <subscribe>commits-subscribe@mina.apache.org</subscribe>
@@ -82,16 +86,19 @@
       <name>Niklas Gustavsson</name>
       <email>niklas@protocol7.com</email>
     </developer>
+    
     <developer>
       <id>rana_b</id>
       <name>Rana Battacharyya</name>
       <email>rana_b.{aT}.yahoo.{d0T}.com</email>
     </developer>
+    
     <developer>
       <id>hammant</id>
       <name>Paul Hammant</name>
       <email>paul.{aT}.hammant.{d0T}.org</email>
     </developer>
+    
     <developer>
       <id>sergey</id>
       <name>Sergey M Vladimirov</name>
@@ -104,27 +111,34 @@
     <contributor>
       <name>Birkir A. Barkarson</name>
     </contributor>
+    
     <contributor>
       <name>David H. DeWolf</name>
       <email>ddewolf.{aT}.apache.{d0T}.org</email>
       <organization>Vivare, INC</organization>
     </contributor>
+    
     <contributor>
       <name>Luis Sanabria</name>
     </contributor>
+    
     <contributor>
       <name>Daniel Hagen</name>
     </contributor>
+    
     <contributor>
       <name>KwangYul Seo</name>
     </contributor>
+    
     <contributor>
       <name>Dave Roberts</name>
       <organization>SAA Consultants Ltd</organization>
     </contributor>
+    
     <contributor>
       <name>Nick Vincent</name>
     </contributor>
+    
     <contributor>
       <name>Andrea Francia</name>
       <url>http://andreafrancia.blogspot.com</url>
@@ -139,27 +153,26 @@
   </scm>
 
   <properties>
-                <project.build.outputTimestamp>10</project.build.outputTimestamp>
+    <project.build.outputTimestamp>10</project.build.outputTimestamp>
 
-    <!-- Disbale the JAVA 8 Javadoc Lint -->
+    <!-- Disable the JAVA 8 Javadoc Lint -->
     <additionalparam>-Xdoclint:none</additionalparam>
 
     <!-- Set versions for depending jars -->
-    <commons.codec.version>1.10</commons.codec.version>
-    <commons.net.version>3.5</commons.net.version>
+    <commons.codec.version>1.15</commons.codec.version>
+    <commons.net.version>3.8.0</commons.net.version>
+    <ftpserver.version>${project.version}</ftpserver.version>
     <hsqldb.version>1.8.0.10</hsqldb.version>
     <jcl.over.slf4j.version>1.7.32</jcl.over.slf4j.version>
-    <junit.version>4.12</junit.version>
+    <junit.version>4.13.2</junit.version>
     <log4j.version>2.17.0</log4j.version>
+    <maven.compile.source>1.8</maven.compile.source>
+    <maven.compile.target>1.8</maven.compile.target>
     <mina.core.version>2.1.2</mina.core.version>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <slf4j.api.version>1.7.32</slf4j.api.version>
     <slf4j.log4j12.version>1.7.32</slf4j.log4j12.version>
     <spring.context.version>2.5.5</spring.context.version>
-
-    <maven.compile.source>1.7</maven.compile.source>
-    <maven.compile.target>1.7</maven.compile.target>
-    <ftpserver.version>${project.version}</ftpserver.version>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
 
   <dependencyManagement>
@@ -253,7 +266,6 @@
         <plugin>
           <groupId>org.apache.rat</groupId>
           <artifactId>apache-rat-plugin</artifactId>
-          <version>0.13</version>
           <inherited>true</inherited>
           <configuration>
             <excludeSubProjects>false</excludeSubProjects>
@@ -295,7 +307,6 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-release-plugin</artifactId>
-          <version>2.5.3</version>
           <configuration>
             <autoVersionSubmodules>true</autoVersionSubmodules>
           </configuration>
@@ -304,25 +315,21 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-source-plugin</artifactId>
-          <version>3.0.1</version>
         </plugin>
 
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-clean-plugin</artifactId>
-          <version>3.0.0</version>
         </plugin>
 
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-install-plugin</artifactId>
-          <version>2.5.2</version>
         </plugin>
 
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-javadoc-plugin</artifactId>
-          <version>2.10.4</version>
         </plugin>
       </plugins>
     </pluginManagement>
@@ -331,7 +338,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-enforcer-plugin</artifactId>
-        <version>1.3.1</version>
         <executions>
           <execution>
             <phase>validate</phase>
@@ -342,7 +348,7 @@
               <rules>
                 <!-- Allow only Maven 2.0.5 and >2.0.7 -->
                 <requireMavenVersion>
-                  <version>[2.0.5],[2.0.7,]</version>
+                  <version>(3.8,]</version>
                 </requireMavenVersion>
               </rules>
             </configuration>
@@ -352,7 +358,6 @@
 
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.18.1</version>
       </plugin>
 
       <plugin>
@@ -364,8 +369,8 @@
       </plugin>
 
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>       
         <artifactId>maven-release-plugin</artifactId>
-        <version>2.5.1</version>
         <configuration>
           <tagBase>https://svn.apache.org/repos/asf/mina/ftpserver/tags/</tagBase>
         </configuration>
@@ -373,7 +378,6 @@
 
       <plugin>
         <artifactId>maven-remote-resources-plugin</artifactId>
-        <version>1.5</version>
         <executions>
           <execution>
             <goals>
@@ -393,7 +397,6 @@
 
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.5.1</version>
         <configuration>
           <source>${maven.compile.source}</source>
           <target>${maven.compile.target}</target>
@@ -402,7 +405,6 @@
 
       <plugin>
         <artifactId>maven-source-plugin</artifactId>
-        <version>2.4</version>
         <executions>
           <execution>
             <id>create-source-jar</id>
@@ -423,7 +425,6 @@
 
       <plugin>
         <artifactId>maven-jar-plugin</artifactId>
-        <version>2.5</version>
         <configuration>
           <archive>
             <addMavenDescriptor>false</addMavenDescriptor>
@@ -434,7 +435,6 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-war-plugin</artifactId>
-        <version>2.5</version>
       </plugin>
 
       <plugin>
@@ -459,8 +459,8 @@
       <build>
         <plugins>
           <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-javadoc-plugin</artifactId>
-            <version>2.10.1</version>
             <executions>
               <execution>
                 <id>create-javadoc-jar</id>