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 2014/07/05 15:27:34 UTC
git commit: Trying to fix MNG4625 on Jenkins Update
maven-shared-utils to 0.6
Repository: maven-integration-testing
Updated Branches:
refs/heads/master 779e37e68 -> b65f258b7
Trying to fix MNG4625 on Jenkins
Update maven-shared-utils to 0.6
Project: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/commit/b65f258b
Tree: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/tree/b65f258b
Diff: http://git-wip-us.apache.org/repos/asf/maven-integration-testing/diff/b65f258b
Branch: refs/heads/master
Commit: b65f258b7d43bd81ed0332670b5993720cb556fd
Parents: 779e37e
Author: Robert Scholte <rf...@codehaus.org>
Authored: Sat Jul 5 15:26:29 2014 +0200
Committer: Robert Scholte <rf...@codehaus.org>
Committed: Sat Jul 5 15:26:29 2014 +0200
----------------------------------------------------------------------
core-it-suite/pom.xml | 2 +-
...625SettingsXmlInterpolationWithXmlMarkupTest.java | 15 ++++++++++++++-
2 files changed, 15 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/b65f258b/core-it-suite/pom.xml
----------------------------------------------------------------------
diff --git a/core-it-suite/pom.xml b/core-it-suite/pom.xml
index a7cdcf2..80d3d30 100644
--- a/core-it-suite/pom.xml
+++ b/core-it-suite/pom.xml
@@ -122,7 +122,7 @@ under the License.
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-shared-utils</artifactId>
- <version>0.1</version>
+ <version>0.6</version>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/maven-integration-testing/blob/b65f258b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4625SettingsXmlInterpolationWithXmlMarkupTest.java
----------------------------------------------------------------------
diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4625SettingsXmlInterpolationWithXmlMarkupTest.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4625SettingsXmlInterpolationWithXmlMarkupTest.java
index 9781f47..7cec585 100644
--- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4625SettingsXmlInterpolationWithXmlMarkupTest.java
+++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4625SettingsXmlInterpolationWithXmlMarkupTest.java
@@ -21,6 +21,7 @@ package org.apache.maven.it;
import org.apache.maven.it.Verifier;
import org.apache.maven.it.util.ResourceExtractor;
+import org.codehaus.plexus.util.Os;
import java.io.File;
import java.util.Properties;
@@ -51,7 +52,19 @@ public class MavenITmng4625SettingsXmlInterpolationWithXmlMarkupTest
Verifier verifier = newVerifier( testDir.getAbsolutePath() );
verifier.setAutoclean( false );
verifier.deleteDirectory( "target" );
- verifier.setSystemProperty( "test.prop", "&x=y<>" );
+
+ // http://bugs.java.com/bugdatabase/view_bug.do?bug_id=6468220
+ // A lot of bugs related to Windows arguments and quoting
+ // Directly called from commandline succeeds, indirect often fails
+ if( Os.isFamily( Os.FAMILY_WINDOWS ) && !System.getProperties().contains( "CLASSWORLDS_LAUNCHER" ) )
+ {
+ verifier.setSystemProperty( "test.prop", "\"&x=y<>\"" );
+ }
+ else
+ {
+ verifier.setSystemProperty( "test.prop", "&x=y<>" );
+ }
+
verifier.addCliOption( "--settings" );
verifier.addCliOption( "settings.xml" );
verifier.executeGoal( "validate" );