[MWRAPPER-134] Add wrapperVersion to maven-wrapper.properties

That contains the current version of the deployed Maven Wrapper

---

https://issues.apache.org/jira/browse/MWRAPPER-134

Author: cstamas

maven-wrapper-plugin/pom.xml

@@ -176,6 +176,9 @@ under the License.
                 <artifact>org.apache.maven.wrapper:maven-wrapper-distribution:${project.version}:zip:script</artifact>
                 <artifact>org.apache.maven.wrapper:maven-wrapper-distribution:${project.version}:zip:source</artifact>
               </extraArtifacts>
+              <scriptVariables>
+                <wrapperCurrentVersion>${project.version}</wrapperCurrentVersion>
+              </scriptVariables>
             </configuration>
             <executions>
               <execution>

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

@@ -29,3 +29,9 @@ log = new File(basedir, 'build.log').text
 assert log.contains('[INFO] Unpacked only-script type wrapper distribution org.apache.maven.wrapper:maven-wrapper-distribution:zip:only-script:')
 // check "mvnw -v" output
 assert log.contains('Apache Maven ')
+
+Properties props = new Properties()
+new File(basedir,'.mvn/wrapper/maven-wrapper.properties').withInputStream {
+    props.load(it)
+}
+assert props.wrapperVersion.equals(wrapperCurrentVersion)

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

@@ -26,11 +26,11 @@ assert !(new File(basedir,'mvnwDebug.cmd').exists())
 def propertiesFile = new File(basedir,'.mvn/wrapper/maven-wrapper.properties')
 assert propertiesFile.exists()
 
-def props = new Properties()
+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')
 
 log = new File(basedir, 'build.log').text

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

@@ -30,3 +30,9 @@ log = new File(basedir, 'build.log').text
 assert log.contains('[INFO] Unpacked bin type wrapper distribution org.apache.maven.wrapper:maven-wrapper-distribution:zip:bin:')
 // check "mvnw -v" output
 assert log.contains('Apache Maven ')
+
+Properties props = new Properties()
+new File(basedir,'.mvn/wrapper/maven-wrapper.properties').withInputStream {
+    props.load(it)
+}
+assert props.wrapperVersion.equals(wrapperCurrentVersion)

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

@@ -34,3 +34,9 @@ assert log.contains('[INFO] Unpacked only-script type wrapper distribution org.a
 // check "mvnw -v" output
 assert log.contains("Couldn't find ")
 assert log.contains(", downloading and installing it ...")
+
+Properties props = new Properties()
+new File(basedir,'.mvn/wrapper/maven-wrapper.properties').withInputStream {
+    props.load(it)
+}
+assert props.wrapperVersion.equals(wrapperCurrentVersion)

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

@@ -35,3 +35,9 @@ assert log.contains('[INFO] Unpacked script type wrapper distribution org.apache
 assert log.contains("Couldn't find ")
 assert log.contains(", downloading it ...")
 assert new File(basedir,'.mvn/wrapper/maven-wrapper.jar').exists()
+
+Properties props = new Properties()
+new File(basedir,'.mvn/wrapper/maven-wrapper.properties').withInputStream {
+    props.load(it)
+}
+assert props.wrapperVersion.equals(wrapperCurrentVersion)

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

@@ -33,3 +33,9 @@ assert log.contains('[INFO] Unpacked source type wrapper distribution org.apache
 assert log.contains("Couldn't find ")
 assert log.contains(", downloading it ...")
 assert new File(basedir,'.mvn/wrapper/maven-wrapper.jar').exists()
+
+Properties props = new Properties()
+new File(basedir,'.mvn/wrapper/maven-wrapper.properties').withInputStream {
+    props.load(it)
+}
+assert props.wrapperVersion.equals(wrapperCurrentVersion)

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

@@ -287,6 +287,7 @@ private void replaceProperties(String wrapperVersion, Path targetFolder) throws
 
         try (BufferedWriter out = Files.newBufferedWriter(wrapperPropertiesFile, StandardCharsets.UTF_8)) {
             out.append(String.format(Locale.ROOT, license));
+            out.append("wrapperVersion=" + wrapperVersion + System.lineSeparator());
             out.append("distributionUrl=" + distributionUrl + System.lineSeparator());
             if (distributionSha256Sum != null) {
                 out.append("distributionSha256Sum=" + distributionSha256Sum + System.lineSeparator());