commit df37e43faecf42fc7e2c6da327145e69943d7e39
author rfscholte <rfscholte@apache.org> Tue Jun 04 22:14:35 2019 +0200
committer rfscholte <rfscholte@apache.org> Tue Jun 04 22:14:35 2019 +0200
tree 1b4397b6761e08a3aeb53ced7e3b6f761a89b8de
parent ba044a9492add0b47a06332aeb0e09376d82744a

Adjust test for Jenkins on Windows

src/test/java/org/apache/maven/plugin/resources/remote/it/IT_RunOnlyAtExecutionRoot.java

diff --git a/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_RunOnlyAtExecutionRoot.java b/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_RunOnlyAtExecutionRoot.java
index 1209568..57edd78 100644
--- a/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_RunOnlyAtExecutionRoot.java
+++ b/src/test/java/org/apache/maven/plugin/resources/remote/it/IT_RunOnlyAtExecutionRoot.java
@@ -44,8 +44,10 @@
     public void test()
         throws IOException, URISyntaxException, VerificationException
     {
-        // Workaround for Windows + Maven-3.5.x + Jenkins due to MNG-6261
-        assumeTrue( !(System.getenv( "JENKINS_HOME" ) != null && Os.isFamily( Os.FAMILY_WINDOWS ) && System.getenv( "MAVEN_HOME" ).contains( "-3.5." ) ) );
+        // Workaround for Windows + Maven-3.5.x/3.6.0 + Jenkins due to MNG-6261
+        assumeTrue( !( System.getenv( "JENKINS_HOME" ) != null 
+                       && Os.isFamily( Os.FAMILY_WINDOWS ) 
+                       &&  ( System.getenv( "MAVEN_HOME" ).contains( "-3.5." ) || System.getenv( "MAVEN_HOME" ).contains( "-3.6.0" ) ) ) );
 
         File dir = TestUtils.getTestDir( "run-only-at-execution-root" );