This is an automated email from the ASF dual-hosted git repository.
elecharny pushed a commit to branch 1.1.X
in repository https://gitbox.apache.org/repos/asf/mina-ftpserver.git
The following commit(s) were added to refs/heads/1.1.X by this push:
new 2f624f9 Backported some fixes and changes from 1.2.X
2f624f9 is described below
commit 2f624f9a247922094292cabca76a1c99dc910a1f
Author: emmanuel lecharny <[email protected]>
AuthorDate: Tue Mar 8 06:32:43 2022 +0100
Backported some fixes and changes from 1.2.X
---
core/pom.xml | 2 +-
examples/ftpserver-example-spring-war/pom.xml | 5 ++---
examples/ftpserver-osgi-ftplet-service/pom.xml | 5 ++---
examples/ftpserver-osgi-spring-service/pom.xml | 5 ++---
pom.xml | 7 +++++++
5 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index 3969289..b1f9d03 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -81,7 +81,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>properties-maven-plugin</artifactId>
- <version>1.0-alpha-2</version>
+ <version>1.0</version>
<executions>
<execution>
<phase>generate-resources</phase>
diff --git a/examples/ftpserver-example-spring-war/pom.xml
b/examples/ftpserver-example-spring-war/pom.xml
index 96ea5fc..902f688 100644
--- a/examples/ftpserver-example-spring-war/pom.xml
+++ b/examples/ftpserver-example-spring-war/pom.xml
@@ -22,7 +22,6 @@
<artifactId>ftpserver-spring-war</artifactId>
<name>FtpServer Spring web project example</name>
<packaging>war</packaging>
- <version>1.1.4-SNAPSHOT</version>
<properties>
<checkstyle.configdir>${basedir}/../..</checkstyle.configdir>
@@ -76,8 +75,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.7</source>
- <target>1.7</target>
+ <source>1.8</source>
+ <target>1.8</target>
</configuration>
</plugin>
</plugins>
diff --git a/examples/ftpserver-osgi-ftplet-service/pom.xml
b/examples/ftpserver-osgi-ftplet-service/pom.xml
index 2c33a7c..713cd53 100644
--- a/examples/ftpserver-osgi-ftplet-service/pom.xml
+++ b/examples/ftpserver-osgi-ftplet-service/pom.xml
@@ -27,7 +27,6 @@
<artifactId>ftpserver-osgi-ftplet-service</artifactId>
<name>FtpServer OSGi Ftplet service example</name>
<packaging>bundle</packaging>
- <version>1.1.4-SNAPSHOT</version>
<properties>
<checkstyle.configdir>${basedir}/../..</checkstyle.configdir>
@@ -74,8 +73,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.7</source>
- <target>1.7</target>
+ <source>1.8</source>
+ <target>1.8</target>
</configuration>
</plugin>
</plugins>
diff --git a/examples/ftpserver-osgi-spring-service/pom.xml
b/examples/ftpserver-osgi-spring-service/pom.xml
index c8e53ed..4e6d64f 100644
--- a/examples/ftpserver-osgi-spring-service/pom.xml
+++ b/examples/ftpserver-osgi-spring-service/pom.xml
@@ -27,7 +27,6 @@
<artifactId>ftpserver-osgi-spring-service</artifactId>
<name>FtpServer OSGi Spring-DM example</name>
<packaging>bundle</packaging>
- <version>1.1.4-SNAPSHOT</version>
<properties>
<checkstyle.configdir>${basedir}/../..</checkstyle.configdir>
@@ -66,8 +65,8 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.7</source>
- <target>1.7</target>
+ <source>1.8</source>
+ <target>1.8</target>
</configuration>
</plugin>
</plugins>
diff --git a/pom.xml b/pom.xml
index e3162f3..9d7f89a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -180,6 +180,9 @@
<maven.compile.source>1.8</maven.compile.source>
<maven.compile.target>1.8</maven.compile.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+
+ <!-- Maven plugin version -->
+ <maven-javadoc-plugin-version>3.3.2</maven-javadoc-plugin-version>
</properties>
<dependencyManagement>
@@ -337,6 +340,10 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
+ <version>${maven-javadoc-plugin-version}</version>
+ <configuration>
+ <source>${maven.compile.source}</source>
+ </configuration>
</plugin>
<plugin>
