This is an automated email from the ASF dual-hosted git repository. rfscholte pushed a commit to branch Windows_CanonicalPath in repository https://gitbox.apache.org/repos/asf/maven-remote-resources-plugin.git
commit df37e43faecf42fc7e2c6da327145e69943d7e39 Author: rfscholte <rfscho...@apache.org> AuthorDate: Tue Jun 4 22:14:35 2019 +0200 Adjust test for Jenkins on Windows --- .../maven/plugin/resources/remote/it/IT_RunOnlyAtExecutionRoot.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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 class IT_RunOnlyAtExecutionRoot 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" );