Update governator and archaius deps

Netflix · Aug 20, 2015 · bf71532 · bf71532
1 parent af64644
commit bf71532
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -46,6 +46,8 @@ Thumbs.db
 **/target
 /build
 **/build
+/bin
+**/bin
 
 # IntelliJ specific files/directories
 out

diff --git a/gradle.properties b/gradle.properties
@@ -17,7 +17,7 @@ org.gradle.daemon=true
 
 rxnetty_version=0.4.7
 jersey_version=1.18.1
-governator_version=1.3.3
+governator_version=1.9.3
 pytheas_version=1.25
 apache_httpclient_version=4.2.1
 eureka_version=1.1.151
diff --git a/karyon2-admin/build.gradle b/karyon2-admin/build.gradle
@@ -23,7 +23,6 @@ dependencies {
         compile 'com.sun.jersey.contribs:jersey-guice:${jersey_version}'
         compile "com.sun.jersey:jersey-servlet:${jersey_version}"
         compile "com.sun.jersey:jersey-server:${jersey_version}"
-        compile 'com.google.inject.extensions:guice-servlet:3.0'
         compile "com.netflix.pytheas:pytheas-core:${pytheas_version}"
         compile "com.sun.jersey:jersey-core:${jersey_version}"
         runtime 'org.codehaus.jackson:jackson-mapper-asl:1.9.11'

diff --git a/karyon2-archaius/build.gradle b/karyon2-archaius/build.gradle
@@ -17,7 +17,8 @@ apply plugin: 'osgi'
 
 dependencies {
     compile project(':karyon2-governator')
-    compile 'com.netflix.archaius:archaius-core:0.6.3'
+    compile 'com.netflix.archaius:archaius-core:0.7.2'
+    compile "com.netflix.governator:governator-archaius:$governator_version"
 }
 
 jar {

diff --git a/karyon2-examples/build.gradle b/karyon2-examples/build.gradle
@@ -25,7 +25,6 @@ dependencies {
     compile project(':karyon2-servo')
 
     compile 'org.codehaus.jettison:jettison:1.2'
-    compile 'com.google.inject:guice:3.0'
     compile 'org.slf4j:slf4j-api:1.7.0'
     runtime 'org.slf4j:slf4j-simple:1.7.0'
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -46,6 +46,8 @@ Thumbs.db @@
     **/target
     /build
     **/build
+    /bin
+    **/bin
     # IntelliJ specific files/directories
     out
@@ Expand Down @@