OBS-URL: https://build.opensuse.org/package/show/Java:packages/maven-invoker?expand=0&rev=18

maven-invoker-3.0.1-source-release.zip

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:067c02cf396a42388cb0804afcaf25225dd168526b2f283f2b4127de9002c33f
-size 85361

maven-invoker-build.xml

@@ -10,7 +10,7 @@
 
   <property name="project.groupId" value="org.apache.maven.shared"/>
   <property name="project.artifactId" value="maven-invoker"/>
-  <property name="project.version" value="3.0.1"/>
+  <property name="project.version" value="3.1.0"/>
   <property name="project.name" value="Apache Maven Invoker"/>
   <property name="project.organization.name" value="The Apache Software Foundation"/>
   
@@ -34,11 +34,6 @@
       <include name="**/*.jar"/>
     </fileset>
   </path>
-  <path id="build.test.classpath">
-    <fileset dir="lib">
-      <include name="**/*.jar"/>
-    </fileset>
-  </path>
 
   <!-- ====================================================================== -->
   <!-- Cleaning up target                                                     -->
@@ -71,24 +66,25 @@
   </target>
 
   <!-- ====================================================================== -->
-  <!-- Target to generate Plexus component.xml                                -->
+  <!-- Sisu javax.inject.Named generation target                              -->
   <!-- ====================================================================== -->
 
-  <target name="gen-meta"
+  <target name="sisu"
           depends="compile"
-          description="Generate Plexus component.xml">
-    <mkdir dir="${build.outputDir}/META-INF/plexus"/>
-    <exec executable="plexus-metadata-generator" failonerror="true">
-      <env key="CLASSPATH" value="${build.outputDir}"/>
-      <arg value="-s"/>
-      <arg value="${build.srcDir}"/>
-      <arg value="-c"/>
-      <arg value="${build.outputDir}"/>
-      <arg value="-m"/>
-      <arg value="${build.outputDir}/META-INF/plexus"/>
-      <arg value="-o"/>
-      <arg value="${build.outputDir}/META-INF/plexus/components.xml"/>
-    </exec>
+          description="Generate javax.inject.Name index">
+    <sequential>
+      <java classname="org.eclipse.sisu.space.SisuIndex"
+            failonerror="true"
+            fork="true">
+        <classpath>
+          <path refid="build.classpath"/>
+        </classpath>
+        <arg value="${build.outputDir}"/>
+      </java>
+      <move todir="${build.outputDir}/META-INF">
+        <fileset dir="META-INF"/>
+      </move>
+    </sequential>
   </target>
 
   <!-- ====================================================================== -->
@@ -124,24 +120,24 @@
   <!-- Package target                                                         -->
   <!-- ====================================================================== -->
 
-  <target name="package" depends="gen-meta" description="Package the application">
+  <target name="package" depends="sisu" description="Package the application">
     <jar jarfile="${build.dir}/${build.finalName}.jar" 
          compress="true" 
          index="false" 
          basedir="${build.outputDir}" 
          excludes="**/package.html">
       <manifest>
-		<attribute name="Implementation-Title" value="${project.name}"/>
-		<attribute name="Implementation-URL" value="http://maven.apache.org/shared/${project.artifactId}/"/>
-		<attribute name="Implementation-Vendor" value="${project.organization.name}"/>
-		<attribute name="Implementation-Vendor-Id" value="${project.groupId}"/>
-		<attribute name="Implementation-Version" value="${project.version}"/>
-		<attribute name="JavaPackages-ArtifactId" value="${project.artifactId}"/>
-		<attribute name="JavaPackages-GroupId" value="${project.groupId}"/>
-		<attribute name="JavaPackages-Version" value="${project.version}"/>
-		<attribute name="Specification-Title" value="${project.name}"/>
-		<attribute name="Specification-Vendor" value="${project.organization.name}"/>
-		<attribute name="Specification-Version" value="${project.version}"/>
+        <attribute name="Implementation-Title" value="${project.name}"/>
+        <attribute name="Implementation-URL" value="http://maven.apache.org/shared/${project.artifactId}/"/>
+        <attribute name="Implementation-Vendor" value="${project.organization.name}"/>
+        <attribute name="Implementation-Vendor-Id" value="${project.groupId}"/>
+        <attribute name="Implementation-Version" value="${project.version}"/>
+        <attribute name="JavaPackages-ArtifactId" value="${project.artifactId}"/>
+        <attribute name="JavaPackages-GroupId" value="${project.groupId}"/>
+        <attribute name="JavaPackages-Version" value="${project.version}"/>
+        <attribute name="Specification-Title" value="${project.name}"/>
+        <attribute name="Specification-Vendor" value="${project.organization.name}"/>
+        <attribute name="Specification-Version" value="${project.version}"/>
       </manifest>
     </jar>
   </target>

maven-invoker.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Apr 25 18:38:03 UTC 2022 - Fridrich Strba <fstrba@suse.com>
+
+- Upgrade to upstream version 3.1.0
+  * Fixes build with maven-shared-utils 3.3.3
+
 -------------------------------------------------------------------
 Sun Mar 20 19:33:22 UTC 2022 - Fridrich Strba <fstrba@suse.com>
 

maven-invoker.spec

@@ -17,7 +17,7 @@
 
 
 Name:           maven-invoker
-Version:        3.0.1
+Version:        3.1.0
 Release:        0
 Summary:        An API for firing a maven build in a clean environment
 License:        Apache-2.0
@@ -25,20 +25,17 @@ Group:          Development/Libraries/Java
 URL:            https://maven.apache.org/shared/maven-invoker/
 Source0:        https://repo1.maven.org/maven2/org/apache/maven/shared/%{name}/%{version}/%{name}-%{version}-source-release.zip
 Source1:        %{name}-build.xml
-Patch0:         new-maven-shared-utils.patch
 # Patch rejected upstream
 Patch1:         %{name}-MSHARED-279.patch
 BuildRequires:  ant
+BuildRequires:  atinject
 BuildRequires:  fdupes
 BuildRequires:  javapackages-local
-BuildRequires:  maven-shared-utils
-BuildRequires:  plexus-containers-component-annotations
-BuildRequires:  plexus-metadata-generator
-BuildRequires:  plexus-utils
+BuildRequires:  maven-shared-utils >= 3.3.3
+BuildRequires:  sisu-inject
 BuildRequires:  unzip
 Requires:       mvn(org.apache.maven.shared:maven-shared-utils)
-Requires:       mvn(org.codehaus.plexus:plexus-component-annotations)
-Requires:       mvn(org.codehaus.plexus:plexus-utils)
+Requires:       mvn(org.eclipse.sisu:org.eclipse.sisu.inject)
 BuildArch:      noarch
 
 %description
@@ -61,18 +58,18 @@ API documentation for %{name}.
 
 %prep
 %setup -q
+sed -i 's/\r$//' src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java
 cp %{SOURCE1} build.xml
-%patch0 -p1
 %patch1 -p1
+%pom_change_dep javax.inject:javax.inject:1  org.eclipse.sisu:org.eclipse.sisu.inject
 
 %pom_remove_parent .
 %pom_xpath_inject pom:project "<groupId>org.apache.maven.shared</groupId>" .
 
 %build
 mkdir -p lib
-build-jar-repository -s lib plexus/utils plexus-containers/plexus-component-annotations maven-shared-utils/maven-shared-utils
-%{ant} \
-  jar javadoc
+build-jar-repository -s lib maven-shared-utils org.eclipse.sisu.inject atinject
+%{ant} jar javadoc
 
 %install
 # jar

new-maven-shared-utils.patch

@@ -1,17 +0,0 @@
---- maven-invoker-3.0.1/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java	2018-05-26 17:17:32.000000000 +0200
-+++ maven-invoker-3.0.1/src/main/java/org/apache/maven/shared/invoker/MavenCommandLineBuilder.java	2022-04-26 15:25:46.046464985 +0200
-@@ -259,8 +259,14 @@
- 
-         if ( ( goals != null ) && !goals.isEmpty() )
-         {
-+            try
-+            {
-             cli.createArg().setLine( StringUtils.join( goals.iterator(), " " ) );
-         }
-+            catch (Exception e)
-+            {
-+            }
-+        }
-     }
- 
-     protected void setProperties( InvocationRequest request, Commandline cli )