From 4f5f4dfd0d21ec026e7231fb41d5953ed25e10c7905c5239890708ee14c5f266 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Mon, 10 Jun 2024 19:00:52 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/maven-surefire?expand=0&rev=40

---
 maven-surefire-build.tar.xz |  4 ++--
 maven-surefire.changes      |  6 ++++++
 maven-surefire.spec         | 16 ----------------
 3 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/maven-surefire-build.tar.xz b/maven-surefire-build.tar.xz
index c1800c3..3de1d9f 100644
--- a/maven-surefire-build.tar.xz
+++ b/maven-surefire-build.tar.xz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:06899d4b2f60be3857b8a650c5a865537ef14594091ff63e6edb73719b649c64
-size 7236
+oid sha256:881df1fdcfa1a545bf2449ee0d26b1a1c746d141114a879ff78927a2722bf152
+size 6900
diff --git a/maven-surefire.changes b/maven-surefire.changes
index ed9d9a8..b8e9ada 100644
--- a/maven-surefire.changes
+++ b/maven-surefire.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jun 10 19:00:07 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Use plexus-metadata-generator executable directly to simplify
+  build classpath
+
 -------------------------------------------------------------------
 Wed Apr 10 10:54:02 UTC 2024 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/maven-surefire.spec b/maven-surefire.spec
index fa364d4..00ab08c 100644
--- a/maven-surefire.spec
+++ b/maven-surefire.spec
@@ -30,14 +30,11 @@ Source10:       %{name}-build.tar.xz
 Patch0:         0001-Port-to-TestNG-7.4.0.patch
 Patch10:        %{name}-bootstrap-resources.patch
 BuildRequires:  ant
-BuildRequires:  apache-commons-cli
 BuildRequires:  apache-commons-compress
 BuildRequires:  apache-commons-io
 BuildRequires:  apache-commons-lang3
 BuildRequires:  atinject
 BuildRequires:  fdupes
-BuildRequires:  google-guice
-BuildRequires:  guava
 BuildRequires:  java-devel >= 1.8
 BuildRequires:  javacc
 BuildRequires:  javapackages-local
@@ -55,16 +52,12 @@ BuildRequires:  maven-reporting-api
 BuildRequires:  maven-reporting-impl
 BuildRequires:  maven-resolver
 BuildRequires:  maven-shared-utils
-BuildRequires:  objectweb-asm
-BuildRequires:  plexus-classworlds
-BuildRequires:  plexus-cli
 BuildRequires:  plexus-i18n
 BuildRequires:  plexus-interpolation
 BuildRequires:  plexus-languages
 BuildRequires:  plexus-metadata-generator
 BuildRequires:  plexus-utils
 BuildRequires:  plexus-xml
-BuildRequires:  qdox
 BuildRequires:  sisu-inject
 BuildRequires:  sisu-plexus
 BuildRequires:  testng
@@ -187,13 +180,9 @@ mkdir -p lib
 build-jar-repository -s -p lib \
     atinject \
     apache-commons-lang3 \
-    commons-cli \
     commons-compress \
     commons-io \
-    guava/guava \
-    guice/google-guice \
     javacc \
-    jdom2/jdom2 \
     jsr-305 \
     junit \
     maven-common-artifact-filters/maven-common-artifact-filters \
@@ -213,19 +202,14 @@ build-jar-repository -s -p lib \
     maven-resolver/maven-resolver-api \
     maven-resolver/maven-resolver-util \
     maven-shared-utils/maven-shared-utils \
-    objectweb-asm/asm \
     org.eclipse.sisu.plexus \
     org.eclipse.sisu.inject \
-    plexus-classworlds \
-    plexus/cli \
     plexus-containers/plexus-component-annotations \
     plexus-i18n/plexus-i18n \
     plexus/interpolation \
     plexus-languages/plexus-java \
-    plexus-metadata-generator \
     plexus/utils \
     plexus/xml \
-    qdox \
     testng
 
 %{ant} \