From e567ea8167823eca1e517a800ea9da0333010d2d Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 24 May 2019 17:00:15 +0200 Subject: [PATCH 01/51] Mass rebuild for javapackages-tools 201901 --- apache-commons-cli.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-cli.spec b/apache-commons-cli.spec index 1e48468..480e9b6 100644 --- a/apache-commons-cli.spec +++ b/apache-commons-cli.spec @@ -1,6 +1,6 @@ Name: apache-commons-cli Version: 1.4 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Command Line Interface Library for Java License: ASL 2.0 URL: http://commons.apache.org/cli/ @@ -40,6 +40,9 @@ command line arguments and options. %doc README.md RELEASE-NOTES.txt %changelog +* Fri May 24 2019 Mikolaj Izdebski - 1.4-5 +- Mass rebuild for javapackages-tools 201901 + * Wed Feb 07 2018 Fedora Release Engineering - 1.4-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 096e2e59ee6cf0718908357ce728c111f12789fa Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 25 Jun 2019 08:51:39 +0200 Subject: [PATCH 02/51] Declare module package --- apache-commons-cli.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apache-commons-cli.spec b/apache-commons-cli.spec index 480e9b6..7c4cb2d 100644 --- a/apache-commons-cli.spec +++ b/apache-commons-cli.spec @@ -20,6 +20,7 @@ BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin) The CLI library provides a simple and easy to use API for working with the command line arguments and options. +%{?module_package} %{?javadoc_package} %prep @@ -35,7 +36,7 @@ command line arguments and options. %install %mvn_install -%files -f .mfiles +%files -n %{?module_prefix}%{name} -f .mfiles %license LICENSE.txt NOTICE.txt %doc README.md RELEASE-NOTES.txt From c3c13620f6000e5d2a28f7dc1b1020652462b2fa Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 25 Jun 2019 09:07:22 +0200 Subject: [PATCH 03/51] Use standard artifact installation location --- apache-commons-cli.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/apache-commons-cli.spec b/apache-commons-cli.spec index 7c4cb2d..a5b03c6 100644 --- a/apache-commons-cli.spec +++ b/apache-commons-cli.spec @@ -28,7 +28,6 @@ command line arguments and options. # Compatibility links %mvn_alias : org.apache.commons:commons-cli -%mvn_file : commons-cli %{name} %build %mvn_build From 72761cf855700c3f37160ccb2a697d96b8c1e4ce Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 27 Jun 2019 14:35:48 +0200 Subject: [PATCH 04/51] Revert "Use standard artifact installation location" This reverts commit c3c13620f6000e5d2a28f7dc1b1020652462b2fa. --- apache-commons-cli.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/apache-commons-cli.spec b/apache-commons-cli.spec index a5b03c6..7c4cb2d 100644 --- a/apache-commons-cli.spec +++ b/apache-commons-cli.spec @@ -28,6 +28,7 @@ command line arguments and options. # Compatibility links %mvn_alias : org.apache.commons:commons-cli +%mvn_file : commons-cli %{name} %build %mvn_build From e1d390a51317a018433ffb3009a25739a9d77c08 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 25 Oct 2019 18:49:09 +0200 Subject: [PATCH 05/51] Set compiler source/target to 1.6 --- 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 7c4cb2d..bcfdf25 100644 --- a/apache-commons-cli.spec +++ b/apache-commons-cli.spec @@ -31,7 +31,7 @@ command line arguments and options. %mvn_file : commons-cli %{name} %build -%mvn_build +%mvn_build -- -Dmaven.compiler.source=1.6 -Dmaven.compiler.target=1.6 %install %mvn_install From fa0d78c14cb5fc231b8241471d550421f7cc59a1 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 5 Nov 2019 17:29:27 +0100 Subject: [PATCH 06/51] Mass rebuild for javapackages-tools 201902 --- apache-commons-cli.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-cli.spec b/apache-commons-cli.spec index bcfdf25..bbd53bb 100644 --- a/apache-commons-cli.spec +++ b/apache-commons-cli.spec @@ -1,6 +1,6 @@ Name: apache-commons-cli Version: 1.4 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Command Line Interface Library for Java License: ASL 2.0 URL: http://commons.apache.org/cli/ @@ -41,6 +41,9 @@ command line arguments and options. %doc README.md RELEASE-NOTES.txt %changelog +* Tue Nov 05 2019 Mikolaj Izdebski - 1.4-6 +- Mass rebuild for javapackages-tools 201902 + * Fri May 24 2019 Mikolaj Izdebski - 1.4-5 - Mass rebuild for javapackages-tools 201901 From 33695bf26728e1db6b810d51a57751d4883c665b Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sat, 25 Jan 2020 14:40:08 +0100 Subject: [PATCH 07/51] Build with OpenJDK 8 --- apache-commons-cli.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/apache-commons-cli.spec b/apache-commons-cli.spec index bbd53bb..28e30fe 100644 --- a/apache-commons-cli.spec +++ b/apache-commons-cli.spec @@ -1,6 +1,6 @@ Name: apache-commons-cli Version: 1.4 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Command Line Interface Library for Java License: ASL 2.0 URL: http://commons.apache.org/cli/ @@ -11,7 +11,7 @@ Source0: http://www.apache.org/dist/commons/cli/source/commons-cli-%{vers # workaround for https://issues.apache.org/jira/browse/CLI-253 Patch0: CLI-253-workaround.patch -BuildRequires: maven-local +BuildRequires: maven-local-openjdk8 BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.commons:commons-parent:pom:) BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin) @@ -41,6 +41,9 @@ command line arguments and options. %doc README.md RELEASE-NOTES.txt %changelog +* Sat Jan 25 2020 Mikolaj Izdebski - 1.4-7 +- Build with OpenJDK 8 + * Tue Nov 05 2019 Mikolaj Izdebski - 1.4-6 - Mass rebuild for javapackages-tools 201902 From a2bbcd2af36205854b808baded1f29a0497301cc Mon Sep 17 00:00:00 2001 From: Alexander Kurtakov Date: Wed, 24 Jun 2020 23:06:02 +0300 Subject: [PATCH 08/51] Fix build with Java 11 --- apache-commons-cli.spec | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/apache-commons-cli.spec b/apache-commons-cli.spec index 70055ce..267159b 100644 --- a/apache-commons-cli.spec +++ b/apache-commons-cli.spec @@ -1,6 +1,6 @@ Name: apache-commons-cli Version: 1.4 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Command Line Interface Library for Java License: ASL 2.0 URL: http://commons.apache.org/cli/ @@ -29,8 +29,14 @@ command line arguments and options. %mvn_alias : org.apache.commons:commons-cli %mvn_file : commons-cli %{name} +# Fix javadoc generation on java 11 +%pom_xpath_inject pom:pluginManagement/pom:plugins " +maven-javadoc-plugin +1.6 +" + %build -%mvn_build +%mvn_build -- -Dmaven.compiler.source=1.6 -Dmaven.compiler.target=1.6 %install %mvn_install @@ -40,6 +46,9 @@ command line arguments and options. %doc README.md RELEASE-NOTES.txt %changelog +* Wed Jun 24 2020 Alexander Kurtakov 1.4-9 +- Fix build with Java 11 + * Tue Jan 28 2020 Fedora Release Engineering - 1.4-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From afa2b50de369cf75b90428ccfddf417938ba4d32 Mon Sep 17 00:00:00 2001 From: Jiri Date: Fri, 10 Jul 2020 14:43:50 +0200 Subject: [PATCH 09/51] Rebuilt for JDK-11 --- apache-commons-cli.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-cli.spec b/apache-commons-cli.spec index 267159b..d14b398 100644 --- a/apache-commons-cli.spec +++ b/apache-commons-cli.spec @@ -1,6 +1,6 @@ Name: apache-commons-cli Version: 1.4 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Command Line Interface Library for Java License: ASL 2.0 URL: http://commons.apache.org/cli/ @@ -46,6 +46,9 @@ command line arguments and options. %doc README.md RELEASE-NOTES.txt %changelog +* Fri Jul 10 2020 Jiri Vanek - 1.4-10 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + * Wed Jun 24 2020 Alexander Kurtakov 1.4-9 - Fix build with Java 11 From 6f8e9f63c7a2b527af60f40b94607e8a63307b6e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 12:09:09 +0000 Subject: [PATCH 10/51] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apache-commons-cli.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-cli.spec b/apache-commons-cli.spec index d14b398..8783b3d 100644 --- a/apache-commons-cli.spec +++ b/apache-commons-cli.spec @@ -1,6 +1,6 @@ Name: apache-commons-cli Version: 1.4 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Command Line Interface Library for Java License: ASL 2.0 URL: http://commons.apache.org/cli/ @@ -46,6 +46,9 @@ command line arguments and options. %doc README.md RELEASE-NOTES.txt %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 1.4-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Fri Jul 10 2020 Jiri Vanek - 1.4-10 - Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 From f0db60e19a5e82396662960e71517d305b25cdf5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 00:13:04 +0000 Subject: [PATCH 11/51] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apache-commons-cli.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-cli.spec b/apache-commons-cli.spec index 8783b3d..b03f118 100644 --- a/apache-commons-cli.spec +++ b/apache-commons-cli.spec @@ -1,6 +1,6 @@ Name: apache-commons-cli Version: 1.4 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Command Line Interface Library for Java License: ASL 2.0 URL: http://commons.apache.org/cli/ @@ -46,6 +46,9 @@ command line arguments and options. %doc README.md RELEASE-NOTES.txt %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 1.4-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Mon Jul 27 2020 Fedora Release Engineering - 1.4-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From f64eb123befe4512fbbef5e84d7407064eb2e562 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 16 Apr 2021 15:33:12 +0200 Subject: [PATCH 12/51] Conditionalize buildrequires in bootstrap mode --- apache-commons-cli.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/apache-commons-cli.spec b/apache-commons-cli.spec index 28e30fe..b616228 100644 --- a/apache-commons-cli.spec +++ b/apache-commons-cli.spec @@ -1,3 +1,5 @@ +%bcond_without bootstrap + Name: apache-commons-cli Version: 1.4 Release: 7%{?dist} @@ -12,9 +14,13 @@ Source0: http://www.apache.org/dist/commons/cli/source/commons-cli-%{vers Patch0: CLI-253-workaround.patch BuildRequires: maven-local-openjdk8 +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.commons:commons-parent:pom:) BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin) +%endif %description The CLI library provides a simple and easy to use API for working with the From 765f69e2732c4b0b7aaa5c0c6e935964f308f8d9 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 13 May 2021 19:08:42 +0200 Subject: [PATCH 13/51] Turn off bootstrap mode by default --- 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 bc69587..cb15fbb 100644 --- a/apache-commons-cli.spec +++ b/apache-commons-cli.spec @@ -1,4 +1,4 @@ -%bcond_without bootstrap +%bcond_with bootstrap Name: apache-commons-cli Version: 1.4 From 0e21777a2bf052918c9d43088df11486d87a5d54 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 17 May 2021 15:49:24 +0200 Subject: [PATCH 14/51] Bootstrap build --- apache-commons-cli.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/apache-commons-cli.spec b/apache-commons-cli.spec index cb15fbb..299f6a9 100644 --- a/apache-commons-cli.spec +++ b/apache-commons-cli.spec @@ -1,8 +1,8 @@ -%bcond_with bootstrap +%bcond_without bootstrap Name: apache-commons-cli Version: 1.4 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Command Line Interface Library for Java License: ASL 2.0 URL: http://commons.apache.org/cli/ @@ -46,6 +46,9 @@ command line arguments and options. %doc README.md RELEASE-NOTES.txt %changelog +* Mon May 17 2021 Mikolaj Izdebski - 1.4-13 +- Bootstrap build + * Tue Jan 26 2021 Fedora Release Engineering - 1.4-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 7f585ef4fd20ab4390cb15ffb775842c213ab486 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 17 May 2021 18:01:40 +0200 Subject: [PATCH 15/51] Non-bootstrap build --- apache-commons-cli.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apache-commons-cli.spec b/apache-commons-cli.spec index 299f6a9..162fa5b 100644 --- a/apache-commons-cli.spec +++ b/apache-commons-cli.spec @@ -1,4 +1,4 @@ -%bcond_without bootstrap +%bcond_with bootstrap Name: apache-commons-cli Version: 1.4 @@ -48,6 +48,7 @@ command line arguments and options. %changelog * Mon May 17 2021 Mikolaj Izdebski - 1.4-13 - Bootstrap build +- Non-bootstrap build * Tue Jan 26 2021 Fedora Release Engineering - 1.4-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From de490694981e881c53a91ab0329935dd75d4175d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 12:45:52 +0000 Subject: [PATCH 16/51] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering From d205f1dd61702ed16e3c197d94c038f1c8e813c9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 17:41:48 +0000 Subject: [PATCH 17/51] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apache-commons-cli.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-cli.spec b/apache-commons-cli.spec index 162fa5b..49d1513 100644 --- a/apache-commons-cli.spec +++ b/apache-commons-cli.spec @@ -2,7 +2,7 @@ Name: apache-commons-cli Version: 1.4 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Command Line Interface Library for Java License: ASL 2.0 URL: http://commons.apache.org/cli/ @@ -46,6 +46,9 @@ command line arguments and options. %doc README.md RELEASE-NOTES.txt %changelog +* Wed Jul 21 2021 Fedora Release Engineering - 1.4-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Mon May 17 2021 Mikolaj Izdebski - 1.4-13 - Bootstrap build - Non-bootstrap build From 6fa7552d275d66cdd71ae4e30ba75643d6c0f34b Mon Sep 17 00:00:00 2001 From: spike Date: Thu, 4 Nov 2021 11:18:13 +0100 Subject: [PATCH 18/51] Update to upstream version 1.5.0 --- .gitignore | 1 + CLI-253-workaround.patch | 96 ---------------------------------------- apache-commons-cli.spec | 15 +++---- sources | 2 +- 4 files changed, 9 insertions(+), 105 deletions(-) delete mode 100644 CLI-253-workaround.patch diff --git a/.gitignore b/.gitignore index e77d52a..05ae819 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /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 diff --git a/CLI-253-workaround.patch b/CLI-253-workaround.patch deleted file mode 100644 index 798c5a4..0000000 --- a/CLI-253-workaround.patch +++ /dev/null @@ -1,96 +0,0 @@ -commit 77218790904f40395304669f5d79740f459c0a90 (HEAD -> cli-253, origin/cli-253) -Author: Michal Srb -AuthorDate: Mon Jun 22 15:01:30 2015 +0200 -Commit: Michal Srb -CommitDate: Mon Jun 22 15:04:05 2015 +0200 - - [CLI-253] Prevent "Unrecognized option: --null" when handling long opts in PosixParser - -diff --git a/src/main/java/org/apache/commons/cli/Options.java b/src/main/java/org/apache/commons/cli/Options.java -index 0ee4eea..1c38194 100644 ---- a/src/main/java/org/apache/commons/cli/Options.java -+++ b/src/main/java/org/apache/commons/cli/Options.java -@@ -224,6 +224,20 @@ public class Options implements Serializable - } - - /** -+ * Retrieve the {@link Option} matching the long name specified. -+ * The leading hyphens in the name are ignored (up to 2). -+ * -+ * @param opt long name of the {@link Option} -+ * @return the option represented by opt -+ */ -+ Option getLongOption(String opt) -+ { -+ opt = Util.stripLeadingHyphens(opt); -+ -+ return longOpts.get(opt); -+ } -+ -+ /** - * Returns the options with a long name starting with the name specified. - * - * @param opt the partial name of the option -diff --git a/src/main/java/org/apache/commons/cli/PosixParser.java b/src/main/java/org/apache/commons/cli/PosixParser.java -index c13a65e..14d2936 100644 ---- a/src/main/java/org/apache/commons/cli/PosixParser.java -+++ b/src/main/java/org/apache/commons/cli/PosixParser.java -@@ -131,7 +131,7 @@ public class PosixParser extends Parser - } - else - { -- currentOption = options.getOption(matchingOpts.get(0)); -+ currentOption = options.getLongOption(matchingOpts.get(0)); - - tokens.add("--" + currentOption.getLongOpt()); - if (pos != -1) -diff --git a/src/test/java/org/apache/commons/cli/bug/BugCLI253Test.java b/src/test/java/org/apache/commons/cli/bug/BugCLI253Test.java -new file mode 100644 -index 0000000..e37b7bc ---- /dev/null -+++ b/src/test/java/org/apache/commons/cli/bug/BugCLI253Test.java -@@ -0,0 +1,44 @@ -+/* -+ * Licensed to the Apache Software Foundation (ASF) under one or more -+ * contributor license agreements. See the NOTICE file distributed with -+ * this work for additional information regarding copyright ownership. -+ * The ASF licenses this file to You under the Apache License, Version 2.0 -+ * (the "License"); you may not use this file except in compliance with -+ * the License. You may obtain a copy of the License at -+ * -+ * http://www.apache.org/licenses/LICENSE-2.0 -+ * -+ * Unless required by applicable law or agreed to in writing, software -+ * distributed under the License is distributed on an "AS IS" BASIS, -+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+ * See the License for the specific language governing permissions and -+ * limitations under the License. -+ */ -+ -+package org.apache.commons.cli.bug; -+ -+import static org.junit.Assert.assertTrue; -+ -+import org.apache.commons.cli.CommandLine; -+import org.apache.commons.cli.Option; -+import org.apache.commons.cli.Options; -+import org.apache.commons.cli.ParseException; -+import org.apache.commons.cli.PosixParser; -+import org.junit.Test; -+ -+@SuppressWarnings("deprecation") // tests some deprecated classes -+public class BugCLI253Test { -+ -+ @Test -+ public void testGroovyUseCase() throws ParseException { -+ CommandLine cli = new PosixParser().parse(getOptions(), new String[] { "--classpath" }); -+ assertTrue(cli.hasOption("--classpath")); -+ } -+ -+ private Options getOptions() { -+ Options options = new Options(); -+ options.addOption(Option.builder("classpath").build()); -+ options.addOption(Option.builder("cp").longOpt("classpath").build()); -+ return options; -+ } -+} diff --git a/apache-commons-cli.spec b/apache-commons-cli.spec index 49d1513..3fdaaa5 100644 --- a/apache-commons-cli.spec +++ b/apache-commons-cli.spec @@ -1,8 +1,8 @@ %bcond_with bootstrap Name: apache-commons-cli -Version: 1.4 -Release: 14%{?dist} +Version: 1.5.0 +Release: 1%{?dist} Summary: Command Line Interface Library for Java License: ASL 2.0 URL: http://commons.apache.org/cli/ @@ -10,16 +10,12 @@ BuildArch: noarch Source0: http://www.apache.org/dist/commons/cli/source/commons-cli-%{version}-src.tar.gz -# workaround for https://issues.apache.org/jira/browse/CLI-253 -Patch0: CLI-253-workaround.patch - -BuildRequires: maven-local-openjdk8 +BuildRequires: maven-local %if %{with bootstrap} BuildRequires: javapackages-bootstrap %else BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.commons:commons-parent:pom:) -BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin) %endif %description @@ -36,7 +32,7 @@ command line arguments and options. %mvn_file : commons-cli %{name} %build -%mvn_build -- -Dmaven.compiler.source=1.6 -Dmaven.compiler.target=1.6 +%mvn_build %install %mvn_install @@ -46,6 +42,9 @@ command line arguments and options. %doc README.md RELEASE-NOTES.txt %changelog +* Thu Nov 4 2021 Christian Schuermann 1.5.0-1 +- Update to upstream version 1.5.0 + * Wed Jul 21 2021 Fedora Release Engineering - 1.4-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index 5adca89..d222cd2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (commons-cli-1.4-src.tar.gz) = a5db856f6154e4340aab1865e3b34c752c0dceb8063faa64740ed470d8e6b3e7782242ae51d6bb57a535a6d6dad2943cc3130d7202223b8f89b8cbecdc3d9d4f +SHA512 (commons-cli-1.5.0-src.tar.gz) = aa2165695177c3e4561f68585cafb5434758138d8a863f3db1860477f660cf78664d2afb07cc3bc767bc8fa87befc7eaa5bdead423ee8b883c62ff00aec7cdda From 8f9a7228e32ea9834df9ec2fb8eeae4cf6d0f660 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jan 2022 21:23:45 +0000 Subject: [PATCH 19/51] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apache-commons-cli.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-cli.spec b/apache-commons-cli.spec index 3fdaaa5..f20ca47 100644 --- a/apache-commons-cli.spec +++ b/apache-commons-cli.spec @@ -2,7 +2,7 @@ Name: apache-commons-cli Version: 1.5.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Command Line Interface Library for Java License: ASL 2.0 URL: http://commons.apache.org/cli/ @@ -42,6 +42,9 @@ command line arguments and options. %doc README.md RELEASE-NOTES.txt %changelog +* Wed Jan 19 2022 Fedora Release Engineering - 1.5.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Nov 4 2021 Christian Schuermann 1.5.0-1 - Update to upstream version 1.5.0 From aa1d84eca15fa3b3c01239335375571580fd1550 Mon Sep 17 00:00:00 2001 From: Jiri Date: Sat, 5 Feb 2022 19:21:34 +0100 Subject: [PATCH 20/51] Rebuilt for java-17-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java17 --- apache-commons-cli.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-cli.spec b/apache-commons-cli.spec index f20ca47..9737eef 100644 --- a/apache-commons-cli.spec +++ b/apache-commons-cli.spec @@ -2,7 +2,7 @@ Name: apache-commons-cli Version: 1.5.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Command Line Interface Library for Java License: ASL 2.0 URL: http://commons.apache.org/cli/ @@ -42,6 +42,9 @@ command line arguments and options. %doc README.md RELEASE-NOTES.txt %changelog +* Sat Feb 05 2022 Jiri Vanek - 1.5.0-3 +- Rebuilt for java-17-openjdk as system jdk + * Wed Jan 19 2022 Fedora Release Engineering - 1.5.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 3a6d7a577355b983c5e7ae9c0961125af2d3e255 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 12 May 2022 22:33:23 +0200 Subject: [PATCH 21/51] Add ExclusiveArch: %{java_arches} noarch See: https://fedoraproject.org/wiki/Changes/Drop_i686_JDKs --- apache-commons-cli.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/apache-commons-cli.spec b/apache-commons-cli.spec index 9737eef..e39d934 100644 --- a/apache-commons-cli.spec +++ b/apache-commons-cli.spec @@ -7,6 +7,7 @@ Summary: Command Line Interface Library for Java License: ASL 2.0 URL: http://commons.apache.org/cli/ BuildArch: noarch +ExclusiveArch: %{java_arches} noarch Source0: http://www.apache.org/dist/commons/cli/source/commons-cli-%{version}-src.tar.gz From d3b69578e6b86876544864ed880b70a5722aecf4 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 14 Jun 2022 08:03:17 +0200 Subject: [PATCH 22/51] Update build-requires in bootstrap mode --- 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 e39d934..6d3ba56 100644 --- a/apache-commons-cli.spec +++ b/apache-commons-cli.spec @@ -11,10 +11,10 @@ ExclusiveArch: %{java_arches} noarch Source0: http://www.apache.org/dist/commons/cli/source/commons-cli-%{version}-src.tar.gz -BuildRequires: maven-local %if %{with bootstrap} BuildRequires: javapackages-bootstrap %else +BuildRequires: maven-local BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.commons:commons-parent:pom:) %endif From 6c7bca8345cf05210d4ec8a0f29b7ec11bc06921 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 20 Jul 2022 20:58:15 +0000 Subject: [PATCH 23/51] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apache-commons-cli.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-cli.spec b/apache-commons-cli.spec index 6d3ba56..67a2ad2 100644 --- a/apache-commons-cli.spec +++ b/apache-commons-cli.spec @@ -2,7 +2,7 @@ Name: apache-commons-cli Version: 1.5.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Command Line Interface Library for Java License: ASL 2.0 URL: http://commons.apache.org/cli/ @@ -43,6 +43,9 @@ command line arguments and options. %doc README.md RELEASE-NOTES.txt %changelog +* Wed Jul 20 2022 Fedora Release Engineering - 1.5.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sat Feb 05 2022 Jiri Vanek - 1.5.0-3 - Rebuilt for java-17-openjdk as system jdk From 082df8ff8faee57e9c63fbc48ab3cc124d2a11db Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 31 Aug 2022 08:36:51 +0200 Subject: [PATCH 24/51] Onboard package into gating --- .fmf/version | 1 + ci.fmf | 1 + gating.yaml | 8 ++++++++ plans/javapackages.fmf | 7 +++++++ 4 files changed, 17 insertions(+) create mode 100644 .fmf/version create mode 100644 ci.fmf create mode 100644 gating.yaml create mode 100644 plans/javapackages.fmf diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/ci.fmf b/ci.fmf new file mode 100644 index 0000000..c5aa0e0 --- /dev/null +++ b/ci.fmf @@ -0,0 +1 @@ +resultsdb-testcase: separate diff --git a/gating.yaml b/gating.yaml new file mode 100644 index 0000000..0d484d7 --- /dev/null +++ b/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} diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf new file mode 100644 index 0000000..8f6c9cb --- /dev/null +++ b/plans/javapackages.fmf @@ -0,0 +1,7 @@ +summary: Run javapackages-specific tests +discover: + how: fmf + url: https://src.fedoraproject.org/tests/javapackages + ref: f37 +execute: + how: tmt From 4a2bc2f8f14a461cf6ed3aa9f00b6ea277ac0182 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 18 Jan 2023 21:53:08 +0000 Subject: [PATCH 25/51] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apache-commons-cli.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-cli.spec b/apache-commons-cli.spec index 67a2ad2..f179e05 100644 --- a/apache-commons-cli.spec +++ b/apache-commons-cli.spec @@ -2,7 +2,7 @@ Name: apache-commons-cli Version: 1.5.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Command Line Interface Library for Java License: ASL 2.0 URL: http://commons.apache.org/cli/ @@ -43,6 +43,9 @@ command line arguments and options. %doc README.md RELEASE-NOTES.txt %changelog +* Wed Jan 18 2023 Fedora Release Engineering - 1.5.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Wed Jul 20 2022 Fedora Release Engineering - 1.5.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 60dab0a7b7c494a93109657ba3a28e6e908f22ce Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 13:27:17 +0000 Subject: [PATCH 26/51] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- apache-commons-cli.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-cli.spec b/apache-commons-cli.spec index f179e05..61b33bb 100644 --- a/apache-commons-cli.spec +++ b/apache-commons-cli.spec @@ -2,7 +2,7 @@ Name: apache-commons-cli Version: 1.5.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Command Line Interface Library for Java License: ASL 2.0 URL: http://commons.apache.org/cli/ @@ -43,6 +43,9 @@ command line arguments and options. %doc README.md RELEASE-NOTES.txt %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 1.5.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Wed Jan 18 2023 Fedora Release Engineering - 1.5.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 1a7ac5a33285669fc335ad6461e07bddb779d494 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 1 Sep 2023 13:20:30 +0200 Subject: [PATCH 27/51] Convert License tag to SPDX format Related: https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_2 --- apache-commons-cli.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/apache-commons-cli.spec b/apache-commons-cli.spec index 61b33bb..f208a41 100644 --- a/apache-commons-cli.spec +++ b/apache-commons-cli.spec @@ -2,9 +2,9 @@ Name: apache-commons-cli Version: 1.5.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Command Line Interface Library for Java -License: ASL 2.0 +License: Apache-2.0 URL: http://commons.apache.org/cli/ BuildArch: noarch ExclusiveArch: %{java_arches} noarch @@ -43,6 +43,9 @@ command line arguments and options. %doc README.md RELEASE-NOTES.txt %changelog +* Fri Sep 01 2023 Mikolaj Izdebski - 1.5.0-7 +- Convert License tag to SPDX format + * Wed Jul 19 2023 Fedora Release Engineering - 1.5.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 9eb07f1c5270353e3d78f0ddb5161e15dd754c76 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 20 Sep 2023 18:07:17 +0200 Subject: [PATCH 28/51] Rebuild to regenerate auto-Requires on java --- apache-commons-cli.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-cli.spec b/apache-commons-cli.spec index f208a41..29775a8 100644 --- a/apache-commons-cli.spec +++ b/apache-commons-cli.spec @@ -2,7 +2,7 @@ Name: apache-commons-cli Version: 1.5.0 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Command Line Interface Library for Java License: Apache-2.0 URL: http://commons.apache.org/cli/ @@ -43,6 +43,9 @@ command line arguments and options. %doc README.md RELEASE-NOTES.txt %changelog +* Wed Sep 20 2023 Mikolaj Izdebski - 1.5.0-8 +- Rebuild to regenerate auto-Requires on java + * Fri Sep 01 2023 Mikolaj Izdebski - 1.5.0-7 - Convert License tag to SPDX format From bec5da06b1bfce0680f5d912780251d78d935013 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 4 Dec 2023 12:27:21 +0100 Subject: [PATCH 29/51] Update to upstream version 1.6.0 --- .gitignore | 1 + apache-commons-cli.spec | 11 ++++++++--- sources | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 05ae819..30af364 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /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 diff --git a/apache-commons-cli.spec b/apache-commons-cli.spec index 29775a8..60c8f88 100644 --- a/apache-commons-cli.spec +++ b/apache-commons-cli.spec @@ -1,8 +1,8 @@ %bcond_with bootstrap Name: apache-commons-cli -Version: 1.5.0 -Release: 8%{?dist} +Version: 1.6.0 +Release: 1%{?dist} Summary: Command Line Interface Library for Java License: Apache-2.0 URL: http://commons.apache.org/cli/ @@ -15,8 +15,10 @@ Source0: http://www.apache.org/dist/commons/cli/source/commons-cli-%{vers BuildRequires: javapackages-bootstrap %else BuildRequires: maven-local -BuildRequires: mvn(junit:junit) 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.vintage:junit-vintage-engine) %endif %description @@ -43,6 +45,9 @@ command line arguments and options. %doc README.md RELEASE-NOTES.txt %changelog +* Mon Dec 04 2023 Mikolaj Izdebski - 1.6.0-1 +- Update to upstream version 1.6.0 + * Wed Sep 20 2023 Mikolaj Izdebski - 1.5.0-8 - Rebuild to regenerate auto-Requires on java diff --git a/sources b/sources index d222cd2..16f9056 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (commons-cli-1.5.0-src.tar.gz) = aa2165695177c3e4561f68585cafb5434758138d8a863f3db1860477f660cf78664d2afb07cc3bc767bc8fa87befc7eaa5bdead423ee8b883c62ff00aec7cdda +SHA512 (commons-cli-1.6.0-src.tar.gz) = 029088e7c51b657a0be5478685e1f689d6d39357957b3b8813ef6b315b4676ba4bd17b739dc15e09a30f8abfbe22e169c1c629f662477821adf0aa66474e1812 From 474cbe82ab8996aec3caff21354cbf44d5f0233d Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 26 Oct 2023 07:33:07 +0200 Subject: [PATCH 30/51] Update javapackages test plan to f40 --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index 8f6c9cb..a2cdaba 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -2,6 +2,6 @@ summary: Run javapackages-specific tests discover: how: fmf url: https://src.fedoraproject.org/tests/javapackages - ref: f37 + ref: f40 execute: how: tmt From 383dd9c11046c1b1d282d0f060578636b0f82062 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 13:11:03 +0000 Subject: [PATCH 31/51] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- apache-commons-cli.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-cli.spec b/apache-commons-cli.spec index 60c8f88..0810698 100644 --- a/apache-commons-cli.spec +++ b/apache-commons-cli.spec @@ -2,7 +2,7 @@ Name: apache-commons-cli Version: 1.6.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Command Line Interface Library for Java License: Apache-2.0 URL: http://commons.apache.org/cli/ @@ -45,6 +45,9 @@ command line arguments and options. %doc README.md RELEASE-NOTES.txt %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 1.6.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Mon Dec 04 2023 Mikolaj Izdebski - 1.6.0-1 - Update to upstream version 1.6.0 From 0c3cd269c5ddd8ce97a65fe73ca404e3453e4c79 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 22 Jan 2024 23:12:29 +0000 Subject: [PATCH 32/51] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- apache-commons-cli.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-cli.spec b/apache-commons-cli.spec index 0810698..f0dcb66 100644 --- a/apache-commons-cli.spec +++ b/apache-commons-cli.spec @@ -2,7 +2,7 @@ Name: apache-commons-cli Version: 1.6.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Command Line Interface Library for Java License: Apache-2.0 URL: http://commons.apache.org/cli/ @@ -45,6 +45,9 @@ command line arguments and options. %doc README.md RELEASE-NOTES.txt %changelog +* Mon Jan 22 2024 Fedora Release Engineering - 1.6.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 1.6.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From cbca251c2683b0cf68d652726f2691811fa18c9c Mon Sep 17 00:00:00 2001 From: Jiri Date: Fri, 23 Feb 2024 14:13:30 +0100 Subject: [PATCH 33/51] bump of release for for java-21-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java21 We are sorry, we messed a bit, and we have to bump release in this package --- apache-commons-cli.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-cli.spec b/apache-commons-cli.spec index f0dcb66..75f2a66 100644 --- a/apache-commons-cli.spec +++ b/apache-commons-cli.spec @@ -2,7 +2,7 @@ Name: apache-commons-cli Version: 1.6.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Command Line Interface Library for Java License: Apache-2.0 URL: http://commons.apache.org/cli/ @@ -45,6 +45,9 @@ command line arguments and options. %doc README.md RELEASE-NOTES.txt %changelog +* Fri Feb 23 2024 Jiri Vanek - 1.6.0-4 +- bump of release for for java-21-openjdk as system jdk + * Mon Jan 22 2024 Fedora Release Engineering - 1.6.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From a6b99c7d9809115b1e0d2065a1dca7b5a2792394 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Tue, 27 Feb 2024 14:39:38 +0100 Subject: [PATCH 34/51] Rebuilt for java-21-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java21 --- apache-commons-cli.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-cli.spec b/apache-commons-cli.spec index 75f2a66..03b7c08 100644 --- a/apache-commons-cli.spec +++ b/apache-commons-cli.spec @@ -2,7 +2,7 @@ Name: apache-commons-cli Version: 1.6.0 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Command Line Interface Library for Java License: Apache-2.0 URL: http://commons.apache.org/cli/ @@ -45,6 +45,9 @@ command line arguments and options. %doc README.md RELEASE-NOTES.txt %changelog +* Tue Feb 27 2024 Jiri Vanek - 1.6.0-5 +- Rebuilt for java-21-openjdk as system jdk + * Fri Feb 23 2024 Jiri Vanek - 1.6.0-4 - bump of release for for java-21-openjdk as system jdk From 61a0446e6c38570ef4ca3716646be8495400d9d6 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Tue, 16 Jul 2024 09:28:33 +0200 Subject: [PATCH 35/51] Update to upstream version 1.8.0 --- .gitignore | 1 + apache-commons-cli.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 30af364..fdafc4b 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /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 diff --git a/apache-commons-cli.spec b/apache-commons-cli.spec index 03b7c08..8957cc3 100644 --- a/apache-commons-cli.spec +++ b/apache-commons-cli.spec @@ -1,15 +1,15 @@ %bcond_with bootstrap Name: apache-commons-cli -Version: 1.6.0 -Release: 5%{?dist} +Version: 1.8.0 +Release: 1%{?dist} Summary: Command Line Interface Library for Java License: Apache-2.0 -URL: http://commons.apache.org/cli/ +URL: https://commons.apache.org/proper/commons-cli/ BuildArch: noarch ExclusiveArch: %{java_arches} noarch -Source0: http://www.apache.org/dist/commons/cli/source/commons-cli-%{version}-src.tar.gz +Source0: https://www.apache.org/dist/commons/cli/source/commons-cli-%{version}-src.tar.gz %if %{with bootstrap} BuildRequires: javapackages-bootstrap @@ -45,6 +45,9 @@ command line arguments and options. %doc README.md RELEASE-NOTES.txt %changelog +* Tue Jul 16 2024 Marian Koncek - 1.8.0-1 +- Update to upstream version 1.8.0 + * Tue Feb 27 2024 Jiri Vanek - 1.6.0-5 - Rebuilt for java-21-openjdk as system jdk diff --git a/sources b/sources index 16f9056..7cb2dda 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (commons-cli-1.6.0-src.tar.gz) = 029088e7c51b657a0be5478685e1f689d6d39357957b3b8813ef6b315b4676ba4bd17b739dc15e09a30f8abfbe22e169c1c629f662477821adf0aa66474e1812 +SHA512 (commons-cli-1.8.0-src.tar.gz) = 588d89d86deb60ac0e182bd4b574e30aac4000dde9da13ee1080844a4982d45f4a4d29fc3ee54c904c74ed6bf14dbb3bffdcbad0eab86ddde8418811f2efb5c2 From 595cca0102a511899070a8463c4fbe8fa3bd853b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 17:09:48 +0000 Subject: [PATCH 36/51] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- apache-commons-cli.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apache-commons-cli.spec b/apache-commons-cli.spec index 8957cc3..4066485 100644 --- a/apache-commons-cli.spec +++ b/apache-commons-cli.spec @@ -2,7 +2,7 @@ Name: apache-commons-cli Version: 1.8.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Command Line Interface Library for Java License: Apache-2.0 URL: https://commons.apache.org/proper/commons-cli/ @@ -45,6 +45,9 @@ command line arguments and options. %doc README.md RELEASE-NOTES.txt %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 1.8.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Tue Jul 16 2024 Marian Koncek - 1.8.0-1 - Update to upstream version 1.8.0 From 0d3aac01ee6ce923f8680f78b3fab93c99760585 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 31 Jul 2024 20:53:29 +0200 Subject: [PATCH 37/51] Switch javapackages tests to f41 branch --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index a2cdaba..17c6113 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -2,6 +2,6 @@ summary: Run javapackages-specific tests discover: how: fmf url: https://src.fedoraproject.org/tests/javapackages - ref: f40 + ref: f41 execute: how: tmt From 9d29604bc27250dff0bc95f1200b816ea96e59bf Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 23 Aug 2024 00:45:00 +0200 Subject: [PATCH 38/51] Convert to %autorelease and %autochangelog --- apache-commons-cli.spec | 165 +--------------------------------------- changelog | 162 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 164 insertions(+), 163 deletions(-) create mode 100644 changelog diff --git a/apache-commons-cli.spec b/apache-commons-cli.spec index 4066485..b88fa5a 100644 --- a/apache-commons-cli.spec +++ b/apache-commons-cli.spec @@ -2,7 +2,7 @@ Name: apache-commons-cli Version: 1.8.0 -Release: 2%{?dist} +Release: %autorelease Summary: Command Line Interface Library for Java License: Apache-2.0 URL: https://commons.apache.org/proper/commons-cli/ @@ -45,165 +45,4 @@ command line arguments and options. %doc README.md RELEASE-NOTES.txt %changelog -* Wed Jul 17 2024 Fedora Release Engineering - 1.8.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Tue Jul 16 2024 Marian Koncek - 1.8.0-1 -- Update to upstream version 1.8.0 - -* Tue Feb 27 2024 Jiri Vanek - 1.6.0-5 -- Rebuilt for java-21-openjdk as system jdk - -* Fri Feb 23 2024 Jiri Vanek - 1.6.0-4 -- bump of release for for java-21-openjdk as system jdk - -* Mon Jan 22 2024 Fedora Release Engineering - 1.6.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jan 19 2024 Fedora Release Engineering - 1.6.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Mon Dec 04 2023 Mikolaj Izdebski - 1.6.0-1 -- Update to upstream version 1.6.0 - -* Wed Sep 20 2023 Mikolaj Izdebski - 1.5.0-8 -- Rebuild to regenerate auto-Requires on java - -* Fri Sep 01 2023 Mikolaj Izdebski - 1.5.0-7 -- Convert License tag to SPDX format - -* Wed Jul 19 2023 Fedora Release Engineering - 1.5.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Wed Jan 18 2023 Fedora Release Engineering - 1.5.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Wed Jul 20 2022 Fedora Release Engineering - 1.5.0-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Sat Feb 05 2022 Jiri Vanek - 1.5.0-3 -- Rebuilt for java-17-openjdk as system jdk - -* Wed Jan 19 2022 Fedora Release Engineering - 1.5.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Thu Nov 4 2021 Christian Schuermann 1.5.0-1 -- Update to upstream version 1.5.0 - -* Wed Jul 21 2021 Fedora Release Engineering - 1.4-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Mon May 17 2021 Mikolaj Izdebski - 1.4-13 -- Bootstrap build -- Non-bootstrap build - -* Tue Jan 26 2021 Fedora Release Engineering - 1.4-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Mon Jul 27 2020 Fedora Release Engineering - 1.4-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Jul 10 2020 Jiri Vanek - 1.4-10 -- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 - -* Wed Jun 24 2020 Alexander Kurtakov 1.4-9 -- Fix build with Java 11 - -* Tue Jan 28 2020 Fedora Release Engineering - 1.4-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Sat Jan 25 2020 Mikolaj Izdebski - 1.4-7 -- Build with OpenJDK 8 - -* Tue Nov 05 2019 Mikolaj Izdebski - 1.4-6 -- Mass rebuild for javapackages-tools 201902 - -* Wed Jul 24 2019 Fedora Release Engineering - 1.4-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri May 24 2019 Mikolaj Izdebski - 1.4-5 -- Mass rebuild for javapackages-tools 201901 - -* Thu Jan 31 2019 Fedora Release Engineering - 1.4-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Thu Jul 12 2018 Fedora Release Engineering - 1.4-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed Feb 07 2018 Fedora Release Engineering - 1.4-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Mon Jan 29 2018 Mikolaj Izdebski - 1.4-3 -- Cleanup spec file - -* Wed Jul 26 2017 Fedora Release Engineering - 1.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Tue Apr 11 2017 Michael Simacek - 1.4-1 -- Update to upstream version 1.4 - -* Fri Feb 10 2017 Fedora Release Engineering - 1.3.1-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Wed Feb 01 2017 Michael Simacek - 1.3.1-5 -- Remove BR on jacoco - -* Wed Jun 15 2016 Mikolaj Izdebski - 1.3.1-4 -- Regenerate build-requires - -* Wed Feb 03 2016 Fedora Release Engineering - 1.3.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Tue Jun 23 2015 Michal Srb - 1.3.1-2 -- Add workaround for CLI-253 - -* Wed Jun 17 2015 Michal Srb - 1.3.1-1 -- Update to upstream version 1.3.1 - -* Wed Jun 17 2015 Fedora Release Engineering - 1.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Wed Jun 3 2015 Mikolaj Izdebski - 1.3-1 -- Update to upstream version 1.3 - -* Sat Jun 07 2014 Fedora Release Engineering - 1.2-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Tue Mar 04 2014 Stanislav Ochotnicky - 1.2-12 -- Use Requires: java-headless rebuild (#1067528) - -* Mon Aug 05 2013 Mat Booth - 1.2-11 -- Update for newer guidelines -- Drop ancient obsoletes/provides on old jakarta name - -* Sat Aug 03 2013 Fedora Release Engineering - 1.2-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Tue Feb 19 2013 Mat Booth - 1.2-9 -- Add missing maven-local BuildRequires - -* Wed Feb 13 2013 Fedora Release Engineering - 1.2-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Wed Jul 18 2012 Fedora Release Engineering - 1.2-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Thu Jan 12 2012 Fedora Release Engineering - 1.2-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Wed Nov 30 2011 Alexander Kurtakov 1.2-5 -- Build with maven 3. -- Adapt to current guidelines. - -* Mon Feb 07 2011 Fedora Release Engineering - 1.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Tue Nov 9 2010 Chris Spike 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 1.2-2 -- Removed Epoch - -* Sun Oct 3 2010 Chris Spike 1.2-1 -- Rename and rebase from jakarta-commons-cli +%autochangelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..ef63bef --- /dev/null +++ b/changelog @@ -0,0 +1,162 @@ +* Wed Jul 17 2024 Fedora Release Engineering - 1.8.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Tue Jul 16 2024 Marian Koncek - 1.8.0-1 +- Update to upstream version 1.8.0 + +* Tue Feb 27 2024 Jiri Vanek - 1.6.0-5 +- Rebuilt for java-21-openjdk as system jdk + +* Fri Feb 23 2024 Jiri Vanek - 1.6.0-4 +- bump of release for for java-21-openjdk as system jdk + +* Mon Jan 22 2024 Fedora Release Engineering - 1.6.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jan 19 2024 Fedora Release Engineering - 1.6.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Dec 04 2023 Mikolaj Izdebski - 1.6.0-1 +- Update to upstream version 1.6.0 + +* Wed Sep 20 2023 Mikolaj Izdebski - 1.5.0-8 +- Rebuild to regenerate auto-Requires on java + +* Fri Sep 01 2023 Mikolaj Izdebski - 1.5.0-7 +- Convert License tag to SPDX format + +* Wed Jul 19 2023 Fedora Release Engineering - 1.5.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Wed Jan 18 2023 Fedora Release Engineering - 1.5.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Wed Jul 20 2022 Fedora Release Engineering - 1.5.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Feb 05 2022 Jiri Vanek - 1.5.0-3 +- Rebuilt for java-17-openjdk as system jdk + +* Wed Jan 19 2022 Fedora Release Engineering - 1.5.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Nov 4 2021 Christian Schuermann 1.5.0-1 +- Update to upstream version 1.5.0 + +* Wed Jul 21 2021 Fedora Release Engineering - 1.4-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon May 17 2021 Mikolaj Izdebski - 1.4-13 +- Bootstrap build +- Non-bootstrap build + +* Tue Jan 26 2021 Fedora Release Engineering - 1.4-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Mon Jul 27 2020 Fedora Release Engineering - 1.4-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jul 10 2020 Jiri Vanek - 1.4-10 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Wed Jun 24 2020 Alexander Kurtakov 1.4-9 +- Fix build with Java 11 + +* Tue Jan 28 2020 Fedora Release Engineering - 1.4-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Sat Jan 25 2020 Mikolaj Izdebski - 1.4-7 +- Build with OpenJDK 8 + +* Tue Nov 05 2019 Mikolaj Izdebski - 1.4-6 +- Mass rebuild for javapackages-tools 201902 + +* Wed Jul 24 2019 Fedora Release Engineering - 1.4-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri May 24 2019 Mikolaj Izdebski - 1.4-5 +- Mass rebuild for javapackages-tools 201901 + +* Thu Jan 31 2019 Fedora Release Engineering - 1.4-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Thu Jul 12 2018 Fedora Release Engineering - 1.4-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Wed Feb 07 2018 Fedora Release Engineering - 1.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Mon Jan 29 2018 Mikolaj Izdebski - 1.4-3 +- Cleanup spec file + +* Wed Jul 26 2017 Fedora Release Engineering - 1.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Tue Apr 11 2017 Michael Simacek - 1.4-1 +- Update to upstream version 1.4 + +* Fri Feb 10 2017 Fedora Release Engineering - 1.3.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Wed Feb 01 2017 Michael Simacek - 1.3.1-5 +- Remove BR on jacoco + +* Wed Jun 15 2016 Mikolaj Izdebski - 1.3.1-4 +- Regenerate build-requires + +* Wed Feb 03 2016 Fedora Release Engineering - 1.3.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Tue Jun 23 2015 Michal Srb - 1.3.1-2 +- Add workaround for CLI-253 + +* Wed Jun 17 2015 Michal Srb - 1.3.1-1 +- Update to upstream version 1.3.1 + +* Wed Jun 17 2015 Fedora Release Engineering - 1.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Wed Jun 3 2015 Mikolaj Izdebski - 1.3-1 +- Update to upstream version 1.3 + +* Sat Jun 07 2014 Fedora Release Engineering - 1.2-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Tue Mar 04 2014 Stanislav Ochotnicky - 1.2-12 +- Use Requires: java-headless rebuild (#1067528) + +* Mon Aug 05 2013 Mat Booth - 1.2-11 +- Update for newer guidelines +- Drop ancient obsoletes/provides on old jakarta name + +* Sat Aug 03 2013 Fedora Release Engineering - 1.2-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Tue Feb 19 2013 Mat Booth - 1.2-9 +- Add missing maven-local BuildRequires + +* Wed Feb 13 2013 Fedora Release Engineering - 1.2-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Wed Jul 18 2012 Fedora Release Engineering - 1.2-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Thu Jan 12 2012 Fedora Release Engineering - 1.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Wed Nov 30 2011 Alexander Kurtakov 1.2-5 +- Build with maven 3. +- Adapt to current guidelines. + +* Mon Feb 07 2011 Fedora Release Engineering - 1.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Tue Nov 9 2010 Chris Spike 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 1.2-2 +- Removed Epoch + +* Sun Oct 3 2010 Chris Spike 1.2-1 +- Rename and rebase from jakarta-commons-cli From 1f71c4f4ec58568098dbdd15c016de7de9c93381 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 23 Aug 2024 02:04:04 +0200 Subject: [PATCH 39/51] Update to upstream version 1.9.0 - Resolves: rhbz#2305042 --- .gitignore | 1 + apache-commons-cli.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index fdafc4b..9c9dd53 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /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 diff --git a/apache-commons-cli.spec b/apache-commons-cli.spec index b88fa5a..b1a47b9 100644 --- a/apache-commons-cli.spec +++ b/apache-commons-cli.spec @@ -1,7 +1,7 @@ %bcond_with bootstrap Name: apache-commons-cli -Version: 1.8.0 +Version: 1.9.0 Release: %autorelease Summary: Command Line Interface Library for Java License: Apache-2.0 @@ -15,10 +15,13 @@ Source0: https://www.apache.org/dist/commons/cli/source/commons-cli-%{ver BuildRequires: javapackages-bootstrap %else BuildRequires: maven-local +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.vintage:junit-vintage-engine) +BuildRequires: mvn(org.junit.jupiter:junit-jupiter-engine) +BuildRequires: mvn(org.junit.jupiter:junit-jupiter-params) +BuildRequires: mvn(org.mockito:mockito-core) %endif %description diff --git a/sources b/sources index 7cb2dda..ee08b7f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (commons-cli-1.8.0-src.tar.gz) = 588d89d86deb60ac0e182bd4b574e30aac4000dde9da13ee1080844a4982d45f4a4d29fc3ee54c904c74ed6bf14dbb3bffdcbad0eab86ddde8418811f2efb5c2 +SHA512 (commons-cli-1.9.0-src.tar.gz) = d20df809e8e0ebed79c57af9c9b447b0068347ba0edfcdec3652cb00bd9575b24fc77093d735e827d9d02a6fe2681bf239fd01df5f7c682ae34ade0781c53e35 From d68c605ec7052a3d06c7a941b7d10e7012456b1b Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 20 Aug 2024 16:32:53 +0200 Subject: [PATCH 40/51] Use %autosetup -C --- 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 b1a47b9..c3363b7 100644 --- a/apache-commons-cli.spec +++ b/apache-commons-cli.spec @@ -31,7 +31,7 @@ command line arguments and options. %{?javadoc_package} %prep -%autosetup -p1 -n commons-cli-%{version}-src +%autosetup -p1 -C # Compatibility links %mvn_alias : org.apache.commons:commons-cli From 06bab565f3490c4d38a69189f6477d602ba7575a Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 29 Nov 2024 08:28:38 +0100 Subject: [PATCH 41/51] Update javapackages test plan to f42 --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index 17c6113..86bfcea 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -2,6 +2,6 @@ summary: Run javapackages-specific tests discover: how: fmf url: https://src.fedoraproject.org/tests/javapackages - ref: f41 + ref: f42 execute: how: tmt From 4fa509534e941c5a206b6ba8d39f1802538303db Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 30 Dec 2024 18:06:35 +0100 Subject: [PATCH 42/51] Explicitly declare javadoc subpackage [skip changelog] --- apache-commons-cli.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/apache-commons-cli.spec b/apache-commons-cli.spec index c3363b7..155b077 100644 --- a/apache-commons-cli.spec +++ b/apache-commons-cli.spec @@ -28,7 +28,11 @@ BuildRequires: mvn(org.mockito:mockito-core) The CLI library provides a simple and easy to use API for working with the command line arguments and options. -%{?javadoc_package} +%package javadoc +Summary: API documentation for %{name} + +%description javadoc +API documentation for %{name}. %prep %autosetup -p1 -C @@ -47,5 +51,7 @@ command line arguments and options. %license LICENSE.txt NOTICE.txt %doc README.md RELEASE-NOTES.txt +%files javadoc -f .mfiles-javadoc + %changelog %autochangelog From 4d8b857afa356fab3fc4a62a13b54661989a06b0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 11:14:21 +0000 Subject: [PATCH 43/51] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 7f93d3082029e695fb65dd78efc5763f2c71e23e Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 3 Mar 2025 11:57:13 +0100 Subject: [PATCH 44/51] 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 45/51] 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 46/51] 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 47/51] 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 48/51] 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 49/51] 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 50/51] 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 51/51] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild