From e0d4eb7294ba68b326bdb540103e290069dd161624f89cc7c22e953b1eae726e Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 2 Apr 2024 17:40:23 +0000 Subject: [PATCH] Accepting request 1164189 from Java:packages:test Depend on plexus-xml OBS-URL: https://build.opensuse.org/request/show/1164189 OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-doxia?expand=0&rev=34 --- maven-doxia.changes | 6 ++++++ maven-doxia.spec | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/maven-doxia.changes b/maven-doxia.changes index 855ea9a..ef211ef 100644 --- a/maven-doxia.changes +++ b/maven-doxia.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Apr 2 17:22:22 UTC 2024 - Fridrich Strba + +- Add dependency on plexus-xml where relevant + * this will be needed for smooth upgrade to plexus-utils 4.0.0 + ------------------------------------------------------------------- Wed Feb 21 05:58:59 UTC 2024 - Fridrich Strba diff --git a/maven-doxia.spec b/maven-doxia.spec index f00fd9d..54cb36a 100644 --- a/maven-doxia.spec +++ b/maven-doxia.spec @@ -49,6 +49,7 @@ BuildRequires: plexus-cli BuildRequires: plexus-containers-component-annotations BuildRequires: plexus-metadata-generator BuildRequires: plexus-utils +BuildRequires: plexus-xml BuildRequires: qdox BuildRequires: sisu-inject BuildRequires: sisu-plexus @@ -196,6 +197,11 @@ API documentation for %{name}. # requires network rm doxia-core/src/test/java/org/apache/maven/doxia/util/XmlValidatorTest.java +%pom_add_dep org.codehaus.plexus:plexus-xml:3.0.0 doxia-core +for i in doxia-module-docbook-simple doxia-module-fml doxia-module-fo doxia-module-itext doxia-module-markdown doxia-module-xdoc doxia-module-xhtml doxia-module-xhtml5; do + %pom_add_dep org.codehaus.plexus:plexus-xml:3.0.0 doxia-modules/${i} +done + %pom_disable_module doxia-module-itext doxia-modules %pom_disable_module doxia-module-markdown doxia-modules @@ -226,6 +232,7 @@ build-jar-repository -s lib \ plexus-containers/plexus-component-annotations \ plexus-metadata-generator \ plexus/utils \ + plexus/xml \ qdox \ xbean/xbean-reflect \ xmlgraphics-commons \