Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package maven-jar-plugin for
openSUSE:Factory checked in at 2025-06-10 09:03:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/maven-jar-plugin (Old)
and /work/SRC/openSUSE:Factory/.maven-jar-plugin.new.19631 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "maven-jar-plugin"
Tue Jun 10 09:03:30 2025 rev:12 rq:1283732 version:3.4.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/maven-jar-plugin/maven-jar-plugin.changes
2024-09-24 17:32:57.464279159 +0200
+++
/work/SRC/openSUSE:Factory/.maven-jar-plugin.new.19631/maven-jar-plugin.changes
2025-06-10 09:06:55.351496131 +0200
@@ -1,0 +2,36 @@
+Fri Jun 6 15:40:16 UTC 2025 - Fridrich Strba <[email protected]>
+
+- 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
+
+-------------------------------------------------------------------
Old:
----
maven-jar-plugin-3.3.0-source-release.zip
New:
----
maven-jar-plugin-3.4.2-source-release.zip
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ maven-jar-plugin.spec ++++++
--- /var/tmp/diff_new_pack.Kj3GRu/_old 2025-06-10 09:06:56.347537294 +0200
+++ /var/tmp/diff_new_pack.Kj3GRu/_new 2025-06-10 09:06:56.347537294 +0200
@@ -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
@@ -34,6 +34,7 @@
Patch0: %{base_name}-bootstrap-resources.patch
Patch1: 01-allow-replacing-artifacts.patch
Patch2: reproducible-from-environment.patch
+BuildRequires: atinject
BuildRequires: fdupes
BuildRequires: java-devel >= 1.8
BuildRequires: javapackages-local
@@ -41,8 +42,11 @@
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
@@ -60,6 +64,7 @@
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
@@ -99,22 +104,25 @@
%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 \
%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0}
-Dmaven.compiler.release=8 \
%endif
- -Dmaven.test.skip=true -DmavenVersion=3.1.1 \
- -Dproject.build.outputTimestamp=$(date -u -d @${SOURCE_DATE_EPOCH:-$(date
+%%s)} +%%Y-%%m-%%dT%%H:%%M:%%SZ) \
+ -Dmaven.test.skip=true \
package org.apache.maven.plugins:maven-javadoc-plugin:aggregate
%endif
++++++ 01-allow-replacing-artifacts.patch ++++++
--- /var/tmp/diff_new_pack.Kj3GRu/_old 2025-06-10 09:06:56.363537955 +0200
+++ /var/tmp/diff_new_pack.Kj3GRu/_new 2025-06-10 09:06:56.367538121 +0200
@@ -1,12 +1,13 @@
----
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.3.0-source-release.zip ->
maven-jar-plugin-3.4.2-source-release.zip ++++++
++++ 3395 lines of diff (skipped)
++++++ maven-jar-plugin-bootstrap-resources.patch ++++++
++++ 1432 lines (skipped)
++++ between
/work/SRC/openSUSE:Factory/maven-jar-plugin/maven-jar-plugin-bootstrap-resources.patch
++++ and
/work/SRC/openSUSE:Factory/.maven-jar-plugin.new.19631/maven-jar-plugin-bootstrap-resources.patch
++++++ maven-jar-plugin-build.xml ++++++
--- /var/tmp/diff_new_pack.Kj3GRu/_old 2025-06-10 09:06:56.539545229 +0200
+++ /var/tmp/diff_new_pack.Kj3GRu/_new 2025-06-10 09:06:56.539545229 +0200
@@ -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}"/>
@@ -101,6 +101,28 @@
</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"
++++++ reproducible-from-environment.patch ++++++
--- /var/tmp/diff_new_pack.Kj3GRu/_old 2025-06-10 09:06:56.551545725 +0200
+++ /var/tmp/diff_new_pack.Kj3GRu/_new 2025-06-10 09:06:56.555545890 +0200
@@ -1,18 +1,18 @@
----
maven-jar-plugin-3.3.0/src/main/java/org/apache/maven/plugins/jar/AbstractJarMojo.java
2024-09-23 11:44:25.479106748 +0200
-+++
maven-jar-plugin-3.3.0/src/main/java/org/apache/maven/plugins/jar/AbstractJarMojo.java
2024-09-23 12:10:05.439871672 +0200
-@@ -251,6 +251,14 @@
- archiver.setArchiver( (JarArchiver) archivers.get( archiverName ) );
- archiver.setOutputFile( jarFile );
+---
maven-jar-plugin-3.4.2/src/main/java/org/apache/maven/plugins/jar/AbstractJarMojo.java
2025-06-06 13:29:29.658765179 +0200
++++
maven-jar-plugin-3.4.2/src/main/java/org/apache/maven/plugins/jar/AbstractJarMojo.java
2025-06-06 13:29:55.193773784 +0200
+@@ -302,6 +302,14 @@
+ getLog().info("Set Build-Jdk-Spec based on
toolchain in maven-jar-plugin " + toolchain);
+ }));
-+ if ( outputTimestamp == null ||
++ if (outputTimestamp == null ||
+ outputTimestamp.length() < 1 ||
-+ ( ( outputTimestamp.length() == 1 )
-+ && !Character.isDigit( outputTimestamp.charAt(0) ) ) )
++ ((outputTimestamp.length() == 1)
++ && !Character.isDigit(outputTimestamp.charAt(0))))
+ {
+ outputTimestamp = System.getenv("SOURCE_DATE_EPOCH");
+ }
+
// configure for Reproducible Builds based on outputTimestamp value
- archiver.configureReproducibleBuild( outputTimestamp );
+ archiver.configureReproducibleBuild(outputTimestamp);
