You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@aurora.apache.org by zm...@apache.org on 2015/08/31 22:01:52 UTC
[1/3] aurora git commit: WIP of upgrading guice.
Repository: aurora
Updated Branches:
refs/heads/zmanji/upgrade-guice [created] 5be754a06
WIP of upgrading guice.
Project: http://git-wip-us.apache.org/repos/asf/aurora/repo
Commit: http://git-wip-us.apache.org/repos/asf/aurora/commit/9d0fc043
Tree: http://git-wip-us.apache.org/repos/asf/aurora/tree/9d0fc043
Diff: http://git-wip-us.apache.org/repos/asf/aurora/diff/9d0fc043
Branch: refs/heads/zmanji/upgrade-guice
Commit: 9d0fc0433861dbca4bd5a31359c14ae358dd89ae
Parents: 04b6858
Author: Zameer Manji <zm...@apache.org>
Authored: Sun Aug 30 21:55:43 2015 -0700
Committer: Zameer Manji <zm...@apache.org>
Committed: Mon Aug 31 10:58:25 2015 -0700
----------------------------------------------------------------------
build.gradle | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aurora/blob/9d0fc043/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 9c78aff..6de944e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -85,7 +85,7 @@ For more details, please see https://issues.apache.org/jira/browse/AURORA-1169
ext.guavaRev = '18.0'
ext.slf4jRev = '1.7.12'
ext.thriftRev = '0.9.1'
- ext.guiceRev = '3.0'
+ ext.guiceRev = '4.0'
ext.servletRev = '2.5'
ext.stringTemplateRev = '3.2.1'
ext.zookeeperRev = '3.3.4'
@@ -110,6 +110,10 @@ For more details, please see https://issues.apache.org/jira/browse/AURORA-1169
force "org.hamcrest:hamcrest-core:1.3"
force "org.apache.thrift:libthrift:${thriftRev}"
force "org.slf4j:slf4j-jdk14:${slf4jRev}"
+ force "com.google.guava:guava:${guavaRev}"
+ force "com.google.inject:guice:${guiceRev}"
+ force "com.google.inject.extensions:guice-multibindings:${guiceRev}"
+ force "com.google.inject.extensions:guice-servlet:${guiceRev}"
}
}
}
@@ -345,7 +349,7 @@ dependencies {
compile "log4j:log4j:${log4jRev}"
compile "org.antlr:stringtemplate:${stringTemplateRev}"
compile 'org.apache.mesos:mesos:0.23.0'
- compile("org.apache.shiro:shiro-guice:${shiroRev}")
+ compile "org.apache.shiro:shiro-guice:${shiroRev}"
compile "org.apache.shiro:shiro-web:${shiroRev}"
compile "org.apache.zookeeper:zookeeper:${zookeeperRev}"
compile "org.eclipse.jetty:jetty-rewrite:${jettyDep}"
[3/3] aurora git commit: Remove exclude.
Posted by zm...@apache.org.
Remove exclude.
Project: http://git-wip-us.apache.org/repos/asf/aurora/repo
Commit: http://git-wip-us.apache.org/repos/asf/aurora/commit/5be754a0
Tree: http://git-wip-us.apache.org/repos/asf/aurora/tree/5be754a0
Diff: http://git-wip-us.apache.org/repos/asf/aurora/diff/5be754a0
Branch: refs/heads/zmanji/upgrade-guice
Commit: 5be754a069834599babe82424a51b2571f1fbe83
Parents: e9fa4ba
Author: Zameer Manji <zm...@apache.org>
Authored: Mon Aug 31 13:01:36 2015 -0700
Committer: Zameer Manji <zm...@apache.org>
Committed: Mon Aug 31 13:01:36 2015 -0700
----------------------------------------------------------------------
build.gradle | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aurora/blob/5be754a0/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index f2303e1..eb87e3f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -344,9 +344,7 @@ dependencies {
compile "com.sun.jersey:jersey-json:${jerseyRev}"
compile "com.sun.jersey:jersey-server:${jerseyRev}"
compile "com.sun.jersey:jersey-servlet:${jerseyRev}"
- compile("com.sun.jersey.contribs:jersey-guice:${jerseyRev}") {
- exclude group: 'com.google.inject.extensions'
- }
+ compile "com.sun.jersey.contribs:jersey-guice:${jerseyRev}"
compile 'javax.inject:javax.inject:1'
compile "javax.servlet:servlet-api:${servletRev}"
compile "log4j:log4j:${log4jRev}"
[2/3] aurora git commit: Remove guice-servlet 3.0 from the classpath.
Posted by zm...@apache.org.
Remove guice-servlet 3.0 from the classpath.
Project: http://git-wip-us.apache.org/repos/asf/aurora/repo
Commit: http://git-wip-us.apache.org/repos/asf/aurora/commit/e9fa4ba3
Tree: http://git-wip-us.apache.org/repos/asf/aurora/tree/e9fa4ba3
Diff: http://git-wip-us.apache.org/repos/asf/aurora/diff/e9fa4ba3
Branch: refs/heads/zmanji/upgrade-guice
Commit: e9fa4ba35f8651661bcfc540a7fbe07bb3bbdc30
Parents: 9d0fc04
Author: Zameer Manji <zm...@apache.org>
Authored: Mon Aug 31 12:59:08 2015 -0700
Committer: Zameer Manji <zm...@apache.org>
Committed: Mon Aug 31 12:59:08 2015 -0700
----------------------------------------------------------------------
build.gradle | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/aurora/blob/e9fa4ba3/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 6de944e..f2303e1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -157,6 +157,7 @@ project(':commons') {
compile "com.google.code.gson:gson:${gsonRev}"
compile "com.google.guava:guava:${guavaRev}"
compile "com.google.inject.extensions:guice-multibindings:${guiceRev}"
+ compile "com.google.inject.extensions:guice-servlet:${guiceRev}"
compile "com.google.inject:guice:${guiceRev}"
compile "com.sun.jersey.contribs:jersey-guice:${jerseyRev}"
compile "com.sun.jersey:jersey-core:${jerseyRev}"
@@ -343,7 +344,9 @@ dependencies {
compile "com.sun.jersey:jersey-json:${jerseyRev}"
compile "com.sun.jersey:jersey-server:${jerseyRev}"
compile "com.sun.jersey:jersey-servlet:${jerseyRev}"
- compile "com.sun.jersey.contribs:jersey-guice:${jerseyRev}"
+ compile("com.sun.jersey.contribs:jersey-guice:${jerseyRev}") {
+ exclude group: 'com.google.inject.extensions'
+ }
compile 'javax.inject:javax.inject:1'
compile "javax.servlet:servlet-api:${servletRev}"
compile "log4j:log4j:${log4jRev}"
@@ -364,8 +367,6 @@ dependencies {
testCompile "com.sun.jersey:jersey-client:${jerseyRev}"
testCompile "junit:junit:${junitRev}"
- configurations.compile {
- }
}
// For normal developer builds, avoid running the often-time-consuming code quality checks.