maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rfscho...@apache.org
Subject [maven-dist-tool] branch master updated: Revert "Maven 3.6.1 sources ended up in different directory. Only maven-3 uses src+bin, so a pragmatic fix"
Date Tue, 23 Apr 2019 19:46:12 GMT
This is an automated email from the ASF dual-hosted git repository.

rfscholte 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 8ec6572  Revert "Maven 3.6.1 sources ended up in different directory. Only maven-3
uses src+bin, so a pragmatic fix"
8ec6572 is described below

commit 8ec657232cc6a8190a13f8f43b6ebf4db63194f6
Author: rfscholte <rfscholte@apache.org>
AuthorDate: Tue Apr 23 21:46:03 2019 +0200

    Revert "Maven 3.6.1 sources ended up in different directory. Only maven-3 uses src+bin,
so a pragmatic fix"
    
    This reverts commit 5778bd5d5704f4f51de31af40aa2dddb82515abe.
---
 .../apache/maven/dist/tools/source/DistCheckSourceReleaseMojo.java    | 4 ++--
 src/main/resources/dist-tool.conf                                     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/apache/maven/dist/tools/source/DistCheckSourceReleaseMojo.java
b/src/main/java/org/apache/maven/dist/tools/source/DistCheckSourceReleaseMojo.java
index 7ba580c..eb9fa8a 100644
--- a/src/main/java/org/apache/maven/dist/tools/source/DistCheckSourceReleaseMojo.java
+++ b/src/main/java/org/apache/maven/dist/tools/source/DistCheckSourceReleaseMojo.java
@@ -168,7 +168,7 @@ public class DistCheckSourceReleaseMojo
         {
             if ( cli.isSrcBin() )
             {
-                String directory = csrr.getVersion() + "/sources/";
+                String directory = csrr.getVersion() + "/source/";
                 sink.link( distributionAreaUrl + cli.getDirectory() + '/' + directory );
                 sink.text( directory );
                 sink.link_();
@@ -553,7 +553,7 @@ public class DistCheckSourceReleaseMojo
 
             // dist
             String distUrl = distributionAreaUrl + configLine.getDirectory()
-                + ( configLine.isSrcBin() ? ( "/" + version + "/sources" ) : "" );
+                + ( configLine.isSrcBin() ? ( "/" + version + "/source" ) : "" );
             result.setMissingDistSourceRelease( checkDirectoryIndex( distUrl, configLine,
version, true ) );
             result.setDistOlderSourceRelease( checkContainsOld( distUrl, configLine, version
) );
         }
diff --git a/src/main/resources/dist-tool.conf b/src/main/resources/dist-tool.conf
index 3fc98ee..eb7ed49 100644
--- a/src/main/resources/dist-tool.conf
+++ b/src/main/resources/dist-tool.conf
@@ -59,8 +59,8 @@
 ##   apache-maven [2.2,3.0-alpha-1)
 
 /maven-3: org.apache.maven src+bin
-##   apache-maven [3.0,3.1.0-alpha-1)
-##   apache-maven [3.1.0,3.2.0-alpha-1)
+  apache-maven [3.0,3.1.0-alpha-1)
+  apache-maven [3.1.0,3.2.0-alpha-1)
   apache-maven
 
 /jxr: org.apache.maven.jxr


Mime
View raw message