From ed540b854facad3155fea7b09cb414369ddf18e6a89f695996c42505dbf89f37 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Sun, 24 Sep 2023 20:38:16 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-doxia?expand=0&rev=27 --- maven-doxia.changes | 4 ---- maven-doxia.spec | 8 ++++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/maven-doxia.changes b/maven-doxia.changes index 92a4dea..5f25c17 100644 --- a/maven-doxia.changes +++ b/maven-doxia.changes @@ -23,10 +23,6 @@ Sat Sep 23 17:46:16 UTC 2023 - Fridrich Strba - Removed patch: * 0001-Fix-itext-dependency.patch + no need to patch a module that we disable -- Added patch: - * 0002-Commons-configuration2.patch - + port to commons-configuration2 in order to remove dependency - on old commons-lang ------------------------------------------------------------------- Fri May 13 09:03:45 UTC 2022 - Fridrich Strba diff --git a/maven-doxia.spec b/maven-doxia.spec index a407c9b..9008a8f 100644 --- a/maven-doxia.spec +++ b/maven-doxia.spec @@ -25,11 +25,11 @@ Group: Development/Libraries/Java URL: https://maven.apache.org/doxia/ Source0: https://repo1.maven.org/maven2/org/apache/maven/doxia/doxia/%{version}/doxia-%{version}-source-release.zip Source1: %{name}-build.tar.xz -Patch0: 0002-Commons-configuration2.patch BuildRequires: ant BuildRequires: apache-commons-cli BuildRequires: apache-commons-collections -BuildRequires: apache-commons-configuration2 +BuildRequires: apache-commons-configuration +BuildRequires: apache-commons-lang BuildRequires: apache-commons-lang3 BuildRequires: apache-commons-text BuildRequires: atinject @@ -185,7 +185,6 @@ API documentation for %{name}. %prep %setup -q -n doxia-%{version} -a1 -%patch0 -p1 # we don't have clirr-maven-plugin %pom_remove_plugin org.codehaus.mojo:clirr-maven-plugin pom.xml @@ -210,7 +209,8 @@ build-jar-repository -s lib \ apache-commons-lang3 \ apache-commons-text \ commons-cli \ - commons-configuration2 \ + commons-configuration \ + commons-lang \ guava/guava \ guice/google-guice \ httpcomponents/httpclient \