Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
jenkins
提交
aea10298
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,发现更多精彩内容 >>
提交
aea10298
编写于
8月 10, 2013
作者:
O
Olivier Lamy
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
use guice from google rather than a fork
上级
128ba434
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
28 addition
and
39 deletion
+28
-39
core/pom.xml
core/pom.xml
+0
-20
maven-plugin/pom.xml
maven-plugin/pom.xml
+9
-13
pom.xml
pom.xml
+19
-6
未找到文件。
core/pom.xml
浏览文件 @
aea10298
...
...
@@ -87,29 +87,9 @@ THE SOFTWARE.
<optional>
true
</optional>
</dependency>
<!--
<dependency>
<groupId>
com.google.inject
</groupId>
<artifactId>
guice
</artifactId>
<version>3.0</version>
</dependency>
-->
<dependency>
<!-- we'd like to use stock Guice, but that breaks Maven embedder
because it uses a modified Guice called Sisu -->
<groupId>
org.sonatype.sisu
</groupId>
<artifactId>
sisu-guice
</artifactId>
<exclusions>
<!--
sisu-guice wants a patched version of guava, which is old.
but from what I can tell from changes, it's GWT related
and we don't care. So let's stick to the proper guava
-->
<exclusion>
<groupId>
org.sonatype.sisu
</groupId>
<artifactId>
sisu-guava
</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<!-- for compatibility only; all new code should use JNR -->
...
...
maven-plugin/pom.xml
浏览文件 @
aea10298
...
...
@@ -217,6 +217,12 @@ THE SOFTWARE.
<groupId>
org.eclipse.sisu
</groupId>
<artifactId>
org.eclipse.sisu.plexus
</artifactId>
<version>
${sisuInjectVersion}
</version>
<exclusions>
<exclusion>
<groupId>
org.sonatype.sisu
</groupId>
<artifactId>
sisu-guice
</artifactId>
</exclusion>
</exclusions>
</dependency>
<!--
...
...
@@ -233,19 +239,9 @@ THE SOFTWARE.
-->
<dependency>
<groupId>
org.sonatype.sisu
</groupId>
<artifactId>
sisu-guice
</artifactId>
<exclusions>
<exclusion>
<!--
sisu-guice wants a patched version of guava, which is old.
but from what I can tell from changes, it's GWT related
and we don't care. So let's stick to the proper guava
-->
<groupId>
org.sonatype.sisu
</groupId>
<artifactId>
sisu-guava
</artifactId>
</exclusion>
</exclusions>
<groupId>
com.google.inject
</groupId>
<artifactId>
guice
</artifactId>
<version>
4.0-beta
</version>
</dependency>
<!-- JENKINS-10819 : This wagon is safer and more configurable to provide http(s) support -->
...
...
pom.xml
浏览文件 @
aea10298
...
...
@@ -182,13 +182,11 @@ THE SOFTWARE.
<artifactId>
guava
</artifactId>
<version>
11.0.1
</version>
</dependency>
<dependency>
<!-- we'd like to use stock Guice, but that breaks Maven embedder
because it uses a modified Guice called Sisu -->
<groupId>
org.sonatype.sisu
</groupId>
<artifactId>
sisu-guice
</artifactId>
<version>
3.1.0
</version>
<groupId>
com.google.inject
</groupId>
<artifactId>
guice
</artifactId>
<version>
4.0-beta
</version>
</dependency>
<!-- SLF4J used in maven-plugin and core -->
...
...
@@ -636,6 +634,21 @@ THE SOFTWARE.
</rules>
</configuration>
</execution>
<execution>
<id>
enforce-banned-dependencies
</id>
<goals>
<goal>
enforce
</goal>
</goals>
<configuration>
<rules>
<bannedDependencies>
<excludes>
<exclude>
org.sonatype.sisu:sisu-guice
</exclude>
</excludes>
</bannedDependencies>
</rules>
</configuration>
</execution>
</executions>
<dependencies>
<dependency>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录