Merge pull request #772 from imod/default-maven-settings

FIXES JENKINS-17723 - Default maven settings Good change ! Originally-Committed-As: 70f457d90eed4af593fd7817f49eb6e1fa366b5b
jenkinsci · May 6, 2013 · 21fbd55 · 21fbd55
2 parents 6f76975 + 8d4ae67
commit 21fbd55
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/src/main/java/hudson/maven/MavenModuleSet.java b/src/main/java/hudson/maven/MavenModuleSet.java
@@ -94,6 +94,7 @@
 import jenkins.mvn.DefaultGlobalSettingsProvider;
 import jenkins.mvn.DefaultSettingsProvider;
 import jenkins.mvn.FilePathSettingsProvider;
+import jenkins.mvn.GlobalMavenConfig;
 import jenkins.mvn.GlobalSettingsProvider;
 import jenkins.mvn.GlobalSettingsProviderDescriptor;
 import jenkins.mvn.SettingsProvider;
@@ -284,12 +285,12 @@ public class MavenModuleSet extends AbstractMavenProject<MavenModuleSet,MavenMod
     /**
      * @since 1.491
      */
-    private SettingsProvider settings = new DefaultSettingsProvider();
+    private SettingsProvider settings;
 
     /**
      * @since 1.491
      */
-    private GlobalSettingsProvider globalSettings = new DefaultGlobalSettingsProvider();
+    private GlobalSettingsProvider globalSettings;
 
 
     /**
@@ -650,14 +651,14 @@ public int getMavenValidationLevel() {
      * @since 1.481
      */
     public SettingsProvider getSettings() {
-        return settings != null ? settings : new DefaultSettingsProvider();
+        return settings != null ? settings : GlobalMavenConfig.get().getSettingsProvider();
     }
 
     /**
      * @since 1.481
      */
     public GlobalSettingsProvider getGlobalSettings() {
-        return globalSettings != null ? globalSettings : new DefaultGlobalSettingsProvider();
+        return globalSettings != null ? globalSettings : GlobalMavenConfig.get().getGlobalSettingsProvider();
     }
 
     /**
@@ -1260,7 +1261,10 @@ public String getDisplayName() {
         }
 
         public MavenModuleSet newInstance(ItemGroup parent, String name) {
-            return new MavenModuleSet(parent,name);
+            MavenModuleSet mms = new MavenModuleSet(parent,name);
+            mms.setSettings(GlobalMavenConfig.get().getSettingsProvider());
+            mms.setGlobalSettings(GlobalMavenConfig.get().getGlobalSettingsProvider());
+            return mms;
         }
 
         public Maven.DescriptorImpl getMavenDescriptor() {