(maven-wrapper) 01/01: [MWRAPPER-143] The wrapperVersion property is not used in only-script mode

[bdemers]

This is an automated email from the ASF dual-hosted git repository.

bdemers pushed a commit to branch MWRAPPER-143-bdemers
in repository https://gitbox.apache.org/repos/asf/maven-wrapper.git

commit 3328b5bd7270458259b86f8f02f4f7a10e779924
Author: Brian Demers <bdem...@apache.org>
AuthorDate: Mon Jun 17 11:03:44 2024 -0400

    [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.
---
 maven-wrapper-plugin/src/it/projects/default/verify.groovy            | 3 ++-
 maven-wrapper-plugin/src/it/projects/mavenversion/verify.groovy       | 3 ++-
 maven-wrapper-plugin/src/it/projects/type_only-script/verify.groovy   | 4 ++--
 .../src/main/java/org/apache/maven/plugins/wrapper/WrapperMojo.java   | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/maven-wrapper-plugin/src/it/projects/default/verify.groovy 
b/maven-wrapper-plugin/src/it/projects/default/verify.groovy
index 6832ec6..c34174e 100644
--- a/maven-wrapper-plugin/src/it/projects/default/verify.groovy
+++ b/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")
diff --git a/maven-wrapper-plugin/src/it/projects/mavenversion/verify.groovy 
b/maven-wrapper-plugin/src/it/projects/mavenversion/verify.groovy
index b68311e..2e89682 100644
--- a/maven-wrapper-plugin/src/it/projects/mavenversion/verify.groovy
+++ b/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
diff --git 
a/maven-wrapper-plugin/src/it/projects/type_only-script/verify.groovy 
b/maven-wrapper-plugin/src/it/projects/type_only-script/verify.groovy
index c3001df..6f4de8e 100644
--- a/maven-wrapper-plugin/src/it/projects/type_only-script/verify.groovy
+++ b/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")
diff --git 
a/maven-wrapper-plugin/src/main/java/org/apache/maven/plugins/wrapper/WrapperMojo.java
 
b/maven-wrapper-plugin/src/main/java/org/apache/maven/plugins/wrapper/WrapperMojo.java
index 4b0650f..0cb65f0 100644
--- 
a/maven-wrapper-plugin/src/main/java/org/apache/maven/plugins/wrapper/WrapperMojo.java
+++ 
b/maven-wrapper-plugin/src/main/java/org/apache/maven/plugins/wrapper/WrapperMojo.java
@@ -330,7 +330,6 @@ public class WrapperMojo extends AbstractMojo {
 
         try (BufferedWriter out = 
Files.newBufferedWriter(wrapperPropertiesFile, StandardCharsets.UTF_8)) {
             out.append(String.format(Locale.ROOT, license));
-            out.append("wrapperVersion=" + wrapperVersion + 
System.lineSeparator());
             out.append(DISTRIBUTION_TYPE_PROPERTY_NAME + "=" + 
distributionType + System.lineSeparator());
             out.append("distributionUrl=" + distributionUrl + 
System.lineSeparator());
             if (distributionSha256Sum != null) {
@@ -338,6 +337,7 @@ public class WrapperMojo extends AbstractMojo {
             }
             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());