Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
FIY695
jenkins
提交
56a1d03f
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,发现更多精彩内容 >>
提交
56a1d03f
编写于
4月 15, 2011
作者:
K
Kohsuke Kawaguchi
浏览文件
操作
浏览文件
下载
差异文件
Merge remote branch 'origin/rc'
上级
fcf7f46f
f3c44a0d
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
8 addition
and
9 deletion
+8
-9
core/src/main/resources/hudson/AboutJenkins/index.jelly
core/src/main/resources/hudson/AboutJenkins/index.jelly
+2
-3
core/src/main/resources/hudson/PluginManager/installed.jelly
core/src/main/resources/hudson/PluginManager/installed.jelly
+1
-1
core/src/main/resources/hudson/PluginWrapper/thirdPartyLicenses.jelly
...n/resources/hudson/PluginWrapper/thirdPartyLicenses.jelly
+2
-2
core/src/main/resources/hudson/PluginWrapper/thirdPartyLicenses.properties
...ources/hudson/PluginWrapper/thirdPartyLicenses.properties
+0
-0
core/src/main/resources/lib/hudson/thirdPartyLicenses.jelly
core/src/main/resources/lib/hudson/thirdPartyLicenses.jelly
+0
-0
core/src/test/java/hudson/util/io/TarArchiverTest.java
core/src/test/java/hudson/util/io/TarArchiverTest.java
+3
-3
未找到文件。
core/src/main/resources/hudson/AboutJenkins/index.jelly
浏览文件 @
56a1d03f
...
...
@@ -25,7 +25,6 @@ THE SOFTWARE.
<!-- 3rd party license acknowledgements and -->
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:s="/lib/form">
<l:layout title="${%about(app.VERSION)}">
<st:include it="${app}" page="sidepanel.jelly" />
<l:main-panel>
<h1>${%about(app.VERSION)}</h1>
<p>
...
...
@@ -35,9 +34,9 @@ THE SOFTWARE.
<p>
${%dependencies}
</p>
<t:
3
rdPartyLicenses>
<t:
thi
rdPartyLicenses>
<st:include page="/META-INF/licenses.xml" />
</t:
3
rdPartyLicenses>
</t:
thi
rdPartyLicenses>
</l:main-panel>
</l:layout>
</j:jelly>
core/src/main/resources/hudson/PluginManager/installed.jelly
浏览文件 @
56a1d03f
...
...
@@ -68,7 +68,7 @@ THE SOFTWARE.
</div>
</td>
<td class="center pane" style="white-space:nowrap">
<a href="plugin/${p.shortName}/
3
rdPartyLicenses">
<a href="plugin/${p.shortName}/
thi
rdPartyLicenses">
${p.version}
</a>
</td>
...
...
core/src/main/resources/hudson/PluginWrapper/
3
rdPartyLicenses.jelly
→
core/src/main/resources/hudson/PluginWrapper/
thi
rdPartyLicenses.jelly
浏览文件 @
56a1d03f
...
...
@@ -29,7 +29,7 @@ THE SOFTWARE.
<h1>${%about(it.longName+' '+it.version)}</h1>
<h3>${%3rd Party Dependencies}</h3>
<t:
3
rdPartyLicenses>
<t:
thi
rdPartyLicenses>
<j:choose>
<j:when test="${it.hasLicensesXml()}">
<j:include uri="${it.baseResourceURL}/WEB-INF/licenses.xml" />
...
...
@@ -38,7 +38,7 @@ THE SOFTWARE.
<p>${%No information recorded}</p>
</j:otherwise>
</j:choose>
</t:
3
rdPartyLicenses>
</t:
thi
rdPartyLicenses>
</l:main-panel>
</l:layout>
</j:jelly>
core/src/main/resources/hudson/PluginWrapper/
3
rdPartyLicenses.properties
→
core/src/main/resources/hudson/PluginWrapper/
thi
rdPartyLicenses.properties
浏览文件 @
56a1d03f
文件已移动
core/src/main/resources/lib/hudson/
3
rdPartyLicenses.jelly
→
core/src/main/resources/lib/hudson/
thi
rdPartyLicenses.jelly
浏览文件 @
56a1d03f
文件已移动
core/src/test/java/hudson/util/io/TarArchiverTest.java
浏览文件 @
56a1d03f
...
...
@@ -44,8 +44,8 @@ public class TarArchiverTest extends TestCase {
public
void
testPermission
()
throws
Exception
{
if
(
Functions
.
isWindows
())
return
;
// can't test on Windows
File
tar
=
new
File
(
"test.
tar"
);
File
zip
=
new
File
(
"test.
zip"
);
File
tar
=
File
.
createTempFile
(
"test"
,
"
tar"
);
File
zip
=
File
.
createTempFile
(
"test"
,
"
zip"
);
FilePath
dir
=
new
FilePath
(
File
.
createTempFile
(
"test"
,
"dir"
));
...
...
@@ -88,7 +88,7 @@ public class TarArchiverTest extends TestCase {
}
finally
{
tar
.
delete
();
zip
.
delete
();
dir
.
delete
();
dir
.
delete
Recursive
();
}
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录