Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package maven-artifact-transfer for 
openSUSE:Factory checked in at 2024-06-11 18:27:39
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/maven-artifact-transfer (Old)
 and      /work/SRC/openSUSE:Factory/.maven-artifact-transfer.new.19518 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "maven-artifact-transfer"

Tue Jun 11 18:27:39 2024 rev:10 rq:1179766 version:0.13.1

Changes:
--------
--- 
/work/SRC/openSUSE:Factory/maven-artifact-transfer/maven-artifact-transfer.changes
  2024-04-03 17:21:27.999821122 +0200
+++ 
/work/SRC/openSUSE:Factory/.maven-artifact-transfer.new.19518/maven-artifact-transfer.changes
       2024-06-11 18:28:16.990656789 +0200
@@ -1,0 +2,6 @@
+Mon Jun 10 16:29:15 UTC 2024 - Fridrich Strba <fst...@suse.com>
+
+- Use plexus-metadata-generator executable directly to simplify
+  build classpath
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ maven-artifact-transfer.spec ++++++
--- /var/tmp/diff_new_pack.89g1UV/_old  2024-06-11 18:28:17.578678248 +0200
+++ /var/tmp/diff_new_pack.89g1UV/_new  2024-06-11 18:28:17.578678248 +0200
@@ -29,32 +29,21 @@
 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,12 +74,6 @@
 %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 \
@@ -98,19 +81,12 @@
        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

++++++ maven-artifact-transfer-build.xml ++++++
--- /var/tmp/diff_new_pack.89g1UV/_old  2024-06-11 18:28:17.626680000 +0200
+++ /var/tmp/diff_new_pack.89g1UV/_new  2024-06-11 18:28:17.630680146 +0200
@@ -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"

Reply via email to