[maven-integration-testing] branch master updated: [MNG-6427] IT for MNG-1957 fails on Java 11+

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

[maven-integration-testing] branch master updated: [MNG-6427] IT for MNG-1957 fails on Java 11+

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

slachiewicz 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 2d1f899  [MNG-6427] IT for MNG-1957 fails on Java 11+
2d1f899 is described below

commit 2d1f89985b1a140c2de98c6a101ddd2ae86187c4
Author: Sylwester Lachiewicz <[hidden email]>
AuthorDate: Wed Nov 7 23:43:32 2018 +0100

    [MNG-6427] IT for MNG-1957 fails on Java 11+
---
 .../it/MavenITmng1957JdkActivationWithVersionRangeTest.java    |  4 ++--
 core-it-suite/src/test/resources/mng-1957/pom.xml              | 10 ++++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1957JdkActivationWithVersionRangeTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1957JdkActivationWithVersionRangeTest.java
index d844b0b..3cd0de0 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1957JdkActivationWithVersionRangeTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1957JdkActivationWithVersionRangeTest.java
@@ -59,8 +59,8 @@ public class MavenITmng1957JdkActivationWithVersionRangeTest
         assertEquals( "PASSED", props.getProperty( "project.properties.jdkProperty1" ) );
         assertEquals( "PASSED", props.getProperty( "project.properties.jdkProperty2" ) );
         assertEquals( "PASSED", props.getProperty( "project.properties.jdkProperty3" ) );
-        assertEquals( null, props.getProperty( "project.properties.jdkProperty4" ) );
-        assertEquals( null, props.getProperty( "project.properties.jdkProperty5" ) );
+        assertNull( props.getProperty( "project.properties.jdkProperty4" ) );
+        assertNull( props.getProperty( "project.properties.jdkProperty5" ) );
         assertEquals( "PASSED", props.getProperty( "project.properties.jdkProperty6" ) );
     }
 
diff --git a/core-it-suite/src/test/resources/mng-1957/pom.xml b/core-it-suite/src/test/resources/mng-1957/pom.xml
index 63c36d5..69f0387 100644
--- a/core-it-suite/src/test/resources/mng-1957/pom.xml
+++ b/core-it-suite/src/test/resources/mng-1957/pom.xml
@@ -176,5 +176,15 @@ under the License.
         <jdkProperty6>PASSED</jdkProperty6>
       </properties>
     </profile>
+    <profile>
+      <!-- bounds close to current Java version (MNG-4512) -->
+      <id>test-6h</id>
+      <activation>
+        <jdk>[11,12)</jdk>
+      </activation>
+      <properties>
+        <jdkProperty6>PASSED</jdkProperty6>
+      </properties>
+    </profile>
   </profiles>
 </project>