From 9787c0719ae2d4fffa7f7179bbbb00d48979f3b6 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Sun, 7 Aug 2011 20:45:07 +0200 Subject: [PATCH] maven native plugin is now aware of global maven settings configuration trough the config file provider plugin --- .../hudson/maven/MavenEmbedderRequest.java | 16 ++++++- .../java/hudson/maven/MavenModuleSet.java | 45 +++++++++++++++++ .../hudson/maven/MavenModuleSetBuild.java | 48 +++++++++++++++++-- .../src/main/java/hudson/maven/MavenUtil.java | 4 ++ .../MavenModuleSet/configure-entries.jelly | 10 ++++ 5 files changed, 119 insertions(+), 4 deletions(-) diff --git a/maven-plugin/src/main/java/hudson/maven/MavenEmbedderRequest.java b/maven-plugin/src/main/java/hudson/maven/MavenEmbedderRequest.java index 1ae8115407..cdd263248b 100755 --- a/maven-plugin/src/main/java/hudson/maven/MavenEmbedderRequest.java +++ b/maven-plugin/src/main/java/hudson/maven/MavenEmbedderRequest.java @@ -47,7 +47,7 @@ public class MavenEmbedderRequest private String privateRepository; private File alternateSettings; - + private TransferListener transferListener; /** @@ -78,6 +78,11 @@ public class MavenEmbedderRequest * @since 1.393 */ private WorkspaceReader workspaceReader; + + /** + * @since 1.426 + */ + private File globalSettings; /** * @param listener @@ -210,4 +215,13 @@ public class MavenEmbedderRequest public void setWorkspaceReader( WorkspaceReader workspaceReader ) { this.workspaceReader = workspaceReader; } + + public File getGlobalSettings() { + return globalSettings; + } + + public MavenEmbedderRequest setGlobalSettings( File globalSettings ) { + this.globalSettings = globalSettings; + return this; + } } diff --git a/maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java b/maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java index 497ea6e356..95e0d6551e 100644 --- a/maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java +++ b/maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java @@ -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 getAllGlobalMavenSettingsConfigs() { + List globalMavenSettingsConfigs = new ArrayList(); + ExtensionList 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 configProviders = ConfigProvider.all(); + if (configProviders != null && configProviders.size() > 0) { + for (ConfigProvider configProvider : configProviders) { + if (configProvider instanceof GlobalMavenSettingsProvider ) { + if ( configProvider.isResponsibleFor( settingsConfigId ) ) { + config = configProvider.getConfigById( settingsConfigId ); + } + } + } + } + if (config == null) { + logger.println(" your Apache Maven build is setup to use a config with id " + globalSettingsConfigId + + " but cannot find the config"); + } else { + logger.println("using settings config with name " + config.name); + String globalSettingsContent = config.content; + if (globalSettingsContent != null ) { + tmpGlobalSettingsFile = File.createTempFile( "global-maven-settings", "xml" ); + remoteGlobalSettings = new FilePath(getWorkspace(), tmpGlobalSettingsFile.getName()); + ByteArrayInputStream bs = new ByteArrayInputStream(globalSettingsContent.getBytes()); + remoteGlobalSettings.copyFrom(bs); + project.globalSettingConfigPath = remoteGlobalSettings.getRemote(); + } + } + } + parsePoms(listener, logger, envVars, mvn, mavenVersion); // #5428 : do pre-build *before* parsing pom SplittableBuildListener slistener = new SplittableBuildListener(listener); proxies = new HashMap(); @@ -705,6 +736,9 @@ public class MavenModuleSetBuild extends AbstractMavenBuild + + + + +