This is an automated email from the ASF dual-hosted git repository. hboutemy pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/maven-dist-tool.git
commit e8f170b464089caca5f6648424556a43a2cd42c1 Author: Hervé Boutemy <[email protected]> AuthorDate: Sat Oct 31 02:25:52 2026 +0100 fix last mvnd edge cases --- .../maven/dist/tools/ConfigurationLineInfo.java | 4 ++++ .../tools/source/DistCheckSourceReleaseReport.java | 19 ++++++++++++++++--- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/apache/maven/dist/tools/ConfigurationLineInfo.java b/src/main/java/org/apache/maven/dist/tools/ConfigurationLineInfo.java index 6f5fec1..b08471e 100644 --- a/src/main/java/org/apache/maven/dist/tools/ConfigurationLineInfo.java +++ b/src/main/java/org/apache/maven/dist/tools/ConfigurationLineInfo.java @@ -219,6 +219,10 @@ public class ConfigurationLineInfo { * @return a {@link java.lang.String} object */ public String getSourceReleaseFilename(String version, boolean dist) { + if ("mvnd".equals(artifactId)) { + // ignore tar.gz and OS-specific builds + return "maven-mvnd-" + version + "-src.zip"; + } return artifactId + "-" + version + (srcBin && (dist || !"maven-ant-tasks".equals(artifactId)) ? "-src" : "-source-release") + ".zip"; } diff --git a/src/main/java/org/apache/maven/dist/tools/source/DistCheckSourceReleaseReport.java b/src/main/java/org/apache/maven/dist/tools/source/DistCheckSourceReleaseReport.java index 957c31d..d4475aa 100644 --- a/src/main/java/org/apache/maven/dist/tools/source/DistCheckSourceReleaseReport.java +++ b/src/main/java/org/apache/maven/dist/tools/source/DistCheckSourceReleaseReport.java @@ -168,9 +168,13 @@ public class DistCheckSourceReleaseReport extends AbstractDistCheckReport { // LATEST column sink.tableCell(); - sink.link(cli.getMetadataFileURL(repoBaseUrl)); - sink.rawText(csrr.getVersion()); - sink.link_(); + if ("mvnd".equals(cli.getArtifactId())) { + sink.rawText(csrr.getVersion()); + } else { + sink.link(cli.getMetadataFileURL(repoBaseUrl)); + sink.rawText(csrr.getVersion()); + sink.link_(); + } sink.tableCell_(); // DATE column @@ -190,6 +194,11 @@ public class DistCheckSourceReleaseReport extends AbstractDistCheckReport { sink.link(distributionAreaUrl + cli.getDirectory() + '/' + directory); sink.text(directory); sink.link_(); + } else if ("mvnd".equals(cli.getArtifactId())) { + String directory = csrr.getVersion() + "/"; + sink.link(distributionAreaUrl + cli.getDirectory() + '/' + directory); + sink.text(directory); + sink.link_(); } if (csrr.dist.isEmpty() && csrr.distOlder.isEmpty()) { sink.text(cli.getSourceReleaseFilename(csrr.getVersion(), true)); @@ -593,6 +602,10 @@ public class DistCheckSourceReleaseReport extends AbstractDistCheckReport { String distUrl = distributionAreaUrl + configLine.getDirectory() + (configLine.isSrcBin() ? ("/" + version + "/source") : ""); + if ("mvnd".equals(configLine.getArtifactId())) { + // mnvd has a specific layout in distribution area... + distUrl = distributionAreaUrl + configLine.getDirectory() + "/" + version; + } result.setMissingDistSourceRelease(checkDirectoryIndex(distUrl, configLine, version, true)); result.setDistOlderSourceRelease(checkContainsOld(distUrl, configLine, version)); } catch (IOException ex) {
