Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package maven-plugin-tools for openSUSE:Factory checked in at 2026-11-03 17:58:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/maven-plugin-tools (Old) and /work/SRC/openSUSE:Factory/.maven-plugin-tools.new.1257 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "maven-plugin-tools" Tue Nov 3 17:58:45 2026 rev:23 rq:1394622 version:4.0.0~beta3 Changes: -------- --- /work/SRC/openSUSE:Factory/maven-plugin-tools/maven-plugin-plugin.changes 2026-09-11 18:07:29.594307054 +0200 +++ /work/SRC/openSUSE:Factory/.maven-plugin-tools.new.1257/maven-plugin-plugin.changes 2026-11-03 18:00:19.622288165 +0100 @@ -1,0 +2,21 @@ +Wed Oct 28 09:59:53 UTC 2026 - Fridrich Strba <[email protected]> + +- Modified patch: + * 0002-A-standalone-plugin-descriptor-generator.patch + + sync StandaloneDescriptorGenerator with upstream PR #1189: + effective model via maven-model-builder, Sisu container, + parent POMs resolved through XMvn workspace reader +- Add xmvn to build classpath; run bootstrap only once in build.xml + +------------------------------------------------------------------- +Sun Sep 20 13:05:12 UTC 2026 - Fridrich Strba <[email protected]> + +- Modified patches: + * 0002-Remove-dependency-on-jtidy.patch + -> 0001-Remove-dependency-on-jtidy.patch + + rediff + * 0001-A-standalone-plugin-descriptor-generator.patch + -> 0002-A-standalone-plugin-descriptor-generator.patch + + rediff and avoid injecting into private fields by reflection + +------------------------------------------------------------------- +++ only whitespace diff in changes, re-diffing maven-plugin-tools.changes: same change Old: ---- 0001-A-standalone-plugin-descriptor-generator.patch 0002-Remove-dependency-on-jtidy.patch New: ---- 0001-Remove-dependency-on-jtidy.patch 0002-A-standalone-plugin-descriptor-generator.patch ----------(Old B)---------- Old:/work/SRC/openSUSE:Factory/.maven-plugin-tools.new.1257/maven-plugin-plugin.changes- + rediff /work/SRC/openSUSE:Factory/.maven-plugin-tools.new.1257/maven-plugin-plugin.changes: * 0001-A-standalone-plugin-descriptor-generator.patch /work/SRC/openSUSE:Factory/.maven-plugin-tools.new.1257/maven-plugin-plugin.changes- -> 0002-A-standalone-plugin-descriptor-generator.patch -- /work/SRC/openSUSE:Factory/.maven-plugin-tools.new.1257/maven-plugin-report-plugin.changes-- Modified patches: /work/SRC/openSUSE:Factory/.maven-plugin-tools.new.1257/maven-plugin-report-plugin.changes: * 0001-A-standalone-plugin-descriptor-generator.patch /work/SRC/openSUSE:Factory/.maven-plugin-tools.new.1257/maven-plugin-report-plugin.changes- * 0002-Remove-dependency-on-jtidy.patch -- /work/SRC/openSUSE:Factory/.maven-plugin-tools.new.1257/maven-plugin-tools.changes-- Modified patches: /work/SRC/openSUSE:Factory/.maven-plugin-tools.new.1257/maven-plugin-tools.changes: * 0001-A-standalone-plugin-descriptor-generator.patch /work/SRC/openSUSE:Factory/.maven-plugin-tools.new.1257/maven-plugin-tools.changes- * 0002-Remove-dependency-on-jtidy.patch Old:/work/SRC/openSUSE:Factory/.maven-plugin-tools.new.1257/maven-plugin-plugin.changes-- Modified patches: /work/SRC/openSUSE:Factory/.maven-plugin-tools.new.1257/maven-plugin-plugin.changes: * 0002-Remove-dependency-on-jtidy.patch /work/SRC/openSUSE:Factory/.maven-plugin-tools.new.1257/maven-plugin-plugin.changes- -> 0001-Remove-dependency-on-jtidy.patch -- /work/SRC/openSUSE:Factory/.maven-plugin-tools.new.1257/maven-plugin-report-plugin.changes- * 0001-A-standalone-plugin-descriptor-generator.patch /work/SRC/openSUSE:Factory/.maven-plugin-tools.new.1257/maven-plugin-report-plugin.changes: * 0002-Remove-dependency-on-jtidy.patch /work/SRC/openSUSE:Factory/.maven-plugin-tools.new.1257/maven-plugin-report-plugin.changes- + rebase -- /work/SRC/openSUSE:Factory/.maven-plugin-tools.new.1257/maven-plugin-tools.changes- * 0001-A-standalone-plugin-descriptor-generator.patch /work/SRC/openSUSE:Factory/.maven-plugin-tools.new.1257/maven-plugin-tools.changes: * 0002-Remove-dependency-on-jtidy.patch /work/SRC/openSUSE:Factory/.maven-plugin-tools.new.1257/maven-plugin-tools.changes- + rebase ----------(Old E)---------- ----------(New B)---------- New:/work/SRC/openSUSE:Factory/.maven-plugin-tools.new.1257/maven-plugin-plugin.changes- * 0002-Remove-dependency-on-jtidy.patch /work/SRC/openSUSE:Factory/.maven-plugin-tools.new.1257/maven-plugin-plugin.changes: -> 0001-Remove-dependency-on-jtidy.patch /work/SRC/openSUSE:Factory/.maven-plugin-tools.new.1257/maven-plugin-plugin.changes- + rediff New:/work/SRC/openSUSE:Factory/.maven-plugin-tools.new.1257/maven-plugin-plugin.changes-- Modified patch: /work/SRC/openSUSE:Factory/.maven-plugin-tools.new.1257/maven-plugin-plugin.changes: * 0002-A-standalone-plugin-descriptor-generator.patch /work/SRC/openSUSE:Factory/.maven-plugin-tools.new.1257/maven-plugin-plugin.changes- + sync StandaloneDescriptorGenerator with upstream PR #1189: ----------(New E)---------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ maven-plugin-plugin.spec ++++++ --- /var/tmp/diff_new_pack.AiM38P/_old 2026-11-03 18:00:22.438407292 +0100 +++ /var/tmp/diff_new_pack.AiM38P/_new 2026-11-03 18:00:22.440407376 +0100 @@ -29,8 +29,8 @@ URL: https://maven.apache.org/plugin-tools/ Source0: https://repo1.maven.org/maven2/org/apache/maven/plugin-tools/%{base_name}/%{file_ver}/%{base_name}-%{file_ver}-source-release.zip Source1: %{base_name}-build.tar.xz -Patch0: 0001-A-standalone-plugin-descriptor-generator.patch -Patch1: 0002-Remove-dependency-on-jtidy.patch +Patch0: 0001-Remove-dependency-on-jtidy.patch +Patch1: 0002-A-standalone-plugin-descriptor-generator.patch BuildRequires: ant BuildRequires: atinject BuildRequires: fdupes @@ -45,6 +45,7 @@ BuildRequires: maven-resolver-util BuildRequires: objectweb-asm >= 9.9 BuildRequires: plexus-build-api0 +BuildRequires: plexus-interpolation BuildRequires: plexus-utils BuildRequires: plexus-velocity BuildRequires: sisu-inject @@ -87,14 +88,19 @@ %build mkdir -p lib build-jar-repository -s lib \ + aopalliance \ atinject \ guava/guava \ + guice/google-guice \ + jakarta-inject \ javaparser/javaparser-core \ javaparser/javaparser-symbol-solver-core \ jsoup/jsoup \ maven/maven-artifact \ + maven/maven-builder-support \ maven/maven-core \ maven/maven-model \ + maven/maven-model-builder \ maven/maven-plugin-api \ maven/maven-repository-metadata \ maven/maven-resolver-provider \ @@ -111,6 +117,8 @@ org.eclipse.sisu.plexus \ plexus/archiver \ plexus-classworlds \ + plexus-containers/plexus-component-annotations \ + plexus/interpolation \ plexus/io \ plexus/plexus-build-api0 \ plexus/utils \ @@ -118,7 +126,8 @@ plexus-velocity/plexus-velocity \ slf4j/api \ slf4j/simple \ - velocity-engine/velocity-engine-core + velocity-engine/velocity-engine-core \ + xmvn %{mvn_file} :%{name} %{base_name}/%{name} %{mvn_package} :%{base_name} __noinstall ++++++ maven-plugin-report-plugin.spec ++++++ --- /var/tmp/diff_new_pack.AiM38P/_old 2026-11-03 18:00:22.484409238 +0100 +++ /var/tmp/diff_new_pack.AiM38P/_new 2026-11-03 18:00:22.485409280 +0100 @@ -28,7 +28,8 @@ Group: Development/Libraries/Java URL: https://maven.apache.org/plugin-tools/ Source0: https://repo1.maven.org/maven2/org/apache/maven/plugin-tools/%{base_name}/%{file_ver}/%{base_name}-%{file_ver}-source-release.zip -Patch0: 0002-Remove-dependency-on-jtidy.patch +Patch0: 0001-Remove-dependency-on-jtidy.patch +Patch1: 0002-A-standalone-plugin-descriptor-generator.patch BuildRequires: fdupes BuildRequires: maven-local BuildRequires: unzip @@ -68,6 +69,7 @@ %prep %setup -q -n %{base_name}-%{file_ver} %patch -P 0 -p1 +%patch -P 1 -p1 %pom_remove_plugin -r :maven-enforcer-plugin %pom_remove_plugin :sisu-maven-plugin ++++++ maven-plugin-tools.spec ++++++ --- /var/tmp/diff_new_pack.AiM38P/_old 2026-11-03 18:00:22.525410972 +0100 +++ /var/tmp/diff_new_pack.AiM38P/_new 2026-11-03 18:00:22.528411099 +0100 @@ -28,7 +28,8 @@ URL: https://maven.apache.org/plugin-tools/ Source0: https://repo1.maven.org/maven2/org/apache/maven/plugin-tools/%{name}/%{file_ver}/%{name}-%{file_ver}-source-release.zip Source1: %{name}-build.tar.xz -Patch0: 0002-Remove-dependency-on-jtidy.patch +Patch0: 0001-Remove-dependency-on-jtidy.patch +Patch1: 0002-A-standalone-plugin-descriptor-generator.patch BuildRequires: ant BuildRequires: atinject BuildRequires: fdupes @@ -110,6 +111,7 @@ %prep %setup -q -a1 -n %{name}-%{file_ver} %patch -P 0 -p1 +%patch -P 1 -p1 %pom_remove_plugin -r :maven-enforcer-plugin ++++++ 0002-Remove-dependency-on-jtidy.patch -> 0001-Remove-dependency-on-jtidy.patch ++++++ --- /work/SRC/openSUSE:Factory/maven-plugin-tools/0002-Remove-dependency-on-jtidy.patch 2026-09-11 18:07:29.509303484 +0200 +++ /work/SRC/openSUSE:Factory/.maven-plugin-tools.new.1257/0001-Remove-dependency-on-jtidy.patch 2026-11-03 18:00:17.748208889 +0100 @@ -1,7 +1,7 @@ -From f52d37feb1f749d8551299b2f9bba457356ab20e Mon Sep 17 00:00:00 2001 +From 82727cb575d984385c6804d981a9c8e1e2f52332 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski <[email protected]> Date: Mon, 27 Apr 2020 12:56:04 +0200 -Subject: [PATCH 2/2] Remove dependency on jtidy +Subject: [PATCH 1/2] Remove dependency on jtidy Forwarded: not-needed --- @@ -103,5 +103,5 @@ return new HtmlToPlainTextConverter().convert(text); } else { -- -2.55.0 +2.56.0 ++++++ 0001-A-standalone-plugin-descriptor-generator.patch -> 0002-A-standalone-plugin-descriptor-generator.patch ++++++ ++++ 1200 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/maven-plugin-tools/0001-A-standalone-plugin-descriptor-generator.patch ++++ and /work/SRC/openSUSE:Factory/.maven-plugin-tools.new.1257/0002-A-standalone-plugin-descriptor-generator.patch ++++++ _scmsync.obsinfo ++++++ --- /var/tmp/diff_new_pack.AiM38P/_old 2026-11-03 18:00:22.619414948 +0100 +++ /var/tmp/diff_new_pack.AiM38P/_new 2026-11-03 18:00:22.622415075 +0100 @@ -1,6 +1,6 @@ -mtime: 1789043242 -commit: 55dc34542defa0eedca6b0363bb446988307fc27f84162da58d8153b5d5dc203 +mtime: 1793182936 +commit: 3d422e5b12cc630f4191fa26cf7789c407a1d84e7de4b27e222241700429f3e3 url: https://src.opensuse.org/java-packages/maven-plugin-tools -revision: 55dc34542defa0eedca6b0363bb446988307fc27f84162da58d8153b5d5dc203 +revision: 3d422e5b12cc630f4191fa26cf7789c407a1d84e7de4b27e222241700429f3e3 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-10-28 11:22:16.000000000 +0100 @@ -0,0 +1 @@ +.osc ++++++ maven-plugin-tools-build.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/maven-plugin-plugin/build.xml new/maven-plugin-plugin/build.xml --- old/maven-plugin-plugin/build.xml 2026-09-08 11:39:17.012848571 +0200 +++ new/maven-plugin-plugin/build.xml 2026-10-28 11:17:34.096732741 +0100 @@ -63,7 +63,7 @@ <!-- Compilation target --> <!-- ====================================================================== --> - <target name="-compile" description="Compile the code"> + <target name="-compile" unless="bootstrap.done" description="Compile the code"> <mkdir dir="${build.outputDir}"/> <!-- not used in this step --> <mkdir dir="${build.dir}/generated-sources/plugin"/> @@ -100,7 +100,8 @@ <!-- Bootstrap plugin descriptor generation target --> <!-- ====================================================================== --> - <target name="-plugin" depends="-compile"> + <!-- ant runs deps once per command-line target: "jar javadoc" would redo bootstrap and repackage the jar --> + <target name="-plugin" depends="-compile" unless="bootstrap.done"> <java classname="org.apache.maven.plugin.plugin.StandaloneDescriptorGenerator" fork="true" failonerror="true"> @@ -116,7 +117,7 @@ <!-- Mock Local Repository Setup Target --> <!-- ====================================================================== --> - <target name="-mock-repo" depends="-plugin" description="Creates a local Maven repo for XMvn"> + <target name="-mock-repo" depends="-plugin" unless="bootstrap.done" description="Creates a local Maven repo for XMvn"> <!-- Here we will need an actual jar --> <antcall target="-package" inheritrefs="true"/> @@ -146,7 +147,7 @@ <!-- HelpMojo.java generation target --> <!-- ====================================================================== --> - <target name="-helpmojo" depends="-mock-repo" description="Generate the HelpMojo.java"> + <target name="-helpmojo" depends="-mock-repo" unless="bootstrap.done" description="Generate the HelpMojo.java"> <mkdir dir="${build.outputDir}"/> <exec executable="xmvn" failonerror="true"> <arg value="--batch-mode" /> @@ -292,6 +293,8 @@ <target name="package" depends="plugin,test" description="Package the application"> <antcall target="-package" inheritrefs="true"/> + <!-- not earlier: "compile" antcalls -compile, which inherits properties --> + <property name="bootstrap.done" value="true"/> </target> <!-- ====================================================================== -->
