This is an automated email from the ASF dual-hosted git repository.
hboutemy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-wrapper.git
The following commit(s) were added to refs/heads/master by this push:
new 803af33 [MWRAPPER-35] don't copy mvnwDebug* scripts by default
803af33 is described below
commit 803af3386f7dbff92e7dfc5a75908384aac908e9
Author: Hervé Boutemy <[email protected]>
AuthorDate: Thu Dec 9 21:45:07 2021 +0100
[MWRAPPER-35] don't copy mvnwDebug* scripts by default
---
maven-wrapper-plugin/src/it/projects/default/verify.groovy | 4 ++--
maven-wrapper-plugin/src/it/projects/extension/verify.groovy | 4 ++--
.../src/it/projects/{excludeDebug => includeDebug}/pom.xml | 0
.../src/it/projects/{excludeDebug => includeDebug}/test.properties | 2 +-
.../src/it/projects/{excludeDebug => includeDebug}/verify.groovy | 4 ++--
maven-wrapper-plugin/src/it/projects/mavenversion/verify.groovy | 4 ++--
maven-wrapper-plugin/src/it/projects/type_bin/verify.groovy | 4 ++--
maven-wrapper-plugin/src/it/projects/type_source/verify.groovy | 4 ++--
.../src/main/java/org/apache/maven/plugins/wrapper/WrapperMojo.java | 5 ++++-
9 files changed, 17 insertions(+), 14 deletions(-)
diff --git a/maven-wrapper-plugin/src/it/projects/default/verify.groovy
b/maven-wrapper-plugin/src/it/projects/default/verify.groovy
index ee553db..46a6f78 100644
--- a/maven-wrapper-plugin/src/it/projects/default/verify.groovy
+++ b/maven-wrapper-plugin/src/it/projects/default/verify.groovy
@@ -20,8 +20,8 @@
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,'mvnwDebug').exists())
+assert !(new File(basedir,'mvnwDebug.cmd').exists())
assert new File(basedir,'.mvn/wrapper/maven-wrapper.properties').exists()
assert new File(basedir,'.mvn/wrapper/maven-wrapper.jar').exists()
assert new File(basedir, 'build.log').text.contains('[INFO] Unpacked bin type
wrapper distribution
org.apache.maven.wrapper:maven-wrapper-distribution:zip:bin:')
\ No newline at end of file
diff --git a/maven-wrapper-plugin/src/it/projects/extension/verify.groovy
b/maven-wrapper-plugin/src/it/projects/extension/verify.groovy
index 627b37e..25b333e 100644
--- a/maven-wrapper-plugin/src/it/projects/extension/verify.groovy
+++ b/maven-wrapper-plugin/src/it/projects/extension/verify.groovy
@@ -20,6 +20,6 @@
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,'mvnwDebug').exists())
+assert !(new File(basedir,'mvnwDebug.cmd').exists())
assert new File(basedir,'.mvn/wrapper/maven-wrapper.properties').exists()
diff --git a/maven-wrapper-plugin/src/it/projects/excludeDebug/pom.xml
b/maven-wrapper-plugin/src/it/projects/includeDebug/pom.xml
similarity index 100%
rename from maven-wrapper-plugin/src/it/projects/excludeDebug/pom.xml
rename to maven-wrapper-plugin/src/it/projects/includeDebug/pom.xml
diff --git a/maven-wrapper-plugin/src/it/projects/excludeDebug/test.properties
b/maven-wrapper-plugin/src/it/projects/includeDebug/test.properties
similarity index 97%
rename from maven-wrapper-plugin/src/it/projects/excludeDebug/test.properties
rename to maven-wrapper-plugin/src/it/projects/includeDebug/test.properties
index 6600e23..0f1a0a6 100644
--- a/maven-wrapper-plugin/src/it/projects/excludeDebug/test.properties
+++ b/maven-wrapper-plugin/src/it/projects/includeDebug/test.properties
@@ -15,4 +15,4 @@
# specific language governing permissions and limitations
# under the License.
-includeDebug=false
\ No newline at end of file
+includeDebug=true
\ No newline at end of file
diff --git a/maven-wrapper-plugin/src/it/projects/excludeDebug/verify.groovy
b/maven-wrapper-plugin/src/it/projects/includeDebug/verify.groovy
similarity index 89%
rename from maven-wrapper-plugin/src/it/projects/excludeDebug/verify.groovy
rename to maven-wrapper-plugin/src/it/projects/includeDebug/verify.groovy
index 5d269c2..4c09a74 100644
--- a/maven-wrapper-plugin/src/it/projects/excludeDebug/verify.groovy
+++ b/maven-wrapper-plugin/src/it/projects/includeDebug/verify.groovy
@@ -20,5 +20,5 @@
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,'mvnwDebug').exists()
+assert new File(basedir,'mvnwDebug.cmd').exists()
diff --git a/maven-wrapper-plugin/src/it/projects/mavenversion/verify.groovy
b/maven-wrapper-plugin/src/it/projects/mavenversion/verify.groovy
index f972b23..be0e5b4 100644
--- a/maven-wrapper-plugin/src/it/projects/mavenversion/verify.groovy
+++ b/maven-wrapper-plugin/src/it/projects/mavenversion/verify.groovy
@@ -20,8 +20,8 @@
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,'mvnwDebug').exists())
+assert !(new File(basedir,'mvnwDebug.cmd').exists())
def propertiesFile = new File(basedir,'.mvn/wrapper/maven-wrapper.properties')
assert propertiesFile.exists()
diff --git a/maven-wrapper-plugin/src/it/projects/type_bin/verify.groovy
b/maven-wrapper-plugin/src/it/projects/type_bin/verify.groovy
index e079d58..40cba0e 100644
--- a/maven-wrapper-plugin/src/it/projects/type_bin/verify.groovy
+++ b/maven-wrapper-plugin/src/it/projects/type_bin/verify.groovy
@@ -20,7 +20,7 @@
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,'mvnwDebug').exists())
+assert !(new File(basedir,'mvnwDebug.cmd').exists())
assert new File(basedir,'.mvn/wrapper/maven-wrapper.properties').exists()
assert new File(basedir,'.mvn/wrapper/maven-wrapper.jar').exists()
\ No newline at end of file
diff --git a/maven-wrapper-plugin/src/it/projects/type_source/verify.groovy
b/maven-wrapper-plugin/src/it/projects/type_source/verify.groovy
index a4a2ed6..8364162 100644
--- a/maven-wrapper-plugin/src/it/projects/type_source/verify.groovy
+++ b/maven-wrapper-plugin/src/it/projects/type_source/verify.groovy
@@ -20,8 +20,8 @@
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,'mvnwDebug').exists())
+assert !(new File(basedir,'mvnwDebug.cmd').exists())
assert new File(basedir,'.mvn/wrapper/maven-wrapper.properties').exists()
assert new File(basedir,'.mvn/wrapper/MavenWrapperDownloader.java').exists()
assert !(new File(basedir,'.mvn/wrapper/maven-wrapper.jar').exists())
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 d8c8b5b..e160358 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
@@ -86,7 +86,10 @@ public class WrapperMojo extends AbstractMojo
@Parameter( defaultValue = "bin", property = "type" )
private String distributionType;
- @Parameter( defaultValue = "true", property = "includeDebug" )
+ /**
+ * Include <code>mvnwDebug*</code> scripts?
+ */
+ @Parameter( defaultValue = "false", property = "includeDebug" )
private boolean includeDebugScript;
// READONLY PARAMETERS
