This commit is contained in:
imod committed 2012-11-04 16:03:39 +01:00
1 parent 2a35bf4d31
commit c206626f00
13 files changed
+40 -25

No files matched your search

@@ -561,7 +561,6 @@ public class MavenModuleSetBuild extends AbstractMavenBuild<MavenModuleSet,Maven
Result r = null;
PrintStream logger = listener.getLogger();
FilePath remoteSettings = null, remoteGlobalSettings = null;
try {
@@ -582,9 +581,6 @@ public class MavenModuleSetBuild extends AbstractMavenBuild<MavenModuleSet,Maven
LOGGER.fine(getFullDisplayName()+" is building with mavenVersion " + mavenVersion + " from file " + mavenInformation.getVersionResourcePath());
remoteSettings = SettingsProvider.getSettingsFilePath(project.getSettings(), MavenModuleSetBuild.this, listener);
remoteGlobalSettings = GlobalSettingsProvider.getSettingsFilePath(project.getGlobalSettings(), MavenModuleSetBuild.this, listener);
if(!project.isAggregatorStyleBuild()) {
parsePoms(listener, logger, envVars, mvn, mavenVersion);
// start module builds
@@ -689,9 +685,11 @@ public class MavenModuleSetBuild extends AbstractMavenBuild<MavenModuleSet,Maven
if(localRepo!=null)
margs.add("-Dmaven.repo.local="+localRepo.getRemote());
FilePath remoteSettings = SettingsProvider.getSettingsFilePath(project.getSettings(), MavenModuleSetBuild.this, listener);
if (remoteSettings != null)
margs.add("-s" , remoteSettings.getRemote());
FilePath remoteGlobalSettings = GlobalSettingsProvider.getSettingsFilePath(project.getGlobalSettings(), MavenModuleSetBuild.this, listener);
if (remoteGlobalSettings != null)
margs.add("-gs" , remoteGlobalSettings.getRemote());
@@ -804,14 +802,6 @@ public class MavenModuleSetBuild extends AbstractMavenBuild<MavenModuleSet,Maven
logger.println("project.getRootModule()="+project.getRootModule());
throw e;
} finally {
// delete tmp files used for MavenSettingsProvider
// TODO implement a hook to let SettingsProvider have the decision whether a settings.xml must be deleted
// if (remoteSettings != null) {
// remoteSettings.delete();
// }
// if (remoteGlobalSettings != null ) {
// remoteGlobalSettings.delete();
// }
}
}