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 2026-09-07 11:30:39
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/maven-jar-plugin (Old)
and /work/SRC/openSUSE:Factory/.maven-jar-plugin.new.1265 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "maven-jar-plugin"
Mon Sep 7 11:30:39 2026 rev:16 rq:1375778 version:3.5.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/maven-jar-plugin/maven-jar-plugin.changes
2026-07-23 23:12:23.712603836 +0200
+++
/work/SRC/openSUSE:Factory/.maven-jar-plugin.new.1265/maven-jar-plugin.changes
2026-09-07 11:32:36.960908622 +0200
@@ -1,0 +2,16 @@
+Fri Sep 4 11:14:43 UTC 2026 - Fridrich Strba <[email protected]>
+
+- Do not build the bootstrap plugin, build the non-bootstrap version
+ using ant and generating the HelpMojo.java and the plugin
+ descriptors by an execution of maven-plugin-plugin goals outside
+ of maven lifecycle
+
+-------------------------------------------------------------------
+Wed Sep 2 13:56:52 UTC 2026 - Fridrich Strba <[email protected]>
+
+- Removed patch:
+ * maven-jar-plugin-bootstrap-resources.patch
+ + use the new standalone plugin descriptor generator for
+ the bootstrap build
+
+-------------------------------------------------------------------
Old:
----
_multibuild
maven-jar-plugin-bootstrap-resources.patch
pom_properties.py
----------(Old B)----------
Old:- Removed patch:
* maven-jar-plugin-bootstrap-resources.patch
+ use the new standalone plugin descriptor generator for
----------(Old E)----------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ maven-jar-plugin.spec ++++++
--- /var/tmp/diff_new_pack.6izWr9/_old 2026-09-07 11:32:37.580930357 +0200
+++ /var/tmp/diff_new_pack.6izWr9/_new 2026-09-07 11:32:37.581930392 +0200
@@ -16,23 +16,16 @@
#
-%global flavor @BUILD_FLAVOR@%{nil}
-%if "%{flavor}" == "bootstrap"
-%bcond_without bootstrap
-%else
-%bcond_with bootstrap
-%endif
-%global base_name maven-jar-plugin
+Name: maven-jar-plugin
Version: 3.5.1
Release: 0
Summary: Maven JAR Plugin
License: Apache-2.0
Group: Development/Libraries/Java
URL: https://maven.apache.org/plugins/maven-jar-plugin/
-Source0:
https://repo1.maven.org/maven2/org/apache/maven/plugins/%{base_name}/%{version}/%{base_name}-%{version}-source-release.zip
-Source1: %{base_name}-build.xml
-Source100: pom_properties.py
-Patch0: %{base_name}-bootstrap-resources.patch
+Source0:
https://repo1.maven.org/maven2/org/apache/maven/plugins/%{name}/%{version}/%{name}-%{version}-source-release.zip
+Source1: %{name}-build.xml
+BuildRequires: ant
BuildRequires: apache-commons-io
BuildRequires: atinject
BuildRequires: fdupes
@@ -42,64 +35,38 @@
BuildRequires: maven-file-management
BuildRequires: maven-lib
BuildRequires: maven-plugin-annotations
+BuildRequires: maven-plugin-plugin
BuildRequires: objectweb-asm
BuildRequires: plexus-archiver >= 4.2.0
BuildRequires: sisu-inject
BuildRequires: slf4j
BuildRequires: unzip
BuildRequires: xmvn-install
+BuildRequires: xmvn-minimal
BuildRequires: xmvn-resolve
BuildRequires: mvn(org.apache.maven.plugins:maven-plugins:pom:)
+Obsoletes: %{name}-bootstrap
BuildArch: noarch
-%if %{with bootstrap}
-Name: %{base_name}-bootstrap
-BuildRequires: ant
-%else
-Name: %{base_name}
-BuildRequires: xmvn
-BuildRequires: mvn(org.apache.maven.plugins:maven-compiler-plugin)
-BuildRequires: mvn(org.apache.maven.plugins:maven-jar-plugin)
-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
-#!BuildRequires: maven-javadoc-plugin-bootstrap
-#!BuildRequires: maven-plugin-plugin-bootstrap
-#!BuildRequires: maven-resources-plugin-bootstrap
-#!BuildRequires: maven-surefire-plugin-bootstrap
-%endif
%description
Builds a Java Archive (JAR) file from the compiled
project classes and resources.
-%if %{without bootstrap}
%package javadoc
Summary: Javadoc for %{name}
Group: Documentation/HTML
%description javadoc
API documentation for %{name}.
-%endif
%prep
-%setup -q -n %{base_name}-%{version}
-%if %{with bootstrap}
+%setup -q
cp %{SOURCE1} build.xml
-%patch -P 0 -p1
-python3 %{SOURCE100} pom.xml >build.properties
-%endif
# Remove all dependencies with scope test, since a raw xmvn does not hide them
%pom_remove_dep -r :::test:
%build
-# Test class MockArtifact doesn't override method getMetadata
-%if %{with bootstrap}
mkdir -p lib
build-jar-repository -s lib \
atinject \
@@ -114,17 +81,9 @@
plexus/archiver \
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 \
- package org.apache.maven.plugins:maven-javadoc-plugin:aggregate
-%endif
+ant -Dtest.skip=true jar javadoc
-%{mvn_artifact} pom.xml target/%{base_name}-%{version}.jar
+%{mvn_artifact} pom.xml target/%{name}-%{version}.jar
%install
%mvn_install
@@ -135,9 +94,7 @@
%license LICENSE
%doc NOTICE
-%if %{without bootstrap}
%files javadoc -f .mfiles-javadoc
%license LICENSE
%doc NOTICE
-%endif
++++++ _scmsync.obsinfo ++++++
--- /var/tmp/diff_new_pack.6izWr9/_old 2026-09-07 11:32:37.609931374 +0200
+++ /var/tmp/diff_new_pack.6izWr9/_new 2026-09-07 11:32:37.612931479 +0200
@@ -1,6 +1,6 @@
-mtime: 1784742633
-commit: d14ab53e94b2e22fb62ac581ec4d0c96d62184504f856f23383cb0d2bf1cb21d
+mtime: 1788520599
+commit: 66745811e54e04d7e8138f7b0bcc61432410cd36e41507d0972267629f415ec2
url: https://src.opensuse.org/java-packages/maven-jar-plugin
-revision: d14ab53e94b2e22fb62ac581ec4d0c96d62184504f856f23383cb0d2bf1cb21d
+revision: 66745811e54e04d7e8138f7b0bcc61432410cd36e41507d0972267629f415ec2
projectscmsync: https://src.opensuse.org/java-packages/_ObsPrj
++++++ build.specials.obscpio ++++++
++++++ build.specials.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/.gitignore new/.gitignore
--- old/.gitignore 1970-01-01 01:00:00.000000000 +0100
+++ new/.gitignore 2026-09-04 13:16:39.000000000 +0200
@@ -0,0 +1 @@
+.osc
++++++ maven-jar-plugin-build.xml ++++++
--- /var/tmp/diff_new_pack.6izWr9/_old 2026-09-07 11:32:37.766936878 +0200
+++ /var/tmp/diff_new_pack.6izWr9/_new 2026-09-07 11:32:37.770937018 +0200
@@ -9,9 +9,6 @@
<property file="build.properties"/>
<property name="project.name" value="Apache Maven JAR Plugin"/>
- <!-- not used in this build.xml file, but used for filtering the bootstrap
resources -->
- <property name="project.description"
- 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.5.1"/>
@@ -57,10 +54,22 @@
</target>
<!-- ======================================================================
-->
+ <!-- HelpMojo.java generation target
-->
+ <!-- ======================================================================
-->
+
+ <target name="helpmojo" description="Generate the HelpMojo.java">
+ <exec executable="xmvn" failonerror="true">
+ <arg value="--batch-mode" />
+ <arg value="--offline" />
+ <arg value="org.apache.maven.plugins:maven-plugin-plugin:helpmojo" />
+ </exec>
+ </target>
+
+ <!-- ======================================================================
-->
<!-- Compilation target
-->
<!-- ======================================================================
-->
- <target name="compile" description="Compile the code">
+ <target name="compile" depends="helpmojo" description="Compile the code">
<mkdir dir="${build.outputDir}"/>
<javac destdir="${build.outputDir}"
nowarn="false"
@@ -74,20 +83,10 @@
source="${compiler.source}">
<src>
<pathelement location="${build.srcDir}"/>
+ <pathelement location="${build.dir}/generated-sources/plugin"/>
</src>
<classpath refid="build.classpath"/>
</javac>
- <copy todir="${build.outputDir}">
- <fileset dir="${build.resourceDir}"/>
- <filterchain>
- <expandproperties>
- <propertyset negate="true">
- <!-- this one should stay unexpanded; the expansion is for the
plugin users -->
- <propertyref name="project.build.outputTimestamp"/>
- </propertyset>
- </expandproperties>
- </filterchain>
- </copy>
<mkdir
dir="${build.outputDir}/META-INF/maven/${project.groupId}/${project.artifactId}"/>
<propertyfile
file="${build.outputDir}/META-INF/maven/${project.groupId}/${project.artifactId}/pom.properties">
<entry key="artifactId" value="${project.artifactId}"/>
@@ -120,6 +119,19 @@
</target>
<!-- ======================================================================
-->
+ <!-- Plugin descriptor generation target
-->
+ <!-- ======================================================================
-->
+
+ <target name="plugin" depends="compile" description="Generate plugin
descriptors">
+ <exec executable="xmvn" failonerror="true">
+ <arg value="--batch-mode" />
+ <arg value="--offline" />
+ <arg value="org.apache.maven.plugins:maven-plugin-plugin:descriptor" />
+ </exec>
+ </target>
+
+
+ <!-- ======================================================================
-->
<!-- Test-compilation target
-->
<!-- ======================================================================
-->
@@ -218,8 +230,8 @@
<!-- Javadoc target
-->
<!-- ======================================================================
-->
- <target name="javadoc" description="Generates the Javadoc of the
application">
- <javadoc sourcepath="${build.srcDir}"
+ <target name="javadoc" depends="helpmojo" description="Generates the Javadoc
of the application">
+ <javadoc sourcepath="${build.srcDir}:${build.dir}/generated-sources/plugin"
packagenames="*"
destdir="${reporting.outputDirectory}/apidocs"
access="protected"
@@ -248,7 +260,7 @@
<!-- Package target
-->
<!-- ======================================================================
-->
- <target name="package" depends="sisu,test" description="Package the
application">
+ <target name="package" depends="plugin,sisu,test" description="Package the
application">
<jar jarfile="${build.dir}/${build.finalName}.jar"
compress="true"
index="false"
