maven native plugin is now aware of global maven settings configuration trough the config file provider plugin

This commit is contained in:
Olivier Lamy committed 2011-08-07 20:45:07 +02:00
1 parent 530596d3d4
commit 9787c0719a
5 files changed
+119 -4

No files matched your search

@@ -33,6 +33,7 @@ import hudson.ExtensionList;
import hudson.FilePath;
import hudson.Indenter;
import hudson.Util;
import hudson.maven.settings.GlobalMavenSettingsProvider;
import hudson.maven.settings.MavenSettingsProvider;
import hudson.model.AbstractProject;
import hudson.model.Action;
@@ -223,6 +224,16 @@ public class MavenModuleSet extends AbstractMavenProject<MavenModuleSet,MavenMod
*/
private String settingConfigId;
/**
* @since 1.426
*/
private String globalSettingConfigId;
/**
* used temporary during maven build to store file path
* @since 1.426
*/
protected transient String globalSettingConfigPath;
/**
* Reporters configured at {@link MavenModuleSet} level. Applies to all {@link MavenModule} builds.
*/
@@ -449,6 +460,22 @@ public class MavenModuleSet extends AbstractMavenProject<MavenModuleSet,MavenMod
this.settingConfigId = settingConfigId;
}
/**
* @since 1.426
* @return
*/
public String getGlobalSettingConfigId() {
return globalSettingConfigId;
}
/**
* @since 1.426
* @param globalSettingConfigId
*/
public void setGlobalSettingConfigId( String globalSettingConfigId ) {
this.globalSettingConfigId = globalSettingConfigId;
}
/**
* List of active {@link MavenReporter}s that should be applied to all module builds.
*/
@@ -803,6 +830,23 @@ public class MavenModuleSet extends AbstractMavenProject<MavenModuleSet,MavenMod
return mavenSettingsConfigs;
}
/**
* @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 (configProvider instanceof GlobalMavenSettingsProvider) {
globalMavenSettingsConfigs.addAll( configProvider.getAllConfigs() );
}
}
}
return globalMavenSettingsConfigs;
}
/**
* Set mavenOpts.
*/
@@ -890,6 +934,7 @@ public class MavenModuleSet extends AbstractMavenProject<MavenModuleSet,MavenMod
publishers.rebuild(req,json,BuildStepDescriptor.filter(Publisher.all(),this.getClass()));
buildWrappers.rebuild(req,json,BuildWrappers.getFor(this));
settingConfigId = req.getParameter( "maven.mavenSettingsConfigId" );
globalSettingConfigId = req.getParameter( "maven.mavenGlobalSettingConfigId" );
}
/**