Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
FIY695
jenkins
提交
c9359ec0
J
jenkins
项目概览
FIY695
/
jenkins
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
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,发现更多精彩内容 >>
提交
c9359ec0
编写于
11月 13, 2012
作者:
J
Jesse Glick
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' of github.com:jenkinsci/jenkins
Conflicts: changelog.html
上级
734e7e01
bdad2a3d
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
26 addition
and
16 deletion
+26
-16
changelog.html
changelog.html
+3
-3
core/src/main/java/hudson/tasks/Maven.java
core/src/main/java/hudson/tasks/Maven.java
+6
-0
core/src/main/resources/hudson/tasks/Maven/config.jelly
core/src/main/resources/hudson/tasks/Maven/config.jelly
+8
-5
core/src/main/resources/hudson/tasks/Maven/help-settings.html
.../src/main/resources/hudson/tasks/Maven/help-settings.html
+0
-0
maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java
maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java
+7
-0
maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/configure-entries.jelly
...urces/hudson/maven/MavenModuleSet/configure-entries.jelly
+2
-8
未找到文件。
changelog.html
浏览文件 @
c9359ec0
...
...
@@ -64,6 +64,9 @@ Upcoming changes</a>
<li
class=
'major bug'
>
Displaying massive test suite results could bring down Jenkins.
(
<a
href=
"https://issues.jenkins-ci.org/browse/JENKINS-15818"
>
issue 15818
</a>
)
<li
class=
"major bug"
>
Jenkins kicks off the wrong downstream builds for Maven.
(
<a
href=
"https://issues.jenkins-ci.org/browse/JENKINS-15367"
>
issue 15367
</a>
)
</ul>
</div>
<!--=TRUNK-END=-->
...
...
@@ -74,9 +77,6 @@ Upcoming changes</a>
<li
class=
"major bug"
>
<code>
ArrayIndexOutOfBoundsException
</code>
or
<code>
StringIndexOutOfBoundsException
</code>
launching processes such as Mercurial polling. (Regression in 1.489.)
(
<a
href=
"https://issues.jenkins-ci.org/browse/JENKINS-15733"
>
issue 15733
</a>
)
<li
class=
bug
>
Jenkins kicks off the wrong downstream builds for Maven.
(
<a
href=
"https://issues.jenkins-ci.org/browse/JENKINS-15367"
>
issue 15367
</a>
)
<li
class=
rfe
>
Support failsafe the same way as surefire in maven2 jobs
</ul>
...
...
core/src/main/java/hudson/tasks/Maven.java
浏览文件 @
c9359ec0
...
...
@@ -394,6 +394,12 @@ public class Maven extends Builder {
return
"/help/project-config/maven.html"
;
}
@Override
public
String
getHelpFile
(
String
fieldName
)
{
if
(
fieldName
.
equals
(
"globalSettings"
))
fieldName
=
"settings"
;
// same help file
return
super
.
getHelpFile
(
fieldName
);
}
public
String
getDisplayName
()
{
return
Messages
.
Maven_DisplayName
();
}
...
...
core/src/main/resources/hudson/tasks/Maven/config.jelly
浏览文件 @
c9359ec0
...
...
@@ -50,11 +50,14 @@ 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}" field="settings" help="/help/tasks/maven/maven-settings.html">
<f:dropdownDescriptorSelector descriptors="${descriptor.settingsProviders}"/>
<f:dropdownDescriptorSelector title="${%Settings file}" descriptors="${descriptor.settingsProviders}" field="settings"/>
<!--
<f:entry help="/help/tasks/maven/maven-settings.html">
</f:entry>
<f:entry title="${%Global Settings file}" field="globalSettings" help="/help/tasks/maven/maven-settings.html">
<f:dropdownDescriptorSelector descriptors="${descriptor.globalSettingsProviders}"/>
</f:entry>
<f:entry help="/help/tasks/maven/maven-settings.html">
</f:entry>
-->
<f:dropdownDescriptorSelector title="${%Global Settings file}" field="globalSettings" descriptors="${descriptor.globalSettingsProviders}"/>
</f:advanced>
</j:jelly>
\ No newline at end of file
war/src/main/webapp/help/tasks/maven/maven
-settings.html
→
core/src/main/resources/hudson/tasks/Maven/help
-settings.html
浏览文件 @
c9359ec0
文件已移动
maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java
浏览文件 @
c9359ec0
...
...
@@ -1182,6 +1182,13 @@ public class MavenModuleSet extends AbstractMavenProject<MavenModuleSet,MavenMod
mavenValidationLevels
.
put
(
"LEVEL_STRICT"
,
ModelBuildingRequest
.
VALIDATION_LEVEL_STRICT
);
}
@Override
public
String
getHelpFile
(
String
fieldName
)
{
String
v
=
super
.
getHelpFile
(
fieldName
);
if
(
v
!=
null
)
return
v
;
return
Jenkins
.
getInstance
().
getDescriptor
(
Maven
.
class
).
getHelpFile
(
fieldName
);
}
public
List
<
SettingsProviderDescriptor
>
getSettingsProviders
()
{
return
Jenkins
.
getInstance
().
getDescriptorList
(
SettingsProvider
.
class
);
}
...
...
maven-plugin/src/main/resources/hudson/maven/MavenModuleSet/configure-entries.jelly
浏览文件 @
c9359ec0
...
...
@@ -113,14 +113,8 @@ THE SOFTWARE.
</select>
</f:entry>
<f:entry title="${%Settings file}" field="settings" help="/help/tasks/maven/maven-settings.html">
<f:dropdownDescriptorSelector descriptors="${descriptor.settingsProviders}"/>
</f:entry>
<f:entry title="${%Global Settings file}" field="globalSettings" help="/help/tasks/maven/maven-settings.html">
<f:dropdownDescriptorSelector descriptors="${descriptor.globalSettingsProviders}"/>
</f:entry>
<f:dropdownDescriptorSelector title="${%Settings file}" field="settings" descriptors="${descriptor.settingsProviders}"/>
<f:dropdownDescriptorSelector title="${%Global Settings file}" field="globalSettings" descriptors="${descriptor.globalSettingsProviders}"/>
</f:advanced>
</f:section>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录