This is an automated email from the ASF dual-hosted git repository. rfscholte pushed a commit to branch revert-MNG-6772 in repository https://gitbox.apache.org/repos/asf/maven-integration-testing.git
commit 91f38bb28d38a6afeb076b9da7787ade67106218 Author: rfscholte <[email protected]> AuthorDate: Sat Jan 23 20:00:39 2021 +0100 Both user settings and global settings need to be overriden --- ...venITmng6772NestedImportScopeRepositoryOverride.java | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6772NestedImportScopeRepositoryOverride.java b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6772NestedImportScopeRepositoryOverride.java index daf0ebc..5ab9a0d 100644 --- a/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6772NestedImportScopeRepositoryOverride.java +++ b/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6772NestedImportScopeRepositoryOverride.java @@ -56,7 +56,7 @@ public class MavenITmng6772NestedImportScopeRepositoryOverride final File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-6772-override-in-project" ); final Verifier verifier = newVerifier( testDir.getAbsolutePath(), null ); - overrideGlobalSettings( testDir, verifier ); + overrideSettings( testDir, verifier ); verifier.deleteArtifacts( "org.apache.maven.its.mng6772" ); verifier.filterFile( "pom-template.xml", "pom.xml", "UTF-8", verifier.newDefaultFilterProperties() ); @@ -99,7 +99,7 @@ public class MavenITmng6772NestedImportScopeRepositoryOverride final File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-6772-override-in-dependency" ); final Verifier verifier = newVerifier( testDir.getAbsolutePath(), null ); - overrideGlobalSettings( testDir, verifier ); + overrideSettings( testDir, verifier ); verifier.deleteArtifacts( "org.apache.maven.its.mng6772" ); verifier.filterFile( "pom-template.xml", "pom.xml", "UTF-8", verifier.newDefaultFilterProperties() ); @@ -140,10 +140,21 @@ public class MavenITmng6772NestedImportScopeRepositoryOverride } // central must not be defined in any settings.xml or super POM will never be in play. - private void overrideGlobalSettings( final File testDir, final Verifier verifier ) + private void overrideSettings( final File testDir, final Verifier verifier ) { final File settingsFile = new File( testDir, "settings-override.xml" ); final String path = settingsFile.getAbsolutePath(); + + verifier.getCliOptions().add( "--global-settings" ); + if ( path.indexOf( ' ' ) < 0 ) + { + verifier.getCliOptions().add( path ); + } + else + { + verifier.getCliOptions().add( '"' + path + '"' ); + } + verifier.getCliOptions().add( "--global-settings" ); if ( path.indexOf( ' ' ) < 0 ) {
