fix use of provided global settings during pom parsing phase

2434132a · Olivier Lamy · ad6ee475 · 2434132a
隐藏空白更改
内联并排

Showing with 2 addition and 4 deletion

maven-plugin/src/main/java/hudson/maven/MavenUtil.java maven-plugin/src/main/java/hudson/maven/MavenUtil.java +2 -4

未找到文件。
--- a/maven-plugin/src/main/java/hudson/maven/MavenUtil.java
+++ b/maven-plugin/src/main/java/hudson/maven/MavenUtil.java
@@ -164,12 +164,10 @@ public class MavenUtil {

        if ( mavenEmbedderRequest.getGlobalSettings() != null) {
            mavenRequest.setGlobalSettingsFile( mavenEmbedderRequest.getGlobalSettings().getAbsolutePath() );
+        } else {
+            mavenRequest.setGlobalSettingsFile( new File( mavenEmbedderRequest.getMavenHome(), "conf/settings.xml" ).getAbsolutePath() );
        }
        
-
-        // FIXME configure those !!
-        mavenRequest.setGlobalSettingsFile( new File( mavenEmbedderRequest.getMavenHome(), "conf/settings.xml" ).getAbsolutePath() );
-        
        if (mavenEmbedderRequest.getWorkspaceReader() != null ) {
            mavenRequest.setWorkspaceReader( mavenEmbedderRequest.getWorkspaceReader() );
        }