From 7f93d3082029e695fb65dd78efc5763f2c71e23e Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 3 Mar 2025 11:57:13 +0100 Subject: [PATCH 1/8] Remove javadoc subpackage --- apache-commons-cli.spec | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/apache-commons-cli.spec b/apache-commons-cli.spec index 155b077..7c0dc7a 100644 --- a/apache-commons-cli.spec +++ b/apache-commons-cli.spec @@ -23,17 +23,13 @@ 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 command line arguments and options. -%package javadoc -Summary: API documentation for %{name} - -%description javadoc -API documentation for %{name}. - %prep %autosetup -p1 -C @@ -42,7 +38,7 @@ API documentation for %{name}. %mvn_file : commons-cli %{name} %build -%mvn_build +%mvn_build -j %install %mvn_install @@ -51,7 +47,5 @@ API documentation for %{name}. %license LICENSE.txt NOTICE.txt %doc README.md RELEASE-NOTES.txt -%files javadoc -f .mfiles-javadoc - %changelog %autochangelog From a05ce65ef673f2b57bf4eb8131c1d79fcc95771d Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 26 Mar 2025 08:43:18 +0100 Subject: [PATCH 2/8] Switch to javapackages tests from CentOS Stream GitLab --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index 86bfcea..e39d47c 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -1,7 +1,7 @@ summary: Run javapackages-specific tests discover: how: fmf - url: https://src.fedoraproject.org/tests/javapackages + url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git ref: f42 execute: how: tmt From 3cddc8dbdd9cc3f3d13b886ea621b18f7dabd718 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 22 May 2025 13:35:31 +0200 Subject: [PATCH 3/8] Switch javapackages test plan to f43 ref --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index e39d47c..ae17c0c 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -2,6 +2,6 @@ summary: Run javapackages-specific tests discover: how: fmf url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git - ref: f42 + ref: f43 execute: how: tmt From 194e595e350aa455101d879aa703da313ff4d876 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sun, 13 Jul 2025 09:22:51 +0200 Subject: [PATCH 4/8] Build with OpenJDK 25 --- apache-commons-cli.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apache-commons-cli.spec b/apache-commons-cli.spec index 7c0dc7a..a0a366a 100644 --- a/apache-commons-cli.spec +++ b/apache-commons-cli.spec @@ -14,7 +14,7 @@ Source0: https://www.apache.org/dist/commons/cli/source/commons-cli-%{ver %if %{with bootstrap} BuildRequires: javapackages-bootstrap %else -BuildRequires: maven-local +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) From b77f92e4d024bbea5237335679f5fa45700713e8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 17:05:12 +0000 Subject: [PATCH 5/8] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 45da626305dcb02e6f31b9d62e405f6c3ac1cc53 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Tue, 29 Jul 2025 19:00:47 +0200 Subject: [PATCH 6/8] Rebuilt for java-25-openjdk as preffered jdk 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. From e42d8406c93c61a22edfbb99fa376609faf5baf1 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 10 Oct 2025 15:33:55 +0200 Subject: [PATCH 7/8] Update to upstream version 1.10.0 --- .gitignore | 1 + 0001-Port-tests-to-commons-lang3.patch | 67 ++++++++++++++++++++++++++ apache-commons-cli.spec | 4 +- sources | 2 +- 4 files changed, 72 insertions(+), 2 deletions(-) create mode 100644 0001-Port-tests-to-commons-lang3.patch diff --git a/.gitignore b/.gitignore index 9c9dd53..6fc0a6d 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /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 diff --git a/0001-Port-tests-to-commons-lang3.patch b/0001-Port-tests-to-commons-lang3.patch new file mode 100644 index 0000000..4096341 --- /dev/null +++ b/0001-Port-tests-to-commons-lang3.patch @@ -0,0 +1,67 @@ +From 92fcda0792a631eebef413a6608bd9c91794158d Mon Sep 17 00:00:00 2001 +From: Mikolaj Izdebski +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 @@ + + + org.apache.commons +- commons-text +- 1.14.0 ++ commons-lang3 ++ 3.18.0 + test + + +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 + diff --git a/apache-commons-cli.spec b/apache-commons-cli.spec index a0a366a..27c557e 100644 --- a/apache-commons-cli.spec +++ b/apache-commons-cli.spec @@ -1,7 +1,7 @@ %bcond_with bootstrap Name: apache-commons-cli -Version: 1.9.0 +Version: 1.10.0 Release: %autorelease Summary: Command Line Interface Library for Java License: Apache-2.0 @@ -11,6 +11,8 @@ ExclusiveArch: %{java_arches} noarch Source0: https://www.apache.org/dist/commons/cli/source/commons-cli-%{version}-src.tar.gz +Patch: 0001-Port-tests-to-commons-lang3.patch + %if %{with bootstrap} BuildRequires: javapackages-bootstrap %else diff --git a/sources b/sources index ee08b7f..fc2fa2d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (commons-cli-1.9.0-src.tar.gz) = d20df809e8e0ebed79c57af9c9b447b0068347ba0edfcdec3652cb00bd9575b24fc77093d735e827d9d02a6fe2681bf239fd01df5f7c682ae34ade0781c53e35 +SHA512 (commons-cli-1.10.0-src.tar.gz) = 245951919a88068f692fc4cab906cb210bbefd853d851167d5c34fd4aebab7370766458033c47cf8174d7a409c4364752770b573252d19746cbb9a0e2c8c255b From 5b25f257f7b9464c0aaa486a9921eca974713cc6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 16 Jan 2026 03:46:23 +0000 Subject: [PATCH 8/8] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild