Accepting request 1294860 from Java:packages

reproducible: another solution

OBS-URL: https://build.opensuse.org/request/show/1294860
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/maven-jar-plugin?expand=0&rev=13

01-allow-replacing-artifacts.patch

@@ -1,11 +1,12 @@
---- maven-jar-plugin-3.3.0/src/main/java/org/apache/maven/plugins/jar/AbstractJarMojo.java	2023-09-14 08:41:53.495070762 +0200
-+++ maven-jar-plugin-3.3.0/src/main/java/org/apache/maven/plugins/jar/AbstractJarMojo.java	2023-09-14 08:46:56.323819346 +0200
-@@ -312,7 +312,7 @@
-             {
-                 if ( projectHasAlreadySetAnArtifact() )
-                 {
--                    throw new MojoExecutionException( "You have to use a classifier "
-+                    getLog().warn( "You have to use a classifier "
-                         + "to attach supplemental artifacts to the project instead of replacing them." );
+diff -urEbwB maven-jar-plugin-3.4.2.orig/src/main/java/org/apache/maven/plugins/jar/AbstractJarMojo.java maven-jar-plugin-3.4.2/src/main/java/org/apache/maven/plugins/jar/AbstractJarMojo.java
+--- maven-jar-plugin-3.4.2.orig/src/main/java/org/apache/maven/plugins/jar/AbstractJarMojo.java	2025-06-06 18:06:45.024404142 +0200
++++ maven-jar-plugin-3.4.2/src/main/java/org/apache/maven/plugins/jar/AbstractJarMojo.java	2025-06-06 18:08:10.461673694 +0200
+@@ -348,7 +348,7 @@
+                 projectHelper.attachArtifact(getProject(), getType(), getClassifier(), jarFile);
+             } else {
+                 if (projectHasAlreadySetAnArtifact()) {
+-                    throw new MojoExecutionException("You have to use a classifier "
++                    getLog().warn("You have to use a classifier "
+                             + "to attach supplemental artifacts to the project instead of replacing them.");
                  }
-                 getProject().getArtifact().setFile( jarFile );
+                 getProject().getArtifact().setFile(jarFile);

maven-jar-plugin-3.4.2-source-release.zip

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6ea7b04b743a93829b08bf1ff801aa60212202033d1b65abcc3f492f2dd3c306
+size 243295

maven-jar-plugin-build.xml

@@ -14,10 +14,10 @@
             value="Builds a Java Archive (JAR) file from the compiled project classes and resources."/>
   <property name="project.groupId" value="org.apache.maven.plugins"/>
   <property name="project.artifactId" value="maven-jar-plugin"/>
-  <property name="project.version" value="3.3.0"/>
+  <property name="project.version" value="3.4.2"/>
   <property name="project.organization.name" value="The Apache Software Foundation"/>
 
-  <property name="spec.version" value="3.3"/>
+  <property name="spec.version" value="3.4"/>
 
   <property name="compiler.source" value="1.8"/>
   <property name="compiler.target" value="${compiler.source}"/>
@@ -100,6 +100,28 @@
     <copy file="pom.xml" tofile="${build.outputDir}/META-INF/maven/${project.groupId}/${project.artifactId}/pom.xml"/>
   </target>
 
+  <!-- ====================================================================== -->
+  <!-- Sisu javax.inject.Named generation target                              -->
+  <!-- ====================================================================== -->
+
+  <target name="sisu"
+          depends="compile"
+          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>
+
   <!-- ====================================================================== -->
   <!-- Test-compilation target                                                -->
   <!-- ====================================================================== -->
@@ -229,7 +251,7 @@
   <!-- Package target                                                         -->
   <!-- ====================================================================== -->
 
-  <target name="package" depends="compile,test" description="Package the application">
+  <target name="package" depends="sisu,test" description="Package the application">
     <jar jarfile="${build.dir}/${build.finalName}.jar"
          compress="true"
          index="false"

maven-jar-plugin.changes

@@ -1,3 +1,56 @@
+-------------------------------------------------------------------
+Mon Jul 21 14:29:28 UTC 2025 - Fridrich Strba <fstrba@suse.com>
+
+- Removed patch:
+  * reproducible-from-environment.patch
+    + patched in a more central place in maven-archiver
+
+-------------------------------------------------------------------
+Fri Jun  6 15:40:16 UTC 2025 - Fridrich Strba <fstrba@suse.com>
+
+- Update to upstream version 3.4.2
+  * New features and improvements
+    + MJAR-292: Detect MRJAR and add Multi-Release manifest entry
+    + MJAR-296: Allow including files excluded by default.
+    + MJAR-302: Require Maven 3.6.3
+    + MJAR-307: Wrong version of commons-io cause a ClassNotFound
+      o.a.commons.io.file.attribute.FileTimes
+    + MJAR-310: fixed toolchain version detection when toolchain
+      paths contain white spaces
+  * Bug Fixes
+    + MJAR-62: Set Build-Jdk according to used toolchain
+  * Dependency updates
+    + MJAR-306: Use properties for plugins versions in
+      LifecycleMapping
+    + Bump org.junit:junit-bom from 5.10.1 to 5.10.2
+    + MJAR-298: Update Maven-Archiver to 3.6.2
+    + Bump apache/maven-gh-actions-shared from 2 to 4
+    + Bump commons-io:commons-io from 2.14.0 to 2.15.1
+    + MJAR-297: Update Parent to 40
+    + MJAR-308: Bump org.apache.maven.plugins:maven-plugins from 41
+      to 42
+  * Maintenance
+    + MJAR-304: Refresh download page
+    + MJAR-303: Cleanup declared dependencies
+    + Remove dependency on plexus
+    + Build with Maven 4
+- Modified patches:
+  * maven-jar-plugin-bootstrap-resources.patch
+    + regenerate from the non-bootstrap build
+  * 01-allow-replacing-artifacts.patch
+  * reproducible-from-environment.patch
+    + rediff
+
+-------------------------------------------------------------------
+Mon Sep 23 10:09:21 UTC 2024 - Fridrich Strba <fstrba@suse.com>
+
+- Use SOURCE_DATE_EPOCH for reproducible builds
+- Added patch:
+  * reproducible-from-environment.patch
+    + SOURCE_DATE_EPOCH environmental variable triggers reproducible
+      use of the maven-jar-plugin if it is not requested already
+      using the project.build.outputTimestamp option.
+
 -------------------------------------------------------------------
 Wed Feb 21 05:59:39 UTC 2024 - Fridrich Strba <fstrba@suse.com>
 

maven-jar-plugin.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package maven-jar-plugin
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -23,7 +23,7 @@
 %bcond_with bootstrap
 %endif
 %global base_name maven-jar-plugin
-Version:        3.3.0
+Version:        3.4.2
 Release:        0
 Summary:        Maven JAR Plugin
 License:        Apache-2.0
@@ -33,6 +33,7 @@ Source0:        https://repo1.maven.org/maven2/org/apache/maven/plugins/%{base_n
 Source1:        %{base_name}-build.xml
 Patch0:         %{base_name}-bootstrap-resources.patch
 Patch1:         01-allow-replacing-artifacts.patch
+BuildRequires:  atinject
 BuildRequires:  fdupes
 BuildRequires:  java-devel >= 1.8
 BuildRequires:  javapackages-local
@@ -40,8 +41,11 @@ BuildRequires:  maven-archiver >= 3.5.0
 BuildRequires:  maven-file-management
 BuildRequires:  maven-lib
 BuildRequires:  maven-plugin-annotations
+BuildRequires:  objectweb-asm
 BuildRequires:  plexus-archiver >= 4.2.0
 BuildRequires:  plexus-utils >= 3.3.0
+BuildRequires:  sisu-inject
+BuildRequires:  slf4j
 BuildRequires:  unzip
 BuildRequires:  xmvn-install
 BuildRequires:  xmvn-resolve
@@ -59,6 +63,7 @@ BuildRequires:  mvn(org.apache.maven.plugins:maven-javadoc-plugin)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-plugin-plugin)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-resources-plugin)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-surefire-plugin)
+BuildRequires:  mvn(org.eclipse.sisu:sisu-maven-plugin)
 Obsoletes:      %{base_name}-bootstrap
 #!BuildRequires: maven-compiler-plugin-bootstrap
 #!BuildRequires: maven-jar-plugin-bootstrap
@@ -97,21 +102,25 @@ cp %{SOURCE1} build.xml
 %if %{with bootstrap}
 mkdir -p lib
 build-jar-repository -s lib \
+    atinject \
     maven-file-management/file-management \
     maven-archiver/maven-archiver \
     maven/maven-artifact \
     maven/maven-core \
     maven/maven-plugin-api \
     maven-plugin-tools/maven-plugin-annotations \
+    objectweb-asm/asm \
+    org.eclipse.sisu.inject \
     plexus/archiver \
-    plexus/utils
+    plexus/utils \
+    slf4j/api
 %{ant} -Dtest.skip=true jar
 %else
 xmvn --batch-mode --offline \
-    -Dmaven.test.skip=true -DmavenVersion=3.1.1 \
 %if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0}
     -Dmaven.compiler.release=8 \
 %endif
+    -Dmaven.test.skip=true \
     package org.apache.maven.plugins:maven-javadoc-plugin:aggregate
 %endif