Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
jenkins
提交
f0dde245
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,发现更多精彩内容 >>
提交
f0dde245
编写于
3月 17, 2011
作者:
O
Olivier Lamy
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[FIXED JENKINS-8573] maven.build.timestamp property is not available during maven build
上级
c2cd2d11
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
53 addition
and
7 deletion
+53
-7
maven-plugin/pom.xml
maven-plugin/pom.xml
+1
-1
maven-plugin/src/main/java/hudson/maven/RedeployPublisher.java
...-plugin/src/main/java/hudson/maven/RedeployPublisher.java
+1
-1
test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java
test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java
+2
-1
test/src/test/java/hudson/maven/Maven3BuildTest.java
test/src/test/java/hudson/maven/Maven3BuildTest.java
+33
-0
test/src/test/java/hudson/maven/MavenBuildTest.java
test/src/test/java/hudson/maven/MavenBuildTest.java
+16
-4
未找到文件。
maven-plugin/pom.xml
浏览文件 @
f0dde245
...
...
@@ -39,7 +39,7 @@ THE SOFTWARE.
<url>
http://wiki.jenkins-ci.org/display/JENKINS/Maven+2+Project+Plugin
</url>
<properties>
<mavenInterceptorsVersion>
1.
0
</mavenInterceptorsVersion>
<mavenInterceptorsVersion>
1.
1
</mavenInterceptorsVersion>
<mavenVersion>
3.0.3
</mavenVersion>
<maven.version>
${mavenVersion}
</maven.version>
<aetherVersion>
1.11
</aetherVersion>
...
...
maven-plugin/src/main/java/hudson/maven/RedeployPublisher.java
浏览文件 @
f0dde245
/*
* The MIT License
*
* Copyright (c) 2004-2010, Sun Microsystems, Inc., Kohsuke Kawaguchi, id:cactusman, Seiji Sogabe
* Copyright (c) 2004-2010, Sun Microsystems, Inc., Kohsuke Kawaguchi, id:cactusman, Seiji Sogabe
, Olivier Lamy
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
...
...
test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java
浏览文件 @
f0dde245
/*
* The MIT License
*
* Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Erik Ramfelt, Yahoo! Inc., Tom Huybrechts
* Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Erik Ramfelt,
* Yahoo! Inc., Tom Huybrechts, Olivier Lamy
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
...
...
test/src/test/java/hudson/maven/Maven3BuildTest.java
浏览文件 @
f0dde245
package
hudson.maven
;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
import
hudson.Launcher
;
import
hudson.model.BuildListener
;
import
hudson.model.ParametersDefinitionProperty
;
...
...
@@ -146,6 +165,20 @@ public class Maven3BuildTest extends HudsonTestCase {
assertEquals
(
"not only one module"
,
1
,
m
.
getModules
().
size
());
}
@Bug
(
8573
)
public
void
testBuildTimeStampProperty
()
throws
Exception
{
MavenInstallation
mavenInstallation
=
configureMaven3
();
MavenModuleSet
m
=
createMavenProject
();
m
.
setMaven
(
mavenInstallation
.
getName
()
);
m
.
getReporters
().
add
(
new
TestReporter
());
m
.
setScm
(
new
ExtractResourceSCM
(
getClass
().
getResource
(
"JENKINS-8573.zip"
)));
m
.
setGoals
(
"process-resources"
);
buildAndAssertSuccess
(
m
);
String
content
=
m
.
getLastBuild
().
getWorkspace
().
child
(
"target/classes/test.txt"
).
readToString
();
assertFalse
(
content
.
contains
(
"${maven.build.timestamp}"
)
);
assertFalse
(
content
.
contains
(
"${maven.build.timestamp}"
)
);
}
private
static
class
TestReporter
extends
MavenReporter
{
@Override
public
boolean
end
(
MavenBuild
build
,
Launcher
launcher
,
BuildListener
listener
)
throws
InterruptedException
,
IOException
{
...
...
test/src/test/java/hudson/maven/MavenBuildTest.java
浏览文件 @
f0dde245
...
...
@@ -5,19 +5,15 @@ import hudson.model.BuildListener;
import
hudson.model.ParametersDefinitionProperty
;
import
hudson.model.Result
;
import
hudson.model.StringParameterDefinition
;
import
hudson.scm.SubversionSCM
;
import
hudson.tasks.Maven.MavenInstallation
;
import
hudson.util.NullStream
;
import
java.io.File
;
import
java.io.IOException
;
import
java.io.PrintWriter
;
import
org.jvnet.hudson.test.Bug
;
import
org.jvnet.hudson.test.Email
;
import
org.jvnet.hudson.test.ExtractResourceSCM
;
import
org.jvnet.hudson.test.HudsonTestCase
;
import
org.tmatesoft.svn.core.SVNException
;
/**
* @author Kohsuke Kawaguchi
...
...
@@ -135,6 +131,22 @@ public class MavenBuildTest extends HudsonTestCase {
assertFalse
(
mmsb
.
getProject
().
getModules
().
isEmpty
());
}
@Bug
(
8573
)
public
void
testBuildTimeStampProperty
()
throws
Exception
{
MavenInstallation
mavenInstallation
=
configureDefaultMaven
();
MavenModuleSet
m
=
createMavenProject
();
m
.
setMaven
(
mavenInstallation
.
getName
()
);
m
.
getReporters
().
add
(
new
TestReporter
());
m
.
setScm
(
new
ExtractResourceSCM
(
getClass
().
getResource
(
"JENKINS-8573.zip"
)));
m
.
setGoals
(
"process-resources"
);
buildAndAssertSuccess
(
m
);
String
content
=
m
.
getLastBuild
().
getWorkspace
().
child
(
"target/classes/test.txt"
).
readToString
();
assertFalse
(
content
.
contains
(
"${maven.build.timestamp}"
)
);
assertFalse
(
content
.
contains
(
"${maven.build.timestamp}"
)
);
System
.
out
.
println
(
"content "
+
content
);
}
private
static
class
TestReporter
extends
MavenReporter
{
@Override
public
boolean
end
(
MavenBuild
build
,
Launcher
launcher
,
BuildListener
listener
)
throws
InterruptedException
,
IOException
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录