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-09-07 11:30:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/maven-plugin-tools (Old) and /work/SRC/openSUSE:Factory/.maven-plugin-tools.new.1265 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "maven-plugin-tools" Mon Sep 7 11:30:44 2026 rev:21 rq:1375795 version:4.0.0~beta2 Changes: -------- --- /work/SRC/openSUSE:Factory/maven-plugin-tools/maven-plugin-plugin.changes 2025-11-09 21:11:19.303726829 +0100 +++ /work/SRC/openSUSE:Factory/.maven-plugin-tools.new.1265/maven-plugin-plugin.changes 2026-09-07 11:32:51.256409701 +0200 @@ -1,0 +2,28 @@ +Fri Sep 4 07:14:59 UTC 2026 - Fridrich Strba <[email protected]> + +- Build with ant and fold the whole bootstrapping into two stage + builds within this package + * First, create bootstrap plugin descriptors using the standalone + plugin descriptor generator and build the whole bootstrap + artifact + * Second, install that artifact into a mock maven repository and + use it to generate all like if it was inside maven lifecycle. + The resulting artifact is having identical metadata as one from + maven build. + +------------------------------------------------------------------- +Wed Sep 2 07:06:17 UTC 2026 - Fridrich Strba <[email protected]> + +- Added patch: + * 0001-A-standalone-generator-of-HelpMojo.java-and-plugin-d.patch + + implement a standalone plugin descriptor generator that allows + the maven-plugin-plugin-bootstrap to generate its own + bootstrap plugin.xml. This generator will be used by other + bootstrap packages that were before patching pre-generated + plugin descriptors into the source tree +- Removed patch: + * maven-plugin-plugin-bootstrap-resouces.patch + + not needed any more, since the bootstrap plugin descriptor is + now generated + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/maven-plugin-tools/maven-plugin-report-plugin.changes 2025-11-09 21:11:31.824250448 +0100 +++ /work/SRC/openSUSE:Factory/.maven-plugin-tools.new.1265/maven-plugin-report-plugin.changes 2026-09-07 11:32:51.433415903 +0200 @@ -1,0 +2,8 @@ +Wed Sep 2 07:06:17 UTC 2026 - Fridrich Strba <[email protected]> + +- Removed patch: + * maven-plugin-plugin-bootstrap-resouces.patch + + not needed any more, since the bootstrap plugin descriptor is + now generated + +------------------------------------------------------------------- maven-plugin-tools.changes: same change Old: ---- maven-plugin-plugin-bootstrap-resouces.patch maven-plugin-plugin-bootstrap.changes maven-plugin-plugin-bootstrap.spec New: ---- 0001-A-standalone-generator-of-HelpMojo.java-and-plugin-d.patch ----------(Old B)---------- Old:/work/SRC/openSUSE:Factory/.maven-plugin-tools.new.1265/maven-plugin-plugin.changes-- Removed patch: /work/SRC/openSUSE:Factory/.maven-plugin-tools.new.1265/maven-plugin-plugin.changes: * maven-plugin-plugin-bootstrap-resouces.patch /work/SRC/openSUSE:Factory/.maven-plugin-tools.new.1265/maven-plugin-plugin.changes- + not needed any more, since the bootstrap plugin descriptor is -- /work/SRC/openSUSE:Factory/.maven-plugin-tools.new.1265/maven-plugin-report-plugin.changes-- Removed patch: /work/SRC/openSUSE:Factory/.maven-plugin-tools.new.1265/maven-plugin-report-plugin.changes: * maven-plugin-plugin-bootstrap-resouces.patch /work/SRC/openSUSE:Factory/.maven-plugin-tools.new.1265/maven-plugin-report-plugin.changes- + not needed any more, since the bootstrap plugin descriptor is -- /work/SRC/openSUSE:Factory/.maven-plugin-tools.new.1265/maven-plugin-tools.changes-- Removed patch: /work/SRC/openSUSE:Factory/.maven-plugin-tools.new.1265/maven-plugin-tools.changes: * maven-plugin-plugin-bootstrap-resouces.patch /work/SRC/openSUSE:Factory/.maven-plugin-tools.new.1265/maven-plugin-tools.changes- + not needed any more, since the bootstrap plugin descriptor is ----------(Old E)---------- ----------(New B)---------- New:/work/SRC/openSUSE:Factory/.maven-plugin-tools.new.1265/maven-plugin-plugin.changes-- Added patch: /work/SRC/openSUSE:Factory/.maven-plugin-tools.new.1265/maven-plugin-plugin.changes: * 0001-A-standalone-generator-of-HelpMojo.java-and-plugin-d.patch /work/SRC/openSUSE:Factory/.maven-plugin-tools.new.1265/maven-plugin-plugin.changes- + implement a standalone plugin descriptor generator that allows ----------(New E)---------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ maven-plugin-plugin.spec ++++++ --- /var/tmp/diff_new_pack.5wkG7V/_old 2026-09-07 11:32:52.524454132 +0200 +++ /var/tmp/diff_new_pack.5wkG7V/_new 2026-09-07 11:32:52.529454307 +0200 @@ -1,7 +1,7 @@ # # spec file for package maven-plugin-plugin # -# Copyright (c) 2025 SUSE LLC and contributors +# 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 @@ -28,36 +28,32 @@ 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 +Source1: %{base_name}-build.tar.xz +Patch0: 0001-A-standalone-generator-of-HelpMojo.java-and-plugin-d.patch +Patch1: 0002-Remove-dependency-on-jtidy.patch +BuildRequires: ant +BuildRequires: atinject BuildRequires: fdupes -BuildRequires: maven-local +BuildRequires: javapackages-local >= 6 +BuildRequires: maven-lib +BuildRequires: maven-plugin-annotations +BuildRequires: maven-plugin-tools-annotations +BuildRequires: maven-plugin-tools-api +BuildRequires: maven-plugin-tools-generators +BuildRequires: maven-resolver-api +BuildRequires: maven-resolver-util +BuildRequires: objectweb-asm >= 9.9 +BuildRequires: plexus-build-api0 +BuildRequires: plexus-utils +BuildRequires: plexus-velocity +BuildRequires: sisu-inject +BuildRequires: sisu-plexus BuildRequires: unzip -BuildRequires: mvn(javax.inject:javax.inject) -BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-annotations) -BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-tools-annotations) -BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-tools-api) -BuildRequires: mvn(org.apache.maven.plugin-tools:maven-plugin-tools-generators) -BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin) -BuildRequires: mvn(org.apache.maven.resolver:maven-resolver-api) -BuildRequires: mvn(org.apache.maven.resolver:maven-resolver-util) -BuildRequires: mvn(org.apache.maven:maven-artifact) -BuildRequires: mvn(org.apache.maven:maven-core) -BuildRequires: mvn(org.apache.maven:maven-model) +BuildRequires: xmvn-install +BuildRequires: xmvn-minimal +BuildRequires: xmvn-resolve BuildRequires: mvn(org.apache.maven:maven-parent:pom:) -BuildRequires: mvn(org.apache.maven:maven-plugin-api) -BuildRequires: mvn(org.apache.maven:maven-repository-metadata) -BuildRequires: mvn(org.apache.maven:maven-settings) -BuildRequires: mvn(org.codehaus.plexus:plexus-utils) -BuildRequires: mvn(org.codehaus.plexus:plexus-velocity) -BuildRequires: mvn(org.eclipse.sisu:org.eclipse.sisu.plexus) -BuildRequires: mvn(org.ow2.asm:asm) >= 9.9 -BuildRequires: mvn(org.sonatype.plexus:plexus-build-api) Obsoletes: %{name}-bootstrap -#!BuildRequires: maven-compiler-plugin-bootstrap -#!BuildRequires: maven-jar-plugin-bootstrap -#!BuildRequires: maven-plugin-plugin-bootstrap -#!BuildRequires: maven-resources-plugin-bootstrap -#!BuildRequires: maven-surefire-plugin-bootstrap BuildArch: noarch %description @@ -74,25 +70,68 @@ API documentation for %{name}. %prep -%setup -q -n %{base_name}-%{file_ver} +%setup -q -n %{base_name}-%{file_ver} -a1 %patch -P 0 -p1 +%patch -P 1 -p1 %pom_remove_plugin -r :maven-enforcer-plugin -%pom_remove_plugin :sisu-maven-plugin %pom_xpath_inject "pom:project/pom:properties" " <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>" +# Remove all dependencies with scope test, since a raw xmvn does not hide them +%pom_remove_dep -r :::test: + %build -pushd %{name} -%{mvn_file} :%{name} %{base_name}/%{name} -%{mvn_build} -f -- \ -%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0} - -Dmaven.compiler.release=8 \ -%endif - -Dsource=8 +mkdir -p lib +build-jar-repository -s lib \ + apache-commons-lang3 \ + atinject \ + 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 \ + maven/maven-settings \ + maven-plugin-tools/maven-plugin-annotations \ + maven-plugin-tools/maven-plugin-tools-api \ + maven-plugin-tools/maven-plugin-tools-generators \ + maven-plugin-tools/maven-plugin-tools-annotations \ + maven-resolver/maven-resolver-api \ + maven-resolver/maven-resolver-util \ + objectweb-asm/asm-all \ + org.eclipse.sisu.inject \ + org.eclipse.sisu.plexus \ + plexus/archiver \ + plexus-classworlds \ + plexus/interpolation \ + plexus/io \ + plexus/plexus-build-api0 \ + plexus/utils \ + plexus/xml \ + plexus-velocity/plexus-velocity \ + qdox \ + slf4j/api \ + velocity-engine/velocity-engine-core \ + xmvn +%{mvn_file} :%{name} %{base_name}/%{name} +%{mvn_package} :%{base_name} __noinstall +pushd %{name} +ant \ + -Dtest.skip=true \ + jar +ant \ + -f build-stage2.xml \ + -Dtest.skip=true \ + jar javadoc +%{mvn_artifact} ../pom.xml +%{mvn_artifact} pom.xml target/%{name}-%{file_ver}.jar popd %install ++++++ maven-plugin-report-plugin.spec ++++++ --- /var/tmp/diff_new_pack.5wkG7V/_old 2026-09-07 11:32:52.563455498 +0200 +++ /var/tmp/diff_new_pack.5wkG7V/_new 2026-09-07 11:32:52.566455603 +0200 @@ -1,7 +1,7 @@ # # spec file for package maven-plugin-report-plugin # -# Copyright (c) 2025 SUSE LLC and contributors +# 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 ++++++ maven-plugin-tools.spec ++++++ --- /var/tmp/diff_new_pack.5wkG7V/_old 2026-09-07 11:32:52.610457145 +0200 +++ /var/tmp/diff_new_pack.5wkG7V/_new 2026-09-07 11:32:52.613457250 +0200 @@ -1,7 +1,7 @@ # # spec file for package maven-plugin-tools # -# Copyright (c) 2025 SUSE LLC and contributors +# 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 @@ -53,7 +53,7 @@ BuildRequires: sisu-plexus BuildRequires: slf4j BuildRequires: unzip -BuildRequires: velocity +BuildRequires: velocity-engine-core BuildRequires: xmvn-install BuildRequires: xmvn-resolve BuildRequires: mvn(org.apache.maven:maven-parent:pom:) @@ -153,9 +153,9 @@ plexus-velocity/plexus-velocity \ qdox \ slf4j/api \ - velocity + velocity-engine/velocity-engine-core -%{ant} \ +ant \ -Dtest.skip=true \ package javadoc ++++++ 0001-A-standalone-generator-of-HelpMojo.java-and-plugin-d.patch ++++++ ++++ 1498 lines (skipped) ++++++ _multibuild ++++++ --- /var/tmp/diff_new_pack.5wkG7V/_old 2026-09-07 11:32:52.700460299 +0200 +++ /var/tmp/diff_new_pack.5wkG7V/_new 2026-09-07 11:32:52.707460544 +0200 @@ -1,5 +1,4 @@ <multibuild> - <package>maven-plugin-plugin-bootstrap</package> <package>maven-plugin-plugin</package> <package>maven-plugin-report-plugin</package> </multibuild> ++++++ _scmsync.obsinfo ++++++ --- /var/tmp/diff_new_pack.5wkG7V/_old 2026-09-07 11:32:52.746461911 +0200 +++ /var/tmp/diff_new_pack.5wkG7V/_new 2026-09-07 11:32:52.750462051 +0200 @@ -1,6 +1,6 @@ -mtime: 1762635508 -commit: ec09315ed0335ba8b3ecf01b1cd0e4c21373cb5ec09e4d5ecc4566cbe64c000d -url: https://src.opensuse.org/java-packages/maven-plugin-tools.git -revision: ec09315ed0335ba8b3ecf01b1cd0e4c21373cb5ec09e4d5ecc4566cbe64c000d +mtime: 1788524377 +commit: 1a1c8449f4ebe8c14ab48c6ccbf2272ff95009791db0fec354e4b381005a4973 +url: https://src.opensuse.org/java-packages/maven-plugin-tools +revision: 1a1c8449f4ebe8c14ab48c6ccbf2272ff95009791db0fec354e4b381005a4973 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 14:19:37.000000000 +0200 @@ -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-stage2.xml new/maven-plugin-plugin/build-stage2.xml --- old/maven-plugin-plugin/build-stage2.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/maven-plugin-plugin/build-stage2.xml 2026-09-04 14:15:10.160120295 +0200 @@ -0,0 +1,66 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<project name="maven-plugin-plugin-stage2" default="package" basedir="."> + + <!-- Inherit the entire base configuration --> + <import file="build.xml"/> + + <!-- ====================================================================== --> + <!-- Mock Local Repository Setup Target --> + <!-- ====================================================================== --> + + <target name="mock-repo" description="Creates a local Maven repo for XMvn"> + <!-- Convert the groupId (org.apache.maven.plugins) into a directory path --> + <loadresource property="groupId.path"> + <propertyresource name="project.groupId"/> + <filterchain> + <replacestring from="." to="/"/> + </filterchain> + </loadresource> + + <property name="repo.path" value="${build.dir}/bootstrap-repo/${groupId.path}/${project.artifactId}/${project.version}" /> + + <!-- Create the Maven-compliant directory structure --> + <mkdir dir="${repo.path}" /> + + <!-- Copy the Stage 1 JAR and POM into the mock repo structure --> + <copy file="${build.dir}/${build.finalName}.jar" tofile="${repo.path}/${project.artifactId}-${project.version}.jar" /> + <copy file="pom.xml" tofile="${repo.path}/${project.artifactId}-${project.version}.pom" /> + </target> + + <!-- ====================================================================== --> + <!-- HelpMojo.java generation target --> + <!-- ====================================================================== --> + + <target name="helpmojo" depends="mock-repo" description="Generate the HelpMojo.java"> + <mkdir dir="${build.outputDir}"/> + <exec executable="xmvn" failonerror="true"> + <arg value="--batch-mode" /> + <arg value="--offline" /> + <!-- Point XMvn to the mock repository we just created --> + <arg value="-Dmaven.repo.local=${basedir}/${build.dir}/bootstrap-repo" /> + <!-- Explicitly define the version to ensure it hits the mocked JAR --> + <arg value="${project.groupId}:${project.artifactId}:${project.version}:helpmojo" /> + </exec> + </target> + + <!-- ====================================================================== --> + <!-- Compilation target --> + <!-- ====================================================================== --> + + <target name="compile" depends="helpmojo,maven-plugin-plugin.compile" /> + + <!-- ====================================================================== --> + <!-- 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="-Dmaven.repo.local=${basedir}/${build.dir}/bootstrap-repo" /> + <arg value="${project.groupId}:${project.artifactId}:${project.version}:descriptor" /> + </exec> + </target> + +</project> 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 2025-10-24 16:13:34.341765943 +0200 +++ new/maven-plugin-plugin/build.xml 2026-09-04 14:13:09.999365641 +0200 @@ -12,17 +12,6 @@ <property name="project.artifactId" value="maven-plugin-plugin"/> <property name="project.name" value="Maven Plugin Plugin"/> - <property name="project.description" - value="The Plugin Plugin is used to create a Maven plugin descriptor for any Mojo's found in the source tree, -to include in the JAR. It is also used to generate Xdoc files for the Mojos as well as for updating the -plugin registry, the artifact metadata and a generic help goal."/> - - <property name="version.maven-resources-plugin" value="3.3.1"/> - <property name="version.maven-compiler-plugin" value="3.14.0"/> - <property name="version.maven-surefire" value="3.5.3"/> - <property name="version.maven-jar-plugin" value="3.4.2"/> - <property name="version.maven-install-plugin" value="3.1.4"/> - <property name="version.maven-deploy-plugin" value="3.1.4"/> <property name="build.finalName" value="${project.artifactId}-${project.version}"/> <property name="build.dir" value="target"/> @@ -44,6 +33,7 @@ <pathelement location="../maven-plugin-tools-api/target/classes"/> <pathelement location="../maven-plugin-tools-generators/target/classes"/> <pathelement location="../maven-plugin-annotations/target/classes"/> + <pathelement location="../maven-plugin-tools-annotations/target/classes"/> <fileset dir="../lib"> <include name="**/*.jar"/> </fileset> @@ -52,6 +42,7 @@ <pathelement location="../maven-plugin-tools-api/target/classes"/> <pathelement location="../maven-plugin-tools-generators/target/classes"/> <pathelement location="../maven-plugin-annotations/target/classes"/> + <pathelement location="../maven-plugin-tools-annotations/target/classes"/> <pathelement location="../maven-plugin-tools-java/target/classes"/> <pathelement location="../maven-script/maven-script-beanshell/target/classes"/> <pathelement location="../maven-script/maven-script-ant/target/classes"/> @@ -74,6 +65,8 @@ <target name="compile" description="Compile the code"> <mkdir dir="${build.outputDir}"/> + <!-- not used in this step --> + <mkdir dir="${build.dir}/generated-sources/plugin"/> <javac destdir="${build.outputDir}" nowarn="false" debug="true" @@ -87,18 +80,13 @@ 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}"/> </copy> - <copy todir="${build.outputDir}"> - <fileset dir="${build.resourceDir.1}"/> - <filterchain> - <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}"/> @@ -109,6 +97,33 @@ </target> <!-- ====================================================================== --> + <!-- Plugin descriptor generation target --> + <!-- ====================================================================== --> + + <target name="plugin" depends="compile"> + + <java classname="org.apache.maven.plugin.plugin.StandaloneDescriptorGenerator$HelpMojoJava" + fork="true" + failonerror="true"> + <classpath> + <pathelement location="${build.outputDir}"/> + <path refid="build.classpath"/> + </classpath> + <arg value="pom.xml"/> + </java> + <antcall target="compile" inheritrefs="true"/> + <java classname="org.apache.maven.plugin.plugin.StandaloneDescriptorGenerator" + fork="true" + failonerror="true"> + <classpath> + <pathelement location="${build.outputDir}"/> + <path refid="build.classpath"/> + </classpath> + <arg value="pom.xml"/> + </java> + </target> + + <!-- ====================================================================== --> <!-- Test-compilation target --> <!-- ====================================================================== --> @@ -163,6 +178,7 @@ <target name="javadoc" description="Generates the Javadoc of the application"> <path id="src.path"> <pathelement location="${build.srcDir}"/> + <pathelement location="${build.dir}/generated-sources/plugin"/> </path> <javadoc sourcepathref="src.path" packagenames="*" @@ -183,14 +199,16 @@ serialwarn="false" encoding="UTF-8" linksource="false" - breakiterator="false"/> + breakiterator="false"> + <classpath refid="build.classpath"/> + </javadoc> </target> <!-- ====================================================================== --> <!-- 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"
