This is an automated email from the ASF dual-hosted git repository.
elecharny pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mina-ftpserver.git
The following commit(s) were added to refs/heads/master by this push:
new 8d7b3ab make build reproducible
new c845197 Merge pull request #13 from hboutemy/reproducible-build
8d7b3ab is described below
commit 8d7b3ab9d0763d74a3e8c3709096d32bb4a3d3a3
Author: Hervé Boutemy <hbout...@apache.org>
AuthorDate: Sat Mar 19 17:02:24 2022 +0100
make build reproducible
---
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 5c31901..5e47375 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -22,7 +22,7 @@
<packaging>bundle</packaging>
<properties>
- <checkstyle.configdir>${basedir}/..</checkstyle.configdir>
+ <checkstyle.configdir>..</checkstyle.configdir>
</properties>
<build>
@@ -49,7 +49,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>
@@ -82,7 +82,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>properties-maven-plugin</artifactId>
- <version>1.0-alpha-2</version>
+ <version>1.1.0</version>
<executions>
<execution>
<phase>generate-resources</phase>
@@ -99,7 +99,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 9ef4bfe..9b1eeeb 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 96ea5fc..24eaa5f 100644
--- a/examples/ftpserver-example-spring-war/pom.xml
+++ b/examples/ftpserver-example-spring-war/pom.xml
@@ -25,7 +25,7 @@
<version>1.1.4-SNAPSHOT</version>
<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 2c33a7c..db8334b 100644
--- a/examples/ftpserver-osgi-ftplet-service/pom.xml
+++ b/examples/ftpserver-osgi-ftplet-service/pom.xml
@@ -30,7 +30,7 @@
<version>1.1.4-SNAPSHOT</version>
<properties>
- <checkstyle.configdir>${basedir}/../..</checkstyle.configdir>
+ <checkstyle.configdir>../..</checkstyle.configdir>
</properties>
<dependencies>
@@ -53,7 +53,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 c8e53ed..5445a08 100644
--- a/examples/ftpserver-osgi-spring-service/pom.xml
+++ b/examples/ftpserver-osgi-spring-service/pom.xml
@@ -30,7 +30,7 @@
<version>1.1.4-SNAPSHOT</version>
<properties>
- <checkstyle.configdir>${basedir}/../..</checkstyle.configdir>
+ <checkstyle.configdir>../..</checkstyle.configdir>
</properties>
<dependencies>
@@ -46,7 +46,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 68773fc..d894066 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -36,7 +36,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 e299b97..663848d 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 61d995d..e24172d 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>
@@ -534,8 +534,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>
@@ -543,7 +543,7 @@
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
- <version>${checksytyle.version}</version>
+ <version>${checkstyle.version}</version>
</dependency>
</dependencies>
<executions>
