Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
FIY695
jenkins
提交
65678ad3
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,发现更多精彩内容 >>
提交
65678ad3
编写于
7月 03, 2011
作者:
C
Christoph Kutzinski
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[JENKINS-9301] don't recalculate dependency graph in modules haven't changed
上级
fe3f951e
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
30 addition
and
2 deletion
+30
-2
maven-plugin/src/main/java/hudson/maven/MavenModule.java
maven-plugin/src/main/java/hudson/maven/MavenModule.java
+9
-0
maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java
...lugin/src/main/java/hudson/maven/MavenModuleSetBuild.java
+11
-1
maven-plugin/src/main/java/hudson/maven/PomInfo.java
maven-plugin/src/main/java/hudson/maven/PomInfo.java
+10
-1
未找到文件。
maven-plugin/src/main/java/hudson/maven/MavenModule.java
浏览文件 @
65678ad3
...
...
@@ -191,6 +191,15 @@ public final class MavenModule extends AbstractMavenProject<MavenModule,MavenBui
}
}
}
/**
* Returns if the given POM likely describes the same module with the same dependencies.
* Implementation needs not be 100% accurate in the true case, but it MUST return false
* if is not the same.
*/
public
boolean
isSameModule
(
PomInfo
pom
)
{
return
pom
.
isSimilar
(
this
.
moduleName
,
this
.
dependencies
);
}
@Override
protected
void
doSetName
(
String
name
)
{
...
...
maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java
浏览文件 @
65678ad3
...
...
@@ -842,6 +842,8 @@ public class MavenModuleSetBuild extends AbstractMavenBuild<MavenModuleSet,Maven
}
throw
new
AbortException
();
}
boolean
needsDependencyGraphRecalculation
=
false
;
// update the module list
Map
<
ModuleName
,
MavenModule
>
modules
=
project
.
modules
;
...
...
@@ -858,12 +860,16 @@ public class MavenModuleSetBuild extends AbstractMavenBuild<MavenModuleSet,Maven
if
(
mm
!=
null
)
{
// found an existing matching module
if
(
debug
)
logger
.
println
(
"Reconfiguring "
+
mm
);
if
(!
mm
.
isSameModule
(
pom
))
{
needsDependencyGraphRecalculation
=
true
;
}
mm
.
reconfigure
(
pom
);
modules
.
put
(
pom
.
name
,
mm
);
}
else
{
// this looks like a new module
logger
.
println
(
Messages
.
MavenModuleSetBuild_DiscoveredModule
(
pom
.
name
,
pom
.
displayName
));
mm
=
new
MavenModule
(
project
,
pom
,
getNumber
());
modules
.
put
(
mm
.
getModuleName
(),
mm
);
needsDependencyGraphRecalculation
=
true
;
}
sortedModules
.
add
(
mm
);
mm
.
save
();
...
...
@@ -877,12 +883,16 @@ public class MavenModuleSetBuild extends AbstractMavenBuild<MavenModuleSet,Maven
if
(
debug
)
logger
.
println
(
"Disabling "
+
om
);
om
.
makeDisabled
(
true
);
needsDependencyGraphRecalculation
=
true
;
}
modules
.
putAll
(
old
);
}
// we might have added new modules
Jenkins
.
getInstance
().
rebuildDependencyGraph
();
if
(
needsDependencyGraphRecalculation
)
{
logger
.
println
(
"Modules changed, recalculating dependency graph"
);
Jenkins
.
getInstance
().
rebuildDependencyGraph
();
}
// module builds must start with this build's number
for
(
MavenModule
m
:
modules
.
values
())
...
...
maven-plugin/src/main/java/hudson/maven/PomInfo.java
浏览文件 @
65678ad3
...
...
@@ -155,7 +155,7 @@ final class PomInfo implements Serializable {
this
.
groupId
=
project
.
getGroupId
();
this
.
artifactId
=
project
.
getArtifactId
();
}
/**
* Creates {@link ModuleDependency} that represents this {@link PomInfo}.
*/
...
...
@@ -229,6 +229,15 @@ final class PomInfo implements Serializable {
&&
StringUtils
.
equals
(
pomInfo
.
artifactId
,
this
.
artifactId
);
}
/**
* Returns if groupId, artifactId and dependencies are the same.
*/
public
boolean
isSimilar
(
ModuleName
moduleName
,
Set
<
ModuleDependency
>
dependencies
)
{
return
StringUtils
.
equals
(
this
.
groupId
,
moduleName
.
groupId
)
&&
StringUtils
.
equals
(
this
.
artifactId
,
moduleName
.
artifactId
)
&&
this
.
dependencies
.
equals
(
dependencies
);
}
/**
* for debug purpose
*/
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录