diff --git a/.fmf/version b/.fmf/version deleted file mode 100644 index d00491f..0000000 --- a/.fmf/version +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/.gitignore b/.gitignore index 6fc0a6d..e77d52a 100644 --- a/.gitignore +++ b/.gitignore @@ -2,8 +2,3 @@ /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 diff --git a/0001-Port-tests-to-commons-lang3.patch b/0001-Port-tests-to-commons-lang3.patch deleted file mode 100644 index 4096341..0000000 --- a/0001-Port-tests-to-commons-lang3.patch +++ /dev/null @@ -1,67 +0,0 @@ -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/CLI-253-workaround.patch b/CLI-253-workaround.patch new file mode 100644 index 0000000..798c5a4 --- /dev/null +++ b/CLI-253-workaround.patch @@ -0,0 +1,96 @@ +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 27c557e..70055ce 100644 --- a/apache-commons-cli.spec +++ b/apache-commons-cli.spec @@ -1,46 +1,36 @@ -%bcond_with bootstrap - Name: apache-commons-cli -Version: 1.10.0 -Release: %autorelease +Version: 1.4 +Release: 8%{?dist} Summary: Command Line Interface Library for Java -License: Apache-2.0 -URL: https://commons.apache.org/proper/commons-cli/ +License: ASL 2.0 +URL: http://commons.apache.org/cli/ BuildArch: noarch -ExclusiveArch: %{java_arches} noarch -Source0: https://www.apache.org/dist/commons/cli/source/commons-cli-%{version}-src.tar.gz +Source0: http://www.apache.org/dist/commons/cli/source/commons-cli-%{version}-src.tar.gz -Patch: 0001-Port-tests-to-commons-lang3.patch +# workaround for https://issues.apache.org/jira/browse/CLI-253 +Patch0: CLI-253-workaround.patch -%if %{with bootstrap} -BuildRequires: javapackages-bootstrap -%else -BuildRequires: maven-local-openjdk25 -BuildRequires: mvn(commons-io:commons-io) +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.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. +%{?javadoc_package} + %prep -%autosetup -p1 -C +%autosetup -p1 -n commons-cli-%{version}-src # Compatibility links %mvn_alias : org.apache.commons:commons-cli %mvn_file : commons-cli %{name} %build -%mvn_build -j +%mvn_build %install %mvn_install @@ -50,4 +40,92 @@ command line arguments and options. %doc README.md RELEASE-NOTES.txt %changelog -%autochangelog +* Tue Jan 28 2020 Fedora Release Engineering - 1.4-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Wed Jul 24 2019 Fedora Release Engineering - 1.4-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* 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 diff --git a/changelog b/changelog deleted file mode 100644 index ef63bef..0000000 --- a/changelog +++ /dev/null @@ -1,162 +0,0 @@ -* 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 diff --git a/ci.fmf b/ci.fmf deleted file mode 100644 index c5aa0e0..0000000 --- a/ci.fmf +++ /dev/null @@ -1 +0,0 @@ -resultsdb-testcase: separate diff --git a/gating.yaml b/gating.yaml deleted file mode 100644 index 0d484d7..0000000 --- a/gating.yaml +++ /dev/null @@ -1,8 +0,0 @@ ---- !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 deleted file mode 100644 index ae17c0c..0000000 --- a/plans/javapackages.fmf +++ /dev/null @@ -1,7 +0,0 @@ -summary: Run javapackages-specific tests -discover: - how: fmf - url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git - ref: f43 -execute: - how: tmt diff --git a/sources b/sources index fc2fa2d..5adca89 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (commons-cli-1.10.0-src.tar.gz) = 245951919a88068f692fc4cab906cb210bbefd853d851167d5c34fd4aebab7370766458033c47cf8174d7a409c4364752770b573252d19746cbb9a0e2c8c255b +SHA512 (commons-cli-1.4-src.tar.gz) = a5db856f6154e4340aab1865e3b34c752c0dceb8063faa64740ed470d8e6b3e7782242ae51d6bb57a535a6d6dad2943cc3130d7202223b8f89b8cbecdc3d9d4f