From f066bc2591e659c500eca32a1b96cf3c3797f8a4f5d1736668b68c46c5ef1c1d Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Mon, 10 Jun 2024 18:44:29 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/maven-doxia-sitetools?expand=0&rev=26

---
 maven-doxia-sitetools-build.tar.xz |  4 ++--
 maven-doxia-sitetools.changes      |  3 ++-
 maven-doxia-sitetools.spec         | 27 +--------------------------
 3 files changed, 5 insertions(+), 29 deletions(-)

diff --git a/maven-doxia-sitetools-build.tar.xz b/maven-doxia-sitetools-build.tar.xz
index a7f5b8c..0445453 100644
--- a/maven-doxia-sitetools-build.tar.xz
+++ b/maven-doxia-sitetools-build.tar.xz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0ad19cb2a7b7ef07794675477bbe0ee1a8977595ce7dc82233dac766e096f080
-size 3484
+oid sha256:d02d393774a062e99ccede62c181961ba52f7fdb1c21a3cabd599f594a2132e4
+size 3528
diff --git a/maven-doxia-sitetools.changes b/maven-doxia-sitetools.changes
index 39b220e..49dd585 100644
--- a/maven-doxia-sitetools.changes
+++ b/maven-doxia-sitetools.changes
@@ -1,7 +1,8 @@
 -------------------------------------------------------------------
 Mon Jun 10 16:41:51 UTC 2024 - Fridrich Strba <fstrba@suse.com>
 
-- Add dependency on jakarta-inject, needed by google-guice 6.0.0
+- Use plexus-metadata-generator executable directly to simplify
+  build classpath
 
 -------------------------------------------------------------------
 Tue Apr  2 17:22:48 UTC 2024 - Fridrich Strba <fstrba@suse.com>
diff --git a/maven-doxia-sitetools.spec b/maven-doxia-sitetools.spec
index eee052c..372c26e 100644
--- a/maven-doxia-sitetools.spec
+++ b/maven-doxia-sitetools.spec
@@ -29,18 +29,12 @@ Source0:        https://repo1.maven.org/maven2/org/apache/maven/doxia/doxia-site
 Source1:        %{name}-build.tar.xz
 Patch1:         0002-Remove-dependency-on-velocity-tools.patch
 BuildRequires:  ant
-BuildRequires:  apache-commons-cli
 BuildRequires:  apache-commons-collections
 BuildRequires:  apache-commons-io
 BuildRequires:  apache-commons-lang3
-BuildRequires:  atinject
 BuildRequires:  fdupes
-BuildRequires:  google-guice
-BuildRequires:  guava
-BuildRequires:  jakarta-inject
 BuildRequires:  java-devel >= 1.8
 BuildRequires:  javapackages-local >= 6
-BuildRequires:  jdom2
 BuildRequires:  maven-doxia-core
 BuildRequires:  maven-doxia-logging-api
 BuildRequires:  maven-doxia-module-fo
@@ -49,9 +43,6 @@ BuildRequires:  maven-doxia-sink-api
 BuildRequires:  maven-lib
 BuildRequires:  maven-reporting-api
 BuildRequires:  modello >= 2.0.0
-BuildRequires:  objectweb-asm
-BuildRequires:  plexus-classworlds
-BuildRequires:  plexus-cli
 BuildRequires:  plexus-containers-component-annotations
 BuildRequires:  plexus-i18n
 BuildRequires:  plexus-interpolation
@@ -59,12 +50,9 @@ BuildRequires:  plexus-metadata-generator
 BuildRequires:  plexus-utils
 BuildRequires:  plexus-velocity
 BuildRequires:  plexus-xml
-BuildRequires:  qdox
-BuildRequires:  sisu-inject
 BuildRequires:  sisu-plexus
 BuildRequires:  unzip
 BuildRequires:  velocity
-BuildRequires:  xbean
 BuildRequires:  xmvn-install
 BuildRequires:  xmvn-resolve
 BuildRequires:  xz
@@ -119,15 +107,9 @@ done
 %build
 mkdir -p lib
 build-jar-repository -s lib \
-    atinject \
     apache-commons-collections \
     apache-commons-lang3 \
-    commons-cli \
     commons-io \
-    guava/guava \
-    guice/google-guice \
-    jakarta-inject \
-    jdom2/jdom2 \
     maven-doxia/doxia-core \
     maven-doxia/doxia-logging-api \
     maven-doxia/doxia-module-fo \
@@ -139,21 +121,14 @@ build-jar-repository -s lib \
     maven/maven-plugin-api \
     maven/maven-project \
     maven-reporting-api/maven-reporting-api \
-    objectweb-asm/asm \
-    org.eclipse.sisu.inject \
     org.eclipse.sisu.plexus \
-    plexus-classworlds \
-    plexus/cli \
     plexus-containers/plexus-component-annotations \
     plexus-i18n/plexus-i18n \
     plexus/interpolation \
-    plexus-metadata-generator \
     plexus/utils \
     plexus/xml \
     plexus-velocity/plexus-velocity \
-    qdox \
-    velocity \
-    xbean/xbean-reflect
+    velocity
 # tests can't run because of missing deps
 %{ant} -Dtest.skip=true package javadoc