mirror of
https://github.com/jenkinsci/jenkins.git
synced 2026-11-16 05:22:22 +00:00
convert alternateSettings attribute to extension
selection, with backward compatibility
This commit is contained in:
1 parent
8d8b3df8ac
commit
f85dc1e496
3 files changed
+39
-41
No files matched your search
@@ -738,17 +738,9 @@ public class MavenModuleSetBuild extends AbstractMavenBuild<MavenModuleSet,Maven
|
||||
margs.add("-pl", Util.join(changedModules, ","));
|
||||
}
|
||||
|
||||
if (project.getAlternateSettings() != null) {
|
||||
if (IOUtils.isAbsolute(project.getAlternateSettings())) {
|
||||
margs.add("-s").add(project.getAlternateSettings());
|
||||
} else {
|
||||
FilePath mrSettings = getModuleRoot().child(project.getAlternateSettings());
|
||||
FilePath wsSettings = getWorkspace().child(project.getAlternateSettings());
|
||||
if (!wsSettings.exists() && mrSettings.exists())
|
||||
wsSettings = mrSettings;
|
||||
|
||||
margs.add("-s").add(wsSettings.getRemote());
|
||||
}
|
||||
SettingsProvider settings = project.getSettings();
|
||||
if (settings != null) {
|
||||
settings.configure(margs, MavenModuleSetBuild.this);
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in new issue
Block a user