You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2018/06/15 22:31:57 UTC

[maven-integration-testing] branch master updated: [MNG-6426] IT for MNG-6127 fails on Java 9+

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

michaelo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git


The following commit(s) were added to refs/heads/master by this push:
     new a022c85  [MNG-6426] IT for MNG-6127 fails on Java 9+
a022c85 is described below

commit a022c8501bc39273737a565f9c194b99dddaadf4
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sat Jun 16 00:30:42 2018 +0200

    [MNG-6426] IT for MNG-6127 fails on Java 9+
---
 .../extension/pom.xml                                |  2 --
 .../mng-5530-mojo-execution-scope/extension/pom.xml  |  2 --
 .../mng-5530-mojo-execution-scope/plugin/pom.xml     |  2 --
 .../mng-5578-session-scope/extension/pom.xml         |  2 --
 .../resources/mng-5578-session-scope/plugin/pom.xml  |  2 --
 .../extension/pom.xml                                |  2 --
 .../plugin/pom.xml                                   |  2 --
 .../plugin/pom.xml                                   |  2 --
 .../apache/maven/its/mng6127/plugin/TestMojo.java    | 20 ++++++++++++++++++--
 9 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/core-it-suite/src/test/resources/mng-5389-lifecycleParticipant-afterSession/extension/pom.xml b/core-it-suite/src/test/resources/mng-5389-lifecycleParticipant-afterSession/extension/pom.xml
index e3224aa..db70e56 100644
--- a/core-it-suite/src/test/resources/mng-5389-lifecycleParticipant-afterSession/extension/pom.xml
+++ b/core-it-suite/src/test/resources/mng-5389-lifecycleParticipant-afterSession/extension/pom.xml
@@ -29,8 +29,6 @@ under the License.
 
   <properties>
     <maven-version>3.2.1</maven-version>
-    <maven.compiler.source>1.5</maven.compiler.source>
-    <maven.compiler.target>1.5</maven.compiler.target>
   </properties>
 
   <dependencies>
diff --git a/core-it-suite/src/test/resources/mng-5530-mojo-execution-scope/extension/pom.xml b/core-it-suite/src/test/resources/mng-5530-mojo-execution-scope/extension/pom.xml
index bb96c99..e52350e 100644
--- a/core-it-suite/src/test/resources/mng-5530-mojo-execution-scope/extension/pom.xml
+++ b/core-it-suite/src/test/resources/mng-5530-mojo-execution-scope/extension/pom.xml
@@ -29,8 +29,6 @@ under the License.
 
   <properties>
     <maven-version>3.2.1</maven-version>
-    <maven.compiler.source>1.5</maven.compiler.source>
-    <maven.compiler.target>1.5</maven.compiler.target>
   </properties>
 
   <dependencies>
diff --git a/core-it-suite/src/test/resources/mng-5530-mojo-execution-scope/plugin/pom.xml b/core-it-suite/src/test/resources/mng-5530-mojo-execution-scope/plugin/pom.xml
index 337751c..ae9a022 100644
--- a/core-it-suite/src/test/resources/mng-5530-mojo-execution-scope/plugin/pom.xml
+++ b/core-it-suite/src/test/resources/mng-5530-mojo-execution-scope/plugin/pom.xml
@@ -30,8 +30,6 @@ under the License.
 
   <properties>
     <maven-version>3.2.1</maven-version>
-    <maven.compiler.source>1.5</maven.compiler.source>
-    <maven.compiler.target>1.5</maven.compiler.target>
   </properties>
 
   <dependencies>
diff --git a/core-it-suite/src/test/resources/mng-5578-session-scope/extension/pom.xml b/core-it-suite/src/test/resources/mng-5578-session-scope/extension/pom.xml
index 4a2fa28..a3dcb47 100644
--- a/core-it-suite/src/test/resources/mng-5578-session-scope/extension/pom.xml
+++ b/core-it-suite/src/test/resources/mng-5578-session-scope/extension/pom.xml
@@ -29,8 +29,6 @@ under the License.
 
   <properties>
     <maven-version>3.2.1</maven-version>
-    <maven.compiler.source>1.5</maven.compiler.source>
-    <maven.compiler.target>1.5</maven.compiler.target>
   </properties>
 
   <dependencies>
diff --git a/core-it-suite/src/test/resources/mng-5578-session-scope/plugin/pom.xml b/core-it-suite/src/test/resources/mng-5578-session-scope/plugin/pom.xml
index 99d8540..81c0ec7 100644
--- a/core-it-suite/src/test/resources/mng-5578-session-scope/plugin/pom.xml
+++ b/core-it-suite/src/test/resources/mng-5578-session-scope/plugin/pom.xml
@@ -30,8 +30,6 @@ under the License.
 
   <properties>
     <maven-version>3.2.1</maven-version>
-    <maven.compiler.source>1.5</maven.compiler.source>
-    <maven.compiler.target>1.5</maven.compiler.target>    
   </properties>
 
   <dependencies>
diff --git a/core-it-suite/src/test/resources/mng-5640-lifecycleParticipant-afterSession/extension/pom.xml b/core-it-suite/src/test/resources/mng-5640-lifecycleParticipant-afterSession/extension/pom.xml
index 4e7722b..70dfb2c 100644
--- a/core-it-suite/src/test/resources/mng-5640-lifecycleParticipant-afterSession/extension/pom.xml
+++ b/core-it-suite/src/test/resources/mng-5640-lifecycleParticipant-afterSession/extension/pom.xml
@@ -29,8 +29,6 @@ under the License.
 
   <properties>
     <maven-version>3.2.1</maven-version>
-    <maven.compiler.source>1.5</maven.compiler.source>
-    <maven.compiler.target>1.5</maven.compiler.target>    
   </properties>
 
   <dependencies>
diff --git a/core-it-suite/src/test/resources/mng-5742-build-extension-classloader/plugin/pom.xml b/core-it-suite/src/test/resources/mng-5742-build-extension-classloader/plugin/pom.xml
index 73391f8..206d16c 100644
--- a/core-it-suite/src/test/resources/mng-5742-build-extension-classloader/plugin/pom.xml
+++ b/core-it-suite/src/test/resources/mng-5742-build-extension-classloader/plugin/pom.xml
@@ -30,8 +30,6 @@ under the License.
 
   <properties>
     <maven-version>3.2.1</maven-version>
-    <maven.compiler.source>1.5</maven.compiler.source>
-    <maven.compiler.target>1.5</maven.compiler.target>    
   </properties>
 
   <dependencies>
diff --git a/core-it-suite/src/test/resources/mng-6127-plugin-execution-configuration-interference/plugin/pom.xml b/core-it-suite/src/test/resources/mng-6127-plugin-execution-configuration-interference/plugin/pom.xml
index cc214d7..b8db3ed 100644
--- a/core-it-suite/src/test/resources/mng-6127-plugin-execution-configuration-interference/plugin/pom.xml
+++ b/core-it-suite/src/test/resources/mng-6127-plugin-execution-configuration-interference/plugin/pom.xml
@@ -30,8 +30,6 @@ under the License.
 
   <properties>
     <maven-version>3.3.1</maven-version>
-    <maven.compiler.source>1.7</maven.compiler.source>
-    <maven.compiler.target>1.7</maven.compiler.target>
   </properties>
 
   <dependencies>
diff --git a/core-it-suite/src/test/resources/mng-6127-plugin-execution-configuration-interference/plugin/src/main/java/org/apache/maven/its/mng6127/plugin/TestMojo.java b/core-it-suite/src/test/resources/mng-6127-plugin-execution-configuration-interference/plugin/src/main/java/org/apache/maven/its/mng6127/plugin/TestMojo.java
index 386b982..f5245ff 100644
--- a/core-it-suite/src/test/resources/mng-6127-plugin-execution-configuration-interference/plugin/src/main/java/org/apache/maven/its/mng6127/plugin/TestMojo.java
+++ b/core-it-suite/src/test/resources/mng-6127-plugin-execution-configuration-interference/plugin/src/main/java/org/apache/maven/its/mng6127/plugin/TestMojo.java
@@ -63,9 +63,12 @@ public class TestMojo
     {
         File file = new File( project.getBasedir(), "configuration.txt" );
         file.getParentFile().mkdirs();
-        
-        try ( Writer w = new OutputStreamWriter( new FileOutputStream( file, true ), "UTF-8" ); )
+
+        Writer w = null;
+
+        try
         {
+            w = new OutputStreamWriter( new FileOutputStream( file, true ), "UTF-8" );
             if ( name != null )
             {
                 w.write( "name=" + name + ", " );
@@ -76,5 +79,18 @@ public class TestMojo
         {
             throw new MojoExecutionException( e.getMessage(), e );
         }
+        finally
+        {
+            if ( w != null )
+            {
+                try
+                {
+                    w.close();
+                }
+                catch ( IOException e )
+                {
+                }
+            }
+        }
     }
 }

-- 
To stop receiving notification emails like this one, please contact
michaelo@apache.org.