commit 2d1f89985b1a140c2de98c6a101ddd2ae86187c4
author Sylwester Lachiewicz <slachiewicz@apache.org> Wed Nov 07 23:43:32 2018 +0100
committer Sylwester Lachiewicz <slachiewicz@apache.org> Wed Nov 07 23:58:08 2018 +0100
tree a5dba0682ec94cf9d8a273d3f49a44d21244301f
parent 6ea72ab224ef3707b0e0824fd6245652107b5887

[MNG-6427] IT for MNG-1957 fails on Java 11+

core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1957JdkActivationWithVersionRangeTest.java

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 @@
         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" ) );
     }
 

core-it-suite/src/test/resources/mng-1957/pom.xml

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 @@
         <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>