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
The following commit(s) were added to refs/heads/master by this push:
new 55a75b4 add support for src+native and no-central
55a75b4 is described below
commit 55a75b47cd7eba0225bc36217a54d6c4168fd8d0
Author: Hervé Boutemy <[email protected]>
AuthorDate: Sat Oct 31 15:22:27 2026 +0100
add support for src+native and no-central
---
.../maven/dist/tools/AbstractDistCheckReport.java | 15 ++++++++--
.../maven/dist/tools/ConfigurationLineInfo.java | 34 ++++++++++++++++++++--
.../tools/source/DistCheckSourceReleaseReport.java | 22 +++++++-------
src/main/resources/dist-tool.conf | 5 ++--
4 files changed, 59 insertions(+), 17 deletions(-)
diff --git
a/src/main/java/org/apache/maven/dist/tools/AbstractDistCheckReport.java
b/src/main/java/org/apache/maven/dist/tools/AbstractDistCheckReport.java
index 00aaddd..23ceda0 100644
--- a/src/main/java/org/apache/maven/dist/tools/AbstractDistCheckReport.java
+++ b/src/main/java/org/apache/maven/dist/tools/AbstractDistCheckReport.java
@@ -264,9 +264,12 @@ public abstract class AbstractDistCheckReport extends
AbstractMavenReport {
getLog().info("");
}
- private String getVersion(ConfigurationLineInfo aLine) throws
MavenReportException {
+ /**
+ * get current version when a release is not published to Maven Central,
then has no standard
+ * way to get maven-metadata.xml
+ */
+ private String getVersionNoCentral(ConfigurationLineInfo aLine) {
if ("mvnd".equals(aLine.getArtifactId())) {
- // not available in Maven Central, cannot use maven-metadata.xml
// use
https://github.com/apache/maven-site/blob/master/pom.xml#L64 instead
// short term: hard code
if (aLine.getVersionRange().containsVersion(new
DefaultArtifactVersion("1.0"))) {
@@ -275,6 +278,14 @@ public abstract class AbstractDistCheckReport extends
AbstractMavenReport {
return "2.0.0-rc-3";
}
}
+ return "?";
+ }
+
+ private String getVersion(ConfigurationLineInfo aLine) throws
MavenReportException {
+ if (aLine.isNoCentral()) {
+ // not available in Maven Central, cannot use maven-metadata.xml
+ return getVersionNoCentral(aLine);
+ }
String metadataUrl = aLine.getMetadataFileURL(repoBaseUrl);
try (InputStream input = new BufferedInputStream(new
URL(metadataUrl).openStream())) {
MetadataXpp3Reader metadataReader = new MetadataXpp3Reader();
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 b08471e..fae26d9 100644
--- a/src/main/java/org/apache/maven/dist/tools/ConfigurationLineInfo.java
+++ b/src/main/java/org/apache/maven/dist/tools/ConfigurationLineInfo.java
@@ -20,6 +20,9 @@ package org.apache.maven.dist.tools;
import java.time.format.DateTimeFormatter;
import java.time.temporal.TemporalAccessor;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
import org.apache.maven.artifact.repository.metadata.Metadata;
import
org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
@@ -37,6 +40,8 @@ public class ConfigurationLineInfo {
private final String directory;
private final String groupId;
private final boolean srcBin;
+ private final boolean srcNative;
+ private final boolean noCentral;
private final String groupIndexPageUrl;
private final String artifactId;
@@ -57,8 +62,11 @@ public class ConfigurationLineInfo {
String g = infos[1];
int index = g.indexOf(':');
this.groupId = (index < 0) ? g : g.substring(0, index);
- this.srcBin = (infos.length > 2) && "src+bin".equals(infos[2]);
- this.groupIndexPageUrl = (!srcBin && (infos.length > 2)) ? infos[2] :
null;
+ Set<String> params = new
HashSet<String>(Arrays.asList(infos).subList(2, infos.length));
+ this.srcBin = params.remove("src+bin");
+ this.srcNative = params.remove("src+native");
+ this.noCentral = params.remove("no-central");
+ this.groupIndexPageUrl = params.isEmpty() ? null :
params.iterator().next();
this.artifactId = (index < 0) ? null : g.substring(index + 1);
this.versionRange = null;
@@ -78,6 +86,8 @@ public class ConfigurationLineInfo {
this.directory = group.getDirectory();
this.groupId = group.getGroupId();
this.srcBin = group.isSrcBin();
+ this.srcNative = group.isSrcNative();
+ this.noCentral = group.isNoCentral();
this.groupIndexPageUrl = group.groupIndexPageUrl;
this.artifactId = infos[0];
@@ -158,6 +168,24 @@ public class ConfigurationLineInfo {
return srcBin;
}
+ /**
+ * <p>isSrcNative.</p>
+ *
+ * @return a boolean
+ */
+ public boolean isSrcNative() {
+ return srcNative;
+ }
+
+ /**
+ * <p>isNoCentral.</p>
+ *
+ * @return a boolean
+ */
+ public boolean isNoCentral() {
+ return noCentral;
+ }
+
/**
* <p>getBaseURL.</p>
*
@@ -220,7 +248,7 @@ public class ConfigurationLineInfo {
*/
public String getSourceReleaseFilename(String version, boolean dist) {
if ("mvnd".equals(artifactId)) {
- // ignore tar.gz and OS-specific builds
+ // ignore tar.gz and OS-specific builds, as mvnd is src+native
(only one)
return "maven-mvnd-" + version + "-src.zip";
}
return artifactId + "-" + version
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 87f00e2..cedcdf2 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
@@ -104,6 +104,8 @@ public class DistCheckSourceReleaseReport extends
AbstractDistCheckReport {
int centralMissing = 0;
+ int noCentral = 0;
+
int distError = 0;
int distMissing = 0;
@@ -121,7 +123,9 @@ public class DistCheckSourceReleaseReport extends
AbstractDistCheckReport {
public void addArtifact(CheckSourceReleaseResult result) {
artifactsCount++;
- if ((result.central != null) && !result.central.isEmpty()) {
+ if (result.central == null) {
+ noCentral++;
+ } else if (!result.central.isEmpty()) {
centralMissing++;
}
if (result.dist == null) {
@@ -168,7 +172,7 @@ public class DistCheckSourceReleaseReport extends
AbstractDistCheckReport {
// LATEST column
sink.tableCell();
- if ("mvnd".equals(cli.getArtifactId())) {
+ if (cli.isNoCentral()) {
sink.rawText(csrr.getVersion());
} else {
sink.link(cli.getMetadataFileURL(repoBaseUrl));
@@ -179,7 +183,7 @@ public class DistCheckSourceReleaseReport extends
AbstractDistCheckReport {
// DATE column
sink.tableCell();
- if ("mvnd".equals(cli.getArtifactId())) {
+ if (cli.isNoCentral()) {
sink.rawText(" ");
} else {
sink.rawText(cli.getReleaseDateFromMetadata());
@@ -192,7 +196,7 @@ public class DistCheckSourceReleaseReport extends
AbstractDistCheckReport {
String subDirectory = "";
if (cli.isSrcBin()) {
subDirectory = csrr.getVersion() + "/source/";
- } else if ("mvnd".equals(cli.getArtifactId())) {
+ } else if (cli.isSrcNative()) {
subDirectory = csrr.getVersion() + "/";
}
if (!subDirectory.isEmpty()) {
@@ -452,13 +456,13 @@ public class DistCheckSourceReleaseReport extends
AbstractDistCheckReport {
sink.tableHeaderCell_();
sink.tableHeaderCell();
- if ("org.apache.maven.daemon".equals(current.groupId)) {
+ if (current.artifactsCount == current.noCentral) {
sink.text(" ");
} else {
sink.link(repoBaseUrl + current.groupId.replace('.', '/'));
sink.text("<central>/" + current.groupId.replace('.',
'/').replace("org/apache/maven", "o/a/m"));
sink.link_();
- sink.rawText(": " + String.valueOf(current.artifactsCount -
current.centralMissing));
+ sink.rawText(": " + String.valueOf(current.artifactsCount -
current.centralMissing - current.noCentral));
iconSuccess(sink);
if (current.centralMissing > 0) {
sink.rawText("/" + String.valueOf(current.centralMissing));
@@ -603,8 +607,7 @@ public class DistCheckSourceReleaseReport extends
AbstractDistCheckReport {
results.add(result);
// central
- if (!"mvnd".equals(configLine.getArtifactId())) {
- // only mvnd is not in Maven Central
+ if (!configLine.isNoCentral()) {
String centralUrl =
configLine.getVersionnedFolderURL(repoBaseUrl, version);
result.setMissingCentralSourceRelease(checkDirectoryIndex(centralUrl,
configLine, version, false));
}
@@ -616,8 +619,7 @@ public class DistCheckSourceReleaseReport extends
AbstractDistCheckReport {
// dist
String distPath = configLine.getDirectory() +
(configLine.isSrcBin() ? ("/" + version + "/source") : "");
- if ("mvnd".equals(configLine.getArtifactId())) {
- // mnvd has a specific layout in distribution area...
+ if (configLine.isSrcNative()) {
distPath = configLine.getDirectory() + "/" + version;
}
String distUrl = distributionAreaUrl + distPath;
diff --git a/src/main/resources/dist-tool.conf
b/src/main/resources/dist-tool.conf
index 3fcaaf7..daf3b42 100644
--- a/src/main/resources/dist-tool.conf
+++ b/src/main/resources/dist-tool.conf
@@ -16,7 +16,7 @@
## under the License.
## line format:
-## /directory: groupId[:parent-pom artifactId] [src+bin] [index page url]
+## /directory: groupId[:parent-pom artifactId] [src+bin or src+native]
[no-central] [index page url]
## [*] artifactId [version restriction]
## * = only check info in index page, but not dist nor site (for
plugins provided by components, like archetype, release, ...)
## > artifactId index-path = /path/
@@ -82,7 +82,8 @@
/maven-4: org.apache.maven src+bin
apache-maven
-/mvnd: org.apache.maven.daemon src
+/mvnd: org.apache.maven.daemon src+native no-central
+## src+native: -src.zip/tar.gz but also -<os>-<arch>.zip/tar.gz
> mvnd site = https://maven.apache.org/tools/mvnd.html
mvnd [1,1.99)
mvnd [1.99,2.99)