Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
野花太放肆
jenkins
提交
0b91480b
J
jenkins
项目概览
野花太放肆
/
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,发现更多精彩内容 >>
提交
0b91480b
编写于
7月 15, 2013
作者:
J
Jesse Glick
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Playing with Maven 3.1.0 upgrade.
上级
ef089002
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
16 addition
and
14 deletion
+16
-14
maven-plugin/pom.xml
maven-plugin/pom.xml
+8
-8
maven-plugin/src/main/java/hudson/maven/EmbedderLoggerImpl.java
...plugin/src/main/java/hudson/maven/EmbedderLoggerImpl.java
+1
-0
maven-plugin/src/main/java/hudson/maven/Maven3Builder.java
maven-plugin/src/main/java/hudson/maven/Maven3Builder.java
+1
-0
maven-plugin/src/main/java/hudson/maven/MavenEmbedderRequest.java
...ugin/src/main/java/hudson/maven/MavenEmbedderRequest.java
+2
-2
maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java
...lugin/src/main/java/hudson/maven/MavenModuleSetBuild.java
+3
-3
maven-plugin/src/main/java/hudson/maven/RedeployPublisher.java
...-plugin/src/main/java/hudson/maven/RedeployPublisher.java
+1
-1
未找到文件。
maven-plugin/pom.xml
浏览文件 @
0b91480b
...
...
@@ -42,9 +42,9 @@ THE SOFTWARE.
<properties>
<mavenInterceptorsVersion>
1.3
</mavenInterceptorsVersion>
<mavenVersion>
3.
0.5
</mavenVersion>
<mavenVersion>
3.
1.0
</mavenVersion>
<maven.version>
${mavenVersion}
</maven.version>
<aetherVersion>
1.13.1
</aetherVersion>
<aetherVersion>
0.9.0.M2
</aetherVersion>
<sisuInjectVersion>
2.3.0
</sisuInjectVersion>
<wagonVersion>
2.4
</wagonVersion>
</properties>
...
...
@@ -147,27 +147,27 @@ THE SOFTWARE.
<dependency>
<groupId>
org.
sonatyp
e.aether
</groupId>
<groupId>
org.
eclips
e.aether
</groupId>
<artifactId>
aether-api
</artifactId>
<version>
${aetherVersion}
</version>
</dependency>
<dependency>
<groupId>
org.
sonatyp
e.aether
</groupId>
<groupId>
org.
eclips
e.aether
</groupId>
<artifactId>
aether-impl
</artifactId>
<version>
${aetherVersion}
</version>
</dependency>
<dependency>
<groupId>
org.
sonatyp
e.aether
</groupId>
<groupId>
org.
eclips
e.aether
</groupId>
<artifactId>
aether-spi
</artifactId>
<version>
${aetherVersion}
</version>
</dependency>
<dependency>
<groupId>
org.
sonatyp
e.aether
</groupId>
<groupId>
org.
eclips
e.aether
</groupId>
<artifactId>
aether-util
</artifactId>
<version>
${aetherVersion}
</version>
</dependency>
<dependency>
<groupId>
org.
sonatyp
e.aether
</groupId>
<groupId>
org.
eclips
e.aether
</groupId>
<artifactId>
aether-connector-wagon
</artifactId>
<version>
${aetherVersion}
</version>
<exclusions>
...
...
@@ -281,7 +281,7 @@ THE SOFTWARE.
<dependency>
<groupId>
org.jenkins-ci.lib
</groupId>
<artifactId>
lib-jenkins-maven-embedder
</artifactId>
<version>
3.
9
</version>
<version>
3.
10-SNAPSHOT
</version>
<exclusions>
<exclusion>
<!-- we'll add our own patched version. see https://issues.jenkins-ci.org/browse/JENKINS-1680 -->
<groupId>
jtidy
</groupId>
...
...
maven-plugin/src/main/java/hudson/maven/EmbedderLoggerImpl.java
浏览文件 @
0b91480b
...
...
@@ -38,6 +38,7 @@ import org.codehaus.plexus.logging.console.ConsoleLogger;
*
* @author Kohsuke Kawaguchi
*/
// TODO this is gone in 3.1.0, replaced by SLF4J
public
final
class
EmbedderLoggerImpl
extends
MavenLoggerManager
{
private
final
PrintStream
logger
;
...
...
maven-plugin/src/main/java/hudson/maven/Maven3Builder.java
浏览文件 @
0b91480b
...
...
@@ -200,6 +200,7 @@ public class Maven3Builder extends AbstractMavenBuilder implements DelegatingCal
// TODO: we should think about reusing the code in org.apache.maven.cli.DefaultMavenExecutionRequestBuilder#logging?
// E.g. there's also the option to redirect logging to a file which is handled there, but not here.
// TODO replace with SLF4J
PrintStreamLogger
logger
=
new
PrintStreamLogger
(
maven3Builder
.
listener
.
getLogger
()
);
if
(
maven3Builder
.
isDebug
())
{
logger
.
setThreshold
(
PrintStreamLogger
.
LEVEL_DEBUG
);
...
...
maven-plugin/src/main/java/hudson/maven/MavenEmbedderRequest.java
浏览文件 @
0b91480b
...
...
@@ -34,8 +34,8 @@ import java.util.Properties;
import
org.apache.commons.io.IOUtils
;
import
org.apache.maven.model.building.ModelBuildingRequest
;
import
org.
sonatyp
e.aether.repository.WorkspaceReader
;
import
org.
sonatyp
e.aether.transfer.TransferListener
;
import
org.
eclips
e.aether.repository.WorkspaceReader
;
import
org.
eclips
e.aether.transfer.TransferListener
;
/**
* @author Olivier Lamy
...
...
maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java
浏览文件 @
0b91480b
...
...
@@ -100,9 +100,9 @@ import org.codehaus.plexus.util.PathTool;
import
org.kohsuke.stapler.StaplerRequest
;
import
org.kohsuke.stapler.StaplerResponse
;
import
org.kohsuke.stapler.export.Exported
;
import
org.
sonatyp
e.aether.transfer.TransferCancelledException
;
import
org.
sonatyp
e.aether.transfer.TransferEvent
;
import
org.
sonatyp
e.aether.transfer.TransferListener
;
import
org.
eclips
e.aether.transfer.TransferCancelledException
;
import
org.
eclips
e.aether.transfer.TransferEvent
;
import
org.
eclips
e.aether.transfer.TransferListener
;
/**
* {@link Build} for {@link MavenModuleSet}.
...
...
maven-plugin/src/main/java/hudson/maven/RedeployPublisher.java
浏览文件 @
0b91480b
...
...
@@ -64,7 +64,7 @@ import org.apache.maven.artifact.repository.ArtifactRepositoryFactory;
import
org.apache.maven.artifact.repository.ArtifactRepositoryPolicy
;
import
org.apache.maven.artifact.repository.Authentication
;
import
org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout
;
import
org.apache.maven.cli.BatchModeMavenTransferListener
;
import
org.apache.maven.cli.
transfer.
BatchModeMavenTransferListener
;
import
org.apache.maven.repository.Proxy
;
import
org.codehaus.plexus.component.repository.exception.ComponentLookupException
;
import
org.kohsuke.stapler.DataBoundConstructor
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录