From cdfae5bb627b570cd234209faf22db533235656f58e250c04d7e36cde2a036b2 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Mon, 10 Jun 2024 16:53:55 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/maven-artifact-transfer?expand=0&rev=27

---
 maven-artifact-transfer-build.xml | 13 +++----------
 maven-artifact-transfer.spec      | 27 +--------------------------
 2 files changed, 4 insertions(+), 36 deletions(-)

diff --git a/maven-artifact-transfer-build.xml b/maven-artifact-transfer-build.xml
index dbcf32d..e70db7c 100644
--- a/maven-artifact-transfer-build.xml
+++ b/maven-artifact-transfer-build.xml
@@ -82,15 +82,8 @@
           depends="compile"
           description="Generate Plexus component.xml">
     <mkdir dir="${build.outputDir}/META-INF/plexus"/>
-    <java classname="org.codehaus.plexus.metadata.PlexusMetadataGeneratorCli"
-          failonerror="true"
-          fork="true">
-      <!-- jvmarg value="-verbose"/ -->
-      <classpath>
-        <path refid="build.classpath"/>
-        <pathelement location="${build.outputDir}"/>
-      </classpath>
-      <arg value="-X"/>
+    <exec executable="plexus-metadata-generator" failonerror="true">
+      <env key="CLASSPATH" value="${build.outputDir}"/>
       <arg value="-s"/>
       <arg value="${build.srcDir}"/>
       <arg value="-c"/>
@@ -99,7 +92,7 @@
       <arg value="${build.outputDir}/META-INF/plexus"/>
       <arg value="-o"/>
       <arg value="${build.outputDir}/META-INF/plexus/components.xml"/>
-    </java>
+    </exec>
   </target>
 
   <!-- ====================================================================== -->
diff --git a/maven-artifact-transfer.spec b/maven-artifact-transfer.spec
index 224576d..e768943 100644
--- a/maven-artifact-transfer.spec
+++ b/maven-artifact-transfer.spec
@@ -29,33 +29,21 @@ Patch0:         0001-Compatibility-with-Maven-3.0.3-and-later.patch
 Patch1:         0002-Remove-support-for-maven-3.0.X.patch
 Patch2:         0003-Port-to-maven-3.8.1.patch
 BuildRequires:  ant
-BuildRequires:  apache-commons-cli
-BuildRequires:  apache-commons-codec
-BuildRequires:  atinject
 BuildRequires:  fdupes
-BuildRequires:  google-guice
-BuildRequires:  guava
-BuildRequires:  jakarta-inject
 BuildRequires:  javapackages-local >= 6
-BuildRequires:  jdom2
 BuildRequires:  maven-common-artifact-filters
 BuildRequires:  maven-lib
 BuildRequires:  maven-resolver-api
 BuildRequires:  maven-resolver-impl
 BuildRequires:  maven-resolver-util
-BuildRequires:  objectweb-asm
 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:  slf4j
 BuildRequires:  unzip
-BuildRequires:  xbean
 BuildArch:      noarch
 
 %description
@@ -86,13 +74,6 @@ find -name Maven30\*.java -delete
 %build
 mkdir -p lib
 build-jar-repository -s lib \
-    atinject \
-    commons-cli \
-    commons-codec \
-    guava/guava \
-    guice/google-guice-no_aop \
-    jakarta-inject \
-    jdom2/jdom2 \
     maven-common-artifact-filters/maven-common-artifact-filters \
     maven/maven-artifact \
     maven/maven-core \
@@ -100,19 +81,13 @@ build-jar-repository -s lib \
     maven-resolver/maven-resolver-api \
     maven-resolver/maven-resolver-impl \
     maven-resolver/maven-resolver-util \
-    objectweb-asm/asm \
-    org.eclipse.sisu.inject \
     org.eclipse.sisu.plexus \
     plexus-classworlds \
-    plexus/cli \
     plexus-containers/plexus-component-annotations \
     plexus-metadata-generator \
     plexus/utils \
     plexus/xml \
-    qdox \
-    slf4j/api \
-    slf4j/simple \
-    xbean/xbean-reflect
+    slf4j/api
 
 %{ant} \
     package javadoc