mirror of
https://github.com/jenkinsci/jenkins.git
synced 2026-11-16 05:22:22 +00:00
integrate SettingsProvider to Maven Builder for free-style projects
This commit is contained in:
1 parent
29f1d02e22
commit
0ed6fdd925
2 files changed
+54
-3
No files matched your search
@@ -39,6 +39,10 @@ import hudson.model.EnvironmentSpecific;
|
||||
import hudson.model.Node;
|
||||
import jenkins.model.Jenkins;
|
||||
import hudson.model.TaskListener;
|
||||
import hudson.mvn.DefaultGlobalSettingsProvider;
|
||||
import hudson.mvn.DefaultSettingsProvider;
|
||||
import hudson.mvn.GlobalSettingsProvider;
|
||||
import hudson.mvn.SettingsProvider;
|
||||
import hudson.remoting.Callable;
|
||||
import hudson.remoting.VirtualChannel;
|
||||
import hudson.slaves.NodeSpecific;
|
||||
@@ -55,6 +59,8 @@ import hudson.util.VariableResolver;
|
||||
import hudson.util.FormValidation;
|
||||
import hudson.util.XStream2;
|
||||
import net.sf.json.JSONObject;
|
||||
|
||||
import org.apache.commons.lang.StringUtils;
|
||||
import org.kohsuke.stapler.DataBoundConstructor;
|
||||
import org.kohsuke.stapler.StaplerRequest;
|
||||
import org.kohsuke.stapler.QueryParameter;
|
||||
@@ -118,31 +124,57 @@ public class Maven extends Builder {
|
||||
* @since 1.322
|
||||
*/
|
||||
public boolean usePrivateRepository = false;
|
||||
|
||||
/**
|
||||
* Provides access to the settings.xml to be used for a build.
|
||||
* @since 1.481
|
||||
*/
|
||||
private SettingsProvider settings = new DefaultSettingsProvider();
|
||||
|
||||
/**
|
||||
* Provides access to the global settings.xml to be used for a build.
|
||||
* @since 1.481
|
||||
*/
|
||||
private GlobalSettingsProvider globalSettings = new DefaultGlobalSettingsProvider();
|
||||
|
||||
private final static String MAVEN_1_INSTALLATION_COMMON_FILE = "bin/maven";
|
||||
private final static String MAVEN_2_INSTALLATION_COMMON_FILE = "bin/mvn";
|
||||
|
||||
public Maven(String targets,String name) {
|
||||
this(targets,name,null,null,null,false);
|
||||
this(targets,name,null,null,null,false, null, null);
|
||||
}
|
||||
|
||||
public Maven(String targets, String name, String pom, String properties, String jvmOptions) {
|
||||
this(targets, name, pom, properties, jvmOptions, false);
|
||||
this(targets, name, pom, properties, jvmOptions, false, null, null);
|
||||
}
|
||||
|
||||
public Maven(String targets,String name, String pom, String properties, String jvmOptions, boolean usePrivateRepository) {
|
||||
this(targets, name, pom, properties, jvmOptions, usePrivateRepository, null, null);
|
||||
}
|
||||
|
||||
@DataBoundConstructor
|
||||
public Maven(String targets,String name, String pom, String properties, String jvmOptions, boolean usePrivateRepository) {
|
||||
public Maven(String targets,String name, String pom, String properties, String jvmOptions, boolean usePrivateRepository, SettingsProvider settings, GlobalSettingsProvider globalSettings) {
|
||||
this.targets = targets;
|
||||
this.mavenName = name;
|
||||
this.pom = Util.fixEmptyAndTrim(pom);
|
||||
this.properties = Util.fixEmptyAndTrim(properties);
|
||||
this.jvmOptions = Util.fixEmptyAndTrim(jvmOptions);
|
||||
this.usePrivateRepository = usePrivateRepository;
|
||||
this.settings = settings != null ? settings : new DefaultSettingsProvider();
|
||||
this.globalSettings = globalSettings != null ? globalSettings : new DefaultGlobalSettingsProvider();
|
||||
}
|
||||
|
||||
public String getTargets() {
|
||||
return targets;
|
||||
}
|
||||
|
||||
public SettingsProvider getSettings() {
|
||||
return settings != null ? settings : new DefaultSettingsProvider();
|
||||
}
|
||||
|
||||
public GlobalSettingsProvider getGlobalSettings() {
|
||||
return globalSettings != null ? globalSettings : new DefaultGlobalSettingsProvider();
|
||||
}
|
||||
|
||||
public void setUsePrivateRepository(boolean usePrivateRepository) {
|
||||
this.usePrivateRepository = usePrivateRepository;
|
||||
@@ -248,6 +280,19 @@ public class Maven extends Builder {
|
||||
}
|
||||
if(pom!=null)
|
||||
args.add("-f",pom);
|
||||
|
||||
if(!targets.contains(" -s ")) {
|
||||
String settingsPath = SettingsProvider.getSettingsRemotePath(getSettings(), build, listener);
|
||||
if(StringUtils.isNotBlank(settingsPath)){
|
||||
args.add("-s", settingsPath);
|
||||
}
|
||||
}
|
||||
if(!targets.contains(" -gs ")) {
|
||||
String settingsPath = GlobalSettingsProvider.getSettingsRemotePath(getGlobalSettings(), build, listener);
|
||||
if(StringUtils.isNotBlank(settingsPath)){
|
||||
args.add("-gs", settingsPath);
|
||||
}
|
||||
}
|
||||
|
||||
Set<String> sensitiveVars = build.getSensitiveBuildVariables();
|
||||
|
||||
|
||||
@@ -50,5 +50,11 @@ THE SOFTWARE.
|
||||
<f:entry field="usePrivateRepository" title="${%Use private Maven repository}" help="/plugin/maven-plugin/private-repository.html">
|
||||
<f:checkbox checked="${it.usesPrivateRepository()}" />
|
||||
</f:entry>
|
||||
<f:entry title="${%Settings file}">
|
||||
<f:dropdownDescriptorSelector field="settings" descriptors="${descriptor.settingsProviders}"/>
|
||||
</f:entry>
|
||||
<f:entry title="${%Global Settings file}">
|
||||
<f:dropdownDescriptorSelector field="globalSettings" descriptors="${descriptor.globalSettingsProviders}"/>
|
||||
</f:entry>
|
||||
</f:advanced>
|
||||
</j:jelly>
|
||||
Reference in new issue
Block a user