mirror of
https://github.com/jenkinsci/jenkins.git
synced 2026-11-16 05:22:22 +00:00
add GlobalSettingsProvider as new EP
This commit is contained in:
1 parent
e6f04215e4
commit
cdae926106
12 files changed
+241
-2
No files matched your search
@@ -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<MavenModuleSet,MavenMod
|
||||
* @since 1.481
|
||||
*/
|
||||
private SettingsProvider settings = new DefaultSettingsProvider();
|
||||
|
||||
/**
|
||||
* @since 1.481
|
||||
*/
|
||||
private GlobalSettingsProvider globalSettings = new DefaultGlobalSettingsProvider();
|
||||
|
||||
|
||||
public Object readResolve() {
|
||||
@@ -595,6 +606,13 @@ public class MavenModuleSet extends AbstractMavenProject<MavenModuleSet,MavenMod
|
||||
return settings;
|
||||
}
|
||||
|
||||
/**
|
||||
* @since 1.481
|
||||
*/
|
||||
public GlobalSettingsProvider getGlobalSettings() {
|
||||
return globalSettings;
|
||||
}
|
||||
|
||||
/**
|
||||
* @since 1.426
|
||||
* @param globalSettingConfigId
|
||||
@@ -1076,6 +1094,7 @@ public class MavenModuleSet extends AbstractMavenProject<MavenModuleSet,MavenMod
|
||||
goals = Util.fixEmpty(req.getParameter("goals").trim());
|
||||
mavenOpts = Util.fixEmpty(req.getParameter("mavenOpts").trim());
|
||||
settings = SettingsProvider.parseSettingsProvider(req);
|
||||
globalSettings = GlobalSettingsProvider.parseSettingsProvider(req);
|
||||
|
||||
mavenName = req.getParameter("maven_version");
|
||||
aggregatorStyleBuild = !req.hasParameter("maven.perModuleBuild");
|
||||
@@ -1162,6 +1181,10 @@ public class MavenModuleSet extends AbstractMavenProject<MavenModuleSet,MavenMod
|
||||
public List<SettingsProviderDescriptor> getSettingsProviders() {
|
||||
return Jenkins.getInstance().getDescriptorList(SettingsProvider.class);
|
||||
}
|
||||
|
||||
public List<GlobalSettingsProviderDescriptor> getGlobalSettingsProviders() {
|
||||
return Jenkins.getInstance().getDescriptorList(GlobalSettingsProvider.class);
|
||||
}
|
||||
|
||||
public String getGlobalMavenOpts() {
|
||||
return globalMavenOpts;
|
||||
|
||||
Reference in new issue
Block a user