You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2019/06/04 20:14:42 UTC
[maven-remote-resources-plugin] branch Windows_CanonicalPath
created (now df37e43)
This is an automated email from the ASF dual-hosted git repository.
rfscholte pushed a change to branch Windows_CanonicalPath
in repository https://gitbox.apache.org/repos/asf/maven-remote-resources-plugin.git.
at df37e43 Adjust test for Jenkins on Windows
This branch includes the following new commits:
new df37e43 Adjust test for Jenkins on Windows
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[maven-remote-resources-plugin] 01/01: Adjust test for Jenkins on
Windows
Posted by rf...@apache.org.
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 <rf...@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" );