Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild

https://fedoraproject.org/wiki/Changes/Java25AndNoMoreSystemJdk
Note, that since f43, you should be always explicit on what jdk to use.
This commit should do exactly that.

.fmf/version

@@ -0,0 +1 @@
+1

.gitignore

@@ -1,2 +1,17 @@
 commons-net-2.0-src.tar.gz
 /commons-net-2.2-src.tar.gz
+/commons-net-3.1-src.tar.gz
+/commons-net-3.2-src.tar.gz
+/commons-net-3.3-src.tar.gz
+/commons-net-3.4-src.tar.gz
+/commons-net-3.5-src.tar.gz
+/commons-net-3.6-src.tar.gz
+/commons-net-3.8.0-src.tar.gz
+/commons-net-3.9.0-src.tar.gz
+/commons-net-3.10.0-src.tar.gz
+/commons-net-3.11.0-src.tar.gz
+/commons-net-3.11.0-src.tar.gz.asc
+/commons-net-3.11.1-src.tar.gz
+/commons-net-3.11.1-src.tar.gz.asc
+/commons-net-3.12.0-src.tar.gz
+/commons-net-3.12.0-src.tar.gz.asc

apache-commons-net.spec

@@ -1,30 +1,30 @@
-
-%global base_name    net
-%global short_name   commons-%{base_name}
-
-Name:           apache-%{short_name}
-Version:        2.2
-Release:        4%{?dist}
+Name:           apache-commons-net
+Version:        3.12.0
+Release:        %autorelease
 Summary:        Internet protocol suite Java library
-License:        ASL 2.0
-Group:          Development/Libraries
-URL:            http://commons.apache.org/%{base_name}/
-Source0:        http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
+License:        Apache-2.0
+URL:            https://commons.apache.org/proper/commons-net/
 BuildArch:      noarch
-BuildRequires:  jpackage-utils >= 0:1.7.2
-BuildRequires:  java-devel >= 1:1.6.0
-BuildRequires:  maven-doxia-sitetools
-BuildRequires:  maven-changes-plugin
-BuildRequires:  maven-surefire-provider-junit
-BuildRequires:  maven-surefire-provider-junit4
-BuildRequires:  maven-plugin-build-helper
-BuildRequires:  apache-commons-parent
+ExclusiveArch:  %{java_arches} noarch
 
-Requires:       java >= 1:1.6.0
-Requires:       jpackage-utils >= 0:1.7.2
+Source0:        https://archive.apache.org/dist/commons/net/source/commons-net-%{version}-src.tar.gz
+Source1:        https://downloads.apache.org/commons/net/source/commons-net-%{version}-src.tar.gz.asc
+Source2:        https://downloads.apache.org/commons/KEYS
 
-Provides:       jakarta-%{short_name} = 0:%{version}-%{release}
-Obsoletes:      jakarta-%{short_name} < 0:2.0-3
+BuildRequires:  maven-local-openjdk25
+BuildRequires:  mvn(commons-io:commons-io)
+BuildRequires:  mvn(org.apache.commons:commons-lang3)
+BuildRequires:  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.junit.jupiter:junit-jupiter-api)
+BuildRequires:  mvn(org.junit.jupiter:junit-jupiter-engine)
+BuildRequires:  mvn(org.junit.jupiter:junit-jupiter-params)
+BuildRequires:  mvn(org.junit.vintage:junit-vintage-engine)
+# for signature verification
+BuildRequires:  gnupg2
+# TODO Remove in Fedora 46
+Obsoletes:      %{name}-javadoc < 3.11.1-11
 
 %description
 This is an Internet protocol suite Java library originally developed by
@@ -33,94 +33,58 @@ NNTP, SMTP, and some miscellaneous protocols like Time and Echo as well
 as BSD R command support. The purpose of the library is to provide
 fundamental protocol access, not higher-level abstractions.
 
-%package javadoc
-Summary:    API documentation for %{name}
-Group:      Documentation
-Requires:   jpackage-utils
-
-Obsoletes:  jakarta-%{short_name}-javadoc < 0:2.0-3
-
-%description javadoc
-%{summary}.
-
 %prep
-%setup -q -n %{short_name}-%{version}-src
-sed -i 's/\r//' NOTICE.txt LICENSE.txt
+%autosetup -p1 -C
+%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
 
+%pom_remove_plugin :exec-maven-plugin
+
+# Fails with "Coverage checks have not been met."
+%pom_remove_plugin org.jacoco:jacoco-maven-plugin
+
+%pom_remove_dep org.apache.ftpserver:ftpserver-core
+
+# Disable tests that depends on commons-collections4 (not packaged yet)
+%pom_remove_dep :commons-collections4
+rm src/test/java/org/apache/commons/net/util/SubnetUtilsTest.java
+
+# Disable tests that rely on networking to be available and working.
+# Depending on host configuration, on different systems they fail with
+# errors such as "Connection timed out", "Address already in use",
+# "Temporary failure in name resolution" etc.
+rm \
+src/test/java/org/apache/commons/net/chargen/CharGenUDPClientTest.java \
+src/test/java/org/apache/commons/net/daytime/DaytimeTCPClientTest.java \
+src/test/java/org/apache/commons/net/daytime/DaytimeUDPClientTest.java \
+src/test/java/org/apache/commons/net/discard/DiscardUDPClientTest.java \
+src/test/java/org/apache/commons/net/echo/EchoUDPClientTest.java \
+src/test/java/org/apache/commons/net/ftp/AbstractFtpsTest.java \
+src/test/java/org/apache/commons/net/ftp/FTPClientTransferModeTest.java \
+src/test/java/org/apache/commons/net/ftp/FTPSClientTest.java \
+src/test/java/org/apache/commons/net/ftp/NoProtocolSslConfigurationProxy.java \
+src/test/java/org/apache/commons/net/tftp/TFTPAckPacketTest.java \
+src/test/java/org/apache/commons/net/tftp/TFTPDataPacketTest.java \
+src/test/java/org/apache/commons/net/tftp/TFTPErrorPacketTest.java \
+src/test/java/org/apache/commons/net/tftp/TFTPReadRequestPacketTest.java \
+src/test/java/org/apache/commons/net/tftp/TFTPRequestPacketTest.java \
+src/test/java/org/apache/commons/net/tftp/TFTPServerPathTest.java \
+src/test/java/org/apache/commons/net/tftp/TFTPTest.java \
+src/test/java/org/apache/commons/net/tftp/TFTPWriteRequestPacketTest.java \
+src/test/java/org/apache/commons/net/time/TimeTCPClientTest.java \
+src/test/java/org/apache/commons/net/time/TimeUDPClientTest.java \
+
+%mvn_file : commons-net %{name}
+%mvn_alias : org.apache.commons:commons-net
 
 %build
-export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mkdir -p $MAVEN_REPO_LOCAL
-# test.failure.ignore added because package would not build on koji
-# with TimeTCPClientTest failing
-mvn-rpmbuild -Dmaven.test.failure.ignore=true \
-    install javadoc:aggregate
+%mvn_build -j -- -Dcommons.osgi.symbolicName=org.apache.commons.net
 
 %install
-# jars
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -p -m 644 target/%{short_name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
-ln -s %{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{short_name}.jar
+%mvn_install
 
-
-# pom
-install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap JPP-%{name}.pom %{name}.jar -a "org.apache.commons:%{short_name}"
-
-# javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-
-%pre javadoc
-# workaround for rpm bug, can be removed in F-17
-[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
-rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
-
-%files
-%doc LICENSE.txt NOTICE.txt
-%{_javadir}/*
-%{_mavenpomdir}/JPP-%{name}.pom
-%{_mavendepmapfragdir}/%{name}
-
-%files javadoc
-%doc %{_javadocdir}/%{name}
-%doc LICENSE.txt NOTICE.txt
+%files -f .mfiles
+%doc README.md RELEASE-NOTES.txt
+%license LICENSE.txt NOTICE.txt
 
 %changelog
-* Thu Jan 12 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Thu Nov 24 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 2.2-3
-- Use maven 3 to build
-- Packaging fixes according to latest guidelines
-
-* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Fri Dec 10 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 2.2-1
-- Replace maven plugins with apache-commons-parent for BR
-- Versionless jars and javadocs
-- Rebase to latest upstream version
-
-* Thu Jul  8 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 2.0-6
-- Add license to javadoc subpackage
-
-* Thu May 20 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 2.0-5
-- Fix maven depmap JPP name to short_name
-
-* Wed May 19 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 2.0-4
-- Ignore test failure
-
-* Wed May 12 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 2.0-3
-- Rename jakarta-commons-net to apache-commons-net and drop EPOCH
-- Build with maven
-- Clean up whole spec
-
-* Thu Aug 13 2009 Alexander Kurtakov <akurtako@redhat.com> 0:2.0-2
-- Set maven.repo.local.
-
-* Thu Aug 13 2009 Alexander Kurtakov <akurtako@redhat.com> 0:2.0-1
-- Update to upstream 2.0.
-
+%autochangelog

changelog

@@ -0,0 +1,195 @@
+* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.11.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Thu Jun 20 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.11.0-3
+- Disable more network-reliant tests
+
+* Fri Jun 07 2024 Jonny Heggheim <hegjon@gmail.com> - 3.11.0-2
+- Verify the source tarball against the signature from upstream
+
+* Fri Jun 07 2024 Jonny Heggheim <hegjon@gmail.com> - 3.11.0-1
+- Update to upstream version 3.11.0
+
+* Tue Feb 27 2024 Jiri Vanek <jvanek@redhat.com> - 3.10.0-4
+- Rebuilt for java-21-openjdk as system jdk
+
+* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.10.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.10.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Mon Dec 18 2023 Marian Koncek <mkoncek@redhat.com> - 3.10.0-1
+- Update to upstream version 3.10.0
+
+* Fri Sep 01 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.9.0-2
+- Rebuild
+
+* Fri Aug 11 2023 Marian Koncek <mkoncek@redhat.com> - 3.9.0-1
+- Update to upstream version 3.9.0
+
+* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.8.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.8.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Wed Sep 07 2022 Marian Koncek <mkoncek@redhat.com> - 3.8.0-1
+- Update to upstream version 3.8.0
+
+* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.6-17
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 3.6-16
+- Rebuilt for java-17-openjdk as system jdk
+
+* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.6-15
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Tue Nov 02 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.6-14
+- Set explicit Java compiler source/target levels to 1.7
+
+* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.6-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Mon Jun 28 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.6-12
+- Remove build-dependency on exec-maven-plugin
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.6-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Wed Sep 30 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.6-6
+- Remove build-dependency on exec-maven-plugin
+
+* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.6-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 3.6-9
+- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
+
+* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.6-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.6-5
+- Mass rebuild for javapackages-tools 201902
+
+* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.6-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.6-4
+- Mass rebuild for javapackages-tools 201901
+
+* Thu Feb 07 2019 Mat Booth <mat.booth@redhat.com> - 3.6-6
+- Rebuild to regenerate OSGi metadata
+
+* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.6-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.6-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.6-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.6-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Tue Mar 28 2017 Michael Simacek <msimacek@redhat.com> - 3.6-1
+- Update to upstream version 3.6
+
+* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Thu May  5 2016 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.5-1
+- Update to upstream version 3.5
+
+* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 3.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Mon Jan  4 2016 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.4-2
+- Add workaround for suprious test failure (NET-586)
+
+* Fri Nov 27 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.4-1
+- Update to upstream version 3.4
+
+* Tue Aug 04 2015 Michael Simacek <msimacek@redhat.com> - 3.3-7
+- Disable failing test
+
+* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.3-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Tue Oct 14 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.3-5
+- Remove legacy Obsoletes/Provides for jakarta-commons
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.3-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Tue Mar 04 2014 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.3-3
+- Use Requires: java-headless rebuild (#1067528)
+
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Wed Jun 12 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.3-1
+- Update to upstream version 3.3
+
+* Wed Jun 05 2013 Michal Srb <msrb@redhat.com> - 3.2-5
+- Enable tests
+- Install README, RELEASE-NOTES.txt files
+- Fix BR
+
+* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Wed Feb 06 2013 Java SIG <java-devel@lists.fedoraproject.org> - 3.2-3
+- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild
+- Replace maven BuildRequires with maven-local
+
+* Wed Jan 16 2013 Michal Srb <msrb@redhat.com> - 3.2-2
+- Build with xmvn
+
+* Mon Dec  3 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.2-1
+- Update to upstream version 3.2
+
+* Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Tue Jun 19 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.1-1
+- Update to upstream 3.1
+- Remove RPM bug workaround
+- Remove BR on maven-changes-plugin
+
+* Thu Jan 12 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Thu Nov 24 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 2.2-3
+- Use maven 3 to build
+- Packaging fixes according to latest guidelines
+
+* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Fri Dec 10 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 2.2-1
+- Replace maven plugins with apache-commons-parent for BR
+- Versionless jars and javadocs
+- Rebase to latest upstream version
+
+* Thu Jul  8 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 2.0-6
+- Add license to javadoc subpackage
+
+* Thu May 20 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 2.0-5
+- Fix maven depmap JPP name to short_name
+
+* Wed May 19 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 2.0-4
+- Ignore test failure
+
+* Wed May 12 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 2.0-3
+- Rename jakarta-commons-net to apache-commons-net and drop EPOCH
+- Build with maven
+- Clean up whole spec
+
+* Thu Aug 13 2009 Alexander Kurtakov <akurtako@redhat.com> 0:2.0-2
+- Set maven.repo.local.
+
+* Thu Aug 13 2009 Alexander Kurtakov <akurtako@redhat.com> 0:2.0-1
+- Update to upstream 2.0.

ci.fmf

@@ -0,0 +1 @@
+resultsdb-testcase: separate

gating.yaml

@@ -0,0 +1,8 @@
+--- !Policy
+product_versions:
+  - fedora-*
+decision_contexts:
+  - bodhi_update_push_testing
+  - bodhi_update_push_stable
+rules:
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/javapackages.functional}

plans/javapackages.fmf

@@ -0,0 +1,7 @@
+summary: Run javapackages-specific tests
+discover:
+  how: fmf
+  url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git
+  ref: f43
+execute:
+  how: tmt

sources

@@ -1 +1,2 @@
-e52a248454857af78784dad1f5a94d87  commons-net-2.2-src.tar.gz
+SHA512 (commons-net-3.12.0-src.tar.gz) = f33da0d8f279a174e3c4eb4514a091a5ac74bd55067d6f230b268bab425fe92941f7322665c613ab2984c78dcc376cac5d665f966626108dd70604ffe682d149
+SHA512 (commons-net-3.12.0-src.tar.gz.asc) = c2605f71ff721b2c6fa964a565c5d34129392e5c95e81b77eb83366082e99768913e99581f0a04f65310c9a9dfe47a5aae17bdb8ede07c6eb101c6582058f461