mirror of
https://github.com/jenkinsci/jenkins.git
synced 2026-11-16 05:22:22 +00:00
refactor interaction with config-file-provider plugin to make dependency optional
This commit is contained in:
1 parent
9cc6e16d1e
commit
fff55f85ea
6 files changed
+58
-176
No files matched your search
@@ -34,8 +34,7 @@ import hudson.maven.MavenBuild.ProxyImpl2;
|
||||
import hudson.maven.reporters.MavenAggregatedArtifactRecord;
|
||||
import hudson.maven.reporters.MavenFingerprinter;
|
||||
import hudson.maven.reporters.MavenMailer;
|
||||
import hudson.maven.settings.GlobalMavenSettingsProvider;
|
||||
import hudson.maven.settings.MavenSettingsProvider;
|
||||
import hudson.maven.settings.SettingConfig;
|
||||
import hudson.maven.settings.SettingsProviderUtils;
|
||||
import hudson.model.AbstractProject;
|
||||
import hudson.model.Action;
|
||||
@@ -92,7 +91,6 @@ import org.apache.maven.model.building.ModelBuildingRequest;
|
||||
import org.apache.maven.project.MavenProject;
|
||||
import org.apache.maven.project.ProjectBuildingException;
|
||||
import org.codehaus.plexus.util.PathTool;
|
||||
import org.jenkinsci.lib.configprovider.model.Config;
|
||||
import org.kohsuke.stapler.StaplerRequest;
|
||||
import org.kohsuke.stapler.StaplerResponse;
|
||||
import org.kohsuke.stapler.export.Exported;
|
||||
@@ -624,7 +622,7 @@ public class MavenModuleSetBuild extends AbstractMavenBuild<MavenModuleSet,Maven
|
||||
|
||||
String settingsConfigId = project.getSettingConfigId();
|
||||
if (StringUtils.isNotBlank(settingsConfigId)) {
|
||||
Config settingsConfig = SettingsProviderUtils.findConfig( settingsConfigId, MavenSettingsProvider.class, org.jenkinsci.lib.configprovider.maven.MavenSettingsProvider.class );
|
||||
SettingConfig settingsConfig = SettingsProviderUtils.findSettings(settingsConfigId);
|
||||
if (settingsConfig == null) {
|
||||
logger.println(" your Apache Maven build is setup to use a config with id " + settingsConfigId
|
||||
+ " but cannot find the config");
|
||||
@@ -639,7 +637,7 @@ public class MavenModuleSetBuild extends AbstractMavenBuild<MavenModuleSet,Maven
|
||||
|
||||
String globalSettingsConfigId = project.getGlobalSettingConfigId();
|
||||
if (StringUtils.isNotBlank(globalSettingsConfigId)) {
|
||||
Config settingsConfig = SettingsProviderUtils.findConfig( globalSettingsConfigId, GlobalMavenSettingsProvider.class, org.jenkinsci.lib.configprovider.maven.GlobalMavenSettingsProvider.class );
|
||||
SettingConfig settingsConfig = SettingsProviderUtils.findSettings(globalSettingsConfigId);
|
||||
if (settingsConfig == null) {
|
||||
logger.println(" your Apache Maven build is setup to use a global settings config with id " + globalSettingsConfigId
|
||||
+ " but cannot find the config");
|
||||
|
||||
Reference in new issue
Block a user