Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package maven-resources-plugin for
openSUSE:Factory checked in at 2026-09-07 11:30:37
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/maven-resources-plugin (Old)
and /work/SRC/openSUSE:Factory/.maven-resources-plugin.new.1265 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "maven-resources-plugin"
Mon Sep 7 11:30:37 2026 rev:11 rq:1375777 version:3.5.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/maven-resources-plugin/maven-resources-plugin.changes
2026-03-05 17:33:41.444780671 +0100
+++
/work/SRC/openSUSE:Factory/.maven-resources-plugin.new.1265/maven-resources-plugin.changes
2026-09-07 11:32:35.146845028 +0200
@@ -1,0 +2,16 @@
+Fri Sep 4 11:17:15 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 14:05:56 UTC 2026 - Fridrich Strba <[email protected]>
+
+- Removed patch:
+ * maven-resources-plugin-bootstrap-resources.patch
+ + use the new standalone plugin descriptor generator for
+ the bootstrap build
+
+-------------------------------------------------------------------
Old:
----
_multibuild
maven-resources-plugin-bootstrap-resources.patch
----------(Old B)----------
Old:- Removed patch:
* maven-resources-plugin-bootstrap-resources.patch
+ use the new standalone plugin descriptor generator for
----------(Old E)----------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ maven-resources-plugin.spec ++++++
--- /var/tmp/diff_new_pack.EeUk4p/_old 2026-09-07 11:32:35.963873670 +0200
+++ /var/tmp/diff_new_pack.EeUk4p/_new 2026-09-07 11:32:35.968873845 +0200
@@ -1,7 +1,7 @@
#
# spec file for package maven-resources-plugin
#
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2026 SUSE LLC and contributors
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,107 +16,88 @@
#
-%global flavor @BUILD_FLAVOR@%{nil}
-%if "%{flavor}" == "bootstrap"
-%bcond_without bootstrap
-%else
-%bcond_with bootstrap
-%endif
-%global base_name maven-resources-plugin
+Name: maven-resources-plugin
Version: 3.5.0
Release: 0
Summary: Maven Resources Plugin
License: Apache-2.0
Group: Development/Libraries/Java
URL: https://maven.apache.org/plugins/maven-resources-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
-Patch0: %{base_name}-bootstrap-resources.patch
-BuildRequires: atinject
+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-lang3
+BuildRequires: atinject
BuildRequires: fdupes
BuildRequires: java-devel >= 1.8
BuildRequires: javapackages-local
BuildRequires: maven-filtering >= 3.5.0
BuildRequires: maven-lib
BuildRequires: maven-plugin-annotations
+BuildRequires: maven-plugin-plugin
BuildRequires: plexus-interpolation
BuildRequires: plexus-utils
BuildRequires: sisu-plexus
BuildRequires: unzip
+BuildRequires: xmvn-connector
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)
-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
The Resources Plugin handles the copying of project resources
to the output directory.
-%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
-%endif
# Remove all dependencies with scope test, since a raw xmvn does not hide them
%pom_remove_dep -r :::test:
%build
-%if %{with bootstrap}
mkdir -p lib
build-jar-repository -s lib \
atinject \
commons-lang3 \
+ jsoup/jsoup\
maven-filtering/maven-filtering \
+ maven/maven-artifact \
maven/maven-core \
maven/maven-model \
maven/maven-plugin-api \
+ maven/maven-resolver-provider \
maven-plugin-tools/maven-plugin-annotations \
+ maven-plugin-tools/maven-plugin-plugin \
+ maven-plugin-tools/maven-plugin-tools-annotations \
+ maven-plugin-tools/maven-plugin-tools-api \
+ maven-plugin-tools/maven-plugin-tools-generators \
+ maven-resolver/maven-resolver-api \
+ maven-resolver/maven-resolver-util \
+ objectweb-asm/asm-all \
org.eclipse.sisu.plexus \
+ plexus/archiver \
+ plexus-classworlds \
plexus/interpolation \
- plexus/utils
-%{ant} -Dtest.skip=true jar
-%else
-xmvn --batch-mode --offline \
- -Dmaven.test.skip=true \
-%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0}
- -Dmaven.compiler.release=8 \
-%endif
- package org.apache.maven.plugins:maven-javadoc-plugin:aggregate
-%endif
+ plexus/utils \
+ plexus/xml \
+ qdox \
+ slf4j/api \
+ velocity-engine/velocity-engine-core \
+ xmvn
+%{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
@@ -125,8 +106,6 @@
%files -f .mfiles
%license LICENSE NOTICE
-%if %{without bootstrap}
%files javadoc -f .mfiles-javadoc
%license LICENSE NOTICE
-%endif
++++++ _scmsync.obsinfo ++++++
--- /var/tmp/diff_new_pack.EeUk4p/_old 2026-09-07 11:32:36.025875843 +0200
+++ /var/tmp/diff_new_pack.EeUk4p/_new 2026-09-07 11:32:36.034876159 +0200
@@ -1,6 +1,6 @@
-mtime: 1772456854
-commit: 2f92a793c2c5a015d662d737119cdbf08218e6977e48089787417d36028710f6
-url: https://src.opensuse.org/java-packages/maven-resources-plugin.git
-revision: 2f92a793c2c5a015d662d737119cdbf08218e6977e48089787417d36028710f6
+mtime: 1788520657
+commit: 4cf82a7b2656b2cd3c66f37adc93c47198c974a888c973eeaf3d0fcfbbd85e9e
+url: https://src.opensuse.org/java-packages/maven-resources-plugin
+revision: 4cf82a7b2656b2cd3c66f37adc93c47198c974a888c973eeaf3d0fcfbbd85e9e
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:17:37.000000000 +0200
@@ -0,0 +1 @@
+.osc
++++++ maven-resources-plugin-build.xml ++++++
--- /var/tmp/diff_new_pack.EeUk4p/_old 2026-09-07 11:32:36.241883416 +0200
+++ /var/tmp/diff_new_pack.EeUk4p/_new 2026-09-07 11:32:36.243883486 +0200
@@ -62,10 +62,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"
@@ -79,23 +91,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>
- <propertyref name="project.name"/>
- <propertyref name="project.version"/>
- <propertyref name="project.groupId"/>
- <propertyref name="project.artifactId"/>
- <propertyref name="project.description"/>
- </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}"/>
@@ -106,6 +105,18 @@
</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
-->
<!-- ======================================================================
-->
@@ -204,8 +215,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"
@@ -234,7 +245,7 @@
<!-- Package target
-->
<!-- ======================================================================
-->
- <target name="package" depends="compile,test" description="Package the
application">
+ <target name="package" depends="plugin,test" description="Package the
application">
<jar jarfile="${build.dir}/${build.finalName}.jar"
compress="true"
index="false"
