Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
五度鱼学Java
jenkins
提交
28ee0372
J
jenkins
项目概览
五度鱼学Java
/
jenkins
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
1
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,发现更多精彩内容 >>
提交
28ee0372
编写于
7月 28, 2016
作者:
S
Stephen Connolly
提交者:
Oliver Gondža
8月 17, 2016
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[JENKINS-37041] Address Code review comments
(cherry picked from commit
d92fd4cc
)
上级
6ea7883f
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
9 addition
and
13 deletion
+9
-13
core/src/main/java/hudson/ClassicPluginStrategy.java
core/src/main/java/hudson/ClassicPluginStrategy.java
+6
-10
core/src/main/java/hudson/PluginManager.java
core/src/main/java/hudson/PluginManager.java
+3
-3
未找到文件。
core/src/main/java/hudson/ClassicPluginStrategy.java
浏览文件 @
28ee0372
...
...
@@ -57,17 +57,13 @@ import java.io.FileInputStream;
import
java.io.FilenameFilter
;
import
java.io.IOException
;
import
java.lang.reflect.Field
;
import
java.lang.reflect.InvocationTargetException
;
import
java.net.URI
;
import
java.net.URL
;
import
java.nio.file.Path
;
import
java.util.ArrayList
;
import
java.util.Arrays
;
import
java.util.Collection
;
import
java.util.Collections
;
import
java.util.Enumeration
;
import
java.util.HashSet
;
import
java.util.LinkedHashSet
;
import
java.util.List
;
import
java.util.Set
;
import
java.util.Vector
;
...
...
@@ -277,7 +273,7 @@ public class ClassicPluginStrategy implements PluginStrategy {
}
// some earlier versions of maven-hpi-plugin apparently puts "null" as a literal in Hudson-Version. watch out for them.
if
(
jenkinsVersion
==
null
||
jenkinsVersion
.
equals
(
"null"
)
||
new
VersionNumber
(
jenkinsVersion
).
compareTo
(
detached
.
splitWhen
)
<=
0
)
{
out
.
add
(
new
PluginWrapper
.
Dependency
(
detached
.
shortName
+
':'
+
detached
.
requireVersion
));
out
.
add
(
new
PluginWrapper
.
Dependency
(
detached
.
shortName
+
':'
+
detached
.
require
d
Version
));
LOGGER
.
log
(
Level
.
FINE
,
"adding implicit dependency {0} → {1} because of {2}"
,
new
Object
[]
{
pluginName
,
detached
.
shortName
,
jenkinsVersion
});
}
}
...
...
@@ -378,12 +374,12 @@ public class ClassicPluginStrategy implements PluginStrategy {
* be "1.123.*" (because 1.124 will be the first version that doesn't include the removed code.)
*/
private
final
VersionNumber
splitWhen
;
private
final
String
requireVersion
;
private
final
String
require
d
Version
;
private
DetachedPlugin
(
String
shortName
,
String
splitWhen
,
String
requireVersion
)
{
private
DetachedPlugin
(
String
shortName
,
String
splitWhen
,
String
require
d
Version
)
{
this
.
shortName
=
shortName
;
this
.
splitWhen
=
new
VersionNumber
(
splitWhen
);
this
.
require
Version
=
require
Version
;
this
.
require
dVersion
=
required
Version
;
}
/**
...
...
@@ -408,8 +404,8 @@ public class ClassicPluginStrategy implements PluginStrategy {
* @return the minimum required version for the current version of Jenkins.
* @sice 2.16
*/
public
VersionNumber
getRequireVersion
()
{
return
new
VersionNumber
(
requireVersion
);
public
VersionNumber
getRequire
d
Version
()
{
return
new
VersionNumber
(
require
d
Version
);
}
}
...
...
core/src/main/java/hudson/PluginManager.java
浏览文件 @
28ee0372
...
...
@@ -719,11 +719,11 @@ public abstract class PluginManager extends AbstractModelObject implements OnMas
final
Set
<
ClassicPluginStrategy
.
DetachedPlugin
>
forceUpgrade
=
new
HashSet
<>();
for
(
ClassicPluginStrategy
.
DetachedPlugin
p
:
ClassicPluginStrategy
.
getDetachedPlugins
())
{
VersionNumber
installedVersion
=
getPluginVersion
(
rootDir
,
p
.
getShortName
());
VersionNumber
require
Version
=
p
.
getRequire
Version
();
if
(
installedVersion
!=
null
&&
installedVersion
.
isOlderThan
(
requireVersion
))
{
VersionNumber
require
dVersion
=
p
.
getRequired
Version
();
if
(
installedVersion
!=
null
&&
installedVersion
.
isOlderThan
(
require
d
Version
))
{
LOGGER
.
log
(
Level
.
WARNING
,
"Detached plugin {0} found at version {1}, required minimum version is {2}"
,
new
Object
[]{
p
.
getShortName
(),
installedVersion
,
requireVersion
});
new
Object
[]{
p
.
getShortName
(),
installedVersion
,
require
d
Version
});
forceUpgrade
.
add
(
p
);
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录