From fb64340087848ea314934743466210d4050e045b Mon Sep 17 00:00:00 2001
From: Sylwester Lachiewicz <slachiewicz@apache.org>
Date: Wed, 7 Nov 2018 23:43:32 +0100
Subject: [PATCH] [MNG-6427] IT for MNG-1957 fails on Java 11+

---
 ...avenITmng1957JdkActivationWithVersionRangeTest.java |  4 ++--
 its/core-it-suite/src/test/resources/mng-1957/pom.xml  | 10 ++++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1957JdkActivationWithVersionRangeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1957JdkActivationWithVersionRangeTest.java
index d844b0b314..3cd0de08c6 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1957JdkActivationWithVersionRangeTest.java
+++ b/its/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/its/core-it-suite/src/test/resources/mng-1957/pom.xml b/its/core-it-suite/src/test/resources/mng-1957/pom.xml
index 63c36d565d..69f0387b68 100644
--- a/its/core-it-suite/src/test/resources/mng-1957/pom.xml
+++ b/its/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>