Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
jenkins
提交
fb3e8a9c
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,发现更多精彩内容 >>
提交
fb3e8a9c
编写于
3月 14, 2011
作者:
C
Christoph Kutzinski
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'refs/heads/master' of
https://git@github.com/jenkinsci/jenkins.git
上级
836fc8b6
7d46b225
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
35 addition
and
11 deletion
+35
-11
changelog.html
changelog.html
+4
-2
core/src/main/java/hudson/tasks/test/AggregatedTestResultPublisher.java
...java/hudson/tasks/test/AggregatedTestResultPublisher.java
+2
-2
debian/debian/changelog
debian/debian/changelog
+6
-0
maven-plugin/src/main/java/hudson/maven/MavenModule.java
maven-plugin/src/main/java/hudson/maven/MavenModule.java
+6
-4
maven-plugin/src/main/java/hudson/maven/ModuleDependency.java
...n-plugin/src/main/java/hudson/maven/ModuleDependency.java
+17
-3
未找到文件。
changelog.html
浏览文件 @
fb3e8a9c
...
...
@@ -99,7 +99,10 @@ Upcoming changes</a>
<!-- these changes are controlled by the release process. DO NOT MODIFY -->
<div
id=
"rc"
style=
"display:none;"
>
<!--=BEGIN=-->
<h3><a
name=
v1.401
>
What's new in 1.401
</a>
<!--=DATE=-->
</h3>
<h3><a
name=
v1.402
>
What's new in 1.402
</a>
<!--=DATE=-->
</h3>
<!--=RC-CHANGES=-->
</div>
<!--=END=-->
<h3><a
name=
v1.401
>
What's new in 1.401
</a>
(2011/03/13)
</h3>
<ul
class=
image
>
<li
class=
bug
>
Fix for JENKINS-8711 breaks deployments with credentials
...
...
@@ -125,7 +128,6 @@ Upcoming changes</a>
Defined a mechanism to replace some of the key UI text.
(
<a
href=
"http://issues.jenkins-ci.org/browse/JENKINS-8579"
>
issue 8579
</a>
)
</ul>
</div>
<!--=END=-->
<h3><a
name=
v1.400
>
What's new in 1.400
</a>
(2011/03/06)
</h3>
<ul
class=
image
>
<li
class=
bug
>
...
...
core/src/main/java/hudson/tasks/test/AggregatedTestResultPublisher.java
浏览文件 @
fb3e8a9c
...
...
@@ -346,9 +346,9 @@ public class AggregatedTestResultPublisher extends Recorder {
public
AggregatedTestResultPublisher
newInstance
(
StaplerRequest
req
,
JSONObject
formData
)
throws
FormException
{
JSONObject
s
=
formData
.
getJSONObject
(
"specify"
);
if
(
s
.
isNullObject
())
return
new
AggregatedTestResultPublisher
(
null
);
return
new
AggregatedTestResultPublisher
(
null
,
req
.
getParameter
(
"includeFailedBuilds"
)
!=
null
);
else
return
new
AggregatedTestResultPublisher
(
s
.
getString
(
"jobs"
));
return
new
AggregatedTestResultPublisher
(
s
.
getString
(
"jobs"
)
,
req
.
getParameter
(
"includeFailedBuilds"
)
!=
null
);
}
public
AutoCompletionCandidates
doAutoCompleteJobs
(
@QueryParameter
String
value
)
{
...
...
debian/debian/changelog
浏览文件 @
fb3e8a9c
jenkins (1.401) unstable; urgency=low
* See http://jenkins-ci.org/changelog for more details.
-- Kohsuke Kawaguchi <kk@kohsuke.org> Sun, 13 Mar 2011 20:56:10 -0700
jenkins (1.400) unstable; urgency=low
* See http://jenkins-ci.org/changelog for more details.
...
...
maven-plugin/src/main/java/hudson/maven/MavenModule.java
浏览文件 @
fb3e8a9c
...
...
@@ -392,8 +392,9 @@ public final class MavenModule extends AbstractMavenProject<MavenModule,MavenBui
for
(
MavenModule
m
:
Hudson
.
getInstance
().
getAllItems
(
MavenModule
.
class
))
{
if
(
m
.
isDisabled
())
continue
;
modules
.
put
(
m
.
asDependency
(),
m
);
modules
.
put
(
m
.
asDependency
().
withUnknownVersion
(),
m
);
ModuleDependency
moduleDependency
=
m
.
asDependency
();
modules
.
put
(
moduleDependency
,
m
);
modules
.
put
(
moduleDependency
.
withUnknownVersion
(),
m
);
}
// in case two modules with the same name is defined, modules in the same MavenModuleSet
...
...
@@ -401,8 +402,9 @@ public final class MavenModule extends AbstractMavenProject<MavenModule,MavenBui
for
(
MavenModule
m
:
getParent
().
getModules
())
{
if
(
m
.
isDisabled
())
continue
;
modules
.
put
(
m
.
asDependency
(),
m
);
modules
.
put
(
m
.
asDependency
().
withUnknownVersion
(),
m
);
ModuleDependency
moduleDependency
=
m
.
asDependency
();
modules
.
put
(
moduleDependency
,
m
);
modules
.
put
(
moduleDependency
.
withUnknownVersion
(),
m
);
}
// if the build style is the aggregator build, define dependencies against project,
...
...
maven-plugin/src/main/java/hudson/maven/ModuleDependency.java
浏览文件 @
fb3e8a9c
...
...
@@ -51,8 +51,10 @@ public final class ModuleDependency implements Serializable {
public
ModuleDependency
(
String
groupId
,
String
artifactId
,
String
version
)
{
this
.
groupId
=
groupId
.
intern
();
this
.
artifactId
=
artifactId
.
intern
();
if
(
version
==
null
)
version
=
UNKNOWN
;
this
.
version
=
version
.
intern
();
if
(
version
==
null
)
this
.
version
=
UNKNOWN
;
else
this
.
version
=
version
.
intern
();
}
public
ModuleDependency
(
ModuleName
name
,
String
version
)
{
...
...
@@ -81,6 +83,15 @@ public final class ModuleDependency implements Serializable {
this
(
ext
.
getGroupId
(),
ext
.
getArtifactId
(),
ext
.
getVersion
());
}
private
ModuleDependency
(
String
groupId
,
String
artifactId
)
{
// to be used only by the withUnknownVersion() method
// where we know that groupId and artifactId are already interned
// and where we want an UNKNOWN version
this
.
groupId
=
groupId
;
this
.
artifactId
=
artifactId
;
this
.
version
=
UNKNOWN
;
}
public
ModuleName
getName
()
{
return
new
ModuleName
(
groupId
,
artifactId
);
}
...
...
@@ -89,7 +100,10 @@ public final class ModuleDependency implements Serializable {
* Returns groupId+artifactId plus unknown version.
*/
public
ModuleDependency
withUnknownVersion
()
{
return
new
ModuleDependency
(
groupId
,
artifactId
,
UNKNOWN
);
if
(
UNKNOWN
.
equals
(
version
))
return
this
;
else
return
new
ModuleDependency
(
groupId
,
artifactId
);
}
public
boolean
equals
(
Object
o
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录