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.
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 @@
{
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 @@
// 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
