add a marker interface MavenSettingsProvider in maven-plugin.

We will only use config provider which implements this.
Start work to use the provided settings for maven build
This commit is contained in:
Olivier Lamy committed 2011-08-07 01:59:33 +02:00
1 parent 4f0fc76101
commit 9a0ef226a7
6 files changed
+105 -62

No files matched your search

@@ -27,6 +27,7 @@ package hudson.maven;
import static hudson.model.Result.FAILURE;
import hudson.AbortException;
import hudson.EnvVars;
import hudson.ExtensionList;
import hudson.FilePath;
import hudson.FilePath.FileCallable;
import hudson.Launcher;
@@ -35,6 +36,8 @@ import hudson.maven.MavenBuild.ProxyImpl2;
import hudson.maven.reporters.MavenAggregatedArtifactRecord;
import hudson.maven.reporters.MavenFingerprinter;
import hudson.maven.reporters.MavenMailer;
import hudson.maven.settings.MavenSettingsProvider;
import hudson.model.AbstractBuild;
import hudson.model.AbstractProject;
import hudson.model.Action;
import hudson.model.Build;
@@ -44,6 +47,8 @@ import hudson.model.Computer;
import hudson.model.Environment;
import hudson.model.Executor;
import hudson.model.Fingerprint;
import jenkins.configprovider.ConfigProvider;
import jenkins.configprovider.model.Config;
import jenkins.model.Jenkins;
import hudson.model.ParameterDefinition;
import hudson.model.ParametersAction;
@@ -63,6 +68,7 @@ import hudson.util.IOUtils;
import hudson.util.MaskingClassLoader;
import hudson.util.StreamTaskListener;
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.IOException;
import java.io.InterruptedIOException;
@@ -82,6 +88,7 @@ import java.util.Set;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.FilenameUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.maven.BuildFailureException;
@@ -553,6 +560,7 @@ public class MavenModuleSetBuild extends AbstractMavenBuild<MavenModuleSet,Maven
protected Result doRun(final BuildListener listener) throws Exception {
PrintStream logger = listener.getLogger();
Result r = null;
File tmpSettingsFile = null;
try {
EnvVars envVars = getEnvironment(listener);
@@ -598,6 +606,36 @@ public class MavenModuleSetBuild extends AbstractMavenBuild<MavenModuleSet,Maven
if(!preBuild(listener, project.getPublishers()))
return Result.FAILURE;
String settingsConfigId = project.getSettingConfigId();
if (settingsConfigId != null) {
Config config = null;
ExtensionList<ConfigProvider> configProviders = ConfigProvider.all();
if (configProviders != null && configProviders.size() > 0) {
for (ConfigProvider configProvider : configProviders) {
if (configProvider instanceof MavenSettingsProvider ) {
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 " + settingsConfigId
+ " but cannot find the config");
} else {
logger.println("using settings config with name " + config.name);
String settingsContent = config.content;
if (settingsContent != null ) {
tmpSettingsFile = File.createTempFile( "maven-settings", "xml" );
FilePath target = new FilePath(getWorkspace(), tmpSettingsFile.getName());
ByteArrayInputStream bs = new ByteArrayInputStream(settingsContent.getBytes());
target.copyFrom(bs);
project.setAlternateSettings( target.getRemote() );
}
}
}
parsePoms(listener, logger, envVars, mvn, mavenVersion); // #5428 : do pre-build *before* parsing pom
SplittableBuildListener slistener = new SplittableBuildListener(listener);
proxies = new HashMap<ModuleName, ProxyImpl2>();
@@ -665,6 +703,8 @@ public class MavenModuleSetBuild extends AbstractMavenBuild<MavenModuleSet,Maven
ArgumentListBuilder margs = new ArgumentListBuilder().add("-B").add("-f", pom.getRemote());
if(project.usesPrivateRepository())
margs.add("-Dmaven.repo.local="+getWorkspace().child(".repository"));
// If incrementalBuild is set
// and the previous build didn't specify that we need a full build
@@ -771,6 +811,8 @@ public class MavenModuleSetBuild extends AbstractMavenBuild<MavenModuleSet,Maven
logger.println("project.getModules()="+project.getModules());
logger.println("project.getRootModule()="+project.getRootModule());
throw e;
} finally {
FileUtils.deleteQuietly( tmpSettingsFile );
}
}