Bumped up some dependencies, make Java 7 mandatory
authorEmmanuel Lécharny <elecharny@symas.com>
Mon, 24 Oct 2016 06:34:27 +0000 (08:34 +0200)
committerEmmanuel Lécharny <elecharny@symas.com>
Mon, 24 Oct 2016 06:34:27 +0000 (08:34 +0200)
core/pom.xml
distribution/pom.xml
examples/ftpserver-example-spring-war/pom.xml
examples/ftpserver-osgi-ftplet-service/pom.xml
examples/ftpserver-osgi-spring-service/pom.xml
ftplet-api/pom.xml
pom.xml

index 6291a3f..1c8c163 100644 (file)
 <?xml version="1.0" encoding="UTF-8"?>
-       <!--
-               Licensed to the Apache Software Foundation (ASF) under one or more
-               contributor license agreements. See the NOTICE file distributed with
-               this work for additional information regarding copyright ownership.
-               The ASF licenses this file to you under the Apache License, Version
-               2.0 (the "License"); you may not use this file except in compliance
-               with the License. You may obtain a copy of the License at
-               http://www.apache.org/licenses/LICENSE-2.0 Unless required by
-               applicable law or agreed to in writing, software distributed under the
-               License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-               CONDITIONS OF ANY KIND, either express or implied. See the License for
-               the specific language governing permissions and limitations under the
-               License.
-       -->
+  <!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements. See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to you under the Apache License, Version
+    2.0 (the "License"); you may not use this file except in compliance
+    with the License. You may obtain a copy of the License at
+    http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+    applicable law or agreed to in writing, software distributed under the
+    License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+    CONDITIONS OF ANY KIND, either express or implied. See the License for
+    the specific language governing permissions and limitations under the
+    License.
+  -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
                       http://maven.apache.org/xsd/maven-4.0.0.xsd">
-       <parent>
-               <artifactId>ftpserver-parent</artifactId>
-               <groupId>org.apache.ftpserver</groupId>
-               <version>1.1.0-SNAPSHOT</version>
-       </parent>
-       <modelVersion>4.0.0</modelVersion>
-       <groupId>org.apache.ftpserver</groupId>
-       <artifactId>ftpserver-core</artifactId>
-       <name>Apache FtpServer Core</name>
-       <version>1.1.0-SNAPSHOT</version>
-       <packaging>bundle</packaging>
-       <scm>
-               <connection>
-                       scm:svn:http://svn.apache.org/repos/asf/mina/ftpserver/trunk/core
-               </connection>
-               <developerConnection>
-                       scm:svn:https://svn.apache.org/repos/asf/mina/ftpserver/trunk/core
-               </developerConnection>
-               <url> http://svn.apache.org/viewvc/mina/ftpserver/trunk/core</url>
-       </scm>
-       <build>
-               <resources>
-                       <resource>
-                               <directory>src/main/resources</directory>
-                               <includes>
-                                       <include>**/*.properties</include>
-                                       <include>**/*.handlers</include>
-                                       <include>**/*.schemas</include>
-                                       <include>**/*.xsd</include>
-                               </includes>
-                       </resource>
-               </resources>
-               <testResources>
-                       <testResource>
-                               <directory>src/test/resources</directory>
-                               <includes>
-                                       <include>**/*.properties</include>
-                               </includes>
-                       </testResource>
-               </testResources>
-               <plugins>
-                       <plugin>
-                               <groupId>org.apache.felix</groupId>
-                               <artifactId>maven-bundle-plugin</artifactId>
-                               <version>2.3.4</version>
-                               <extensions>true</extensions>
-                               <configuration>
-                                       <instructions>
-                                               <Bundle-SymbolicName> ${project.artifactId}</Bundle-SymbolicName>
-                                               <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
-                                               <Export-Package> org.apache.ftpserver;version=${project.version},
-                                                       org.apache.ftpserver.command;version=${project.version},
-                                                       org.apache.ftpserver.config.spring;version=${project.version},
-                                                       org.apache.ftpserver.filesystem.nativefs;version=${project.version},
-                                                       org.apache.ftpserver.ftpletcontainer;version=${project.version},
-                                                       org.apache.ftpserver.ipfilter;version=${project.version},
-                                                       org.apache.ftpserver.listener;version=${project.version},
-                                                       org.apache.ftpserver.main;version=${project.version},
-                                                       org.apache.ftpserver.message;version=${project.version},
-                                                       org.apache.ftpserver.ssl;version=${project.version},
-                                                       org.apache.ftpserver.usermanager;version=${project.version}
-                                               </Export-Package>
-                                               <Import-Package>
-                                                       org.springframework.beans.factory.config;resolution:=optional;version="2.5",
-                                                       org.springframework.beans.factory.support;resolution:=optional;version="2.5",
-                                                       org.springframework.beans.factory.xml;resolution:=optional;version="2.5",
-                                                       org.springframework.context.support;resolution:=optional;version="2.5",
-                                                       org.springframework.util;resolution:=optional;version="2.5",
-                                                       org.springframework.util.xml;resolution:=optional;version="2.5",
-                                                       *</Import-Package>
-                                       </instructions>
-                               </configuration>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.codehaus.mojo</groupId>
-                               <artifactId>properties-maven-plugin</artifactId>
-                               <version>1.0-alpha-1</version>
-                               <executions>
-                                       <execution>
-                                               <phase>generate-resources</phase>
-                                               <goals>
-                                                       <goal>write-project-properties</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <outputFile>${project.build.outputDirectory}/org/apache/ftpserver/ftpserver.properties</outputFile>
-                                               </configuration>
-                                       </execution>
-                               </executions>
-                       </plugin>
+  <parent>
+    <artifactId>ftpserver-parent</artifactId>
+    <groupId>org.apache.ftpserver</groupId>
+    <version>1.1.0-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>ftpserver-core</artifactId>
+  <name>Apache FtpServer Core</name>
+  <version>1.1.0-SNAPSHOT</version>
+  <packaging>bundle</packaging>
+  <scm>
+    <connection>
+      scm:svn:http://svn.apache.org/repos/asf/mina/ftpserver/trunk/core
+    </connection>
+    <developerConnection>
+      scm:svn:https://svn.apache.org/repos/asf/mina/ftpserver/trunk/core
+    </developerConnection>
+    <url> http://svn.apache.org/viewvc/mina/ftpserver/trunk/core</url>
+  </scm>
+  <build>
+    <resources>
+      <resource>
+        <directory>src/main/resources</directory>
+        <includes>
+          <include>**/*.properties</include>
+          <include>**/*.handlers</include>
+          <include>**/*.schemas</include>
+          <include>**/*.xsd</include>
+        </includes>
+      </resource>
+    </resources>
+    <testResources>
+      <testResource>
+        <directory>src/test/resources</directory>
+        <includes>
+          <include>**/*.properties</include>
+        </includes>
+      </testResource>
+    </testResources>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <version>2.5.3</version>
+        <extensions>true</extensions>
+        <configuration>
+          <instructions>
+            <Bundle-SymbolicName> ${project.artifactId}</Bundle-SymbolicName>
+            <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
+            <Export-Package> org.apache.ftpserver;version=${project.version},
+              org.apache.ftpserver.command;version=${project.version},
+              org.apache.ftpserver.config.spring;version=${project.version},
+              org.apache.ftpserver.filesystem.nativefs;version=${project.version},
+              org.apache.ftpserver.ftpletcontainer;version=${project.version},
+              org.apache.ftpserver.ipfilter;version=${project.version},
+              org.apache.ftpserver.listener;version=${project.version},
+              org.apache.ftpserver.main;version=${project.version},
+              org.apache.ftpserver.message;version=${project.version},
+              org.apache.ftpserver.ssl;version=${project.version},
+              org.apache.ftpserver.usermanager;version=${project.version}
+            </Export-Package>
+            <Import-Package>
+              org.springframework.beans.factory.config;resolution:=optional;version="2.5",
+              org.springframework.beans.factory.support;resolution:=optional;version="2.5",
+              org.springframework.beans.factory.xml;resolution:=optional;version="2.5",
+              org.springframework.context.support;resolution:=optional;version="2.5",
+              org.springframework.util;resolution:=optional;version="2.5",
+              org.springframework.util.xml;resolution:=optional;version="2.5",
+              *</Import-Package>
+          </instructions>
+        </configuration>
+      </plugin>
+      
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>properties-maven-plugin</artifactId>
+        <version>1.0-alpha-2</version>
+        <executions>
+          <execution>
+            <phase>generate-resources</phase>
+            <goals>
+              <goal>write-project-properties</goal>
+            </goals>
+            <configuration>
+              <outputFile>${project.build.outputDirectory}/org/apache/ftpserver/ftpserver.properties</outputFile>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
 
-                       <plugin>
-                               <groupId>org.codehaus.mojo</groupId>
-                               <artifactId>rat-maven-plugin</artifactId>
-                               <version>1.0-alpha-3</version>
-                               <configuration>
-                                       <excludes>
-                                               <exclude>res/user.gen</exclude>
-                                       </excludes>
-                               </configuration>
-                       </plugin>
-               </plugins>
-       </build>
-       <dependencies>
-               <dependency>
-                       <groupId>${project.groupId}</groupId>
-                       <artifactId>ftplet-api</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.slf4j</groupId>
-                       <artifactId>slf4j-api</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.apache.mina</groupId>
-                       <artifactId>mina-core</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.springframework</groupId>
-                       <artifactId>spring-context</artifactId>
-                       <optional>true</optional>
-               </dependency>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>rat-maven-plugin</artifactId>
+        <version>1.0-alpha-3</version>
+        <configuration>
+          <excludes>
+            <exclude>res/user.gen</exclude>
+          </excludes>
+        </configuration>
+      </plugin>
+    </plugins>
+    
+    <pluginManagement>
+      <plugins>
+        <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+        <plugin>
+          <groupId>org.eclipse.m2e</groupId>
+          <artifactId>lifecycle-mapping</artifactId>
+          <version>1.0.0</version>
+          <configuration>
+            <lifecycleMappingMetadata>
+              <pluginExecutions>
+                <pluginExecution>
+                  <pluginExecutionFilter>
+                    <groupId>
+                      org.codehaus.mojo
+                    </groupId>
+                    <artifactId>
+                      properties-maven-plugin
+                    </artifactId>
+                    <versionRange>
+                      [1.0-alpha-1,)
+                    </versionRange>
+                    <goals>
+                      <goal>
+                        write-project-properties
+                      </goal>
+                    </goals>
+                  </pluginExecutionFilter>
+                  <action>
+                    <ignore></ignore>
+                  </action>
+                </pluginExecution>
+              </pluginExecutions>
+            </lifecycleMappingMetadata>
+          </configuration>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
+  
+  <dependencies>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>ftplet-api</artifactId>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.apache.mina</groupId>
+      <artifactId>mina-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-context</artifactId>
+      <optional>true</optional>
+    </dependency>
 
-               <!-- Use as Spring uses JCL -->
-               <dependency>
-                       <groupId>org.slf4j</groupId>
-                       <artifactId>jcl-over-slf4j</artifactId>
-                       <optional>true</optional>
-               </dependency>
+    <!-- Use as Spring uses JCL -->
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>jcl-over-slf4j</artifactId>
+      <optional>true</optional>
+    </dependency>
 
 
-               <!-- Test dependencies -->
-               <dependency>
-                       <groupId>commons-net</groupId>
-                       <artifactId>commons-net</artifactId>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.slf4j</groupId>
-                       <artifactId>slf4j-log4j12</artifactId>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>log4j</groupId>
-                       <artifactId>log4j</artifactId>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>junit</groupId>
-                       <artifactId>junit</artifactId>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>commons-codec</groupId>
-                       <artifactId>commons-codec</artifactId>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>hsqldb</groupId>
-                       <artifactId>hsqldb</artifactId>
-                       <scope>test</scope>
-               </dependency>
-       </dependencies>
+    <!-- Test dependencies -->
+    <dependency>
+      <groupId>commons-net</groupId>
+      <artifactId>commons-net</artifactId>
+      <scope>test</scope>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+      <scope>test</scope>
+    </dependency>
+    
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+      <scope>test</scope>
+    </dependency>
+    
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+    
+    <dependency>
+      <groupId>commons-codec</groupId>
+      <artifactId>commons-codec</artifactId>
+      <scope>test</scope>
+    </dependency>
+    
+    <dependency>
+      <groupId>hsqldb</groupId>
+      <artifactId>hsqldb</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
 </project>
index 9287289..502f64e 100644 (file)
   <packaging>pom</packaging>
   <name>Apache FtpServer</name>
   <version>1.1.0-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>
     <url>http://svn.apache.org/viewvc/mina/ftpserver/trunk/distribution</url>
   </scm>
+  
   <build>
     <finalName>apache-${project.artifactId}-${project.version}</finalName>
     <plugins>
           </execution>
         </executions>
       </plugin>
-         <plugin>
-           <groupId>org.codehaus.mojo</groupId>
-           <artifactId>rat-maven-plugin</artifactId>
-           <version>1.0-alpha-3</version>
-           <configuration>
-             <excludes>
-                       <exclude>LICENSE.slf4j.txt</exclude>
-                       <exclude>LICENSE.springframework.txt</exclude>
-               </excludes>
-           </configuration>
-         </plugin>
+    <plugin>
+      <groupId>org.codehaus.mojo</groupId>
+      <artifactId>rat-maven-plugin</artifactId>
+      <version>1.0-alpha-3</version>
+      <configuration>
+        <excludes>
+          <exclude>LICENSE.slf4j.txt</exclude>
+          <exclude>LICENSE.springframework.txt</exclude>
+        </excludes>
+      </configuration>
+    </plugin>
 
     </plugins>
   </build>
+  
   <dependencies>
     <dependency>
       <groupId>org.apache.ftpserver</groupId>
       <artifactId>ftplet-api</artifactId>
     </dependency>
+    
     <dependency>
       <groupId>org.apache.ftpserver</groupId>
       <artifactId>ftpserver-core</artifactId>
     </dependency>
+    
     <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>slf4j-log4j12</artifactId>
     </dependency>
+    
     <dependency>
         <groupId>log4j</groupId>
         <artifactId>log4j</artifactId>
     </dependency>
-        <dependency>
+    
+    <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-context</artifactId>
     </dependency>
+    
     <!-- Use as Spring uses JCL -->
     <dependency>
         <groupId>org.slf4j</groupId>
               </tasks>
             </configuration>
           </execution>
+          
           <execution>
             <id>copy-javadocs-docs</id>
             <phase>process-resources</phase>
               <tasks>
                 <echo>Copying Javadocs</echo>
                 <mkdir dir="${project.build.directory}/api"></mkdir>
-               <copy todir="${project.build.directory}/api">
-                   <fileset dir="../target/site/apidocs" />
-               </copy>
+                <copy todir="${project.build.directory}/api">
+                  <fileset dir="../target/site/apidocs" />
+                </copy>
               </tasks>
             </configuration>
           </execution>
index a2afe68..19180c6 100644 (file)
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
-       <modelVersion>4.0.0</modelVersion>
-       <groupId>org.apache.ftpserver.examples</groupId>
-       <artifactId>ftpserver-spring-war</artifactId>
-       <name>FtpServer Spring web project example</name>
-       <packaging>war</packaging>
-       <version>1.1.0-SNAPSHOT</version>
-       <dependencies>
-               <dependency>
-                       <groupId>org.springframework</groupId>
-                       <artifactId>spring-web</artifactId>
-                       <version>2.5.5</version>
-               </dependency>
-        <dependency>
-            <groupId>org.apache.ftpserver</groupId>
-            <artifactId>ftpserver-core</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-               <dependency>
-                       <groupId>javax.servlet</groupId>
-                       <artifactId>servlet-api</artifactId>
-                       <version>2.5</version>
-                       <scope>provided</scope>
-               </dependency>
-               <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
-        </dependency>
-               <dependency>
-                       <groupId>log4j</groupId>
-                       <artifactId>log4j</artifactId>
-               </dependency>
-       </dependencies>
-       <build>
-               <finalName>ftpserver-spring-war</finalName>
-               <plugins>
-                       <plugin>
-                               <groupId>org.mortbay.jetty</groupId>
-                               <artifactId>maven-jetty-plugin</artifactId>
-                               <version>6.1.8</version>
-                               <configuration>
-                                       <contextPath>/</contextPath>
-                                       <scanIntervalSeconds>5</scanIntervalSeconds>
-                               </configuration>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-compiler-plugin</artifactId>
-                               <configuration>
-                                       <source>1.5</source>
-                                       <target>1.5</target>
-                               </configuration>
-                       </plugin>
-               </plugins>
-       </build>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.ftpserver.examples</groupId>
+  <artifactId>ftpserver-spring-war</artifactId>
+  <name>FtpServer Spring web project example</name>
+  <packaging>war</packaging>
+  <version>1.1.0-SNAPSHOT</version>
+  
+  <dependencies>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-web</artifactId>
+      <version>2.5.5</version>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.apache.ftpserver</groupId>
+      <artifactId>ftpserver-core</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>2.5</version>
+      <scope>provided</scope>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+    </dependency>
+    
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+    </dependency>
+  </dependencies>
+  
+  <build>
+    <finalName>ftpserver-spring-war</finalName>
+    <plugins>
+      <plugin>
+        <groupId>org.mortbay.jetty</groupId>
+        <artifactId>maven-jetty-plugin</artifactId>
+        <version>6.1.8</version>
+        <configuration>
+          <contextPath>/</contextPath>
+          <scanIntervalSeconds>5</scanIntervalSeconds>
+        </configuration>
+      </plugin>
+      
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.7</source>
+          <target>1.7</target>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>
index cf2b2bb..87ab724 100644 (file)
@@ -1,77 +1,82 @@
 <?xml version="1.0" encoding="UTF-8"?>
-       <!--
-               Licensed to the Apache Software Foundation (ASF) under one or more
-               contributor license agreements. See the NOTICE file distributed with
-               this work for additional information regarding copyright ownership.
-               The ASF licenses this file to you under the Apache License, Version
-               2.0 (the "License"); you may not use this file except in compliance
-               with the License. You may obtain a copy of the License at
-               http://www.apache.org/licenses/LICENSE-2.0 Unless required by
-               applicable law or agreed to in writing, software distributed under the
-               License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-               CONDITIONS OF ANY KIND, either express or implied. See the License for
-               the specific language governing permissions and limitations under the
-               License.
-       -->
+  <!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements. See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to you under the Apache License, Version
+    2.0 (the "License"); you may not use this file except in compliance
+    with the License. You may obtain a copy of the License at
+    http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+    applicable law or agreed to in writing, software distributed under the
+    License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+    CONDITIONS OF ANY KIND, either express or implied. See the License for
+    the specific language governing permissions and limitations under the
+    License.
+  -->
 <project  xmlns="http://maven.apache.org/POM/4.0.0"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
                       http://maven.apache.org/xsd/maven-4.0.0.xsd">
-       <description>Simple example where an Ftplet is published as a OSGi service. Another bundle, using the white-board pattern can locate this and plug it into a running server.</description>
-       <parent>
-               <artifactId>ftpserver-parent</artifactId>
-               <groupId>org.apache.ftpserver</groupId>
-               <version>1.1.0-SNAPSHOT</version>
-               <relativePath>../../pom.xml</relativePath>
-       </parent>
-       <modelVersion>4.0.0</modelVersion>
-       <groupId>org.apache.ftpserver.examples</groupId>
-       <artifactId>ftpserver-osgi-ftplet-service</artifactId>
-       <name>FtpServer OSGi Ftplet service example</name>
-       <packaging>bundle</packaging>
-       <version>1.1.0-SNAPSHOT</version>
-       <dependencies>
-               <dependency>
-                       <groupId>org.apache.ftpserver</groupId>
-                       <artifactId>ftplet-api</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
-               <dependency>
-                 <groupId>org.osgi</groupId>
-                 <artifactId>osgi_R4_core</artifactId>
-                 <version>1.0</version>
-                 <scope>provided</scope>
-               </dependency>
-       </dependencies>
-       <build>
-               <plugins>
-                       <plugin>
-                               <groupId>org.apache.felix</groupId>
-                               <artifactId>maven-bundle-plugin</artifactId>
-                               <version>2.3.4</version>
-                               <extensions>true</extensions>
-                               <configuration>
-                                       <instructions>
-                                               <Bundle-SymbolicName> ${project.artifactId}</Bundle-SymbolicName>
-                                               <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
-                                               <Export-Package> org.apache.ftpserver.example.ftpletservice</Export-Package>
-                                               <Private-Package> org.apache.ftpserver.example.ftpletservice.impl</Private-Package>
-                                               <Bundle-Activator>org.apache.ftpserver.example.ftpletservice.impl.Activator</Bundle-Activator>
-                                               <Import-Package>
-                                                 org.apache.ftpserver.ftplet,
-                                                 org.osgi.framework
-                                               </Import-Package>
-                                       </instructions>
-                               </configuration>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-compiler-plugin</artifactId>
-                               <configuration>
-                                       <source>1.5</source>
-                                       <target>1.5</target>
-                               </configuration>
-                       </plugin>
-               </plugins>
-       </build>
+  <description>Simple example where an Ftplet is published as a OSGi service. Another bundle, using the white-board pattern can locate this and plug it into a running server.</description>
+  <parent>
+    <artifactId>ftpserver-parent</artifactId>
+    <groupId>org.apache.ftpserver</groupId>
+    <version>1.1.0-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
+  </parent>
+  
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.ftpserver.examples</groupId>
+  <artifactId>ftpserver-osgi-ftplet-service</artifactId>
+  <name>FtpServer OSGi Ftplet service example</name>
+  <packaging>bundle</packaging>
+  <version>1.1.0-SNAPSHOT</version>
+  
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.ftpserver</groupId>
+      <artifactId>ftplet-api</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.osgi</groupId>
+      <artifactId>osgi_R4_core</artifactId>
+      <version>1.0</version>
+      <scope>provided</scope>
+    </dependency>
+  </dependencies>
+  
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <version>2.5.3</version>
+        <extensions>true</extensions>
+        <configuration>
+          <instructions>
+            <Bundle-SymbolicName> ${project.artifactId}</Bundle-SymbolicName>
+            <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
+            <Export-Package> org.apache.ftpserver.example.ftpletservice</Export-Package>
+            <Private-Package> org.apache.ftpserver.example.ftpletservice.impl</Private-Package>
+            <Bundle-Activator>org.apache.ftpserver.example.ftpletservice.impl.Activator</Bundle-Activator>
+            <Import-Package>
+              org.apache.ftpserver.ftplet,
+              org.osgi.framework
+            </Import-Package>
+          </instructions>
+        </configuration>
+      </plugin>
+      
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.7</source>
+          <target>1.7</target>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>
index 378f552..9524f98 100644 (file)
@@ -1,70 +1,74 @@
 <?xml version="1.0" encoding="UTF-8"?>
-       <!--
-               Licensed to the Apache Software Foundation (ASF) under one or more
-               contributor license agreements. See the NOTICE file distributed with
-               this work for additional information regarding copyright ownership.
-               The ASF licenses this file to you under the Apache License, Version
-               2.0 (the "License"); you may not use this file except in compliance
-               with the License. You may obtain a copy of the License at
-               http://www.apache.org/licenses/LICENSE-2.0 Unless required by
-               applicable law or agreed to in writing, software distributed under the
-               License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-               CONDITIONS OF ANY KIND, either express or implied. See the License for
-               the specific language governing permissions and limitations under the
-               License.
-       -->
+  <!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements. See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to you under the Apache License, Version
+    2.0 (the "License"); you may not use this file except in compliance
+    with the License. You may obtain a copy of the License at
+    http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+    applicable law or agreed to in writing, software distributed under the
+    License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+    CONDITIONS OF ANY KIND, either express or implied. See the License for
+    the specific language governing permissions and limitations under the
+    License.
+  -->
 <project  xmlns="http://maven.apache.org/POM/4.0.0"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
                       http://maven.apache.org/xsd/maven-4.0.0.xsd">
-       <description>Spring-DM based OSGi bundle that starts an FtpServer and looks for a published Ftplet service.</description>
-       <parent>
-               <artifactId>ftpserver-parent</artifactId>
-               <groupId>org.apache.ftpserver</groupId>
-               <version>1.1.0-SNAPSHOT</version>
-               <relativePath>../../pom.xml</relativePath>
-       </parent>
-       <modelVersion>4.0.0</modelVersion>
-       <groupId>org.apache.ftpserver.examples</groupId>
-       <artifactId>ftpserver-osgi-spring-service</artifactId>
-       <name>FtpServer OSGi Spring-DM example</name>
-       <packaging>bundle</packaging>
-       <version>1.1.0-SNAPSHOT</version>
-       <dependencies>
-               <dependency>
-                       <groupId>org.apache.ftpserver</groupId>
-                       <artifactId>ftpserver-core</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
-       </dependencies>
-       <build>
-               <plugins>
-                       <plugin>
-                               <groupId>org.apache.felix</groupId>
-                               <artifactId>maven-bundle-plugin</artifactId>
-                               <version>2.3.4</version>
-                               <extensions>true</extensions>
-                               <configuration>
-                                       <instructions>
-                                               <Bundle-SymbolicName> ${project.artifactId}</Bundle-SymbolicName>
-                                               <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
-                                               <Export-Package> org.apache.ftpserver.example.osgiservice</Export-Package>
-                                               <Private-Package>org.apache.ftpserver.example.osgiservice.impl</Private-Package>
-                                               <Import-Package>
-                                                 org.apache.ftpserver,
-                                                 org.apache.ftpserver.ftplet
-                                               </Import-Package>
-                                       </instructions>
-                               </configuration>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-compiler-plugin</artifactId>
-                               <configuration>
-                                       <source>1.5</source>
-                                       <target>1.5</target>
-                               </configuration>
-                       </plugin>
-               </plugins>
-       </build>
+  <description>Spring-DM based OSGi bundle that starts an FtpServer and looks for a published Ftplet service.</description>
+  <parent>
+    <artifactId>ftpserver-parent</artifactId>
+    <groupId>org.apache.ftpserver</groupId>
+    <version>1.1.0-SNAPSHOT</version>
+    <relativePath>../../pom.xml</relativePath>
+  </parent>
+  
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.ftpserver.examples</groupId>
+  <artifactId>ftpserver-osgi-spring-service</artifactId>
+  <name>FtpServer OSGi Spring-DM example</name>
+  <packaging>bundle</packaging>
+  <version>1.1.0-SNAPSHOT</version>
+  
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.ftpserver</groupId>
+      <artifactId>ftpserver-core</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+  </dependencies>
+  
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <version>2.5.3</version>
+        <extensions>true</extensions>
+        <configuration>
+          <instructions>
+            <Bundle-SymbolicName> ${project.artifactId}</Bundle-SymbolicName>
+            <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
+            <Export-Package> org.apache.ftpserver.example.osgiservice</Export-Package>
+            <Private-Package>org.apache.ftpserver.example.osgiservice.impl</Private-Package>
+            <Import-Package>
+              org.apache.ftpserver,
+              org.apache.ftpserver.ftplet
+            </Import-Package>
+          </instructions>
+        </configuration>
+      </plugin>
+      
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.7</source>
+          <target>1.7</target>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>
index 7c0bdcc..d6a6e66 100644 (file)
@@ -1,86 +1,93 @@
 <?xml version="1.0" encoding="UTF-8"?>
-       <!--
-               Licensed to the Apache Software Foundation (ASF) under one or more
-               contributor license agreements. See the NOTICE file distributed with
-               this work for additional information regarding copyright ownership.
-               The ASF licenses this file to you under the Apache License, Version
-               2.0 (the "License"); you may not use this file except in compliance
-               with the License. You may obtain a copy of the License at
-               http://www.apache.org/licenses/LICENSE-2.0 Unless required by
-               applicable law or agreed to in writing, software distributed under the
-               License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-               CONDITIONS OF ANY KIND, either express or implied. See the License for
-               the specific language governing permissions and limitations under the
-               License.
-       -->
+  <!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements. See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to you under the Apache License, Version
+    2.0 (the "License"); you may not use this file except in compliance
+    with the License. You may obtain a copy of the License at
+    http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+    applicable law or agreed to in writing, software distributed under the
+    License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+    CONDITIONS OF ANY KIND, either express or implied. See the License for
+    the specific language governing permissions and limitations under the
+    License.
+  -->
 <project xmlns="http://maven.apache.org/POM/4.0.0"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
                       http://maven.apache.org/xsd/maven-4.0.0.xsd">
-       <parent>
-               <artifactId>ftpserver-parent</artifactId>
-               <groupId>org.apache.ftpserver</groupId>
-               <version>1.1.0-SNAPSHOT</version>
-       </parent>
-       <modelVersion>4.0.0</modelVersion>
-       <groupId>org.apache.ftpserver</groupId>
-       <artifactId>ftplet-api</artifactId>
-       <version>1.1.0-SNAPSHOT</version>
-       <packaging>bundle</packaging>
-       <name>Apache Ftplet API</name>
-       <description> Ftplets are, similar to servlets, an API to plug into the
-               request lifecycle of FtpServer. Ftplets are called on session connect
-               and disconnect as well as before and after each command within a user
-               session.</description>
-       <url>http://mina.apache.org/ftpserver
-       </url>
-       <scm>
-               <connection>
-                       scm:svn:http://svn.apache.org/repos/asf/mina/ftpserver/trunk/ftplet-api
-               </connection>
-               <developerConnection>
-                       scm:svn:https://svn.apache.org/repos/asf/mina/ftpserver/trunk/ftplet-api
-               </developerConnection>
-               <url>http://svn.apache.org/viewvc/mina/ftpserver/trunk/ftplet-api
-               </url>
-       </scm>
-       <build>
-               <plugins>
-                       <plugin>
-                               <groupId>org.apache.felix</groupId>
-                               <artifactId>maven-bundle-plugin</artifactId>
-                               <version>2.3.4</version>
-                               <extensions>true</extensions>
-                               <configuration>
-                                       <instructions>
-                                               <Bundle-SymbolicName> ${project.artifactId}</Bundle-SymbolicName>
-                                               <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
-                                               <Export-Package> org.apache.ftpserver.ftplet;version=${project.version}</Export-Package>
-                                       </instructions>
-                               </configuration>
-                       </plugin>
-               </plugins>
-       </build>
-       <dependencies>
-               <dependency>
-                       <groupId>junit</groupId>
-                       <artifactId>junit</artifactId>
-                       <scope>test</scope>
-               </dependency>
-       </dependencies>
-       <reporting>
-               <plugins>
-                       <plugin>
-                               <artifactId>maven-javadoc-plugin</artifactId>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.codehaus.mojo</groupId>
-                               <artifactId>jxr-maven-plugin</artifactId>
-                       </plugin>
-               </plugins>
-       </reporting>
-       <properties>
-               <maven.compile.source>1.5</maven.compile.source>
-               <maven.compile.target>1.5</maven.compile.target>
-       </properties>
+  <parent>
+    <artifactId>ftpserver-parent</artifactId>
+    <groupId>org.apache.ftpserver</groupId>
+    <version>1.1.0-SNAPSHOT</version>
+  </parent>
+  
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.ftpserver</groupId>
+  <artifactId>ftplet-api</artifactId>
+  <version>1.1.0-SNAPSHOT</version>
+  <packaging>bundle</packaging>
+  <name>Apache Ftplet API</name>
+  
+  <description> Ftplets are, similar to servlets, an API to plug into the
+    request lifecycle of FtpServer. Ftplets are called on session connect
+    and disconnect as well as before and after each command within a user
+    session.</description>
+  <url>http://mina.apache.org/ftpserver</url>
+  
+  <scm>
+    <connection>
+      scm:svn:http://svn.apache.org/repos/asf/mina/ftpserver/trunk/ftplet-api
+    </connection>
+    
+    <developerConnection>
+      scm:svn:https://svn.apache.org/repos/asf/mina/ftpserver/trunk/ftplet-api
+    </developerConnection>
+    <url>http://svn.apache.org/viewvc/mina/ftpserver/trunk/ftplet-api
+    </url>
+  </scm>
+  
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <version>2.5.3</version>
+        <extensions>true</extensions>
+        <configuration>
+          <instructions>
+            <Bundle-SymbolicName> ${project.artifactId}</Bundle-SymbolicName>
+            <Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
+            <Export-Package> org.apache.ftpserver.ftplet;version=${project.version}</Export-Package>
+          </instructions>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+  
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+  
+  <reporting>
+    <plugins>
+      <plugin>
+        <artifactId>maven-javadoc-plugin</artifactId>
+      </plugin>
+        <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>jxr-maven-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </reporting>
+  
+  <properties>
+    <maven.compile.source>1.7</maven.compile.source>
+    <maven.compile.target>1.7</maven.compile.target>
+  </properties>
 </project>
diff --git a/pom.xml b/pom.xml
index 75a8e7a..7f521a1 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
   <parent>
     <artifactId>apache</artifactId>
     <groupId>org.apache</groupId>
-    <version>9</version>
+    <version>17</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.ftpserver</groupId>
     <url>http://svn.apache.org/viewvc/mina/ftpserver/trunk</url>
   </scm>
 
+  <properties>
+    <!-- Set versions for depending jars -->
+    <commons.codec.version>1.10</commons.codec.version>
+    <commons.net.version>3.5</commons.net.version>
+    <hsqldb.version>1.8.0.10</hsqldb.version>
+    <jcl.over.slf4j.version>1.7.21</jcl.over.slf4j.version>
+    <junit.version>4.12</junit.version>
+    <log4j.version>1.2.17</log4j.version>
+    <mina.core.version>2.0.16</mina.core.version>
+    <slf4j.api.version>1.7.21</slf4j.api.version>
+    <slf4j.log4j12.version>1.7.21</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>
     <dependencies>
       <!-- Submodules -->
       <dependency>
         <groupId>org.apache.mina</groupId>
         <artifactId>mina-core</artifactId>
-        <version>2.0.4</version>
+        <version>${mina.core.version}</version>
       </dependency>
 
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-context</artifactId>
-      <version>2.5.5</version>
+      <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-context</artifactId>
+        <version>${spring.context.version}</version>
         <exclusions>
-            <exclusion>
-                <groupId>commons-logging</groupId>
-                <artifactId>commons-logging</artifactId>
-            </exclusion>
-       </exclusions>
-    </dependency>
-
+          <exclusion>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
 
       <!-- Logging -->
       <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>slf4j-api</artifactId>
-        <version>1.6.4</version>
+        <version>${slf4j.api.version}</version>
       </dependency>
 
       <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>jcl-over-slf4j</artifactId>
-        <version>1.6.4</version>
+        <version>${jcl.over.slf4j.version}</version>
       </dependency>
 
       <!-- Test dependencies -->
       <dependency>
         <groupId>junit</groupId>
         <artifactId>junit</artifactId>
-        <version>4.8.2</version>
+        <version>${junit.version}</version>
       </dependency>
 
       <dependency>
         <groupId>commons-net</groupId>
         <artifactId>commons-net</artifactId>
-        <version>2.0</version>
+        <version>${commons.net.version}</version>
       </dependency>
 
       <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>slf4j-log4j12</artifactId>
-        <version>1.6.4</version>
+        <version>${slf4j.log4j12.version}</version>
       </dependency>
 
       <dependency>
         <groupId>log4j</groupId>
         <artifactId>log4j</artifactId>
-        <version>1.2.14</version>
+        <version>${log4j.version}</version>
       </dependency>
 
       <dependency>
         <groupId>commons-codec</groupId>
         <artifactId>commons-codec</artifactId>
-        <version>1.3</version>
+        <version>${commons.codec.version}</version>
       </dependency>
 
       <dependency>
         <groupId>hsqldb</groupId>
         <artifactId>hsqldb</artifactId>
-        <version>1.8.0.7</version>
+        <version>${hsqldb.version}</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-enforcer-plugin</artifactId>
-        <version>1.0-alpha-3</version>
+        <version>1.3.1</version>
         <executions>
           <execution>
             <phase>validate</phase>
 
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.8.1</version>
+        <version>2.18.1</version>
       </plugin>
 
       <plugin>
         <artifactId>maven-eclipse-plugin</artifactId>
-        <version>2.5.1</version>
+        <version>2.9</version>
         <configuration>
           <downloadSources>true</downloadSources>
         </configuration>
 
       <plugin>
         <artifactId>maven-release-plugin</artifactId>
-        <version>2.0-beta-7</version>
+        <version>2.5.1</version>
         <configuration>
           <tagBase>https://svn.apache.org/repos/asf/mina/ftpserver/tags/</tagBase>
         </configuration>
 
       <plugin>
         <artifactId>maven-remote-resources-plugin</artifactId>
-        <version>1.0</version>
+        <version>1.5</version>
         <executions>
           <execution>
             <goals>
 
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.0.2</version>
+        <version>3.2</version>
         <configuration>
           <source>${maven.compile.source}</source>
           <target>${maven.compile.target}</target>
         </configuration>
       </plugin>
 
-         <plugin>
-           <groupId>org.codehaus.mojo</groupId>
-           <artifactId>rat-maven-plugin</artifactId>
-           <version>1.0-alpha-3</version>
-         </plugin>
+    <plugin>
+      <groupId>org.codehaus.mojo</groupId>
+      <artifactId>rat-maven-plugin</artifactId>
+      <version>1.0-alpha-3</version>
+    </plugin>
 
       <plugin>
         <artifactId>maven-source-plugin</artifactId>
-        <version>2.0.4</version>
+        <version>2.4</version>
         <executions>
           <execution>
             <id>create-source-jar</id>
 
       <plugin>
         <artifactId>maven-idea-plugin</artifactId>
-        <version>2.1</version>
+        <version>2.2.1</version>
         <configuration>
           <jdkLevel>${maven.compile.source}</jdkLevel>
         </configuration>
 
       <plugin>
         <artifactId>maven-jar-plugin</artifactId>
-        <version>2.2</version>
+        <version>2.5</version>
         <configuration>
           <archive>
             <addMavenDescriptor>false</addMavenDescriptor>
       <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-war-plugin</artifactId>
-          <version>2.0.2</version>
+          <version>2.5</version>
       </plugin>
     </plugins>
   </build>
         <plugins>
           <plugin>
             <artifactId>maven-javadoc-plugin</artifactId>
-            <version>2.5</version>
+            <version>2.10.1</version>
             <executions>
               <execution>
                 <id>create-javadoc-jar</id>
                 </goals>
                 <configuration>
                   <source>${maven.compile.source}</source>
-                 <excludePackageNames>
-                   *.impl:org.apache.ftpserver.example.*:org.apache.ftpserver.config.spring:org.apache.ftpserver.command.impl.listing:org.apache.ftpserver.listener.nio:org.apache.ftpserver.util
-                 </excludePackageNames>
+                  <excludePackageNames>
+                    *.impl:org.apache.ftpserver.example.*:org.apache.ftpserver.config.spring:org.apache.ftpserver.command.impl.listing:org.apache.ftpserver.listener.nio:org.apache.ftpserver.util
+                  </excludePackageNames>
                 </configuration>
               </execution>
+
               <execution>
                 <id>create-site-javadoc</id>
                 <phase>process-resources</phase>
                   <goal>aggregate</goal>
                 </goals>
                 <configuration>
-                 <doctitle>Apache FtpServer ${project.version} Public API</doctitle>
-                 <windowtitle>Apache FtpServer ${project.version} Public API</windowtitle>
+                  <doctitle>Apache FtpServer ${project.version} Public API</doctitle>
+                  <windowtitle>Apache FtpServer ${project.version} Public API</windowtitle>
                   <source>${maven.compile.source}</source>
-                 <excludePackageNames>
-                   *.impl:org.apache.ftpserver.example.*:org.apache.ftpserver.config.spring:org.apache.ftpserver.command.impl.listing:org.apache.ftpserver.listener.nio:org.apache.ftpserver.util
-                 </excludePackageNames>
+                  <excludePackageNames>
+                    *.impl:org.apache.ftpserver.example.*:org.apache.ftpserver.config.spring:org.apache.ftpserver.command.impl.listing:org.apache.ftpserver.listener.nio:org.apache.ftpserver.util
+                  </excludePackageNames>
                 </configuration>
               </execution>
             </executions>
           </plugin>
-         <plugin>
-           <groupId>org.codehaus.mojo</groupId>
-           <artifactId>rat-maven-plugin</artifactId>
-           <version>1.0-alpha-3</version>
+
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>rat-maven-plugin</artifactId>
+            <version>1.0-alpha-3</version>
             <executions>
               <execution>
                 <id>verify-licenses</id>
                 </goals>
               </execution>
             </executions>
-         </plugin>
+          </plugin>
         </plugins>
       </build>
       <modules>
     <module>examples</module>
   </modules>
 
-  <properties>
-    <maven.compile.source>1.5</maven.compile.source>
-    <maven.compile.target>1.5</maven.compile.target>
-    <ftpserver.version>${project.version}</ftpserver.version>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-  </properties>
 </project>