Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
jenkins
提交
ec9d403c
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,发现更多精彩内容 >>
提交
ec9d403c
编写于
5月 22, 2012
作者:
O
Olivier Lamy
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #480 from IanKemp/master
[JENKINS-13822] fix Thanks
上级
6e58e07c
4e8775fc
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
10 addition
and
9 deletion
+10
-9
maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java
maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java
+8
-6
maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java
...lugin/src/main/java/hudson/maven/MavenModuleSetBuild.java
+2
-3
未找到文件。
maven-plugin/src/main/java/hudson/maven/MavenModuleSet.java
浏览文件 @
ec9d403c
...
...
@@ -799,10 +799,10 @@ public class MavenModuleSet extends AbstractMavenProject<MavenModuleSet,MavenMod
final
Set
<
ResourceActivity
>
activities
=
new
HashSet
<
ResourceActivity
>();
activities
.
addAll
(
super
.
getResourceActivities
());
activities
.
addAll
(
Util
.
filter
(
publishers
,
ResourceActivity
.
class
));
activities
.
addAll
(
Util
.
filter
(
publishers
,
ResourceActivity
.
class
));
activities
.
addAll
(
Util
.
filter
(
buildWrappers
,
ResourceActivity
.
class
));
activities
.
addAll
(
Util
.
filter
(
prebuilders
,
ResourceActivity
.
class
));
activities
.
addAll
(
Util
.
filter
(
postbuilders
,
ResourceActivity
.
class
));
activities
.
addAll
(
Util
.
filter
(
prebuilders
,
ResourceActivity
.
class
));
activities
.
addAll
(
Util
.
filter
(
postbuilders
,
ResourceActivity
.
class
));
return
activities
;
}
...
...
@@ -810,9 +810,11 @@ public class MavenModuleSet extends AbstractMavenProject<MavenModuleSet,MavenMod
/**
* Gets the location of top-level <tt>pom.xml</tt> relative to the workspace root.
*/
public
String
getRootPOM
()
{
if
(
rootPOM
==
null
)
return
"pom.xml"
;
return
rootPOM
;
public
String
getRootPOM
(
EnvVars
env
)
{
if
(
rootPOM
==
null
)
return
"pom.xml"
;
// JENKINS-13822
if
(
env
==
null
)
return
rootPOM
;
return
env
.
expand
(
rootPOM
);
}
public
void
setRootPOM
(
String
rootPOM
)
{
...
...
maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java
浏览文件 @
ec9d403c
...
...
@@ -688,7 +688,7 @@ public class MavenModuleSetBuild extends AbstractMavenBuild<MavenModuleSet,Maven
// choice of module root ('ws' in this method) is somewhat arbitrary
// when multiple CVS/SVN modules are checked out, so also check
// the path against the workspace root if that seems like what the user meant (see issue #1293)
String
rootPOM
=
project
.
getRootPOM
(
);
String
rootPOM
=
project
.
getRootPOM
(
envVars
);
// JENKINS-13822
FilePath
pom
=
getModuleRoot
().
child
(
rootPOM
);
FilePath
parentLoc
=
getWorkspace
().
child
(
rootPOM
);
if
(!
pom
.
exists
()
&&
parentLoc
.
exists
())
...
...
@@ -1078,7 +1078,7 @@ public class MavenModuleSetBuild extends AbstractMavenBuild<MavenModuleSet,Maven
MavenModuleSet
project
=
build
.
getProject
();
this
.
listener
=
listener
;
this
.
mavenHome
=
mavenHome
;
this
.
rootPOM
=
project
.
getRootPOM
(
);
this
.
rootPOM
=
project
.
getRootPOM
(
envVars
);
// JENKINS-13822
this
.
profiles
=
project
.
getProfiles
();
this
.
properties
=
project
.
getMavenProperties
();
this
.
updateSnapshots
=
isUpdateSnapshots
(
project
.
getGoals
());
...
...
@@ -1123,7 +1123,6 @@ public class MavenModuleSetBuild extends AbstractMavenBuild<MavenModuleSet,Maven
this
.
globalSetings
=
project
.
globalSettingConfigPath
;
}
private
boolean
isUpdateSnapshots
(
String
goals
)
{
return
StringUtils
.
contains
(
goals
,
"-U"
)
||
StringUtils
.
contains
(
goals
,
"--update-snapshots"
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录