mirror of
https://github.com/jenkinsci/jenkins.git
synced 2026-11-16 05:22:22 +00:00
refactor interaction with config-file-provider plugin to make dependency optional
This commit is contained in:
1 parent
9cc6e16d1e
commit
fff55f85ea
6 files changed
+58
-176
No files matched your search
@@ -37,6 +37,7 @@ import hudson.Util;
|
||||
import hudson.maven.local_repo.DefaultLocalRepositoryLocator;
|
||||
import hudson.maven.local_repo.LocalRepositoryLocator;
|
||||
import hudson.maven.local_repo.PerJobLocalRepositoryLocator;
|
||||
import hudson.maven.settings.SettingConfig;
|
||||
import hudson.maven.settings.SettingsProviderUtils;
|
||||
import hudson.model.AbstractProject;
|
||||
import hudson.model.Action;
|
||||
@@ -96,8 +97,6 @@ import net.sf.json.JSONObject;
|
||||
|
||||
import org.apache.commons.lang.math.NumberUtils;
|
||||
import org.apache.maven.model.building.ModelBuildingRequest;
|
||||
import org.jenkinsci.lib.configprovider.ConfigProvider;
|
||||
import org.jenkinsci.lib.configprovider.model.Config;
|
||||
import org.kohsuke.stapler.HttpResponse;
|
||||
import org.kohsuke.stapler.HttpResponses;
|
||||
import org.kohsuke.stapler.QueryParameter;
|
||||
@@ -117,7 +116,6 @@ import org.kohsuke.stapler.export.Exported;
|
||||
*/
|
||||
public class MavenModuleSet extends AbstractMavenProject<MavenModuleSet,MavenModuleSetBuild> implements TopLevelItem, ItemGroup<MavenModule>, SCMedItem, Saveable, BuildableItemWithBuildWrappers {
|
||||
|
||||
|
||||
/**
|
||||
* All {@link MavenModule}s, keyed by their {@link MavenModule#getModuleName()} module name}s.
|
||||
*/
|
||||
@@ -944,34 +942,16 @@ public class MavenModuleSet extends AbstractMavenProject<MavenModuleSet,MavenMod
|
||||
* @since 1.426
|
||||
* @return
|
||||
*/
|
||||
public List<Config> getAllMavenSettingsConfigs() {
|
||||
List<Config> mavenSettingsConfigs = new ArrayList<Config>();
|
||||
ExtensionList<ConfigProvider> configProviders = ConfigProvider.all();
|
||||
if (configProviders != null && configProviders.size() > 0) {
|
||||
for (ConfigProvider configProvider : configProviders) {
|
||||
if (SettingsProviderUtils.isMavenSettingsProvider( configProvider )){
|
||||
mavenSettingsConfigs.addAll( configProvider.getAllConfigs() );
|
||||
}
|
||||
}
|
||||
}
|
||||
return mavenSettingsConfigs;
|
||||
public List<SettingConfig> getAllMavenSettingsConfigs() {
|
||||
return SettingsProviderUtils.getAllMavenSettingsConfigs();
|
||||
}
|
||||
|
||||
/**
|
||||
* @since 1.426
|
||||
* @return
|
||||
*/
|
||||
public List<Config> getAllGlobalMavenSettingsConfigs() {
|
||||
List<Config> globalMavenSettingsConfigs = new ArrayList<Config>();
|
||||
ExtensionList<ConfigProvider> configProviders = ConfigProvider.all();
|
||||
if (configProviders != null && configProviders.size() > 0) {
|
||||
for (ConfigProvider configProvider : configProviders) {
|
||||
if (SettingsProviderUtils.isGlobalMavenSettingsProvider( configProvider )){
|
||||
globalMavenSettingsConfigs.addAll( configProvider.getAllConfigs() );
|
||||
}
|
||||
}
|
||||
}
|
||||
return globalMavenSettingsConfigs;
|
||||
public List<SettingConfig> getAllGlobalMavenSettingsConfigs() {
|
||||
return SettingsProviderUtils.getAllGlobalMavenSettingsConfigs();
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in new issue
Block a user