From 5f01b456b14b0bceccb4861e66a559476d7d094b038ab612fc36ac8cf6da0cbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 14 Jun 2024 17:17:54 +0200 Subject: [PATCH] Sync from SUSE:SLFO:Main maven-doxia revision 8b30e95078f635e9f57e4b8ee3abddb1 --- maven-doxia-build.tar.xz | 4 ++-- maven-doxia.changes | 6 ++++++ maven-doxia.spec | 24 ------------------------ 3 files changed, 8 insertions(+), 26 deletions(-) diff --git a/maven-doxia-build.tar.xz b/maven-doxia-build.tar.xz index 7b7bf23..2409421 100644 --- a/maven-doxia-build.tar.xz +++ b/maven-doxia-build.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ab05e18998e64d53317936318cbac5d2494ea4825f2d2cc025081889ab6fa285 -size 5136 +oid sha256:c0fe9b4ef80e9d0b9e1c14803213e1fab45bbc3a799816f001e6a37da93e994f +size 5328 diff --git a/maven-doxia.changes b/maven-doxia.changes index ef211ef..be4980f 100644 --- a/maven-doxia.changes +++ b/maven-doxia.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Jun 10 16:37:25 UTC 2024 - Fridrich Strba + +- Use plexus-metadata-generator executable directly to simplify + build classpath + ------------------------------------------------------------------- Tue Apr 2 17:22:22 UTC 2024 - Fridrich Strba diff --git a/maven-doxia.spec b/maven-doxia.spec index 54cb36a..278cd1e 100644 --- a/maven-doxia.spec +++ b/maven-doxia.spec @@ -27,34 +27,22 @@ Source0: https://repo1.maven.org/maven2/org/apache/maven/doxia/doxia/%{ve 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-lang3 BuildRequires: apache-commons-text -BuildRequires: atinject BuildRequires: fdupes -BuildRequires: google-guice -BuildRequires: guava BuildRequires: httpcomponents-client BuildRequires: httpcomponents-core BuildRequires: javapackages-local -BuildRequires: jdom2 BuildRequires: modello >= 2.0.0 -BuildRequires: objectweb-asm BuildRequires: parboiled BuildRequires: pegdown -BuildRequires: plexus-classworlds -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 BuildRequires: unzip -BuildRequires: xbean BuildRequires: xmlgraphics-commons BuildRequires: xmlgraphics-fop BuildRequires: xmlunit @@ -212,29 +200,17 @@ done %build mkdir -p lib build-jar-repository -s lib \ - atinject \ apache-commons-text \ - commons-cli \ commons-configuration2 \ commons-lang3 \ - guava/guava \ - guice/google-guice \ httpcomponents/httpclient \ httpcomponents/httpcore \ - jdom2/jdom2 \ - objectweb-asm/asm \ - org.eclipse.sisu.inject \ org.eclipse.sisu.plexus \ parboiled/core \ pegdown \ - plexus-classworlds \ - plexus/cli \ plexus-containers/plexus-component-annotations \ - plexus-metadata-generator \ plexus/utils \ plexus/xml \ - qdox \ - xbean/xbean-reflect \ xmlgraphics-commons \ xmlgraphics-fop