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 4d4c91d  check svn:dist in addition to downloads.a.o to detect infra 
sync issues
4d4c91d is described below

commit 4d4c91d574757ff09e6bee3c5e1bd2ca9e2a7b8b
Author: HervĂ© Boutemy <[email protected]>
AuthorDate: Sat Oct 31 11:17:54 2026 +0100

    check svn:dist in addition to downloads.a.o to detect infra sync issues
---
 .../maven/dist/tools/AbstractDistCheckReport.java  | 18 ++++++++-
 .../tools/source/CheckSourceReleaseResult.java     |  5 +++
 .../tools/source/DistCheckSourceReleaseReport.java | 45 +++++++++++++++-------
 src/main/resources/dist-tool.conf                  |  1 +
 4 files changed, 54 insertions(+), 15 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 e0358ee..00aaddd 100644
--- a/src/main/java/org/apache/maven/dist/tools/AbstractDistCheckReport.java
+++ b/src/main/java/org/apache/maven/dist/tools/AbstractDistCheckReport.java
@@ -88,10 +88,15 @@ public abstract class AbstractDistCheckReport extends 
AbstractMavenReport {
     protected List<ArtifactRepository> artifactRepositories = new 
LinkedList<>();
 
     /**
-     * Location of distribution area
+     * Location of distribution area (in https://downloads.apache.org/)
      */
     protected String distributionAreaUrl;
 
+    /**
+     * Location of svn distribution area (in 
https://dist.apache.org/repos/dist/release/)
+     */
+    protected String svnDistAreaUrl;
+
     /**
      * Path in index page mapping, when path is not the classical /artifact-id/
      * The configuration in <code>dist-tool.conf</code> looks like this:
@@ -202,6 +207,8 @@ public abstract class AbstractDistCheckReport extends 
AbstractMavenReport {
 
                 if ("dist-area".equals(param)) {
                     distributionAreaUrl = value;
+                } else if ("svn-dist".equals(param)) {
+                    svnDistAreaUrl = value;
                 } else if (param.contains(" ")) {
                     // parameter for an artifactId
                     index = param.indexOf(' ');
@@ -331,6 +338,15 @@ public abstract class AbstractDistCheckReport extends 
AbstractMavenReport {
         icon(sink, "icon_error_sml");
     }
 
+    /**
+     * add an info icon.
+     *
+     * @param sink doxiasink
+     */
+    public static void iconInfo(Sink sink) {
+        icon(sink, "icon_info_sml");
+    }
+
     /**
      * add a warning icon.
      *
diff --git 
a/src/main/java/org/apache/maven/dist/tools/source/CheckSourceReleaseResult.java
 
b/src/main/java/org/apache/maven/dist/tools/source/CheckSourceReleaseResult.java
index bfdf336..39147fb 100644
--- 
a/src/main/java/org/apache/maven/dist/tools/source/CheckSourceReleaseResult.java
+++ 
b/src/main/java/org/apache/maven/dist/tools/source/CheckSourceReleaseResult.java
@@ -27,6 +27,7 @@ class CheckSourceReleaseResult extends AbstractCheckResult {
 
     List<String> central;
     List<String> dist;
+    List<String> svnDist;
     List<String> distOlder;
 
     CheckSourceReleaseResult(ConfigurationLineInfo r, String version) {
@@ -37,6 +38,10 @@ class CheckSourceReleaseResult extends AbstractCheckResult {
         dist = checkRepos;
     }
 
+    void setMissingSvnDistSourceRelease(List<String> checkRepos) {
+        svnDist = checkRepos;
+    }
+
     void setMissingCentralSourceRelease(List<String> checkRepos) {
         central = checkRepos;
     }
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 d4475aa..87f00e2 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
@@ -189,27 +189,35 @@ public class DistCheckSourceReleaseReport extends 
AbstractDistCheckReport {
         // dist column
         sink.tableCell();
         if (csrr.dist != null) {
+            String subDirectory = "";
             if (cli.isSrcBin()) {
-                String directory = csrr.getVersion() + "/source/";
-                sink.link(distributionAreaUrl + cli.getDirectory() + '/' + 
directory);
-                sink.text(directory);
-                sink.link_();
+                subDirectory = csrr.getVersion() + "/source/";
             } else if ("mvnd".equals(cli.getArtifactId())) {
-                String directory = csrr.getVersion() + "/";
-                sink.link(distributionAreaUrl + cli.getDirectory() + '/' + 
directory);
-                sink.text(directory);
+                subDirectory = csrr.getVersion() + "/";
+            }
+            if (!subDirectory.isEmpty()) {
+                sink.link(distributionAreaUrl + cli.getDirectory() + '/' + 
subDirectory);
+                sink.text(subDirectory);
                 sink.link_();
             }
             if (csrr.dist.isEmpty() && csrr.distOlder.isEmpty()) {
                 sink.text(cli.getSourceReleaseFilename(csrr.getVersion(), 
true));
                 iconSuccess(sink);
             }
+
+            // missing from dist-area?
             StringBuilder cliMissing = new StringBuilder();
+            boolean svnSyncIssues = false;
             for (String missing : csrr.dist) {
                 sink.lineBreak();
                 iconError(sink);
                 sink.rawText(missing);
-                if ((csrr.central != null) && !csrr.central.contains(missing)) 
{
+
+                // check if missing also from svn:dist = the RM forgot to add
+                if ((csrr.svnDist != null) && !csrr.svnDist.contains(missing)) 
{
+                    // available in svn:dist but not downloads: sync from svn 
to downloads
+                    svnSyncIssues = true;
+                } else if ((csrr.central != null) && 
!csrr.central.contains(missing)) {
                     // if the release distribution is in central repository, 
we can get it from there...
                     cliMissing.append("\nwget ");
                     cliMissing.append(cli.getVersionnedFolderURL(repoBaseUrl, 
csrr.getVersion()));
@@ -223,6 +231,14 @@ public class DistCheckSourceReleaseReport extends 
AbstractDistCheckReport {
                 sink.unknown("pre", new Object[] 
{Integer.valueOf(HtmlMarkup.TAG_TYPE_START)}, atts);
                 sink.text(cliMissing.toString());
                 sink.unknown("pre", new Object[] 
{Integer.valueOf(HtmlMarkup.TAG_TYPE_END)}, null);
+            } else if (svnSyncIssues) {
+                sink.lineBreak();
+                iconInfo(sink);
+                sink.text("infra sync issue: available in svn:dist ");
+                String svnDist = svnDistAreaUrl + cli.getDirectory() + '/' + 
subDirectory;
+                sink.link(svnDist);
+                sink.text(svnDist);
+                sink.link_();
             }
 
             StringBuilder cliOlder = new StringBuilder();
@@ -232,7 +248,7 @@ public class DistCheckSourceReleaseReport extends 
AbstractDistCheckReport {
                 sink.rawText(missing);
                 cliOlder.append("\nsvn rm ").append(missing);
             }
-            if (!cliOlder.toString().isEmpty()) {
+            if (!cliOlder.toString().isEmpty() && !svnSyncIssues) {
                 sink.lineBreak();
                 SinkEventAttributeSet atts = new SinkEventAttributeSet();
                 sink.unknown("pre", new Object[] 
{Integer.valueOf(HtmlMarkup.TAG_TYPE_START)}, atts);
@@ -529,7 +545,7 @@ public class DistCheckSourceReleaseReport extends 
AbstractDistCheckReport {
     }
 
     /**
-     * Check that url points to a directory index containing expected release 
files
+     * Check that url points to a directory index containing expected release 
files (archives + .asc + fingerprint)
      *
      * @param url
      * @param cli
@@ -599,14 +615,15 @@ public class DistCheckSourceReleaseReport extends 
AbstractDistCheckReport {
             }
 
             // dist
-            String distUrl = distributionAreaUrl
-                    + configLine.getDirectory()
-                    + (configLine.isSrcBin() ? ("/" + version + "/source") : 
"");
+            String distPath = configLine.getDirectory() + 
(configLine.isSrcBin() ? ("/" + version + "/source") : "");
             if ("mvnd".equals(configLine.getArtifactId())) {
                 // mnvd has a specific layout in distribution area...
-                distUrl = distributionAreaUrl + configLine.getDirectory() + 
"/" + version;
+                distPath = configLine.getDirectory() + "/" + version;
             }
+            String distUrl = distributionAreaUrl + distPath;
+            String svnDistUrl = svnDistAreaUrl + distPath;
             result.setMissingDistSourceRelease(checkDirectoryIndex(distUrl, 
configLine, version, true));
+            
result.setMissingSvnDistSourceRelease(checkDirectoryIndex(svnDistUrl, 
configLine, version, true));
             result.setDistOlderSourceRelease(checkContainsOld(distUrl, 
configLine, version));
         } catch (IOException ex) {
             throw new MavenReportException(ex.getMessage(), ex);
diff --git a/src/main/resources/dist-tool.conf 
b/src/main/resources/dist-tool.conf
index 73bfbb6..3fcaaf7 100644
--- a/src/main/resources/dist-tool.conf
+++ b/src/main/resources/dist-tool.conf
@@ -24,6 +24,7 @@
 ## > artifactId:version site = site url
 
 > dist-area = https://downloads.apache.org/maven/
+> svn-dist = https://dist.apache.org/repos/dist/release/maven/
 
 ## EOL
 ## /ant-tasks: org.apache.maven src+bin

Reply via email to