[MWRAPPER-143] - The wrapperVersion property is not used in only-script mode (#145)

* [MWRAPPER-143] The wrapperVersion property is not used in only-script mode

The only-script mode doesn't use the wrapper distribution, this property is now only added to the maven-wrapper.properties file when other types are used.

---------

Co-authored-by: Slawomir Jaranowski <[email protected]>

Author: bdemers

maven-wrapper-plugin/src/it/projects/default/verify.groovy

@@ -34,5 +34,6 @@ Properties props = new Properties()
 new File(basedir,'.mvn/wrapper/maven-wrapper.properties').withInputStream {
     props.load(it)
 }
-assert props.wrapperVersion.equals(wrapperCurrentVersion)
 assert props.distributionType.equals("only-script")
+assert !props.containsKey('wrapperUrl')
+assert !props.containsKey("wrapperVersion")

maven-wrapper-plugin/src/it/projects/mavenversion/verify.groovy

@@ -30,9 +30,10 @@ Properties props = new Properties()
 propertiesFile.withInputStream {
     props.load(it)
 }
-assert props.wrapperVersion.equals(wrapperCurrentVersion)
 assert props.distributionUrl.endsWith('/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip')
 assert props.distributionType.equals("only-script")
+assert !props.containsKey('wrapperUrl')
+assert !props.containsKey("wrapperVersion")
 
 log = new File(basedir, 'build.log').text
 // check "mvn wrapper:wrapper" output

maven-wrapper-plugin/src/it/projects/sh_type_only-script/verify.groovy

@@ -39,5 +39,7 @@ Properties props = new Properties()
 new File(basedir,'.mvn/wrapper/maven-wrapper.properties').withInputStream {
     props.load(it)
 }
-assert props.wrapperVersion.equals(wrapperCurrentVersion)
+
 assert props.distributionType.equals("only-script")
+assert !props.containsKey('wrapperUrl')
+assert !props.containsKey("wrapperVersion")

maven-wrapper-plugin/src/it/projects/type_only-script/verify.groovy

@@ -25,7 +25,6 @@ assert !(new File(basedir,'mvnwDebug.cmd').exists())
 
 wrapperProperties = new File(basedir,'.mvn/wrapper/maven-wrapper.properties')
 assert wrapperProperties.exists()
-assert !wrapperProperties.text.contains('wrapperUrl')
 
 log = new File(basedir, 'build.log').text
 // check "mvn wrapper:wrapper" output
@@ -39,5 +38,6 @@ Properties props = new Properties()
 new File(basedir,'.mvn/wrapper/maven-wrapper.properties').withInputStream {
     props.load(it)
 }
-assert props.wrapperVersion.equals(wrapperCurrentVersion)
 assert props.distributionType.equals("only-script")
+assert !props.containsKey('wrapperUrl')
+assert !props.containsKey("wrapperVersion")

maven-wrapper-plugin/src/main/java/org/apache/maven/plugins/wrapper/WrapperMojo.java

@@ -326,14 +326,14 @@ private void replaceProperties(String wrapperVersion, Path targetFolder) throws
                 + buffer().strong("Maven " + mavenVersion) + " and download from " + repoUrl);
 
         try (BufferedWriter out = Files.newBufferedWriter(wrapperPropertiesFile, StandardCharsets.UTF_8)) {
-            out.append("wrapperVersion=" + wrapperVersion + System.lineSeparator());
             out.append(DISTRIBUTION_TYPE_PROPERTY_NAME + "=" + distributionType + System.lineSeparator());
             out.append("distributionUrl=" + finalDistributionUrl + System.lineSeparator());
             if (distributionSha256Sum != null) {
                 out.append("distributionSha256Sum=" + distributionSha256Sum + System.lineSeparator());
             }
             if (!distributionType.equals(TYPE_ONLY_SCRIPT)) {
                 out.append("wrapperUrl=" + wrapperUrl + System.lineSeparator());
+                out.append("wrapperVersion=" + wrapperVersion + System.lineSeparator());
             }
             if (wrapperSha256Sum != null) {
                 out.append("wrapperSha256Sum=" + wrapperSha256Sum + System.lineSeparator());