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 +1,9 @@
 /commons-cli-1.2-src.tar.gz
+/commons-cli-1.3-src.tar.gz
+/commons-cli-1.3.1-src.tar.gz
+/commons-cli-1.4-src.tar.gz
+/commons-cli-1.5.0-src.tar.gz
+/commons-cli-1.6.0-src.tar.gz
+/commons-cli-1.8.0-src.tar.gz
+/commons-cli-1.9.0-src.tar.gz
+/commons-cli-1.10.0-src.tar.gz

0001-Port-tests-to-commons-lang3.patch

@@ -0,0 +1,67 @@
+From 92fcda0792a631eebef413a6608bd9c91794158d Mon Sep 17 00:00:00 2001
+From: Mikolaj Izdebski <mizdebsk@redhat.com>
+Date: Fri, 10 Oct 2025 16:50:15 +0200
+Subject: [PATCH] Port tests to commons-lang3
+
+We want to avoid dependency on commons-text for now.
+---
+ pom.xml                                                     | 4 ++--
+ .../org/apache/commons/cli/example/AptHelpAppendable.java   | 6 +++---
+ .../org/apache/commons/cli/example/XhtmlHelpAppendable.java | 2 +-
+ 3 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/pom.xml b/pom.xml
+index 2663f3f..95ac48c 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -69,8 +69,8 @@
+     </dependency>
+     <dependency>
+       <groupId>org.apache.commons</groupId>
+-      <artifactId>commons-text</artifactId>
+-      <version>1.14.0</version>
++      <artifactId>commons-lang3</artifactId>
++      <version>3.18.0</version>
+       <scope>test</scope>
+     </dependency>
+     <dependency>
+diff --git a/src/test/java/org/apache/commons/cli/example/AptHelpAppendable.java b/src/test/java/org/apache/commons/cli/example/AptHelpAppendable.java
+index cbedfe2..7e275c1 100644
+--- a/src/test/java/org/apache/commons/cli/example/AptHelpAppendable.java
++++ b/src/test/java/org/apache/commons/cli/example/AptHelpAppendable.java
+@@ -25,8 +25,8 @@ import org.apache.commons.cli.help.FilterHelpAppendable;
+ import org.apache.commons.cli.help.TableDefinition;
+ import org.apache.commons.cli.help.TextStyle;
+ import org.apache.commons.lang3.StringUtils;
+-import org.apache.commons.text.translate.CharSequenceTranslator;
+-import org.apache.commons.text.translate.LookupTranslator;
++import org.apache.commons.lang3.text.translate.CharSequenceTranslator;
++import org.apache.commons.lang3.text.translate.LookupTranslator;
+ 
+ /**
+  * Appends APT formatted text to an {@link Appendable}.
+@@ -45,7 +45,7 @@ public class AptHelpAppendable extends FilterHelpAppendable {
+         escapeAptMap.put("*", "\\*");
+         escapeAptMap.put("+", "\\+");
+         escapeAptMap.put("|", "\\|");
+-        ESCAPE_APT = new LookupTranslator(escapeAptMap);
++        ESCAPE_APT = new LookupTranslator(escapeAptMap.entrySet().stream().map(e -> new CharSequence[]{ e.getKey(), e.getValue() }).toArray(CharSequence[][]::new));
+     }
+ 
+     /**
+diff --git a/src/test/java/org/apache/commons/cli/example/XhtmlHelpAppendable.java b/src/test/java/org/apache/commons/cli/example/XhtmlHelpAppendable.java
+index 51ae058..ee6f2b3 100644
+--- a/src/test/java/org/apache/commons/cli/example/XhtmlHelpAppendable.java
++++ b/src/test/java/org/apache/commons/cli/example/XhtmlHelpAppendable.java
+@@ -24,7 +24,7 @@ import java.util.Objects;
+ import org.apache.commons.cli.help.FilterHelpAppendable;
+ import org.apache.commons.cli.help.TableDefinition;
+ import org.apache.commons.lang3.StringUtils;
+-import org.apache.commons.text.StringEscapeUtils;
++import org.apache.commons.lang3.StringEscapeUtils;
+ 
+ /**
+  * Appends XHTML formatted text to an {@link Appendable}.
+-- 
+2.51.0
+

apache-commons-cli.spec

@@ -1,93 +1,53 @@
-%global base_name       cli
-%global short_name      commons-%{base_name}
+%bcond_with bootstrap
 
-Name:             apache-%{short_name}
-Version:          1.2
-Release:          7%{?dist}
-Summary:          Command Line Interface Library for Java
-Group:            Development/Libraries
-License:          ASL 2.0
-URL:              http://commons.apache.org/%{base_name}/
-Source0:          http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
-BuildArch:        noarch
+Name:           apache-commons-cli
+Version:        1.10.0
+Release:        %autorelease
+Summary:        Command Line Interface Library for Java
+License:        Apache-2.0
+URL:            https://commons.apache.org/proper/commons-cli/
+BuildArch:      noarch
+ExclusiveArch:  %{java_arches} noarch
 
-BuildRequires:    java-devel >= 1:1.6.0
-BuildRequires:    jpackage-utils
-BuildRequires:    apache-commons-parent
+Source0:        https://www.apache.org/dist/commons/cli/source/commons-cli-%{version}-src.tar.gz
 
-Requires:         java >= 1:1.6.0
-Requires:         jpackage-utils
+Patch:          0001-Port-tests-to-commons-lang3.patch
 
-# This should go away with F-17
-Provides:         jakarta-%{short_name} = 0:%{version}-%{release}
-Obsoletes:        jakarta-%{short_name} < 0:1.1-6
+%if %{with bootstrap}
+BuildRequires:  javapackages-bootstrap
+%else
+BuildRequires:  maven-local-openjdk25
+BuildRequires:  mvn(commons-io:commons-io)
+BuildRequires:  mvn(org.apache.commons:commons-parent:pom:)
+BuildRequires:  mvn(org.apache.maven.plugins:maven-antrun-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.mockito:mockito-core)
+%endif
+# TODO Remove in Fedora 46
+Obsoletes:      %{name}-javadoc < 1.9.0-7
 
 %description
-The CLI library provides a simple and easy to use API for working with the 
+The CLI library provides a simple and easy to use API for working with the
 command line arguments and options.
 
-%package javadoc
-Summary:          Javadoc for %{name}
-Group:            Documentation
-Requires:         jpackage-utils
-# This should go away with F-17
-Obsoletes:        jakarta-%{short_name}-javadoc < 0:1.1-6
-
-%description javadoc
-This package contains the API documentation for %{name}.
-
 %prep
-%setup -q -n %{short_name}-%{version}-src
+%autosetup -p1 -C
+
+# Compatibility links
+%mvn_alias : org.apache.commons:commons-cli
+%mvn_file : commons-cli %{name}
 
 %build
-mvn-rpmbuild install javadoc:javadoc
+%mvn_build -j
 
 %install
-# jars
-install -d -m 0755 %{buildroot}%{_javadir}
-install -pm 644 target/%{short_name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
-(cd %{buildroot}%{_javadir} && for jar in *%{name}*; do ln -sf ${jar} `echo $jar| sed  "s|apache-||g"`; done)
-
-# pom
-install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap JPP-%{name}.pom %{name}.jar -a "%{short_name}:%{short_name}"
-
-# javadoc
-install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
-cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
-
-%files
-%doc LICENSE.txt NOTICE.txt README.txt RELEASE-NOTES.txt
-%{_javadir}/*
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
-
-%files javadoc
-%doc LICENSE.txt
-%{_javadocdir}/%{name}
+%mvn_install
 
+%files -f .mfiles
+%license LICENSE.txt NOTICE.txt
+%doc README.md RELEASE-NOTES.txt
 
 %changelog
-* Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Thu Jan 12 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Wed Nov 30 2011 Alexander Kurtakov <akurtako@redhat.com> 1.2-5
-- Build with maven 3.
-- Adapt to current guidelines.
-
-* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Tue Nov 9 2010 Chris Spike <chris.spike@arcor.de> 1.2-3
-- Removed maven* BRs in favour of apache-commons-parent
-- Added deprecated groupId to depmap for compatibility reasons
-
-* Mon Oct 18 2010 Chris Spike <chris.spike@arcor.de> 1.2-2
-- Removed Epoch
-
-* Sun Oct 3 2010 Chris Spike <chris.spike@arcor.de> 1.2-1
-- Rename and rebase from jakarta-commons-cli
+%autochangelog

changelog

@@ -0,0 +1,162 @@
+* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Tue Jul 16 2024 Marian Koncek <mkoncek@redhat.com> - 1.8.0-1
+- Update to upstream version 1.8.0
+
+* Tue Feb 27 2024 Jiri Vanek <jvanek@redhat.com> - 1.6.0-5
+- Rebuilt for java-21-openjdk as system jdk
+
+* Fri Feb 23 2024 Jiri Vanek <jvanek@redhat.com> - 1.6.0-4
+- bump of release for for java-21-openjdk as system jdk
+
+* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Mon Dec 04 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.6.0-1
+- Update to upstream version 1.6.0
+
+* Wed Sep 20 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.5.0-8
+- Rebuild to regenerate auto-Requires on java
+
+* Fri Sep 01 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.5.0-7
+- Convert License tag to SPDX format
+
+* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.0-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 1.5.0-3
+- Rebuilt for java-17-openjdk as system jdk
+
+* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Thu Nov 4 2021 Christian Schuermann <spike@fedoraproject.org> 1.5.0-1
+- Update to upstream version 1.5.0
+
+* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.4-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.4-13
+- Bootstrap build
+- Non-bootstrap build
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.4-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.4-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 1.4-10
+- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
+
+* Wed Jun 24 2020 Alexander Kurtakov <akurtako@redhat.com> 1.4-9
+- Fix build with Java 11
+
+* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.4-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Sat Jan 25 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.4-7
+- Build with OpenJDK 8
+
+* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.4-6
+- Mass rebuild for javapackages-tools 201902
+
+* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.4-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.4-5
+- Mass rebuild for javapackages-tools 201901
+
+* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.4-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.4-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.4-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Mon Jan 29 2018 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.4-3
+- Cleanup spec file
+
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Tue Apr 11 2017 Michael Simacek <msimacek@redhat.com> - 1.4-1
+- Update to upstream version 1.4
+
+* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.1-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Wed Feb 01 2017 Michael Simacek <msimacek@redhat.com> - 1.3.1-5
+- Remove BR on jacoco
+
+* Wed Jun 15 2016 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.3.1-4
+- Regenerate build-requires
+
+* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Tue Jun 23 2015 Michal Srb <msrb@redhat.com> - 1.3.1-2
+- Add workaround for CLI-253
+
+* Wed Jun 17 2015 Michal Srb <msrb@redhat.com> - 1.3.1-1
+- Update to upstream version 1.3.1
+
+* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Wed Jun  3 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.3-1
+- Update to upstream version 1.3
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Tue Mar 04 2014 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.2-12
+- Use Requires: java-headless rebuild (#1067528)
+
+* Mon Aug 05 2013 Mat Booth <fedora@matbooth.co.uk> - 1.2-11
+- Update for newer guidelines
+- Drop ancient obsoletes/provides on old jakarta name
+
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Tue Feb 19 2013 Mat Booth <fedora@matbooth.co.uk> - 1.2-9
+- Add missing maven-local BuildRequires
+
+* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Thu Jan 12 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Wed Nov 30 2011 Alexander Kurtakov <akurtako@redhat.com> 1.2-5
+- Build with maven 3.
+- Adapt to current guidelines.
+
+* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Tue Nov 9 2010 Chris Spike <chris.spike@arcor.de> 1.2-3
+- Removed maven* BRs in favour of apache-commons-parent
+- Added deprecated groupId to depmap for compatibility reasons
+
+* Mon Oct 18 2010 Chris Spike <chris.spike@arcor.de> 1.2-2
+- Removed Epoch
+
+* Sun Oct 3 2010 Chris Spike <chris.spike@arcor.de> 1.2-1
+- Rename and rebase from jakarta-commons-cli

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 @@
-ee486a89570648bcca0a2a4a7e95fcaf  commons-cli-1.2-src.tar.gz
+SHA512 (commons-cli-1.10.0-src.tar.gz) = 245951919a88068f692fc4cab906cb210bbefd853d851167d5c34fd4aebab7370766458033c47cf8174d7a409c4364752770b573252d19746cbb9a0e2c8c255b