diff --git a/apache-commons-net.spec b/apache-commons-net.spec index e416337..3f211b1 100644 --- a/apache-commons-net.spec +++ b/apache-commons-net.spec @@ -1,16 +1,21 @@ Name: apache-commons-net -Version: 3.6 -Release: 6 +Version: 3.10.0 +Release: 1 Summary: Java library for Internet protocol License: ASL 2.0 URL: http://commons.apache.org/net/ -Source0: http://archive.apache.org/dist/commons/net/source/commons-net-3.6-src.tar.gz +Source0: https://github.com/apache/commons-net/archive/refs/tags/rel/commons-net-%{version}.tar.gz BuildArch: noarch BuildRequires: maven-local mvn(junit:junit) mvn(org.apache.commons:commons-parent:pom:) BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin) BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) BuildRequires: mvn(org.codehaus.mojo:exec-maven-plugin) +BuildRequires: mvn(org.junit.jupiter:junit-jupiter-api) +BuildRequires: mvn(org.junit.jupiter:junit-jupiter-engine) +BuildRequires: mvn(org.junit.vintage:junit-vintage-engine) +BuildRequires: java-17-openjdk-devel +Requires: java-17-openjdk %description Apache Commons Net library contains a collection of network utilities and protocol implementations. @@ -25,17 +30,37 @@ Obsoletes: %{name}-javadoc < %{version}-%{release} Help document for apache-commons-net. %prep -%autosetup -n commons-net-%{version}-src -p1 +%autosetup -n commons-net-rel-commons-net-%{version} -p1 rm src/test/java/org/apache/commons/net/time/TimeTCPClientTest.java rm src/test/java/org/apache/commons/net/tftp/TFTPServerPathTest.java -rm src/test/java/org/apache/commons/net/ftp/TestConnectTimeout.java + +%pom_remove_dep org.apache.ftpserver:ftpserver-core +%pom_remove_plugin :maven-checkstyle-plugin + +%pom_xpath_inject pom:build/pom:plugins " + + org.apache.maven.plugins + maven-surefire-plugin + 2.22.1 + + true + +" + +rm \ +src/test/java/org/apache/commons/net/ftp/FTPSClientTest.java \ +src/test/java/org/apache/commons/net/ftp/AbstractFtpsTest.java \ +src/test/java/org/apache/commons/net/ftp/NoProtocolSslConfigurationProxy.java %mvn_file : commons-net apache-commons-net %mvn_alias : org.apache.commons:commons-net %build -%mvn_build +export JAVA_HOME=%{_jvmdir}/java-17-openjdk +export CFLAGS="${RPM_OPT_FLAGS}" +export CXXFLAGS="${RPM_OPT_FLAGS}" +%mvn_build --xmvn-javadoc %install %mvn_install @@ -47,6 +72,9 @@ rm src/test/java/org/apache/commons/net/ftp/TestConnectTimeout.java %doc README.md RELEASE-NOTES.txt %changelog +* Fri Oct 27 2023 yaoxin - 3.10.0-1 +- Upgrade to 3.10.0 + * Mon Jun 05 2023 wangkai <13474090681@163.com> - 3.6-6 - Remove TestConnectTimeout for ftp diff --git a/apache-commons-net.yaml b/apache-commons-net.yaml new file mode 100644 index 0000000..7c0d389 --- /dev/null +++ b/apache-commons-net.yaml @@ -0,0 +1,4 @@ +version_control: github +src_repo: apache/commons-net +tag_prefix: "^rel/commons-net-" +seperator: "." diff --git a/commons-net-3.10.0.tar.gz b/commons-net-3.10.0.tar.gz new file mode 100644 index 0000000..058adc2 Binary files /dev/null and b/commons-net-3.10.0.tar.gz differ diff --git a/commons-net-3.6-src.tar.gz b/commons-net-3.6-src.tar.gz deleted file mode 100644 index a27a317..0000000 Binary files a/commons-net-3.6-src.tar.gz and /dev/null differ