mirror of
https://github.com/jenkinsci/jenkins.git
synced 2026-11-16 05:22:22 +00:00
implement readResolve() for backward comp.
This commit is contained in:
1 parent
cdae926106
commit
0b01798326
1 file changed
+29
-4
@@ -50,7 +50,6 @@ import hudson.model.ItemGroup;
|
||||
import hudson.model.Job;
|
||||
import hudson.model.Queue;
|
||||
import hudson.model.Queue.Task;
|
||||
import hudson.model.AbstractBuild;
|
||||
import hudson.model.ResourceActivity;
|
||||
import hudson.model.Result;
|
||||
import hudson.model.SCMedItem;
|
||||
@@ -59,7 +58,6 @@ import hudson.model.TaskListener;
|
||||
import hudson.model.TopLevelItem;
|
||||
import hudson.mvn.DefaultGlobalSettingsProvider;
|
||||
import hudson.mvn.DefaultSettingsProvider;
|
||||
import hudson.mvn.FilePathGlobalSettingsProvider;
|
||||
import hudson.mvn.FilePathSettingsProvider;
|
||||
import hudson.mvn.GlobalSettingsProvider;
|
||||
import hudson.mvn.GlobalSettingsProviderDescriptor;
|
||||
@@ -78,7 +76,6 @@ import hudson.tasks.Maven.MavenInstallation;
|
||||
import hudson.tasks.Publisher;
|
||||
import hudson.tasks.JavadocArchiver;
|
||||
import hudson.tasks.junit.JUnitResultArchiver;
|
||||
import hudson.util.ArgumentListBuilder;
|
||||
import hudson.util.CopyOnWriteMap;
|
||||
import hudson.util.DescribableList;
|
||||
import hudson.util.FormValidation;
|
||||
@@ -103,6 +100,8 @@ import javax.servlet.ServletException;
|
||||
import jenkins.model.Jenkins;
|
||||
import net.sf.json.JSONObject;
|
||||
|
||||
import org.apache.commons.beanutils.PropertyUtils;
|
||||
import org.apache.commons.lang.StringUtils;
|
||||
import org.apache.commons.lang.math.NumberUtils;
|
||||
import org.apache.maven.model.building.ModelBuildingRequest;
|
||||
import org.kohsuke.stapler.HttpResponse;
|
||||
@@ -285,7 +284,33 @@ public class MavenModuleSet extends AbstractMavenProject<MavenModuleSet,MavenMod
|
||||
|
||||
public Object readResolve() {
|
||||
// backward compatibility
|
||||
if (alternateSettings != null) this.settings = new FilePathSettingsProvider(alternateSettings);
|
||||
if (alternateSettings != null) {
|
||||
this.settings = new FilePathSettingsProvider(alternateSettings);
|
||||
} else if (StringUtils.isNotBlank(settingConfigId)) {
|
||||
try {
|
||||
Class<? extends SettingsProvider> legacySettings = Class.forName("org.jenkinsci.plugins.configfiles.maven.LegacySettingsProvider").asSubclass(SettingsProvider.class);
|
||||
SettingsProvider newInstance = legacySettings.newInstance();
|
||||
PropertyUtils.setProperty(newInstance, "settingConfigId", settingConfigId);
|
||||
this.settings = newInstance;
|
||||
} catch (Exception e) {
|
||||
// FIXME how should we log this?
|
||||
System.out.println("Please update the 'config-file-provider' plugin, the current version is not supported anymore! (settingConfigId="+settingConfigId+")");
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
|
||||
if (StringUtils.isNotBlank(globalSettingConfigId)) {
|
||||
try {
|
||||
Class<? extends GlobalSettingsProvider> legacySettings = Class.forName("org.jenkinsci.plugins.configfiles.maven.LegacyGlobalSettingsProvider").asSubclass(GlobalSettingsProvider.class);
|
||||
GlobalSettingsProvider newInstance = legacySettings.newInstance();
|
||||
PropertyUtils.setProperty(newInstance, "settingConfigId", globalSettingConfigId);
|
||||
this.globalSettings = newInstance;
|
||||
} catch (Exception e) {
|
||||
// FIXME how should we log this?
|
||||
System.out.println("Please update the 'config-file-provider' plugin, the current version is not supported anymore! (globalSettingConfigId="+globalSettingConfigId+")");
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
return this;
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user