Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
jenkins
提交
787123cf
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,发现更多精彩内容 >>
提交
787123cf
编写于
10月 08, 2011
作者:
C
Christoph Kutzinski
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fixed compiler warnings
上级
fc65f0b4
变更
8
显示空白变更内容
内联
并排
Showing
8 changed file
with
11 addition
and
11 deletion
+11
-11
maven-plugin/src/main/java/hudson/maven/AbstractMavenProject.java
...ugin/src/main/java/hudson/maven/AbstractMavenProject.java
+2
-1
maven-plugin/src/main/java/hudson/maven/Maven2Builder.java
maven-plugin/src/main/java/hudson/maven/Maven2Builder.java
+1
-0
maven-plugin/src/main/java/hudson/maven/MavenBuilder.java
maven-plugin/src/main/java/hudson/maven/MavenBuilder.java
+1
-0
maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java
...lugin/src/main/java/hudson/maven/MavenModuleSetBuild.java
+1
-2
maven-plugin/src/main/java/hudson/maven/MavenTestDataPublisher.java
...in/src/main/java/hudson/maven/MavenTestDataPublisher.java
+1
-1
maven-plugin/src/main/java/hudson/maven/RedeployPublisher.java
...-plugin/src/main/java/hudson/maven/RedeployPublisher.java
+1
-2
maven-plugin/src/main/java/hudson/maven/reporters/MavenAbstractArtifactRecord.java
...a/hudson/maven/reporters/MavenAbstractArtifactRecord.java
+3
-3
maven-plugin/src/test/java/hudson/maven/MavenModuleTest.java
maven-plugin/src/test/java/hudson/maven/MavenModuleTest.java
+1
-2
未找到文件。
maven-plugin/src/main/java/hudson/maven/AbstractMavenProject.java
浏览文件 @
787123cf
...
...
@@ -142,6 +142,7 @@ public abstract class AbstractMavenProject<P extends AbstractProject<P,R>,R exte
* @return
* True if any upstream projects are building or in queue, false otherwise.
*/
@SuppressWarnings
(
"rawtypes"
)
private
boolean
areUpstreamsBuilding
(
AbstractProject
<?,?>
downstreamProject
,
AbstractProject
<?,?>
excludeProject
)
{
DependencyGraph
graph
=
Jenkins
.
getInstance
().
getDependencyGraph
();
...
...
maven-plugin/src/main/java/hudson/maven/Maven2Builder.java
浏览文件 @
787123cf
...
...
@@ -51,6 +51,7 @@ import org.apache.maven.project.MavenProject;
* This is only used for
* {@link MavenModuleSet#isAggregatorStyleBuild() the aggregator style build}.
*/
@SuppressWarnings
(
"deprecation"
)
// as we're restricted to Maven 2.x API here, but compile against Maven 3.x, we cannot avoid deprecations
final
class
Maven2Builder
extends
MavenBuilder
{
private
final
Map
<
ModuleName
,
MavenBuildProxy2
>
proxies
;
private
final
Map
<
ModuleName
,
List
<
MavenReporter
>>
reporters
=
new
HashMap
<
ModuleName
,
List
<
MavenReporter
>>();
...
...
maven-plugin/src/main/java/hudson/maven/MavenBuilder.java
浏览文件 @
787123cf
...
...
@@ -69,6 +69,7 @@ import org.codehaus.plexus.configuration.PlexusConfiguration;
* @author Kohsuke Kawaguchi
* @since 1.133
*/
@SuppressWarnings
(
"deprecation"
)
// as we're restricted to Maven 2.x API here, but compile against Maven 3.x we cannot avoid deprecations
public
abstract
class
MavenBuilder
extends
AbstractMavenBuilder
implements
DelegatingCallable
<
Result
,
IOException
>
{
...
...
maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java
浏览文件 @
787123cf
...
...
@@ -472,7 +472,7 @@ public class MavenModuleSetBuild extends AbstractMavenBuild<MavenModuleSet,Maven
}
@Override
public
Fingerprint
.
RangeSet
getDownstreamRelationship
(
AbstractProject
that
)
{
public
Fingerprint
.
RangeSet
getDownstreamRelationship
(
@SuppressWarnings
(
"rawtypes"
)
AbstractProject
that
)
{
Fingerprint
.
RangeSet
rs
=
super
.
getDownstreamRelationship
(
that
);
for
(
List
<
MavenBuild
>
builds
:
getModuleBuilds
().
values
())
for
(
MavenBuild
b
:
builds
)
...
...
@@ -619,7 +619,6 @@ public class MavenModuleSetBuild extends AbstractMavenBuild<MavenModuleSet,Maven
+
" but cannot find the config"
);
}
else
{
logger
.
println
(
"using settings config with name "
+
config
.
name
);
String
settingsContent
=
config
.
content
;
if
(
config
.
content
!=
null
)
{
remoteSettings
=
SettingsProviderUtils
.
copyConfigContentToFilePath
(
config
,
getWorkspace
()
);
project
.
setAlternateSettings
(
remoteSettings
.
getRemote
()
);
...
...
maven-plugin/src/main/java/hudson/maven/MavenTestDataPublisher.java
浏览文件 @
787123cf
...
...
@@ -65,7 +65,7 @@ public class MavenTestDataPublisher extends Recorder {
return
BuildStepMonitor
.
STEP
;
}
public
boolean
perform
(
AbstractBuild
build
,
Launcher
launcher
,
public
boolean
perform
(
AbstractBuild
<?,?>
build
,
Launcher
launcher
,
BuildListener
listener
)
throws
InterruptedException
,
IOException
{
SurefireReport
report
=
build
.
getAction
(
SurefireReport
.
class
);
...
...
maven-plugin/src/main/java/hudson/maven/RedeployPublisher.java
浏览文件 @
787123cf
...
...
@@ -223,7 +223,6 @@ public class RedeployPublisher extends Recorder {
+
" but cannot find the config"
);
}
else
{
listener
.
getLogger
().
println
(
"redeploy publisher using settings config with name "
+
config
.
name
);
String
settingsContent
=
config
.
content
;
if
(
config
.
content
!=
null
)
{
remoteSettingsFromConfig
=
SettingsProviderUtils
.
copyConfigContentToFilePath
(
config
,
build
.
getWorkspace
()
);
altSettingsPath
=
remoteSettingsFromConfig
.
getRemote
();
...
...
@@ -386,7 +385,7 @@ public class RedeployPublisher extends Recorder {
//---------------------------------------------
@SuppressWarnings
(
"deprecation"
)
// as we're restricted to Maven 2.x API here, but compile against Maven 3.x we cannot avoid deprecations
public
static
class
WrappedArtifactRepository
implements
ArtifactRepository
{
private
ArtifactRepository
artifactRepository
;
private
boolean
uniqueVersion
;
...
...
maven-plugin/src/main/java/hudson/maven/reporters/MavenAbstractArtifactRecord.java
浏览文件 @
787123cf
...
...
@@ -105,7 +105,7 @@ public abstract class MavenAbstractArtifactRecord<T extends AbstractBuild<?,?>>
/**
* Returns the log of this deployment record.
*/
public
AnnotatedLargeText
getLog
()
{
public
AnnotatedLargeText
<
Record
>
getLog
()
{
return
new
AnnotatedLargeText
<
Record
>(
new
File
(
getBuild
().
getRootDir
(),
fileName
),
Charset
.
defaultCharset
(),
true
,
this
);
}
...
...
@@ -218,12 +218,12 @@ public abstract class MavenAbstractArtifactRecord<T extends AbstractBuild<?,?>>
final
Record
record
=
new
Record
(
repositoryUrl
,
logFile
.
getName
());
records
.
add
(
record
);
new
TaskThread
(
this
,
ListenerAndText
.
forFile
(
logFile
))
{
new
TaskThread
(
this
,
ListenerAndText
.
forFile
(
logFile
,
this
))
{
protected
void
perform
(
TaskListener
listener
)
throws
Exception
{
try
{
MavenEmbedder
embedder
=
MavenUtil
.
createEmbedder
(
listener
,
getBuild
());
ArtifactRepositoryLayout
layout
=
(
ArtifactRepositoryLayout
)
embedder
.
lookup
(
ArtifactRepositoryLayout
.
class
,
"default"
);
embedder
.
lookup
(
ArtifactRepositoryLayout
.
class
,
"default"
);
ArtifactRepositoryFactory
factory
=
(
ArtifactRepositoryFactory
)
embedder
.
lookup
(
ArtifactRepositoryFactory
.
ROLE
);
...
...
maven-plugin/src/test/java/hudson/maven/MavenModuleTest.java
浏览文件 @
787123cf
...
...
@@ -32,8 +32,6 @@ import com.google.common.collect.Lists;
@PrepareForTest
(
{
MavenModuleSet
.
class
,
DescriptorImpl
.
class
,
AbstractProject
.
class
})
public
class
MavenModuleTest
{
private
MavenModuleSet
parent
;
private
MavenModule
module
;
private
MavenProject
project
;
...
...
@@ -73,6 +71,7 @@ public class MavenModuleTest {
Lists
.<
AbstractProject
<?,?>>
newArrayList
(
this
.
module
,
pluginModule
));
graph
.
build
();
@SuppressWarnings
(
"rawtypes"
)
List
<
AbstractProject
>
downstream
=
graph
.
getDownstream
(
pluginModule
);
Assert
.
assertEquals
(
1
,
downstream
.
size
());
Assert
.
assertSame
(
this
.
module
,
downstream
.
get
(
0
));
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录