Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
jenkins
提交
741e8717
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,发现更多精彩内容 >>
提交
741e8717
编写于
10月 28, 2014
作者:
J
Jesse Glick
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'rc' into security-rc
上级
3a7e1705
4c1d0a5f
变更
14
显示空白变更内容
内联
并排
Showing
14 changed file
with
51 addition
and
123 deletion
+51
-123
changelog.html
changelog.html
+11
-2
cli/pom.xml
cli/pom.xml
+1
-1
core/pom.xml
core/pom.xml
+3
-3
core/src/main/java/hudson/FilePath.java
core/src/main/java/hudson/FilePath.java
+1
-0
core/src/main/java/hudson/model/Cause.java
core/src/main/java/hudson/model/Cause.java
+1
-1
core/src/main/java/hudson/model/Computer.java
core/src/main/java/hudson/model/Computer.java
+8
-3
core/src/main/java/hudson/model/Queue.java
core/src/main/java/hudson/model/Queue.java
+9
-7
core/src/main/resources/lib/hudson/failed-test.jelly
core/src/main/resources/lib/hudson/failed-test.jelly
+2
-72
core/src/main/resources/lib/hudson/failed-test_pt_BR.properties
...rc/main/resources/lib/hudson/failed-test_pt_BR.properties
+0
-25
debian/debian/changelog
debian/debian/changelog
+6
-0
plugins/pom.xml
plugins/pom.xml
+4
-4
pom.xml
pom.xml
+1
-1
test/pom.xml
test/pom.xml
+2
-2
war/pom.xml
war/pom.xml
+2
-2
未找到文件。
changelog.html
浏览文件 @
741e8717
...
@@ -61,7 +61,17 @@ Upcoming changes</a>
...
@@ -61,7 +61,17 @@ Upcoming changes</a>
<!-- these changes are controlled by the release process. DO NOT MODIFY -->
<!-- these changes are controlled by the release process. DO NOT MODIFY -->
<div
id=
"rc"
style=
"display:none;"
>
<!--=BEGIN=-->
<div
id=
"rc"
style=
"display:none;"
>
<!--=BEGIN=-->
<h3><a
name=
v1.586
>
What's new in 1.586
</a>
<!--=DATE=-->
</h3>
<h3><a
name=
v1.587
>
What's new in 1.587
</a>
<!--=DATE=-->
</h3>
<ul
class=
image
>
<li
class=
bug
>
Queue didn't always leave a trail for cancelled items properly
(
<a
href=
"https://issues.jenkins-ci.org/browse/JENKINS-25314"
>
issue 25314
</a>
)
<li
class=
bug
>
JNA update for deprecated JNA-POSIX library.
(
<a
href=
"https://issues.jenkins-ci.org/browse/JENKINS-24527"
>
issue 24527
</a>
)
</ul>
</div>
<!--=END=-->
<h3><a
name=
v1.586
>
What's new in 1.586
</a>
(2014/10/26)
</h3>
<ul
class=
image
>
<ul
class=
image
>
<li
class=
rfe
>
<li
class=
rfe
>
Bumping up JNA to 4.10. This is potentially a breaking change for plugins that depend on JNA 3.x
Bumping up JNA to 4.10. This is potentially a breaking change for plugins that depend on JNA 3.x
...
@@ -77,7 +87,6 @@ Upcoming changes</a>
...
@@ -77,7 +87,6 @@ Upcoming changes</a>
Existing
<code>
FileParameter
</code>
s should be handled as different values to avoid merging of queued builds
Existing
<code>
FileParameter
</code>
s should be handled as different values to avoid merging of queued builds
(
<a
href=
"https://issues.jenkins-ci.org/browse/JENKINS-19017"
>
issue 19017
</a>
)
(
<a
href=
"https://issues.jenkins-ci.org/browse/JENKINS-19017"
>
issue 19017
</a>
)
</ul>
</ul>
</div>
<!--=END=-->
<h3><a
name=
v1.585
>
What's new in 1.585
</a>
(2014/10/19)
</h3>
<h3><a
name=
v1.585
>
What's new in 1.585
</a>
(2014/10/19)
</h3>
<ul
class=
image
>
<ul
class=
image
>
<li
class=
bug
>
<li
class=
bug
>
...
...
cli/pom.xml
浏览文件 @
741e8717
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
<parent>
<parent>
<artifactId>
pom
</artifactId>
<artifactId>
pom
</artifactId>
<groupId>
org.jenkins-ci.main
</groupId>
<groupId>
org.jenkins-ci.main
</groupId>
<version>
1.58
6
-SNAPSHOT
</version>
<version>
1.58
7
-SNAPSHOT
</version>
</parent>
</parent>
<artifactId>
cli
</artifactId>
<artifactId>
cli
</artifactId>
...
...
core/pom.xml
浏览文件 @
741e8717
...
@@ -29,7 +29,7 @@ THE SOFTWARE.
...
@@ -29,7 +29,7 @@ THE SOFTWARE.
<parent>
<parent>
<groupId>
org.jenkins-ci.main
</groupId>
<groupId>
org.jenkins-ci.main
</groupId>
<artifactId>
pom
</artifactId>
<artifactId>
pom
</artifactId>
<version>
1.58
6
-SNAPSHOT
</version>
<version>
1.58
7
-SNAPSHOT
</version>
<relativePath>
../pom.xml
</relativePath>
<relativePath>
../pom.xml
</relativePath>
</parent>
</parent>
...
@@ -42,7 +42,7 @@ THE SOFTWARE.
...
@@ -42,7 +42,7 @@ THE SOFTWARE.
<properties>
<properties>
<staplerFork>
true
</staplerFork>
<staplerFork>
true
</staplerFork>
<stapler.version>
1.23
1
</stapler.version>
<stapler.version>
1.23
3
</stapler.version>
<spring.version>
2.5.6.SEC03
</spring.version>
<spring.version>
2.5.6.SEC03
</spring.version>
<groovy.version>
1.8.9
</groovy.version>
<groovy.version>
1.8.9
</groovy.version>
</properties>
</properties>
...
@@ -102,7 +102,7 @@ THE SOFTWARE.
...
@@ -102,7 +102,7 @@ THE SOFTWARE.
<dependency>
<!-- for compatibility only; all new code should use JNR -->
<dependency>
<!-- for compatibility only; all new code should use JNR -->
<groupId>
org.jruby.ext.posix
</groupId>
<groupId>
org.jruby.ext.posix
</groupId>
<artifactId>
jna-posix
</artifactId>
<artifactId>
jna-posix
</artifactId>
<version>
1.0.3
</version>
<version>
1.0.3
-jenkins-1
</version>
</dependency>
</dependency>
<dependency>
<dependency>
<groupId>
com.github.jnr
</groupId>
<groupId>
com.github.jnr
</groupId>
...
...
core/src/main/java/hudson/FilePath.java
浏览文件 @
741e8717
...
@@ -1668,6 +1668,7 @@ public final class FilePath implements Serializable {
...
@@ -1668,6 +1668,7 @@ public final class FilePath implements Serializable {
/**
/**
* Reads this file from the specific offset.
* Reads this file from the specific offset.
* @since 1.586
*/
*/
public
InputStream
readFromOffset
(
final
long
offset
)
throws
IOException
{
public
InputStream
readFromOffset
(
final
long
offset
)
throws
IOException
{
if
(
channel
==
null
)
{
if
(
channel
==
null
)
{
...
...
core/src/main/java/hudson/model/Cause.java
浏览文件 @
741e8717
...
@@ -137,7 +137,7 @@ public abstract class Cause {
...
@@ -137,7 +137,7 @@ public abstract class Cause {
}
}
/**
/**
* A build is triggered by
the completion of
another build (AKA upstream build.)
* A build is triggered by another build (AKA upstream build.)
*/
*/
public
static
class
UpstreamCause
extends
Cause
{
public
static
class
UpstreamCause
extends
Cause
{
...
...
core/src/main/java/hudson/model/Computer.java
浏览文件 @
741e8717
...
@@ -470,9 +470,14 @@ public /*transient*/ abstract class Computer extends Actionable implements Acces
...
@@ -470,9 +470,14 @@ public /*transient*/ abstract class Computer extends Actionable implements Acces
* is not yet gone.
* is not yet gone.
*/
*/
public
@CheckForNull
Node
getNode
()
{
public
@CheckForNull
Node
getNode
()
{
if
(
nodeName
==
null
)
Jenkins
j
=
Jenkins
.
getInstance
();
return
Jenkins
.
getInstance
();
if
(
j
==
null
)
{
return
Jenkins
.
getInstance
().
getNode
(
nodeName
);
return
null
;
}
if
(
nodeName
==
null
)
{
return
j
;
}
return
j
.
getNode
(
nodeName
);
}
}
@Exported
@Exported
...
...
core/src/main/java/hudson/model/Queue.java
浏览文件 @
741e8717
...
@@ -658,12 +658,7 @@ public class Queue extends ResourceController implements Saveable {
...
@@ -658,12 +658,7 @@ public class Queue extends ResourceController implements Saveable {
public
synchronized
boolean
cancel
(
Item
item
)
{
public
synchronized
boolean
cancel
(
Item
item
)
{
LOGGER
.
log
(
Level
.
FINE
,
"Cancelling {0} item#{1}"
,
new
Object
[]
{
item
.
task
,
item
.
id
});
LOGGER
.
log
(
Level
.
FINE
,
"Cancelling {0} item#{1}"
,
new
Object
[]
{
item
.
task
,
item
.
id
});
boolean
r
=
item
.
cancel
(
this
);
return
item
.
cancel
(
this
);
LeftItem
li
=
new
LeftItem
(
item
);
li
.
enter
(
this
);
return
r
;
}
}
/**
/**
...
@@ -1588,10 +1583,17 @@ public class Queue extends ResourceController implements Saveable {
...
@@ -1588,10 +1583,17 @@ public class Queue extends ResourceController implements Saveable {
/**
/**
* Cancels this item, which updates {@link #future} to notify the listener, and
* Cancels this item, which updates {@link #future} to notify the listener, and
* also leaves the queue.
* also leaves the queue.
*
* @return true
* if the item was successfully cancelled.
*/
*/
/*package*/
boolean
cancel
(
Queue
q
)
{
/*package*/
boolean
cancel
(
Queue
q
)
{
boolean
r
=
leave
(
q
);
boolean
r
=
leave
(
q
);
if
(
r
)
future
.
setAsCancelled
();
if
(
r
)
{
future
.
setAsCancelled
();
LeftItem
li
=
new
LeftItem
(
this
);
li
.
enter
(
q
);
}
return
r
;
return
r
;
}
}
...
...
core/src/main/resources/lib/hudson/failed-test.jelly
浏览文件 @
741e8717
...
@@ -25,77 +25,7 @@ THE SOFTWARE.
...
@@ -25,77 +25,7 @@ THE SOFTWARE.
<?jelly escape-by-default='true'?>
<?jelly escape-by-default='true'?>
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
<st:documentation>
<st:documentation>
Display link to the failed test.
DEPRECATED
@since 1.538
<st:attribute name="url" type="String">
Path to the failed test.
</st:attribute>
<st:attribute name="result" type="TestObject">
Failed test object
</st:attribute>
</st:documentation>
</st:documentation>
<st:once>
<st:include page="/lib/hudson/test/failed-test.jelly"/>
<script type="text/javascript">
<!-- TODO make sure load doesn't happen every time -->
function showFailureSummary(id,query) {
var element = document.getElementById(id)
element.style.display = "";
document.getElementById(id + "-showlink").style.display = "none";
document.getElementById(id + "-hidelink").style.display = "";
if (typeof query !== 'undefined') {
var rqo = new XMLHttpRequest();
rqo.open('GET', query, true);
rqo.onreadystatechange = function() { element.innerHTML = rqo.responseText; }
rqo.send(null);
}
}
function hideFailureSummary(id) {
document.getElementById(id).style.display = "none";
document.getElementById(id + "-showlink").style.display = "";
document.getElementById(id + "-hidelink").style.display = "none";
}
</script>
<style type="text/css">
.failure-summary {
margin-left: 2em;
}
.failure-summary h4 {
margin: 0.5em 0 0.5em 0;
}
.failure-summary h4 a {
text-decoration: none;
color: inherit;
}
.failure-summary h4 a img {
width: 8px;
height: 8px;
}
.failure-summary pre {
margin-left: 2em;
}
</style>
</st:once>
<j:set var="id" value="${h.jsStringEscape(url)}"/>
<j:set var="open" value="javascript:showFailureSummary('test-${id}','${url}/summary')"/>
<j:set var="close" value="javascript:hideFailureSummary('test-${id}')"/>
<a id="test-${id}-showlink" href="${open}" title="${%Show details}">
<l:icon class="icon-document-add icon-sm"/>
</a>
<a id="test-${id}-hidelink" href="${close}" title="${%Hide details}" style="display:none">
<l:icon class="icon-document-delete icon-sm"/>
</a>
<st:nbsp/>
<a href="${url}" class="model-link inside"><st:out value="${result.fullDisplayName}"/></a>
<j:forEach var="badge" items="${result.testActions}">
<st:include it="${badge}" page="badge.jelly" optional="true"/>
</j:forEach>
<div id="test-${id}" class="failure-summary" style="display: none;">
${%Loading...}
</div>
</j:jelly>
</j:jelly>
core/src/main/resources/lib/hudson/failed-test_pt_BR.properties
已删除
100644 → 0
浏览文件 @
3a7e1705
# The MIT License
#
# Copyright (c) 2004-, Kohsuke Kawaguchi, Sun Microsystems, Inc., and a number of other of contributers
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
# in the Software without restriction, including without limitation the rights
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
# copies of the Software, and to permit persons to whom the Software is
# furnished to do so, subject to the following conditions:
#
# The above copyright notice and this permission notice shall be included in
# all copies or substantial portions of the Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
Hide\
details
=
Ocultar detalhes
Loading...
=
Carregando...
Show\
details
=
Exibir detalhes
debian/debian/changelog
浏览文件 @
741e8717
jenkins (1.586) unstable; urgency=low
* See http://jenkins-ci.org/changelog for more details.
-- Kohsuke Kawaguchi <kk@kohsuke.org> Sun, 26 Oct 2014 20:50:22 -0700
jenkins (1.585) unstable; urgency=low
jenkins (1.585) unstable; urgency=low
* See http://jenkins-ci.org/changelog for more details.
* See http://jenkins-ci.org/changelog for more details.
...
...
plugins/pom.xml
浏览文件 @
741e8717
...
@@ -11,7 +11,7 @@
...
@@ -11,7 +11,7 @@
<groupId>
org.jenkins-ci.plugins
</groupId>
<groupId>
org.jenkins-ci.plugins
</groupId>
<artifactId>
plugin
</artifactId>
<artifactId>
plugin
</artifactId>
<name>
Jenkins plugin POM
</name>
<name>
Jenkins plugin POM
</name>
<version>
1.58
6
-SNAPSHOT
</version>
<version>
1.58
7
-SNAPSHOT
</version>
<packaging>
pom
</packaging>
<packaging>
pom
</packaging>
<!--
<!--
...
@@ -40,19 +40,19 @@
...
@@ -40,19 +40,19 @@
<groupId>
org.jenkins-ci.main
</groupId>
<groupId>
org.jenkins-ci.main
</groupId>
<artifactId>
jenkins-war
</artifactId>
<artifactId>
jenkins-war
</artifactId>
<type>
war
</type>
<type>
war
</type>
<version>
1.58
6
-SNAPSHOT
</version>
<version>
1.58
7
-SNAPSHOT
</version>
<scope>
test
</scope>
<scope>
test
</scope>
</dependency>
</dependency>
<dependency>
<dependency>
<groupId>
org.jenkins-ci.main
</groupId>
<groupId>
org.jenkins-ci.main
</groupId>
<artifactId>
jenkins-core
</artifactId>
<artifactId>
jenkins-core
</artifactId>
<version>
1.58
6
-SNAPSHOT
</version>
<version>
1.58
7
-SNAPSHOT
</version>
<scope>
provided
</scope>
<scope>
provided
</scope>
</dependency>
</dependency>
<dependency>
<dependency>
<groupId>
org.jenkins-ci.main
</groupId>
<groupId>
org.jenkins-ci.main
</groupId>
<artifactId>
jenkins-test-harness
</artifactId>
<artifactId>
jenkins-test-harness
</artifactId>
<version>
1.58
6
-SNAPSHOT
</version>
<version>
1.58
7
-SNAPSHOT
</version>
<scope>
test
</scope>
<scope>
test
</scope>
</dependency>
</dependency>
<!--
<!--
...
...
pom.xml
浏览文件 @
741e8717
...
@@ -33,7 +33,7 @@ THE SOFTWARE.
...
@@ -33,7 +33,7 @@ THE SOFTWARE.
<groupId>
org.jenkins-ci.main
</groupId>
<groupId>
org.jenkins-ci.main
</groupId>
<artifactId>
pom
</artifactId>
<artifactId>
pom
</artifactId>
<version>
1.58
6
-SNAPSHOT
</version>
<version>
1.58
7
-SNAPSHOT
</version>
<packaging>
pom
</packaging>
<packaging>
pom
</packaging>
<name>
Jenkins main module
</name>
<name>
Jenkins main module
</name>
...
...
test/pom.xml
浏览文件 @
741e8717
...
@@ -29,7 +29,7 @@ THE SOFTWARE.
...
@@ -29,7 +29,7 @@ THE SOFTWARE.
<parent>
<parent>
<artifactId>
pom
</artifactId>
<artifactId>
pom
</artifactId>
<groupId>
org.jenkins-ci.main
</groupId>
<groupId>
org.jenkins-ci.main
</groupId>
<version>
1.58
6
-SNAPSHOT
</version>
<version>
1.58
7
-SNAPSHOT
</version>
</parent>
</parent>
<groupId>
org.jenkins-ci.main
</groupId>
<groupId>
org.jenkins-ci.main
</groupId>
<artifactId>
jenkins-test-harness
</artifactId>
<artifactId>
jenkins-test-harness
</artifactId>
...
@@ -101,7 +101,7 @@ THE SOFTWARE.
...
@@ -101,7 +101,7 @@ THE SOFTWARE.
<dependency>
<dependency>
<groupId>
org.jenkins-ci.plugins
</groupId>
<groupId>
org.jenkins-ci.plugins
</groupId>
<artifactId>
junit
</artifactId>
<artifactId>
junit
</artifactId>
<version>
1.
0
</version>
<version>
1.
2-beta-3
</version>
</dependency>
</dependency>
<dependency>
<dependency>
<groupId>
org.mortbay.jetty
</groupId>
<groupId>
org.mortbay.jetty
</groupId>
...
...
war/pom.xml
浏览文件 @
741e8717
...
@@ -28,7 +28,7 @@ THE SOFTWARE.
...
@@ -28,7 +28,7 @@ THE SOFTWARE.
<parent>
<parent>
<groupId>
org.jenkins-ci.main
</groupId>
<groupId>
org.jenkins-ci.main
</groupId>
<artifactId>
pom
</artifactId>
<artifactId>
pom
</artifactId>
<version>
1.58
6
-SNAPSHOT
</version>
<version>
1.58
7
-SNAPSHOT
</version>
<relativePath>
../pom.xml
</relativePath>
<relativePath>
../pom.xml
</relativePath>
</parent>
</parent>
...
@@ -370,7 +370,7 @@ THE SOFTWARE.
...
@@ -370,7 +370,7 @@ THE SOFTWARE.
<artifactItem>
<artifactItem>
<groupId>
org.jenkins-ci.plugins
</groupId>
<groupId>
org.jenkins-ci.plugins
</groupId>
<artifactId>
junit
</artifactId>
<artifactId>
junit
</artifactId>
<version>
1.
0
</version>
<version>
1.
2-beta-3
</version>
<type>
hpi
</type>
<type>
hpi
</type>
</artifactItem>
</artifactItem>
</artifactItems>
</artifactItems>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录