feat: Specify wrapper version (or latest)

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

@@ -26,12 +26,15 @@ assert new File(basedir,'.mvn/wrapper/maven-wrapper.properties').exists()
 
 log = new File(basedir, 'build.log').text
 // check "mvn wrapper:wrapper" output
-assert log.contains('[INFO] Unpacked only-script type wrapper distribution org.apache.maven.wrapper:maven-wrapper-distribution:zip:only-script:')
+assert log.contains("[INFO] Unpacked only-script type wrapper distribution org.apache.maven.wrapper:maven-wrapper-distribution:zip:only-script:$wrapperCurrentVersion")
+assert log.contains("\nApache Maven $mavenVersion ")
 // check "mvnw -v" output
-assert log.contains('Apache Maven ')
+assert !log.contains("[INFO] Apache Maven $mavenVersion")
 
 Properties props = new Properties()
 new File(basedir,'.mvn/wrapper/maven-wrapper.properties').withInputStream {
     props.load(it)
 }
-assert props.wrapperVersion.equals(wrapperCurrentVersion)
+assert props.wrapperVersion == wrapperCurrentVersion
+assert props.wrapperUrl == null
+assert props.distributionUrl.endsWith("/org/apache/maven/apache-maven/$mavenVersion/apache-maven-$mavenVersion-bin.zip")

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

@@ -17,9 +17,22 @@
  * specific language governing permissions and limitations
  * under the License.
  */
- 
+
 assert new File(basedir,'mvnw').exists()
 assert new File(basedir,'mvnw.cmd').exists()
 assert !(new File(basedir,'mvnwDebug').exists())
 assert !(new File(basedir,'mvnwDebug.cmd').exists())
 assert new File(basedir,'.mvn/wrapper/maven-wrapper.properties').exists()
+
+Properties props = new Properties()
+new File(basedir,'.mvn/wrapper/maven-wrapper.properties').withInputStream {
+    props.load(it)
+}
+assert props.wrapperVersion == wrapperCurrentVersion
+assert props.wrapperUrl == null
+assert props.distributionUrl.endsWith("/org/apache/maven/apache-maven/$mavenVersion/apache-maven-$mavenVersion-bin.zip")
+
+log = new File(basedir, 'build.log').text
+// check "mvn wrapper:wrapper" output
+assert log.contains("[INFO] Unpacked only-script type wrapper distribution org.apache.maven.wrapper:maven-wrapper-distribution:zip:only-script:$wrapperCurrentVersion")
+assert !log.contains("Apache Maven")

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

@@ -22,3 +22,17 @@ assert new File(basedir,'mvnw').exists()
 assert new File(basedir,'mvnw.cmd').exists()
 assert new File(basedir,'mvnwDebug').exists()
 assert new File(basedir,'mvnwDebug.cmd').exists()
+
+Properties props = new Properties()
+new File(basedir,'.mvn/wrapper/maven-wrapper.properties').withInputStream {
+    props.load(it)
+}
+assert props.wrapperVersion == wrapperCurrentVersion
+assert props.wrapperUrl == null
+assert props.distributionUrl.endsWith("/org/apache/maven/apache-maven/$mavenVersion/apache-maven-$mavenVersion-bin.zip")
+
+log = new File(basedir, 'build.log').text
+// check "mvn wrapper:wrapper" output
+assert log.contains("[INFO] Unpacked only-script type wrapper distribution org.apache.maven.wrapper:maven-wrapper-distribution:zip:only-script:$wrapperCurrentVersion")
+assert log.contains("Apache Maven $mavenVersion")
+assert !log.contains("[INFO] Apache Maven $mavenVersion")

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

@@ -29,13 +29,13 @@ def props = new Properties()
 propertiesFile.withInputStream {
     props.load( it )
 }
-
-def (_, mavenVersion1, mavenVersion2) = (props.distributionUrl =~ /\/org\/apache\/maven\/apache-maven\/(.+)\/apache-maven-(.+)-bin.zip/)[0]
-
-assert mavenVersion1 == mavenVersion2
+assert props.wrapperVersion == wrapperCurrentVersion
+assert props.wrapperUrl == null
+assert props.distributionUrl.endsWith("/org/apache/maven/apache-maven/$mavenVersion/apache-maven-$mavenVersion-bin.zip")
 
 log = new File( basedir, 'build.log' ).text
 // check "mvn wrapper:wrapper" output
-assert log.contains( '[INFO] Unpacked only-script type wrapper distribution org.apache.maven.wrapper:maven-wrapper-distribution:zip:only-script:' )
+assert log.contains("[INFO] Unpacked only-script type wrapper distribution org.apache.maven.wrapper:maven-wrapper-distribution:zip:only-script:$wrapperCurrentVersion")
 // check "mvnw -v" output
-assert log.contains( 'Apache Maven ' + mavenVersion1 )
+assert log.contains("Apache Maven $mavenVersion")
+assert !log.contains("[INFO] Apache Maven ")

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

@@ -29,13 +29,13 @@ def props = new Properties()
 propertiesFile.withInputStream {
     props.load( it )
 }
-
-def (_, mavenVersion1, mavenVersion2) = (props.distributionUrl =~ /\/org\/apache\/maven\/apache-maven\/(.+)\/apache-maven-(.+)-bin.zip/)[0]
-
-assert mavenVersion1 == mavenVersion2
+assert props.wrapperVersion == wrapperCurrentVersion
+assert props.wrapperUrl == null
+assert props.distributionUrl.endsWith("/org/apache/maven/apache-maven/$mavenVersion/apache-maven-$mavenVersion-bin.zip")
 
 log = new File( basedir, 'build.log' ).text
 // check "mvn wrapper:wrapper" output
-assert log.contains( '[INFO] Unpacked only-script type wrapper distribution org.apache.maven.wrapper:maven-wrapper-distribution:zip:only-script:' )
+assert log.contains("[INFO] Unpacked only-script type wrapper distribution org.apache.maven.wrapper:maven-wrapper-distribution:zip:only-script:$wrapperCurrentVersion")
 // check "mvnw -v" output
-assert log.contains( 'Apache Maven ' + mavenVersion1 )
+assert log.contains("Apache Maven $mavenVersion")
+assert !log.contains("[INFO] Apache Maven ")

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

@@ -17,7 +17,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
- 
+
 assert new File(basedir,'mvnw').exists()
 assert new File(basedir,'mvnw.cmd').exists()
 assert !(new File(basedir,'mvnwDebug').exists())
@@ -30,11 +30,13 @@ Properties props = new Properties()
 propertiesFile.withInputStream {
     props.load(it)
 }
-assert props.wrapperVersion.equals(wrapperCurrentVersion)
+assert props.wrapperVersion == wrapperCurrentVersion
+assert props.wrapperUrl == null
 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
 // check "mvn wrapper:wrapper" output
-assert log.contains('[INFO] Unpacked only-script type wrapper distribution org.apache.maven.wrapper:maven-wrapper-distribution:zip:only-script:')
+assert log.contains("[INFO] Unpacked only-script type wrapper distribution org.apache.maven.wrapper:maven-wrapper-distribution:zip:only-script:$wrapperCurrentVersion")
 // check "mvnw -v" output
 assert log.contains('Apache Maven 3.6.3')
+assert !log.contains("[INFO] Apache Maven ")

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

@@ -25,11 +25,20 @@ assert !(new File(basedir,'mvnwDebug.cmd').exists())
 
 properties = new File(basedir,'.mvn/wrapper/maven-wrapper.properties')
 assert properties.exists()
-assert properties.text.contains('distributionSha256Sum=7e0c63c6a99639e57cc64375d6717d72e301d8ab829fef2e145ee860317bc3cb')
+def props = new Properties()
+properties.withInputStream {
+    props.load( it )
+}
+assert props.wrapperVersion == wrapperCurrentVersion
+assert props.wrapperUrl.endsWith("/org/apache/maven/wrapper/maven-wrapper/${props.wrapperVersion}/maven-wrapper-${props.wrapperVersion}.jar")
+assert props.distributionUrl.endsWith("/org/apache/maven/apache-maven/$mavenVersion/apache-maven-$mavenVersion-bin.zip")
+assert props.distributionSha256Sum == '7e0c63c6a99639e57cc64375d6717d72e301d8ab829fef2e145ee860317bc3cb'
+assert props.wrapperSha256Sum == null
 
 log = new File(basedir, 'build.log').text
 // check "mvn wrapper:wrapper" output
 assert log.contains('Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised.')
-
+assert log.contains("[INFO] Unpacked bin type wrapper distribution org.apache.maven.wrapper:maven-wrapper-distribution:zip:bin:$wrapperCurrentVersion\n[INFO] Configuring .mvn/wrapper/maven-wrapper.properties to use Maven $mavenVersion and download from ")
 // check "mvnw -v" output
-assert log.contains('Apache Maven ')
+assert log.contains("[INFO] Apache Maven Wrapper ${props.wrapperVersion}\n[INFO] Installing Maven distribution ")
+assert !log.contains("Apache Maven $mavenVersion")

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

@@ -25,12 +25,21 @@ assert !(new File(basedir,'mvnwDebug.cmd').exists())
 
 properties = new File(basedir,'.mvn/wrapper/maven-wrapper.properties')
 assert properties.exists()
-assert properties.text.contains('distributionSha256Sum=7e0c63c6a99639e57cc64375d6717d72e301d8ab829fef2e145ee860317bc3cb')
+def props = new Properties()
+properties.withInputStream {
+    props.load( it )
+}
+assert props.wrapperVersion == wrapperCurrentVersion
+assert props.wrapperUrl == null
+assert props.distributionUrl.endsWith("/org/apache/maven/apache-maven/$mavenVersion/apache-maven-$mavenVersion-bin.zip")
+assert props.distributionSha256Sum == '7e0c63c6a99639e57cc64375d6717d72e301d8ab829fef2e145ee860317bc3cb'
+assert props.wrapperSha256Sum == null
 
 log = new File(basedir, 'build.log').text
 // check "mvn wrapper:wrapper" output
 assert log.contains('Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised.')
 assert !log.contains('shasum:')
+assert log.contains("[INFO] Unpacked only-script type wrapper distribution org.apache.maven.wrapper:maven-wrapper-distribution:zip:only-script:$wrapperCurrentVersion")
 
 // check "mvnw -v" output
 assert !log.contains('Apache Maven ')

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

@@ -25,12 +25,21 @@ assert !(new File(basedir,'mvnwDebug.cmd').exists())
 
 properties = new File(basedir,'.mvn/wrapper/maven-wrapper.properties')
 assert properties.exists()
-assert properties.text.contains('wrapperSha256Sum=7e0c63c6a99639e57cc64375d6717d72e301d8ab829fef2e145ee860317bc3cb')
+def props = new Properties()
+properties.withInputStream {
+    props.load( it )
+}
+assert props.wrapperVersion == wrapperCurrentVersion
+assert props.wrapperUrl.endsWith("/org/apache/maven/wrapper/maven-wrapper/${props.wrapperVersion}/maven-wrapper-${props.wrapperVersion}.jar")
+assert props.distributionUrl.endsWith("/org/apache/maven/apache-maven/$mavenVersion/apache-maven-$mavenVersion-bin.zip")
+assert props.distributionSha256Sum == null
+assert props.wrapperSha256Sum == '7e0c63c6a99639e57cc64375d6717d72e301d8ab829fef2e145ee860317bc3cb'
 
 log = new File(basedir, 'build.log').text
 // check "mvn wrapper:wrapper" output
 assert log.contains('Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised.')
 assert !log.contains('shasum:')
+assert log.contains("[INFO] Unpacked bin type wrapper distribution org.apache.maven.wrapper:maven-wrapper-distribution:zip:bin:$wrapperCurrentVersion")
 
 // check "mvnw -v" output
 assert !log.contains('Apache Maven ')

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

@@ -30,15 +30,18 @@ propertiesFile.withInputStream {
     props.load(it)
 }
 
-assert props.distributionUrl.equals('https://archive.apache.org/dist/maven/mvnd/0.9.0/maven-mvnd-0.9.0-bin.zip')
+assert props.wrapperVersion == wrapperCurrentVersion
+assert props.wrapperUrl == null
+assert props.distributionUrl == 'https://archive.apache.org/dist/maven/mvnd/0.9.0/maven-mvnd-0.9.0-bin.zip'
 
 log = new File(basedir, 'build.log').text
 
 // check "mvn wrapper:wrapper" output
 // works only on 'only-script' type
-assert log.contains('[INFO] Unpacked only-script type wrapper distribution org.apache.maven.wrapper:maven-wrapper-distribution:zip:only-script:')
+assert log.contains("[INFO] Unpacked only-script type wrapper distribution org.apache.maven.wrapper:maven-wrapper-distribution:zip:only-script:$wrapperCurrentVersion")
 
 // check "mvnw --status" output
 assert log.contains("Status")
 assert log.contains("RSS")
 assert log.contains("Java home")
+assert !log.contains("Apache Maven")

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

@@ -27,12 +27,15 @@ assert new File(basedir,'.mvn/wrapper/maven-wrapper.jar').exists()
 
 log = new File(basedir, 'build.log').text
 // check "mvn wrapper:wrapper" output
-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 ')
+assert log.contains("[INFO] Unpacked bin type wrapper distribution org.apache.maven.wrapper:maven-wrapper-distribution:zip:bin:$wrapperCurrentVersion\n[INFO] Configuring .mvn/wrapper/maven-wrapper.properties to use Maven $mavenVersion and download from ")
 
 Properties props = new Properties()
 new File(basedir,'.mvn/wrapper/maven-wrapper.properties').withInputStream {
     props.load(it)
 }
-assert props.wrapperVersion.equals(wrapperCurrentVersion)
+assert props.wrapperVersion == wrapperCurrentVersion
+assert props.wrapperUrl.endsWith("/org/apache/maven/wrapper/maven-wrapper/${props.wrapperVersion}/maven-wrapper-${props.wrapperVersion}.jar")
+assert props.distributionUrl.endsWith("/org/apache/maven/apache-maven/$mavenVersion/apache-maven-$mavenVersion-bin.zip")
+
+// check "mvnw -v" output
+assert log.contains("[INFO] Apache Maven Wrapper ${props.wrapperVersion}\nApache Maven $mavenVersion")

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

@@ -21,6 +21,8 @@
 log = new File(basedir, 'build.log').text
 boolean isWindows = System.getProperty('os.name', 'unknown').startsWith('Windows')
 
+assert log.contains("[INFO] Unpacked only-script type wrapper distribution org.apache.maven.wrapper:maven-wrapper-distribution:zip:only-script:$wrapperCurrentVersion")
+assert !log.contains("Apache Maven")
 if (isWindows) {
     // on Windows: just the fact it failed is enough
     assert log.contains('Exception calling "DownloadFile"')
@@ -29,3 +31,13 @@ if (isWindows) {
     // cover all methods: point is, there is no Maven version 0.0.0
     assert log.contains('wget: Failed to fetch') || log.contains('curl: Failed to fetch') || log.contains('- Error downloading:')
 }
+
+properties = new File(basedir,'.mvn/wrapper/maven-wrapper.properties')
+assert properties.exists()
+def props = new Properties()
+properties.withInputStream {
+    props.load( it )
+}
+assert props.wrapperVersion == wrapperCurrentVersion
+assert props.wrapperUrl == null
+assert props.distributionUrl.endsWith("/org/apache/maven/apache-maven/0.0.0/apache-maven-0.0.0-bin.zip")

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

@@ -23,20 +23,20 @@ assert new File(basedir,'mvnw.cmd').exists()
 assert !(new File(basedir,'mvnwDebug').exists())
 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
-assert log.contains('[INFO] Unpacked only-script type wrapper distribution org.apache.maven.wrapper:maven-wrapper-distribution:zip:only-script:')
+assert log.contains("[INFO] Unpacked only-script type wrapper distribution org.apache.maven.wrapper:maven-wrapper-distribution:zip:only-script:$wrapperCurrentVersion")
 
 // check "mvnw -v" output
 assert log.contains("Couldn't find ")
 assert log.contains(", downloading and installing it ...")
+assert log.contains("Apache Maven $mavenVersion")
+assert !log.contains("[INFO] Apache Maven ")
 
 Properties props = new Properties()
 new File(basedir,'.mvn/wrapper/maven-wrapper.properties').withInputStream {
     props.load(it)
 }
-assert props.wrapperVersion.equals(wrapperCurrentVersion)
+assert props.wrapperVersion == wrapperCurrentVersion
+assert props.wrapperUrl == null
+assert props.distributionUrl.endsWith("/org/apache/maven/apache-maven/$mavenVersion/apache-maven-$mavenVersion-bin.zip")

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

@@ -23,21 +23,24 @@ assert new File(basedir,'mvnw.cmd').exists()
 assert !(new File(basedir,'mvnwDebug').exists())
 assert !(new File(basedir,'mvnwDebug.cmd').exists())
 
-wrapperProperties = new File(basedir,'.mvn/wrapper/maven-wrapper.properties')
-assert wrapperProperties.exists()
-assert wrapperProperties.text.contains('wrapperUrl')
+properties = new File(basedir,'.mvn/wrapper/maven-wrapper.properties')
+assert properties.exists()
+def props = new Properties()
+properties.withInputStream {
+    props.load( it )
+}
+assert props.wrapperVersion == wrapperCurrentVersion
+assert props.wrapperUrl.endsWith("/org/apache/maven/wrapper/maven-wrapper/${props.wrapperVersion}/maven-wrapper-${props.wrapperVersion}.jar")
+assert props.distributionUrl.endsWith("/org/apache/maven/apache-maven/$mavenVersion/apache-maven-$mavenVersion-bin.zip")
 
 log = new File(basedir, 'build.log').text
 // check "mvn wrapper:wrapper" output
-assert log.contains('[INFO] Unpacked script type wrapper distribution org.apache.maven.wrapper:maven-wrapper-distribution:zip:script:')
+assert log.contains("[INFO] Unpacked script type wrapper distribution org.apache.maven.wrapper:maven-wrapper-distribution:zip:script:${props.wrapperVersion}\n[INFO] Configuring .mvn/wrapper/maven-wrapper.properties to use Maven $mavenVersion and download from ")
+assert log.contains("\nApache Maven $mavenVersion ")
 
 // check "mvnw -v" output
 assert log.contains("Couldn't find ")
 assert log.contains(", downloading it ...")
+assert log.contains("[INFO] Apache Maven Wrapper ${props.wrapperVersion}\n[INFO] Installing Maven distribution ")
+assert !log.contains("[INFO] Apache Maven $mavenVersion")
 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

@@ -27,7 +27,7 @@ assert new File(basedir,'.mvn/wrapper/MavenWrapperDownloader.java').exists()
 
 log = new File(basedir, 'build.log').text
 // check "mvn wrapper:wrapper" output
-assert log.contains('[INFO] Unpacked source type wrapper distribution org.apache.maven.wrapper:maven-wrapper-distribution:zip:source:')
+assert log.contains("[INFO] Unpacked source type wrapper distribution org.apache.maven.wrapper:maven-wrapper-distribution:zip:source:$wrapperCurrentVersion\n[INFO] Configuring .mvn/wrapper/maven-wrapper.properties to use Maven $mavenVersion and download from ")
 
 // check "mvnw -v" output
 assert log.contains("Couldn't find ")
@@ -38,4 +38,8 @@ Properties props = new Properties()
 new File(basedir,'.mvn/wrapper/maven-wrapper.properties').withInputStream {
     props.load(it)
 }
-assert props.wrapperVersion.equals(wrapperCurrentVersion)
+assert props.wrapperVersion == wrapperCurrentVersion
+assert props.wrapperUrl.endsWith("/org/apache/maven/wrapper/maven-wrapper/${props.wrapperVersion}/maven-wrapper-${props.wrapperVersion}.jar")
+assert props.distributionUrl.endsWith("/org/apache/maven/apache-maven/$mavenVersion/apache-maven-$mavenVersion-bin.zip")
+
+assert log.contains("[INFO] Apache Maven Wrapper ${props.wrapperVersion}\nApache Maven $mavenVersion")

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

@@ -25,4 +25,5 @@ assert !new File( basedir, '.mvn/wrapper' ).exists()
 
 def buildLog = new File( basedir, "build.log").text;
 
-assert buildLog.matches('(?ms).*artifact: org.apache.maven.wrapper:maven-wrapper-distribution:zip:unknown-type:.* not resolved.*')
+assert buildLog.contains("artifact: org.apache.maven.wrapper:maven-wrapper-distribution:zip:unknown-type:$wrapperCurrentVersion not resolved")
+assert !buildLog.contains("Apache Maven")