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-11 18:04:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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" Fri Sep 11 18:04:09 2026 rev:22 rq:1377328 version:4.0.0~beta3 Changes: -------- --- /work/SRC/openSUSE:Factory/maven-plugin-tools/maven-plugin-plugin.changes 2026-09-07 11:32:51.256409701 +0200 +++ /work/SRC/openSUSE:Factory/.maven-plugin-tools.new.1265/maven-plugin-plugin.changes 2026-09-11 18:07:29.594307054 +0200 @@ -1,0 +2,77 @@ +Wed Sep 9 18:04:24 UTC 2026 - Fridrich Strba <[email protected]> + +- Upgrade to upstream version 4.0.0-beta-3 + * New features and improvements + + Wire up @after annotation scanning in the annotation-based + descriptor extractor + + MPLUGIN-421: Replace QDox with JavaParser for Javadoc + extraction + + Stop depending on Wagon for nonProxyHosts matching + + GH-944: Support root path exclusion for QDox scanning to + avoid existing blocking issues + * Bug Fixes + + Normalize references in Javadoc + + Fix excludedScanDirectories never matching on Windows + + #1105 Modified to properly report expression and defaultValue + when processing Maven 4 plugin + + JavadocLinkGenerator.createLink(String) must consider module + names + * Documentation updates + + Restore the common wording on the download page + + Convert the index page from xdoc to Markdown + * Maintenance + + Update SCM tag and resolver version + + Run the site ITs against the parent's site plugin version + + Convert the index page from xdoc to Markdown + + MPLUGIN-421: Migrate legacy plugin Javadoc annotations + + Restore the document metadata dropped when the pages were + ported + + Port the site documentation from APT to Markdown + + Build against Maven 4.0.0-rc-6 + + Remove Plexus component configuration + + Cleanup tests + + Remove deprecated GeneratorUtils#toText + * Dependency updates + + Bump org.jsoup:jsoup from 1.19.1 to 1.23.2 + + Bump org.codehaus.plexus:plexus-java from 1.5.0 to 1.6.0 + + Bump org.codehaus.plexus:plexus-classworlds from 2.9.0 to + 2.12.1 + + Bump org.codehaus.plexus:plexus-velocity from 2.3.0 to 2.4.0 + + Bump org.codehaus.plexus:plexus-utils from 4.0.2 to 4.1.0 + + Bump org.codehaus.plexus:plexus-i18n from 1.0.0 to 1.2.0 + + Bump org.codehaus.plexus:plexus-archiver from 4.10.3 to 4.14.0 + + Bump net.bytebuddy:byte-buddy from 1.17.8 to 1.18.12 + + Stop depending on Wagon for nonProxyHosts matching + + Bump apache/maven-gh-actions-shared/.github/workflows/ + /release-drafter.yml from 4 to 5 + + Bump apache/maven-gh-actions-shared/.github/workflows/ + /maven-verify.yml from 4 to 5 + + Bump apache/maven-gh-actions-shared/.github/workflows/ + /stale.yml from 4 to 5 + + Bump apache/maven-gh-actions-shared/.github/workflows/ + /pr-automation.yml from 4 to 5 + + Bump org.apache.maven:maven-parent from 47 to 49 + + Bump asmVersion from 9.9 to 9.10.1 + + Bump maven3Version from 3.9.11 to 3.9.16 + + Bump doxiaVersion from 2.0.0 to 2.1.0 + + Update to Parent 47 and Resolver 1.9.25 + + Bump org.apache.maven.plugin-testing + :maven-plugin-testing-harness from 3.3.0 to 3.5.1 + + Bump org.assertj:assertj-core from 3.27.6 to 3.27.7 + + Add palantir format for Java 25 + + Bump org.apache.commons:commons-lang3 from 3.19.0 to 3.20.0 +- Modified patches: + * 0001-A-standalone-plugin-descriptor-generator.patch + * 0002-Remove-dependency-on-jtidy.patch + + rebase + +------------------------------------------------------------------- +Tue Sep 8 09:48:27 UTC 2026 - Fridrich Strba <[email protected]> + +- Modified patch: + * 0001-A-standalone-generator-of-HelpMojo.java-and-plugin-d.patch + -> 0001-A-standalone-plugin-descriptor-generator.patch + + Just a minimal version allowing us to build a basic plugin + that we immediately use to build the full-fledged one. + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/maven-plugin-tools/maven-plugin-report-plugin.changes 2026-09-07 11:32:51.433415903 +0200 +++ /work/SRC/openSUSE:Factory/.maven-plugin-tools.new.1265/maven-plugin-report-plugin.changes 2026-09-11 18:07:29.615307936 +0200 @@ -1,0 +2,68 @@ +Wed Sep 9 18:04:24 UTC 2026 - Fridrich Strba <[email protected]> + +- Upgrade to upstream version 4.0.0-beta-3 + * New features and improvements + + Wire up @after annotation scanning in the annotation-based + descriptor extractor + + MPLUGIN-421: Replace QDox with JavaParser for Javadoc + extraction + + Stop depending on Wagon for nonProxyHosts matching + + GH-944: Support root path exclusion for QDox scanning to + avoid existing blocking issues + * Bug Fixes + + Normalize references in Javadoc + + Fix excludedScanDirectories never matching on Windows + + #1105 Modified to properly report expression and defaultValue + when processing Maven 4 plugin + + JavadocLinkGenerator.createLink(String) must consider module + names + * Documentation updates + + Restore the common wording on the download page + + Convert the index page from xdoc to Markdown + * Maintenance + + Update SCM tag and resolver version + + Run the site ITs against the parent's site plugin version + + Convert the index page from xdoc to Markdown + + MPLUGIN-421: Migrate legacy plugin Javadoc annotations + + Restore the document metadata dropped when the pages were + ported + + Port the site documentation from APT to Markdown + + Build against Maven 4.0.0-rc-6 + + Remove Plexus component configuration + + Cleanup tests + + Remove deprecated GeneratorUtils#toText + * Dependency updates + + Bump org.jsoup:jsoup from 1.19.1 to 1.23.2 + + Bump org.codehaus.plexus:plexus-java from 1.5.0 to 1.6.0 + + Bump org.codehaus.plexus:plexus-classworlds from 2.9.0 to + 2.12.1 + + Bump org.codehaus.plexus:plexus-velocity from 2.3.0 to 2.4.0 + + Bump org.codehaus.plexus:plexus-utils from 4.0.2 to 4.1.0 + + Bump org.codehaus.plexus:plexus-i18n from 1.0.0 to 1.2.0 + + Bump org.codehaus.plexus:plexus-archiver from 4.10.3 to 4.14.0 + + Bump net.bytebuddy:byte-buddy from 1.17.8 to 1.18.12 + + Stop depending on Wagon for nonProxyHosts matching + + Bump apache/maven-gh-actions-shared/.github/workflows/ + /release-drafter.yml from 4 to 5 + + Bump apache/maven-gh-actions-shared/.github/workflows/ + /maven-verify.yml from 4 to 5 + + Bump apache/maven-gh-actions-shared/.github/workflows/ + /stale.yml from 4 to 5 + + Bump apache/maven-gh-actions-shared/.github/workflows/ + /pr-automation.yml from 4 to 5 + + Bump org.apache.maven:maven-parent from 47 to 49 + + Bump asmVersion from 9.9 to 9.10.1 + + Bump maven3Version from 3.9.11 to 3.9.16 + + Bump doxiaVersion from 2.0.0 to 2.1.0 + + Update to Parent 47 and Resolver 1.9.25 + + Bump org.apache.maven.plugin-testing + :maven-plugin-testing-harness from 3.3.0 to 3.5.1 + + Bump org.assertj:assertj-core from 3.27.6 to 3.27.7 + + Add palantir format for Java 25 + + Bump org.apache.commons:commons-lang3 from 3.19.0 to 3.20.0 +- Modified patches: + * 0001-A-standalone-plugin-descriptor-generator.patch + * 0002-Remove-dependency-on-jtidy.patch + + rebase + +------------------------------------------------------------------- maven-plugin-tools.changes: same change Old: ---- 0001-A-standalone-generator-of-HelpMojo.java-and-plugin-d.patch maven-plugin-tools-4.0.0-beta-2-source-release.zip New: ---- 0001-A-standalone-plugin-descriptor-generator.patch maven-plugin-tools-4.0.0-beta-3-source-release.zip ----------(Old B)---------- Old:/work/SRC/openSUSE:Factory/.maven-plugin-tools.new.1265/maven-plugin-plugin.changes-- Modified 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- -> 0001-A-standalone-plugin-descriptor-generator.patch ----------(Old E)---------- ----------(New B)---------- New:/work/SRC/openSUSE:Factory/.maven-plugin-tools.new.1265/maven-plugin-plugin.changes-- Modified patches: /work/SRC/openSUSE:Factory/.maven-plugin-tools.new.1265/maven-plugin-plugin.changes: * 0001-A-standalone-plugin-descriptor-generator.patch /work/SRC/openSUSE:Factory/.maven-plugin-tools.new.1265/maven-plugin-plugin.changes- * 0002-Remove-dependency-on-jtidy.patch -- /work/SRC/openSUSE:Factory/.maven-plugin-tools.new.1265/maven-plugin-report-plugin.changes-- Modified patches: /work/SRC/openSUSE:Factory/.maven-plugin-tools.new.1265/maven-plugin-report-plugin.changes: * 0001-A-standalone-plugin-descriptor-generator.patch /work/SRC/openSUSE:Factory/.maven-plugin-tools.new.1265/maven-plugin-report-plugin.changes- * 0002-Remove-dependency-on-jtidy.patch -- /work/SRC/openSUSE:Factory/.maven-plugin-tools.new.1265/maven-plugin-tools.changes-- Modified patches: /work/SRC/openSUSE:Factory/.maven-plugin-tools.new.1265/maven-plugin-tools.changes: * 0001-A-standalone-plugin-descriptor-generator.patch /work/SRC/openSUSE:Factory/.maven-plugin-tools.new.1265/maven-plugin-tools.changes- * 0002-Remove-dependency-on-jtidy.patch ----------(New E)---------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ maven-plugin-plugin.spec ++++++ --- /var/tmp/diff_new_pack.l5Qfuw/_old 2026-09-11 18:07:30.290336287 +0200 +++ /var/tmp/diff_new_pack.l5Qfuw/_new 2026-09-11 18:07:30.291336329 +0200 @@ -17,7 +17,7 @@ %global base_ver 4.0.0 -%global beta_ver 2 +%global beta_ver 3 %global file_ver %{base_ver}-beta-%{beta_ver} %global base_name maven-plugin-tools Name: maven-plugin-plugin @@ -29,12 +29,13 @@ 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-generator-of-HelpMojo.java-and-plugin-d.patch +Patch0: 0001-A-standalone-plugin-descriptor-generator.patch Patch1: 0002-Remove-dependency-on-jtidy.patch BuildRequires: ant BuildRequires: atinject BuildRequires: fdupes BuildRequires: javapackages-local >= 6 +BuildRequires: javaparser >= 3.28.2 BuildRequires: maven-lib BuildRequires: maven-plugin-annotations BuildRequires: maven-plugin-tools-annotations @@ -86,14 +87,14 @@ %build mkdir -p lib build-jar-repository -s lib \ - apache-commons-lang3 \ atinject \ + guava/guava \ + 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 \ @@ -104,31 +105,26 @@ maven-plugin-tools/maven-plugin-tools-annotations \ maven-resolver/maven-resolver-api \ maven-resolver/maven-resolver-util \ - objectweb-asm/asm-all \ + objectweb-asm/asm \ + objectweb-asm/asm-util \ 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 + slf4j/simple \ + velocity-engine/velocity-engine-core %{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 ++++++ maven-plugin-report-plugin.spec ++++++ --- /var/tmp/diff_new_pack.l5Qfuw/_old 2026-09-11 18:07:30.318337463 +0200 +++ /var/tmp/diff_new_pack.l5Qfuw/_new 2026-09-11 18:07:30.319337505 +0200 @@ -17,7 +17,7 @@ %global base_ver 4.0.0 -%global beta_ver 2 +%global beta_ver 3 %global file_ver %{base_ver}-beta-%{beta_ver} %global base_name maven-plugin-tools Name: maven-plugin-report-plugin ++++++ maven-plugin-tools.spec ++++++ --- /var/tmp/diff_new_pack.l5Qfuw/_old 2026-09-11 18:07:30.345338597 +0200 +++ /var/tmp/diff_new_pack.l5Qfuw/_new 2026-09-11 18:07:30.346338639 +0200 @@ -17,7 +17,7 @@ %global base_ver 4.0.0 -%global beta_ver 2 +%global beta_ver 3 %global file_ver %{base_ver}-beta-%{beta_ver} Name: maven-plugin-tools Version: %{base_ver}~beta%{beta_ver} @@ -36,6 +36,7 @@ BuildRequires: httpcomponents-core BuildRequires: java-devel >= 1.8 BuildRequires: javapackages-local >= 6 +BuildRequires: javaparser >= 3.28.2 BuildRequires: jsoup BuildRequires: maven-lib BuildRequires: maven-reporting-api @@ -48,7 +49,6 @@ BuildRequires: plexus-utils BuildRequires: plexus-velocity BuildRequires: plexus-xml -BuildRequires: qdox BuildRequires: sisu-inject BuildRequires: sisu-plexus BuildRequires: slf4j @@ -129,19 +129,17 @@ atinject \ httpcomponents/httpclient \ httpcomponents/httpcore \ + javaparser/javaparser-core \ + javaparser/javaparser-symbol-solver-core \ jsoup/jsoup \ - maven/maven-api-plugin \ maven/maven-artifact \ - maven/maven-compat \ maven/maven-core \ maven/maven-model \ maven/maven-plugin-api \ maven/maven-settings \ maven-reporting-api/maven-reporting-api \ maven-resolver/maven-resolver-api \ - maven-wagon/provider-api \ objectweb-asm/asm \ - objectweb-asm/asm-commons \ objectweb-asm/asm-util \ org.eclipse.sisu.inject \ org.eclipse.sisu.plexus \ @@ -151,7 +149,6 @@ plexus/utils \ plexus/xml \ plexus-velocity/plexus-velocity \ - qdox \ slf4j/api \ velocity-engine/velocity-engine-core ++++++ 0001-A-standalone-plugin-descriptor-generator.patch ++++++ ++++ 917 lines (skipped) ++++++ 0002-Remove-dependency-on-jtidy.patch ++++++ --- /var/tmp/diff_new_pack.l5Qfuw/_old 2026-09-11 18:07:30.379340025 +0200 +++ /var/tmp/diff_new_pack.l5Qfuw/_new 2026-09-11 18:07:30.381340109 +0200 @@ -1,20 +1,29 @@ -From 6953b37ee5a7c0566d2e11e7141768f8a4c03fa2 Mon Sep 17 00:00:00 2001 +From f52d37feb1f749d8551299b2f9bba457356ab20e Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski <[email protected]> Date: Mon, 27 Apr 2020 12:56:04 +0200 -Subject: [PATCH 2/3] Remove dependency on jtidy +Subject: [PATCH 2/2] Remove dependency on jtidy Forwarded: not-needed - --- - .../plugin/generator/GeneratorUtils.java | 49 +------------------ + .../plugin/generator/GeneratorUtils.java | 50 ------------------- .../PluginDescriptorFilesGenerator.java | 7 +-- - 2 files changed, 2 insertions(+), 54 deletions(-) + 2 files changed, 1 insertion(+), 56 deletions(-) diff --git a/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/GeneratorUtils.java b/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/GeneratorUtils.java -index 99aa7965..f05fb876 100644 +index 5a7fd89f..35b202bd 100644 --- a/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/GeneratorUtils.java +++ b/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/GeneratorUtils.java -@@ -51,7 +51,6 @@ import org.apache.maven.reporting.MavenReport; +@@ -22,9 +22,6 @@ import javax.swing.text.MutableAttributeSet; + import javax.swing.text.html.HTML; + import javax.swing.text.html.HTMLEditorKit; + +-import java.io.ByteArrayInputStream; +-import java.io.ByteArrayOutputStream; +-import java.nio.charset.StandardCharsets; + import java.util.Collection; + import java.util.HashMap; + import java.util.LinkedList; +@@ -43,7 +40,6 @@ import org.apache.maven.tools.plugin.util.PluginUtils; import org.codehaus.plexus.component.repository.ComponentDependency; import org.codehaus.plexus.util.StringUtils; import org.codehaus.plexus.util.xml.XMLWriter; @@ -22,10 +31,11 @@ /** * Convenience methods to play with Maven plugins. -@@ -225,52 +224,6 @@ public final class GeneratorUtils { +@@ -217,52 +213,6 @@ public final class GeneratorUtils { + return decoded.toString(); } - /** +- /** - * Fixes some javadoc comment to become a valid XHTML snippet. - * - * @param description Javadoc description with HTML tags, may be <code>null</code>. @@ -71,24 +81,14 @@ - return commentCleaned; - } - -- /** - * Converts a HTML fragment as extracted from a javadoc comment to a plain text string. This method tries to retain - * as much of the text formatting as possible by means of the following transformations: - * <ul> -@@ -301,7 +254,7 @@ public final class GeneratorUtils { - HTMLEditorKit.ParserCallback htmlCallback = new MojoParserCallback(sb); - - try { -- parser.parse(new StringReader(makeHtmlValid(html)), htmlCallback, true); -+ parser.parse(new StringReader(html), htmlCallback, true); - } catch (IOException e) { - throw new RuntimeException(e); - } + /** + * ParserCallback implementation. + */ diff --git a/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginDescriptorFilesGenerator.java b/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginDescriptorFilesGenerator.java -index cf5c5c48..9f435f0e 100644 +index e1f6ffdc..2b182fdb 100644 --- a/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginDescriptorFilesGenerator.java +++ b/maven-plugin-tools-generators/src/main/java/org/apache/maven/tools/plugin/generator/PluginDescriptorFilesGenerator.java -@@ -201,12 +201,7 @@ public class PluginDescriptorFilesGenerator implements Generator { +@@ -209,12 +209,7 @@ public class PluginDescriptorFilesGenerator implements Generator { */ private static String getTextValue(DescriptorType type, boolean containsXhtmlValue, String text) { final String xhtmlText; @@ -96,12 +96,13 @@ - { - xhtmlText = GeneratorUtils.makeHtmlValid(text); - } else { - xhtmlText = text; +- xhtmlText = text; - } ++ xhtmlText = text; if (type != DescriptorType.XHTML) { return new HtmlToPlainTextConverter().convert(text); } else { -- -2.41.0 +2.55.0 ++++++ _scmsync.obsinfo ++++++ --- /var/tmp/diff_new_pack.l5Qfuw/_old 2026-09-11 18:07:30.415341537 +0200 +++ /var/tmp/diff_new_pack.l5Qfuw/_new 2026-09-11 18:07:30.418341663 +0200 @@ -1,6 +1,6 @@ -mtime: 1788524377 -commit: 1a1c8449f4ebe8c14ab48c6ccbf2272ff95009791db0fec354e4b381005a4973 +mtime: 1789043242 +commit: 55dc34542defa0eedca6b0363bb446988307fc27f84162da58d8153b5d5dc203 url: https://src.opensuse.org/java-packages/maven-plugin-tools -revision: 1a1c8449f4ebe8c14ab48c6ccbf2272ff95009791db0fec354e4b381005a4973 +revision: 55dc34542defa0eedca6b0363bb446988307fc27f84162da58d8153b5d5dc203 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-10 14:27:22.000000000 +0200 @@ -0,0 +1 @@ +.osc ++++++ maven-plugin-tools-4.0.0-beta-2-source-release.zip -> maven-plugin-tools-4.0.0-beta-3-source-release.zip ++++++ ++++ 9222 lines of diff (skipped) ++++++ maven-plugin-tools-build.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/common.xml new/common.xml --- old/common.xml 2025-10-23 09:30:28.705725066 +0200 +++ new/common.xml 2026-09-09 07:55:32.374402308 +0200 @@ -3,7 +3,7 @@ <project name="common" basedir="."> <property file="build.properties"/> - <property name="project.version" value="4.0.0-beta-2"/> + <property name="project.version" value="4.0.0-beta-3"/> <property name="project.groupId" value="org.apache.maven.plugin-tools"/> <property name="project.organization.name" value="The Apache Software Foundation"/> 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 2026-09-04 14:15:10.160120295 +0200 +++ new/maven-plugin-plugin/build-stage2.xml 1970-01-01 01:00:00.000000000 +0100 @@ -1,66 +0,0 @@ -<?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 2026-09-04 14:13:09.999365641 +0200 +++ new/maven-plugin-plugin/build.xml 2026-09-08 11:39:17.012848571 +0200 @@ -63,7 +63,7 @@ <!-- Compilation target --> <!-- ====================================================================== --> - <target name="compile" description="Compile the code"> + <target name="-compile" description="Compile the code"> <mkdir dir="${build.outputDir}"/> <!-- not used in this step --> <mkdir dir="${build.dir}/generated-sources/plugin"/> @@ -97,21 +97,10 @@ </target> <!-- ====================================================================== --> - <!-- Plugin descriptor generation target --> + <!-- Bootstrap 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"/> + <target name="-plugin" depends="-compile"> <java classname="org.apache.maven.plugin.plugin.StandaloneDescriptorGenerator" fork="true" failonerror="true"> @@ -124,6 +113,73 @@ </target> <!-- ====================================================================== --> + <!-- Mock Local Repository Setup Target --> + <!-- ====================================================================== --> + + <target name="-mock-repo" depends="-plugin" description="Creates a local Maven repo for XMvn"> + + <!-- Here we will need an actual jar --> + <antcall target="-package" inheritrefs="true"/> + + <!-- 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"> + <antcall target="-compile" inheritrefs="true"/> + </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="-Dmaven.repo.local=${basedir}/${build.dir}/bootstrap-repo" /> + <arg value="${project.groupId}:${project.artifactId}:${project.version}:descriptor" /> + </exec> + </target> + + <!-- ====================================================================== --> <!-- Test-compilation target --> <!-- ====================================================================== --> @@ -175,7 +231,7 @@ <!-- Javadoc target --> <!-- ====================================================================== --> - <target name="javadoc" description="Generates the Javadoc of the application"> + <target name="javadoc" depends="-helpmojo" description="Generates the Javadoc of the application"> <path id="src.path"> <pathelement location="${build.srcDir}"/> <pathelement location="${build.dir}/generated-sources/plugin"/> @@ -205,10 +261,10 @@ </target> <!-- ====================================================================== --> - <!-- Package target --> + <!-- The base for package target --> <!-- ====================================================================== --> - <target name="package" depends="plugin,test" description="Package the application"> + <target name="-package" description="Package the application"> <jar jarfile="${build.dir}/${build.finalName}.jar" compress="true" index="false" @@ -231,6 +287,14 @@ </target> <!-- ====================================================================== --> + <!-- Package target --> + <!-- ====================================================================== --> + + <target name="package" depends="plugin,test" description="Package the application"> + <antcall target="-package" inheritrefs="true"/> + </target> + + <!-- ====================================================================== --> <!-- A dummy target for the package named after the type it creates --> <!-- ====================================================================== -->
