[MINVOKER-239] - Upgrade maven-plugins parent to version 32
authorKarl Heinz Marbaise <khmarbaise@apache.org>
Mon, 23 Jul 2018 21:19:13 +0000 (23:19 +0200)
committerKarl Heinz Marbaise <khmarbaise@apache.org>
Thu, 2 Aug 2018 18:09:39 +0000 (20:09 +0200)
 o Fixed several IT's.
 o The maven-invoker-plugin version 3.1.0 seemed to be having
   an issue related to the ITs: exec-timeout-invoker-level
   and exec-timeout-mojo-level which are failing
   constantly. version 3.0.1 works.

30 files changed:
pom.xml
src/it/MINVOKER-191/pom.xml
src/it/exec-timeout-invoker-level/pom.xml
src/it/exec-timeout-invoker-level/src/it/basic/pom.xml
src/it/exec-timeout-mojo-level/pom.xml
src/it/exec-timeout-mojo-level/src/it/basic/pom.xml
src/it/filtering-extensions/pom.xml
src/it/invocation-debug/pom.xml
src/it/invocation-debug/src/it/minvoker-142/pom.xml
src/it/invocation-emptyproperty/pom.xml
src/it/invocation-emptyproperty/src/it/minvoker-118/pom.xml
src/it/invocation-multiple/pom.xml
src/it/invocation-offline/pom.xml
src/it/invocation-reactor-indirect/pom.xml
src/it/invocation-spaces/pom.xml
src/it/local-repo-default/pom.xml
src/it/local-repo-isolated/pom.xml
src/it/local-repo-path/pom.xml
src/it/multiEnvVar/pom.xml
src/it/pom-filtering-encoding/pom.xml
src/it/pom-filtering/pom.xml
src/it/postbuild-executed-only-once/pom.xml
src/it/settings-inherit/pom.xml
src/it/settings-inherit/src/it/project/pom.xml
src/it/settings-merge-multiexecutions/pom.xml
src/it/settings-merge/pom.xml
src/it/settings-merge_jdk9+/pom.xml
src/it/spaces-should-work_non-windows/pom.xml
src/it/special-characters-should-work/pom.xml
src/it/wrongPropertyInterpolation/pom.xml

diff --git a/pom.xml b/pom.xml
index ab67df5..71a7f01 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@ under the License.
   <parent>
     <artifactId>maven-plugins</artifactId>
     <groupId>org.apache.maven.plugins</groupId>
-    <version>31</version>
+    <version>32</version>
     <relativePath>../../pom/maven/maven-plugins/pom.xml</relativePath>
   </parent>
 
@@ -67,7 +67,6 @@ under the License.
   <properties>
     <javaVersion>7</javaVersion>
     <mavenVersion>3.0</mavenVersion>
-    <surefire.version>2.21.0</surefire.version>
     <doxiaVersion>1.7</doxiaVersion>
     <doxia-sitetoolsVersion>1.7.4</doxia-sitetoolsVersion>
     <beanshell-groupId>org.beanshell</beanshell-groupId>
@@ -310,8 +309,8 @@ under the License.
             <plugin>
               <groupId>org.apache.maven.plugins</groupId>
               <artifactId>maven-invoker-plugin</artifactId>
+              <version>3.0.1</version>
               <configuration>
-                <debug>true</debug>
                 <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
                 <preBuildHookScript>setup</preBuildHookScript>
                 <postBuildHookScript>verify</postBuildHookScript>
@@ -319,6 +318,8 @@ under the License.
                 <settingsFile>src/it/settings.xml</settingsFile>
                 <mavenOpts>-Djava.io.tmpdir=${project.build.directory}</mavenOpts>
                 <properties>
+                  <!-- e.g. ensure that Java7 picks up TLSv1.2 when connecting with Central -->
+                  <https.protocols>${https.protocols}</https.protocols>
                   <maven.compiler.source>${maven.compiler.source}</maven.compiler.source>
                   <maven.compiler.target>${maven.compiler.target}</maven.compiler.target>
                 </properties>
index fc24aa5..2e8a898 100644 (file)
@@ -64,7 +64,13 @@ under the License.
         <plugin>\r
           <groupId>org.apache.maven.plugins</groupId>\r
           <artifactId>maven-invoker-plugin</artifactId>\r
-          <version>@pom.version@</version>\r
+          <version>@project.version@</version>\r
+          <configuration>\r
+            <properties>\r
+              <!-- e.g. ensure that Java7 picks up TLSv1.2 when connecting with Central -->\r
+              <https.protocols>${https.protocols}</https.protocols>\r
+            </properties>\r
+          </configuration>\r
         </plugin>\r
       </plugins>\r
     </pluginManagement>\r
index 61c75de..3bcb75c 100644 (file)
@@ -40,10 +40,15 @@ under the License.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-invoker-plugin</artifactId>
-        <version>@pom.version@</version>
+        <version>@project.version@</version>
         <configuration>
+          <streamLogs>true</streamLogs>
           <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
           <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
+          <properties>
+            <!-- e.g. ensure that Java7 picks up TLSv1.2 when connecting with Central -->
+            <https.protocols>${https.protocols}</https.protocols>
+          </properties>
         </configuration>
         <executions>
           <execution>
index 9bebf8b..eba22eb 100644 (file)
@@ -33,6 +33,12 @@ under the License.
         <groupId>org.apache.maven.plugins.invoker</groupId>
         <artifactId>exec-timeout-invoker-level</artifactId>
         <version>1.0-SNAPSHOT</version>
+        <configuration>
+          <properties>
+            <!-- e.g. ensure that Java7 picks up TLSv1.2 when connecting with Central -->
+            <https.protocols>${https.protocols}</https.protocols>
+          </properties>
+        </configuration>
         <executions>
           <execution>
             <id>touch</id>
index 20737a0..3f02a9a 100644 (file)
@@ -40,11 +40,16 @@ under the License.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-invoker-plugin</artifactId>
-        <version>@pom.version@</version>
+        <version>@project.version@</version>
         <configuration>
+          <streamLogs>true</streamLogs>
           <timeoutInSeconds>2</timeoutInSeconds>
           <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
           <localRepositoryPath>${project.build.directory}/local-repo</localRepositoryPath>
+          <properties>
+            <!-- e.g. ensure that Java7 picks up TLSv1.2 when connecting with Central -->
+            <https.protocols>${https.protocols}</https.protocols>
+          </properties>
         </configuration>
         <executions>
           <execution>
index 9bebf8b..eba22eb 100644 (file)
@@ -33,6 +33,12 @@ under the License.
         <groupId>org.apache.maven.plugins.invoker</groupId>
         <artifactId>exec-timeout-invoker-level</artifactId>
         <version>1.0-SNAPSHOT</version>
+        <configuration>
+          <properties>
+            <!-- e.g. ensure that Java7 picks up TLSv1.2 when connecting with Central -->
+            <https.protocols>${https.protocols}</https.protocols>
+          </properties>
+        </configuration>
         <executions>
           <execution>
             <id>touch</id>
index 28f6da8..2d72f14 100644 (file)
@@ -39,7 +39,7 @@ under the License.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-invoker-plugin</artifactId>
-        <version>@pom.version@</version>
+        <version>@project.version@</version>
         <configuration>
           <debug>true</debug>
           <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
@@ -49,6 +49,10 @@ under the License.
           <goals>
             <goal>process-resources</goal>
           </goals>
+          <properties>
+            <!-- e.g. ensure that Java7 picks up TLSv1.2 when connecting with Central -->
+            <https.protocols>${https.protocols}</https.protocols>
+          </properties>
         </configuration>
         <executions>
           <execution>
index 08940c2..4e89b8e 100644 (file)
@@ -47,6 +47,10 @@ under the License.
           </goals>\r
           <debug>false</debug>\r
           <postBuildHookScript>verify</postBuildHookScript>\r
+          <properties>\r
+            <!-- e.g. ensure that Java7 picks up TLSv1.2 when connecting with Central -->\r
+            <https.protocols>${https.protocols}</https.protocols>\r
+          </properties>\r
         </configuration>\r
         <executions>\r
           <execution>\r
index fc1577c..87c7142 100644 (file)
@@ -42,6 +42,10 @@ under the License.
               <goal>enforce</goal>\r
             </goals>\r
             <configuration>\r
+              <properties>\r
+                <!-- e.g. ensure that Java7 picks up TLSv1.2 when connecting with Central -->\r
+                <https.protocols>${https.protocols}</https.protocols>\r
+              </properties>\r
               <rules>\r
                 <AlwaysPass/>\r
               </rules>\r
index 58045a9..690caca 100644 (file)
@@ -48,6 +48,8 @@ under the License.
             <key>value</key>\r
             <some.property>${example.property}</some.property>\r
             <empty.property/>\r
+            <!-- e.g. ensure that Java7 picks up TLSv1.2 when connecting with Central -->\r
+            <https.protocols>${https.protocols}</https.protocols>\r
           </properties>\r
         </configuration>\r
         <executions>\r
index f542fda..cd7234b 100644 (file)
@@ -42,6 +42,10 @@ under the License.
               <goal>enforce</goal>\r
             </goals>\r
             <configuration>\r
+              <properties>\r
+                <!-- e.g. ensure that Java7 picks up TLSv1.2 when connecting with Central -->\r
+                <https.protocols>${https.protocols}</https.protocols>\r
+              </properties>\r
               <rules>\r
                 <AlwaysPass/>\r
               </rules>\r
index 0ce8813..67d1caa 100644 (file)
@@ -55,6 +55,8 @@ under the License.
           <properties>
             <maven.compiler.source>${maven.compiler.source}</maven.compiler.source>
             <maven.compiler.target>${maven.compiler.target}</maven.compiler.target>
+            <!-- e.g. ensure that Java7 picks up TLSv1.2 when connecting with Central -->
+            <https.protocols>${https.protocols}</https.protocols>
           </properties>
         </configuration>
         <executions>
index c423e9f..bb9efaf 100644 (file)
@@ -40,7 +40,7 @@ under the License.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-invoker-plugin</artifactId>
-        <version>@pom.version@</version>
+        <version>@project.version@</version>
         <configuration>
           <localRepositoryPath>${project.build.directory}/it-repo</localRepositoryPath>
           <pomIncludes>
@@ -50,6 +50,10 @@ under the License.
           <goals>
             <goal>validate</goal>
           </goals>
+          <properties>
+            <!-- e.g. ensure that Java7 picks up TLSv1.2 when connecting with Central -->
+            <https.protocols>${https.protocols}</https.protocols>
+          </properties>
         </configuration>
         <executions>
           <execution>
index 70d0569..6986e4d 100644 (file)
@@ -63,7 +63,13 @@ under the License.
         <plugin>\r
           <groupId>org.apache.maven.plugins</groupId>\r
           <artifactId>maven-invoker-plugin</artifactId>\r
-          <version>@pom.version@</version>\r
+          <version>@project.version@</version>\r
+          <configuration>\r
+            <properties>\r
+              <!-- e.g. ensure that Java7 picks up TLSv1.2 when connecting with Central -->\r
+              <https.protocols>${https.protocols}</https.protocols>\r
+            </properties>\r
+          </configuration>\r
         </plugin>\r
       </plugins>\r
     </pluginManagement>\r
index 85dd7f1..7bfede6 100644 (file)
@@ -52,6 +52,8 @@ under the License.
             <goal>install</goal>
           </goals>
           <properties>
+            <!-- e.g. ensure that Java7 picks up TLSv1.2 when connecting with Central -->
+            <https.protocols>${https.protocols}</https.protocols>
             <propertyFromCommandLine>value with spaces from cli</propertyFromCommandLine>
           </properties>
           <filterProperties>
index b601efb..ce1c1cf 100644 (file)
@@ -51,6 +51,10 @@ under the License.
           <goals>
             <goal>install</goal>
           </goals>
+          <properties>
+            <!-- e.g. ensure that Java7 picks up TLSv1.2 when connecting with Central -->
+            <https.protocols>${https.protocols}</https.protocols>
+          </properties>
         </configuration>
         <executions>
           <execution>
index a2e2f8e..06a16ef 100644 (file)
@@ -50,6 +50,10 @@ under the License.
           <goals>
             <goal>install</goal>
           </goals>
+          <properties>
+            <!-- e.g. ensure that Java7 picks up TLSv1.2 when connecting with Central -->
+            <https.protocols>${https.protocols}</https.protocols>
+          </properties>
         </configuration>
         <executions>
           <execution>
index 3700cb1..85a7739 100644 (file)
@@ -46,7 +46,7 @@ under the License.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-invoker-plugin</artifactId>
-        <version>@pom.version@</version>
+        <version>@project.version@</version>
         <configuration>
           <localRepositoryPath>${project.build.directory}/it-repo</localRepositoryPath>
           <pomIncludes>
@@ -56,6 +56,10 @@ under the License.
           <goals>
             <goal>org.apache.maven.plugins:maven-clean-plugin:2.2:clean</goal>
           </goals>
+          <properties>
+            <!-- e.g. ensure that Java7 picks up TLSv1.2 when connecting with Central -->
+            <https.protocols>${https.protocols}</https.protocols>
+          </properties>
         </configuration>
         <executions>
           <execution>
index b8c946c..b34d142 100644 (file)
@@ -44,6 +44,10 @@ under the License.
         <configuration>\r
           <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>\r
           <postBuildHookScript>verify</postBuildHookScript>\r
+          <properties>\r
+            <!-- e.g. ensure that Java7 picks up TLSv1.2 when connecting with Central -->\r
+            <https.protocols>${https.protocols}</https.protocols>\r
+          </properties>\r
         </configuration>\r
         <executions>\r
           <execution>\r
@@ -63,4 +67,4 @@ under the License.
       </plugin>\r
     </plugins>\r
   </build>\r
-</project>
\ No newline at end of file
+</project>\r
index a769935..72331d4 100644 (file)
@@ -47,6 +47,10 @@ under the License.
           <filterProperties>
             <latin1Chars>&#169;&#174;&#196;&#214;&#220;&#228;&#246;&#252;&#223;</latin1Chars>
           </filterProperties>
+          <properties>
+            <!-- e.g. ensure that Java7 picks up TLSv1.2 when connecting with Central -->
+            <https.protocols>${https.protocols}</https.protocols>
+          </properties>
         </configuration>
         <executions>
           <execution>
index 31bda51..b43fd1d 100644 (file)
@@ -41,7 +41,7 @@ under the License.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-invoker-plugin</artifactId>
-        <version>@pom.version@</version>
+        <version>@project.version@</version>
         <configuration>
           <debug>true</debug>
           <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
@@ -60,6 +60,10 @@ under the License.
             <basedir>FAILED</basedir>
             <baseurl>FAILED</baseurl>
           </filterProperties>
+          <properties>
+            <!-- e.g. ensure that Java7 picks up TLSv1.2 when connecting with Central -->
+            <https.protocols>${https.protocols}</https.protocols>
+          </properties>
         </configuration>
         <executions>
           <execution>
index 4f6722f..479b580 100644 (file)
@@ -38,7 +38,7 @@ under the License.
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-invoker-plugin</artifactId>
-        <version>@pom.version@</version>
+        <version>@project.version@</version>
         <configuration>
           <debug>true</debug>
           <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
@@ -48,6 +48,10 @@ under the License.
           <goals>
             <goal>validate</goal>
           </goals>
+          <properties>
+            <!-- e.g. ensure that Java7 picks up TLSv1.2 when connecting with Central -->
+            <https.protocols>${https.protocols}</https.protocols>
+          </properties>
         </configuration>
         <executions>
           <execution>
index d717322..068063d 100644 (file)
@@ -43,6 +43,10 @@ under the License.
           <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
           <cloneClean>true</cloneClean>
           <mergeUserSettings>true</mergeUserSettings>
+          <properties>
+            <!-- e.g. ensure that Java7 picks up TLSv1.2 when connecting with Central -->
+            <https.protocols>${https.protocols}</https.protocols>
+          </properties>
         </configuration>
         <executions>
           <execution>
index 4d50191..a367a64 100644 (file)
@@ -51,6 +51,10 @@ under the License.
                 </requireProperty>
               </rules>
               <fail>true</fail>
+              <properties>
+                <!-- e.g. ensure that Java7 picks up TLSv1.2 when connecting with Central -->
+                <https.protocols>${https.protocols}</https.protocols>
+              </properties>
             </configuration>
           </execution>
         </executions>
index ff6535c..fe7c2ae 100644 (file)
@@ -37,6 +37,10 @@ under the License.
                     <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>
                     <settingsFile>src/it/settings.xml</settingsFile>
                     <mergeUserSettings>true</mergeUserSettings>
+                    <properties>
+                      <!-- e.g. ensure that Java7 picks up TLSv1.2 when connecting with Central -->
+                      <https.protocols>${https.protocols}</https.protocols>
+                    </properties>
                 </configuration>
                 <executions>
                     <execution>
index 7c51805..c7b89c6 100644 (file)
@@ -45,6 +45,10 @@ under the License.
           <cloneClean>true</cloneClean>
           <settingsFile>src/it/settings.xml</settingsFile>
           <mergeUserSettings>true</mergeUserSettings>
+          <properties>
+            <!-- e.g. ensure that Java7 picks up TLSv1.2 when connecting with Central -->
+            <https.protocols>${https.protocols}</https.protocols>
+          </properties>
         </configuration>
         <executions>
           <execution>
index 158590d..9bc0316 100644 (file)
@@ -45,6 +45,10 @@ under the License.
           <cloneClean>true</cloneClean>\r
           <settingsFile>src/it/settings.xml</settingsFile>\r
           <mergeUserSettings>true</mergeUserSettings>\r
+          <properties>\r
+            <!-- e.g. ensure that Java7 picks up TLSv1.2 when connecting with Central -->\r
+            <https.protocols>${https.protocols}</https.protocols>\r
+          </properties>\r
         </configuration>\r
         <executions>\r
           <execution>\r
index e111e1e..03e8163 100644 (file)
@@ -47,6 +47,10 @@ under the License.
             <goal>validate</goal>\r
           </goals>\r
           <postBuildHookScript>verify</postBuildHookScript>\r
+          <properties>\r
+            <!-- e.g. ensure that Java7 picks up TLSv1.2 when connecting with Central -->\r
+            <https.protocols>${https.protocols}</https.protocols>\r
+          </properties>\r
         </configuration>\r
         <executions>\r
           <execution>\r
index 0ea6fb5..b5ecd46 100644 (file)
@@ -47,6 +47,10 @@ under the License.
           </goals>\r
           <debug>false</debug>\r
           <postBuildHookScript>verify</postBuildHookScript>\r
+          <properties>\r
+            <!-- e.g. ensure that Java7 picks up TLSv1.2 when connecting with Central -->\r
+            <https.protocols>${https.protocols}</https.protocols>\r
+          </properties>\r
         </configuration>\r
         <executions>\r
           <execution>\r
index 2b8eb2f..5371627 100644 (file)
@@ -44,6 +44,10 @@ under the License.
         <configuration>\r
           <cloneProjectsTo>${project.build.directory}/it</cloneProjectsTo>\r
           <postBuildHookScript>verify</postBuildHookScript>\r
+          <properties>\r
+            <!-- e.g. ensure that Java7 picks up TLSv1.2 when connecting with Central -->\r
+            <https.protocols>${https.protocols}</https.protocols>\r
+          </properties>\r
         </configuration>\r
         <executions>\r
           <execution>\r