diff --git a/apache-ftpserver-1.2.0-src.tar.gz b/apache-ftpserver-1.2.0-src.tar.gz deleted file mode 100644 index f18a75a12cbe6e13cfb41f0153308359c575f49b..0000000000000000000000000000000000000000 Binary files a/apache-ftpserver-1.2.0-src.tar.gz and /dev/null differ diff --git a/apache-ftpserver-1.2.1-src.tar.gz b/apache-ftpserver-1.2.1-src.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..c08fcb6e023c6c0047f3d54fd94305c6ec6f545a Binary files /dev/null and b/apache-ftpserver-1.2.1-src.tar.gz differ diff --git a/mina-ftpserver.spec b/mina-ftpserver.spec index 2e6cc92719b6a781edd8ef58702e97743ec41a17..fe19cd501e266ae6c596714482f1b50db94c877b 100644 --- a/mina-ftpserver.spec +++ b/mina-ftpserver.spec @@ -1,5 +1,5 @@ Name: mina-ftpserver -Version: 1.2.0 +Version: 1.2.1 Release: 1 Summary: A 100% pure Java FTP server License: Apache-2.0 @@ -49,21 +49,23 @@ Summary: Javadoc for %{name} This package contains javadoc for %{name}. %prep -%setup -q -n apache-ftpserver-%{version} +%autosetup -n apache-ftpserver-%{version} -p1 find . -name "*.bat" -delete find . -name "*.class" -delete find . -name "*.exe" -delete find . -name "*.jar" -delete -%patch0 -p1 mv src/* ./ +sed -i 's|\s*\${maven.compile.source}\s*|8|g; + s|\s*\${maven.compile.target}\s*|8|g' pom.xml + %pom_disable_module distribution %pom_disable_module ftpserver-example-spring-war examples %pom_remove_plugin :maven-source-plugin +%pom_remove_plugin :maven-checkstyle-plugin %pom_remove_plugin -r :rat-maven-plugin %pom_remove_plugin -r :apache-rat-plugin %pom_remove_plugin -r :properties-maven-plugin -%pom_remove_plugin :jxr-maven-plugin ftplet-api %pom_xpath_set "pom:Bundle-SymbolicName" '${project.artifactId}' ftplet-api %pom_xpath_set "pom:Bundle-SymbolicName" '${project.artifactId}' core %pom_xpath_set "pom:Bundle-SymbolicName" '${project.artifactId}' examples/ftpserver-osgi-ftplet-service @@ -85,7 +87,8 @@ rm core/src/test/java/org/apache/ftpserver/impl/DefaultFtpServerTest.java \ core/src/test/java/org/apache/ftpserver/ssl/MinaExplicitSSLTest.java \ core/src/test/java/org/apache/ftpserver/ssl/MinaImplicitDataChannelTest.java \ core/src/test/java/org/apache/ftpserver/ssl/MinaImplicitSSLTest.java \ - core/src/test/java/org/apache/ftpserver/clienttests/PasvUsedPortTest.java + core/src/test/java/org/apache/ftpserver/clienttests/PasvUsedPortTest.java \ + core/src/test/java/org/apache/ftpserver/VersionTest.java %build %mvn_build -- -Dproject.build.sourceEncoding=UTF-8 -Denforcer.fail=false @@ -104,6 +107,9 @@ rm core/src/test/java/org/apache/ftpserver/impl/DefaultFtpServerTest.java \ %license LICENSE NOTICE %changelog +* Wed Aug 06 2025 yaoxin <1024769339@qq.com> - 1.2.1-1 +- Update to 1.2.1 for fix build failure due to apache-mina upgraded + * Mon Jul 08 2024 yaoxin - 1.2.0-1 - Update to 1.2.0 * Added the source definition in maven-javadoc-plugin to pass with Java 8