all() {
+ return Jenkins.getInstance().getDescriptorList(GlobalSettingsProvider.class);
+ }
+}
diff --git a/core/src/main/resources/hudson/mvn/DefaultGlobalSettingsProvider/config.jelly b/core/src/main/resources/hudson/mvn/DefaultGlobalSettingsProvider/config.jelly
new file mode 100644
index 0000000000..acbdc5ef61
--- /dev/null
+++ b/core/src/main/resources/hudson/mvn/DefaultGlobalSettingsProvider/config.jelly
@@ -0,0 +1,27 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/mvn/DefaultGlobalSettingsProvider/help.html b/core/src/main/resources/hudson/mvn/DefaultGlobalSettingsProvider/help.html
new file mode 100644
index 0000000000..7d7aa8fd9a
--- /dev/null
+++ b/core/src/main/resources/hudson/mvn/DefaultGlobalSettingsProvider/help.html
@@ -0,0 +1,3 @@
+
+ Use default maven settings ($HOME/.m2/settings.xml) as set on build node.
+
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/mvn/FilePathGlobalSettingsProvider/config.jelly b/core/src/main/resources/hudson/mvn/FilePathGlobalSettingsProvider/config.jelly
new file mode 100644
index 0000000000..84d5424a23
--- /dev/null
+++ b/core/src/main/resources/hudson/mvn/FilePathGlobalSettingsProvider/config.jelly
@@ -0,0 +1,30 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/mvn/FilePathGlobalSettingsProvider/help-path.html b/core/src/main/resources/hudson/mvn/FilePathGlobalSettingsProvider/help-path.html
new file mode 100644
index 0000000000..7cd8bbb536
--- /dev/null
+++ b/core/src/main/resources/hudson/mvn/FilePathGlobalSettingsProvider/help-path.html
@@ -0,0 +1,3 @@
+
+ Path to settings.xml file, relative to project workspace.
+
\ No newline at end of file
diff --git a/core/src/main/resources/hudson/mvn/FilePathGlobalSettingsProvider/help.html b/core/src/main/resources/hudson/mvn/FilePathGlobalSettingsProvider/help.html
new file mode 100644
index 0000000000..b0123f5704
--- /dev/null
+++ b/core/src/main/resources/hudson/mvn/FilePathGlobalSettingsProvider/help.html
@@ -0,0 +1,3 @@
+
+ Use a custom setting.xml file from job workspace. Such a file is checked out from SCM as part of the job
+
\ No newline at end of file
diff --git a/maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java b/maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java
index 8ab956e493..fcedea63ba 100644
--- a/maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java
+++ b/maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java
@@ -50,14 +50,19 @@ import hudson.model.ItemGroup;
import hudson.model.Job;
import hudson.model.Queue;
import hudson.model.Queue.Task;
+import hudson.model.AbstractBuild;
import hudson.model.ResourceActivity;
import hudson.model.Result;
import hudson.model.SCMedItem;
import hudson.model.Saveable;
import hudson.model.TaskListener;
import hudson.model.TopLevelItem;
+import hudson.mvn.DefaultGlobalSettingsProvider;
import hudson.mvn.DefaultSettingsProvider;
+import hudson.mvn.FilePathGlobalSettingsProvider;
import hudson.mvn.FilePathSettingsProvider;
+import hudson.mvn.GlobalSettingsProvider;
+import hudson.mvn.GlobalSettingsProviderDescriptor;
import hudson.mvn.SettingsProvider;
import hudson.mvn.SettingsProviderDescriptor;
import hudson.search.CollectionSearchIndex;
@@ -73,6 +78,7 @@ import hudson.tasks.Maven.MavenInstallation;
import hudson.tasks.Publisher;
import hudson.tasks.JavadocArchiver;
import hudson.tasks.junit.JUnitResultArchiver;
+import hudson.util.ArgumentListBuilder;
import hudson.util.CopyOnWriteMap;
import hudson.util.DescribableList;
import hudson.util.FormValidation;
@@ -270,6 +276,11 @@ public class MavenModuleSet extends AbstractMavenProject getSettingsProviders() {
return Jenkins.getInstance().getDescriptorList(SettingsProvider.class);
}
+
+ public List getGlobalSettingsProviders() {
+ return Jenkins.getInstance().getDescriptorList(GlobalSettingsProvider.class);
+ }
public String getGlobalMavenOpts() {
return globalMavenOpts;
diff --git a/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java b/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java
index 0a9aa446e0..a432034836 100644
--- a/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java
+++ b/maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java
@@ -53,6 +53,7 @@ import hudson.model.Result;
import hudson.model.Run;
import hudson.model.StringParameterDefinition;
import hudson.model.TaskListener;
+import hudson.mvn.GlobalSettingsProvider;
import hudson.mvn.SettingsProvider;
import hudson.remoting.VirtualChannel;
import hudson.scm.ChangeLogSet;
@@ -722,8 +723,7 @@ public class MavenModuleSetBuild extends AbstractMavenBuild
+
+
+
+