[maven-wrapper-plugin] branch MWRAPPER-0_WIP updated: invoker.properties are not inherited, so specify mavenVersion invoker.maven.version per IT

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[maven-wrapper-plugin] branch MWRAPPER-0_WIP updated: invoker.properties are not inherited, so specify mavenVersion invoker.maven.version per IT

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

rfscholte pushed a commit to branch MWRAPPER-0_WIP
in repository https://gitbox.apache.org/repos/asf/maven-wrapper-plugin.git


The following commit(s) were added to refs/heads/MWRAPPER-0_WIP by this push:
     new c5bdc33  invoker.properties are not inherited, so specify mavenVersion invoker.maven.version per IT
c5bdc33 is described below

commit c5bdc3343b2e68ee92ccf20a7d938ed8ec951cfb
Author: rfscholte <[hidden email]>
AuthorDate: Sat May 23 13:51:05 2020 +0200

    invoker.properties are not inherited, so specify mavenVersion invoker.maven.version per IT
---
 pom.xml                                            |  4 +++
 src/it/projects/default/invoker.properties         |  2 +-
 src/it/projects/excludeDebug/invoker.properties    |  2 +-
 src/it/projects/{ => extension}/invoker.properties |  0
 src/it/projects/mavenversion/invoker.properties    |  2 +-
 src/it/projects/type_bin/invoker.properties        |  2 +-
 src/it/projects/type_source/invoker.properties     |  2 +-
 .../invoker.properties                             |  1 -
 src/it/projects/wrapperversion/pom.xml             | 29 ++++++++++++++++++
 .../test.properties}                               |  2 +-
 src/it/projects/wrapperversion/verify.groovy       | 34 ++++++++++++++++++++++
 11 files changed, 73 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index d3e8f83..ddf70f9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -112,6 +112,10 @@ under the License.
                 <goal>wrapper</goal>
               </goals>
               <projectsDirectory>src/it/projects</projectsDirectory>
+              <pomExcludes>
+                <!-- remove once Maven 3.7.0 is released -->
+                <pomExclude>wrapperversion/pom.xml</pomExclude>
+              </pomExcludes>
             </configuration>
           </plugin>
         </plugins>
diff --git a/src/it/projects/default/invoker.properties b/src/it/projects/default/invoker.properties
index a9aec42..d880d6e 100644
--- a/src/it/projects/default/invoker.properties
+++ b/src/it/projects/default/invoker.properties
@@ -14,5 +14,5 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-
+invoker.maven.version = 3.7.0+
 invoker.goals = org.apache.maven.plugins:maven-wrapper-plugin:${project.version}:wrapper
\ No newline at end of file
diff --git a/src/it/projects/excludeDebug/invoker.properties b/src/it/projects/excludeDebug/invoker.properties
index a9aec42..d880d6e 100644
--- a/src/it/projects/excludeDebug/invoker.properties
+++ b/src/it/projects/excludeDebug/invoker.properties
@@ -14,5 +14,5 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-
+invoker.maven.version = 3.7.0+
 invoker.goals = org.apache.maven.plugins:maven-wrapper-plugin:${project.version}:wrapper
\ No newline at end of file
diff --git a/src/it/projects/invoker.properties b/src/it/projects/extension/invoker.properties
similarity index 100%
copy from src/it/projects/invoker.properties
copy to src/it/projects/extension/invoker.properties
diff --git a/src/it/projects/mavenversion/invoker.properties b/src/it/projects/mavenversion/invoker.properties
index a9aec42..d880d6e 100644
--- a/src/it/projects/mavenversion/invoker.properties
+++ b/src/it/projects/mavenversion/invoker.properties
@@ -14,5 +14,5 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-
+invoker.maven.version = 3.7.0+
 invoker.goals = org.apache.maven.plugins:maven-wrapper-plugin:${project.version}:wrapper
\ No newline at end of file
diff --git a/src/it/projects/type_bin/invoker.properties b/src/it/projects/type_bin/invoker.properties
index a9aec42..d880d6e 100644
--- a/src/it/projects/type_bin/invoker.properties
+++ b/src/it/projects/type_bin/invoker.properties
@@ -14,5 +14,5 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-
+invoker.maven.version = 3.7.0+
 invoker.goals = org.apache.maven.plugins:maven-wrapper-plugin:${project.version}:wrapper
\ No newline at end of file
diff --git a/src/it/projects/type_source/invoker.properties b/src/it/projects/type_source/invoker.properties
index a9aec42..d880d6e 100644
--- a/src/it/projects/type_source/invoker.properties
+++ b/src/it/projects/type_source/invoker.properties
@@ -14,5 +14,5 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-
+invoker.maven.version = 3.7.0+
 invoker.goals = org.apache.maven.plugins:maven-wrapper-plugin:${project.version}:wrapper
\ No newline at end of file
diff --git a/src/it/projects/mavenversion/invoker.properties b/src/it/projects/wrapperversion/invoker.properties
similarity index 97%
copy from src/it/projects/mavenversion/invoker.properties
copy to src/it/projects/wrapperversion/invoker.properties
index a9aec42..308bfd8 100644
--- a/src/it/projects/mavenversion/invoker.properties
+++ b/src/it/projects/wrapperversion/invoker.properties
@@ -14,5 +14,4 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-
 invoker.goals = org.apache.maven.plugins:maven-wrapper-plugin:${project.version}:wrapper
\ No newline at end of file
diff --git a/src/it/projects/wrapperversion/pom.xml b/src/it/projects/wrapperversion/pom.xml
new file mode 100644
index 0000000..ed54d55
--- /dev/null
+++ b/src/it/projects/wrapperversion/pom.xml
@@ -0,0 +1,29 @@
+<?xml version='1.0' encoding='UTF-8'?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <groupId>org.apache.maven.plugins.it.wrapper</groupId>
+  <artifactId>extension</artifactId>
+  <version>1.0.0-SNAPSHOT</version>
+  <packaging>pom</packaging>
+</project>
\ No newline at end of file
diff --git a/src/it/projects/invoker.properties b/src/it/projects/wrapperversion/test.properties
similarity index 96%
rename from src/it/projects/invoker.properties
rename to src/it/projects/wrapperversion/test.properties
index 7b22bf3..e84426f 100644
--- a/src/it/projects/invoker.properties
+++ b/src/it/projects/wrapperversion/test.properties
@@ -15,4 +15,4 @@
 # specific language governing permissions and limitations
 # under the License.
 
-invoker.maven.version = 3.7.0+
+wrapperVersion=3.7.0
\ No newline at end of file
diff --git a/src/it/projects/wrapperversion/verify.groovy b/src/it/projects/wrapperversion/verify.groovy
new file mode 100644
index 0000000..f972b23
--- /dev/null
+++ b/src/it/projects/wrapperversion/verify.groovy
@@ -0,0 +1,34 @@
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * 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()
+
+def propertiesFile = new File(basedir,'.mvn/wrapper/maven-wrapper.properties')
+assert propertiesFile.exists()
+
+def props = new Properties()
+propertiesFile.withInputStream {
+    props.load(it)
+}
+
+assert props.distributionUrl == 'https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip'