Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Trying to fix MNG4625 on Jenkins 

Update maven-shared-utils to 0.6
This commit is contained in:
Robert Scholte 2014-07-05 15:26:29 +02:00
parent 3e8bdbf565
commit 8ee8479080
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
its/core-it-suite/pom.xml
View File

@ -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>

15
its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4625SettingsXmlInterpolationWithXmlMarkupTest.java
View File

@ -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" );