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 307c955 Applied @hboutemy patches
307c955 is described below
commit 307c955ef47aff21b8a21bbce05a7cd3c98929d4
Author: emmanuel lecharny <elecha...@apache.org>
AuthorDate: Mon Mar 21 09:45:16 2022 +0100
Applied @hboutemy patches
---
core/pom.xml | 7 +++----
distribution/pom.xml | 2 +-
examples/ftpserver-example-spring-war/pom.xml | 2 +-
examples/ftpserver-osgi-ftplet-service/pom.xml | 4 ++--
examples/ftpserver-osgi-spring-service/pom.xml | 4 ++--
examples/pom.xml | 2 +-
ftplet-api/pom.xml | 2 +-
pom.xml | 10 +++++-----
8 files changed, 16 insertions(+), 17 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index 8886e4f..a384c84 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -21,7 +21,7 @@
<packaging>bundle</packaging>
<properties>
- <checkstyle.configdir>${basedir}/..</checkstyle.configdir>
+ <checkstyle.configdir>..</checkstyle.configdir>
</properties>
<build>
@@ -48,7 +48,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.5.3</version>
+ <version>5.1.4</version>
<extensions>true</extensions>
<configuration>
<instructions>
@@ -81,7 +81,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>properties-maven-plugin</artifactId>
- <version>1.0.0</version>
+ <version>1.1.0</version>
<executions>
<execution>
<phase>generate-resources</phase>
@@ -98,7 +98,6 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>rat-maven-plugin</artifactId>
- <version>1.0-alpha-3</version>
<configuration>
<excludes>
<exclude>res/user.gen</exclude>
diff --git a/distribution/pom.xml b/distribution/pom.xml
index 43e06ab..c71d83c 100644
--- a/distribution/pom.xml
+++ b/distribution/pom.xml
@@ -24,7 +24,7 @@
<name>Apache FtpServer</name>
<properties>
- <checkstyle.configdir>${basedir}/..</checkstyle.configdir>
+ <checkstyle.configdir>..</checkstyle.configdir>
</properties>
<build>
diff --git a/examples/ftpserver-example-spring-war/pom.xml
b/examples/ftpserver-example-spring-war/pom.xml
index 1f507dd..a3d27a6 100644
--- a/examples/ftpserver-example-spring-war/pom.xml
+++ b/examples/ftpserver-example-spring-war/pom.xml
@@ -24,7 +24,7 @@
<packaging>war</packaging>
<properties>
- <checkstyle.configdir>${basedir}/../..</checkstyle.configdir>
+ <checkstyle.configdir>../..</checkstyle.configdir>
</properties>
<dependencies>
diff --git a/examples/ftpserver-osgi-ftplet-service/pom.xml
b/examples/ftpserver-osgi-ftplet-service/pom.xml
index 73920ed..830eeaf 100644
--- a/examples/ftpserver-osgi-ftplet-service/pom.xml
+++ b/examples/ftpserver-osgi-ftplet-service/pom.xml
@@ -29,7 +29,7 @@
<packaging>bundle</packaging>
<properties>
- <checkstyle.configdir>${basedir}/../..</checkstyle.configdir>
+ <checkstyle.configdir>../..</checkstyle.configdir>
</properties>
<dependencies>
@@ -52,7 +52,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.5.3</version>
+ <version>5.1.4</version>
<extensions>true</extensions>
<configuration>
<instructions>
diff --git a/examples/ftpserver-osgi-spring-service/pom.xml
b/examples/ftpserver-osgi-spring-service/pom.xml
index 19bb1cb..da53d29 100644
--- a/examples/ftpserver-osgi-spring-service/pom.xml
+++ b/examples/ftpserver-osgi-spring-service/pom.xml
@@ -29,7 +29,7 @@
<packaging>bundle</packaging>
<properties>
- <checkstyle.configdir>${basedir}/../..</checkstyle.configdir>
+ <checkstyle.configdir>../..</checkstyle.configdir>
</properties>
<dependencies>
@@ -45,7 +45,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.5.3</version>
+ <version>5.1.4</version>
<extensions>true</extensions>
<configuration>
<instructions>
diff --git a/examples/pom.xml b/examples/pom.xml
index e7d1a86..323ef21 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -34,7 +34,7 @@
</modules>
<properties>
- <checkstyle.configdir>${basedir}/..</checkstyle.configdir>
+ <checkstyle.configdir>..</checkstyle.configdir>
</properties>
</project>
diff --git a/ftplet-api/pom.xml b/ftplet-api/pom.xml
index 2c5b8a6..6038b92 100644
--- a/ftplet-api/pom.xml
+++ b/ftplet-api/pom.xml
@@ -72,6 +72,6 @@
<properties>
<maven.compile.source>1.8</maven.compile.source>
<maven.compile.target>1.8</maven.compile.target>
- <checkstyle.configdir>${basedir}/..</checkstyle.configdir>
+ <checkstyle.configdir>..</checkstyle.configdir>
</properties>
</project>
diff --git a/pom.xml b/pom.xml
index ddb3404..e2ec8ea 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
<parent>
<artifactId>apache</artifactId>
<groupId>org.apache</groupId>
- <version>24</version>
+ <version>25</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -174,7 +174,7 @@
<!-- Checkstyle configuration -->
<checkstyle.plugin.version>3.1.2</checkstyle.plugin.version>
<checkstyle.version>9.3</checkstyle.version>
- <checkstyle.configdir>${basedir}</checkstyle.configdir>
+ <checkstyle.configdir>.</checkstyle.configdir>
<!-- Java version to use -->
<maven.compile.source>1.8</maven.compile.source>
@@ -541,8 +541,8 @@
<artifactId>maven-checkstyle-plugin</artifactId>
<version>${checkstyle.plugin.version}</version>
<configuration>
-
<configLocation>${checkstyle.configdir}/checkstyle.xml</configLocation>
-
<suppressionsLocation>${checkstyle.configdir}/checkstyle-suppressions.xml</suppressionsLocation>
+
<configLocation>${basedir}/${checkstyle.configdir}/checkstyle.xml</configLocation>
+
<suppressionsLocation>${basedir}/${checkstyle.configdir}/checkstyle-suppressions.xml</suppressionsLocation>
<enableRulesSummary>false</enableRulesSummary>
<propertyExpansion>basedir=${basedir}</propertyExpansion>
</configuration>
@@ -550,7 +550,7 @@
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
- <version>${checksytyle.version}</version>
+ <version>${checkstyle.version}</version>
</dependency>
</dependencies>
<executions>
