Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
jenkins
提交
91f0352e
J
jenkins
项目概览
xxadev
/
jenkins
与 Fork 源项目一致
从无法访问的项目Fork
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
J
jenkins
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
91f0352e
编写于
5月 04, 2013
作者:
I
imod
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
try using defaulting of dropdownDescriptorSelector
上级
b8adcb43
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
15 addition
and
8 deletion
+15
-8
core/src/main/java/hudson/tasks/Maven.java
core/src/main/java/hudson/tasks/Maven.java
+12
-6
core/src/main/resources/hudson/tasks/Maven/config.jelly
core/src/main/resources/hudson/tasks/Maven/config.jelly
+3
-2
未找到文件。
core/src/main/java/hudson/tasks/Maven.java
浏览文件 @
91f0352e
...
...
@@ -38,8 +38,6 @@ import hudson.model.Computer;
import
hudson.model.EnvironmentSpecific
;
import
hudson.model.Node
;
import
jenkins.model.Jenkins
;
import
jenkins.mvn.DefaultGlobalSettingsProvider
;
import
jenkins.mvn.DefaultSettingsProvider
;
import
jenkins.mvn.GlobalMavenConfig
;
import
jenkins.mvn.GlobalSettingsProvider
;
import
jenkins.mvn.SettingsProvider
;
...
...
@@ -130,13 +128,13 @@ public class Maven extends Builder {
* Provides access to the settings.xml to be used for a build.
* @since 1.491
*/
private
SettingsProvider
settings
=
new
DefaultSettingsProvider
()
;
private
SettingsProvider
settings
;
/**
* Provides access to the global settings.xml to be used for a build.
* @since 1.491
*/
private
GlobalSettingsProvider
globalSettings
=
new
DefaultGlobalSettingsProvider
()
;
private
GlobalSettingsProvider
globalSettings
;
private
final
static
String
MAVEN_1_INSTALLATION_COMMON_FILE
=
"bin/maven"
;
private
final
static
String
MAVEN_2_INSTALLATION_COMMON_FILE
=
"bin/mvn"
;
...
...
@@ -164,8 +162,8 @@ public class Maven extends Builder {
this
.
properties
=
Util
.
fixEmptyAndTrim
(
properties
);
this
.
jvmOptions
=
Util
.
fixEmptyAndTrim
(
jvmOptions
);
this
.
usePrivateRepository
=
usePrivateRepository
;
this
.
settings
=
settings
;
this
.
globalSettings
=
globalSettings
;
this
.
settings
=
settings
!=
null
?
settings
:
GlobalMavenConfig
.
get
().
getSettingsProvider
()
;
this
.
globalSettings
=
globalSettings
!=
null
?
globalSettings
:
GlobalMavenConfig
.
get
().
getGlobalSettingsProvider
()
;
}
public
String
getTargets
()
{
...
...
@@ -407,6 +405,14 @@ public class Maven extends Builder {
public
String
getDisplayName
()
{
return
Messages
.
Maven_DisplayName
();
}
public
GlobalSettingsProvider
getDefaultGlobalSettingsProvider
()
{
return
GlobalMavenConfig
.
get
().
getGlobalSettingsProvider
();
}
public
SettingsProvider
getDefaultSettingsProvider
()
{
return
GlobalMavenConfig
.
get
().
getSettingsProvider
();
}
public
MavenInstallation
[]
getInstallations
()
{
return
installations
;
...
...
core/src/main/resources/hudson/tasks/Maven/config.jelly
浏览文件 @
91f0352e
...
...
@@ -50,7 +50,8 @@ 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:dropdownDescriptorSelector title="${%Settings file}" descriptors="${descriptor.settingsProviders}" field="settings"/>
<f:dropdownDescriptorSelector title="${%Settings file}" field="settings" default="${descriptor.defaultSettingsProvider}"/>
<!--
<f:entry help="/help/tasks/maven/maven-settings.html">
...
...
@@ -58,6 +59,6 @@ THE SOFTWARE.
<f:entry help="/help/tasks/maven/maven-settings.html">
</f:entry>
-->
<f:dropdownDescriptorSelector title="${%Global Settings file}" field="globalSettings" descriptors="${descriptor.globalSettingsProviders}"/>
<f:dropdownDescriptorSelector title="${%Global Settings file}" field="globalSettings" default="${descriptor.defaultGlobalSettingsProvider}"/>
</f:advanced>
</j:jelly>
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录