From 1007ea16e969424d0423a8cf0f46fdb454d5e9b51c54f2016f2894c0359cf673 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= <adrian@suse.de>
Date: Fri, 14 Jun 2024 17:17:35 +0200
Subject: [PATCH] Sync from SUSE:SLFO:Main maven-artifact-transfer revision
 6326e9d02e3a50cfe75e8ed8e5bccc56

---
 maven-artifact-transfer-build.xml | 21 ++++++-------
 maven-artifact-transfer.changes   |  6 ++++
 maven-artifact-transfer.spec      | 52 +++++++++----------------------
 3 files changed, 30 insertions(+), 49 deletions(-)

diff --git a/maven-artifact-transfer-build.xml b/maven-artifact-transfer-build.xml
index 2a1592c..5f49f58 100644
--- a/maven-artifact-transfer-build.xml
+++ b/maven-artifact-transfer-build.xml
@@ -17,7 +17,8 @@
 
   <property name="spec.version" value="0.13"/>
 
-  <property name="compiler.source" value="1.8"/>
+  <property name="compiler.release" value="8"/>
+  <property name="compiler.source" value="1.${compiler.release}"/>
   <property name="compiler.target" value="${compiler.source}"/>
 
   <property name="build.finalName" value="${project.artifactId}-${project.version}"/>
@@ -61,6 +62,7 @@
            encoding="UTF-8"
            optimize="false"
            deprecation="true"
+           release="${compiler.release}"
            target="${compiler.target}"
            verbose="false"
            fork="false"
@@ -80,15 +82,11 @@
           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"/>
+    <pathconvert property="classpath.string" pathsep=":">
+      <path refid="build.classpath"/>
+    </pathconvert>
+    <exec executable="plexus-metadata-generator" failonerror="true">
+      <env key="CLASSPATH" value="${build.outputDir}:${classpath.string}"/>
       <arg value="-s"/>
       <arg value="${build.srcDir}"/>
       <arg value="-c"/>
@@ -97,7 +95,7 @@
       <arg value="${build.outputDir}/META-INF/plexus"/>
       <arg value="-o"/>
       <arg value="${build.outputDir}/META-INF/plexus/components.xml"/>
-    </java>
+    </exec>
   </target>
 
   <!-- ====================================================================== -->
@@ -115,6 +113,7 @@
            encoding="UTF-8"
            optimize="false"
            deprecation="true"
+           release="${compiler.release}"
            target="${compiler.target}"
            verbose="false"
            fork="false"
diff --git a/maven-artifact-transfer.changes b/maven-artifact-transfer.changes
index d7dbcd7..2a497b5 100644
--- a/maven-artifact-transfer.changes
+++ b/maven-artifact-transfer.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Jun 10 16:29:15 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Use plexus-metadata-generator executable directly to simplify
+  build classpath
+
 -------------------------------------------------------------------
 Tue Apr  2 17:20:27 UTC 2024 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/maven-artifact-transfer.spec b/maven-artifact-transfer.spec
index 97523e1..8fe692a 100644
--- a/maven-artifact-transfer.spec
+++ b/maven-artifact-transfer.spec
@@ -29,32 +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:  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
@@ -85,35 +74,22 @@ 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 \
-	jdom2/jdom2 \
-	maven-common-artifact-filters/maven-common-artifact-filters \
-	maven/maven-artifact \
-	maven/maven-core \
-	maven/maven-model \
-	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
+    maven-common-artifact-filters/maven-common-artifact-filters \
+    maven/maven-artifact \
+    maven/maven-core \
+    maven/maven-model \
+    maven-resolver/maven-resolver-api \
+    maven-resolver/maven-resolver-impl \
+    maven-resolver/maven-resolver-util \
+    org.eclipse.sisu.plexus \
+    plexus-classworlds \
+    plexus-containers/plexus-component-annotations \
+    plexus/utils \
+    plexus/xml \
+    slf4j/api
 
 %{ant} \
-	package javadoc
+    package javadoc
 
 %install
 # jar