Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
LinuxSuRen
jenkins
提交
c50a7cc6
J
jenkins
项目概览
LinuxSuRen
/
jenkins
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
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,发现更多精彩内容 >>
提交
c50a7cc6
编写于
7月 20, 2013
作者:
O
Olivier Lamy
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
use new maven3 interceptor commons jar
上级
565586f8
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
28 addition
and
0 deletion
+28
-0
maven-plugin/pom.xml
maven-plugin/pom.xml
+5
-0
maven-plugin/src/main/java/hudson/maven/AbstractMavenProcessFactory.java
...c/main/java/hudson/maven/AbstractMavenProcessFactory.java
+14
-0
maven-plugin/src/main/java/hudson/maven/Maven3ProcessFactory.java
...ugin/src/main/java/hudson/maven/Maven3ProcessFactory.java
+7
-0
maven-plugin/src/main/java/hudson/maven/MavenComputerListener.java
...gin/src/main/java/hudson/maven/MavenComputerListener.java
+2
-0
未找到文件。
maven-plugin/pom.xml
浏览文件 @
c50a7cc6
...
...
@@ -119,6 +119,11 @@ THE SOFTWARE.
<artifactId>
maven3-interceptor
</artifactId>
<version>
${mavenInterceptorsVersion}
</version>
</dependency>
<dependency>
<groupId>
org.jenkins-ci.main.maven
</groupId>
<artifactId>
maven3-interceptor-commons
</artifactId>
<version>
${mavenInterceptorsVersion}
</version>
</dependency>
<dependency>
<groupId>
org.apache.ant
</groupId>
<artifactId>
ant
</artifactId>
...
...
maven-plugin/src/main/java/hudson/maven/AbstractMavenProcessFactory.java
浏览文件 @
c50a7cc6
...
...
@@ -324,6 +324,12 @@ public abstract class AbstractMavenProcessFactory
// interceptor.jar
args
.
add
(
getMavenInterceptorClassPath
(
mvn
,
isMaster
,
slaveRoot
));
String
mavenInterceptorCommonClasspath
=
getMavenInterceptorCommonClassPath
(
mvn
,
isMaster
,
slaveRoot
);
if
(
mavenInterceptorCommonClasspath
!=
null
){
args
.
add
(
mavenInterceptorCommonClasspath
);
}
// TCP/IP port to establish the remoting infrastructure
args
.
add
(
tcpPort
);
...
...
@@ -344,6 +350,14 @@ public abstract class AbstractMavenProcessFactory
* Returns the classpath string for the maven-interceptor jar
*/
protected
abstract
String
getMavenInterceptorClassPath
(
MavenInstallation
mvn
,
boolean
isMaster
,
FilePath
slaveRoot
)
throws
IOException
,
InterruptedException
;
/**
* Returns the classpath string for the maven-interceptor jar
* @since 1.525
*/
protected
String
getMavenInterceptorCommonClassPath
(
MavenInstallation
mvn
,
boolean
isMaster
,
FilePath
slaveRoot
)
throws
IOException
,
InterruptedException
{
return
null
;
}
/**
* For Maven 2.1.x - 2.2.x we need an additional jar which overrides some classes in the other interceptor jar.
...
...
maven-plugin/src/main/java/hudson/maven/Maven3ProcessFactory.java
浏览文件 @
c50a7cc6
...
...
@@ -41,6 +41,7 @@ import java.net.URL;
import
org.jvnet.hudson.maven3.agent.Maven3Main
;
import
org.jvnet.hudson.maven3.launcher.Maven3Launcher
;
import
org.jvnet.hudson.maven3.listeners.HudsonMavenExecutionResult
;
/**
* {@link AbstractMavenProcessFactory} for Maven 3.
...
...
@@ -74,6 +75,12 @@ public class Maven3ProcessFactory extends AbstractMavenProcessFactory implements
slaveRoot
.
child
(
"maven3-interceptor.jar"
).
getRemote
();
}
protected
String
getMavenInterceptorCommonClassPath
(
MavenInstallation
mvn
,
boolean
isMaster
,
FilePath
slaveRoot
)
throws
IOException
,
InterruptedException
{
return
isMaster
?
Which
.
jarFile
(
HudsonMavenExecutionResult
.
class
).
getAbsolutePath
():
slaveRoot
.
child
(
"maven3-interceptor-commons.jar"
).
getRemote
();
}
@Override
protected
String
getMavenInterceptorOverride
(
MavenInstallation
mvn
,
boolean
isMaster
,
FilePath
slaveRoot
)
throws
IOException
,
...
...
maven-plugin/src/main/java/hudson/maven/MavenComputerListener.java
浏览文件 @
c50a7cc6
...
...
@@ -43,6 +43,7 @@ import org.apache.tools.ant.taskdefs.Zip;
import
org.codehaus.plexus.classworlds.ClassWorld
;
import
org.jvnet.hudson.maven3.agent.Maven3Main
;
import
org.jvnet.hudson.maven3.launcher.Maven3Launcher
;
import
org.jvnet.hudson.maven3.listeners.HudsonMavenExecutionResult
;
/**
* When a slave is connected, copy <tt>maven-agent.jar</tt> and <tt>maven-intercepter.jar</tt>
...
...
@@ -58,6 +59,7 @@ public class MavenComputerListener extends ComputerListener {
copyJar
(
logger
,
root
,
Maven3Main
.
class
,
"maven3-agent"
);
copyJar
(
logger
,
root
,
Maven3Launcher
.
class
,
"maven3-interceptor"
);
copyJar
(
logger
,
root
,
AbortException
.
class
,
"maven-interceptor"
);
copyJar
(
logger
,
root
,
HudsonMavenExecutionResult
.
class
,
"maven3-interceptor-commons"
);
copyJar
(
logger
,
root
,
Maven21Interceptor
.
class
,
"maven2.1-interceptor"
);
copyJar
(
logger
,
root
,
ClassWorld
.
class
,
"plexus-classworld"
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录