Merge pull request #51 from allenxwang/cp

Add async HTTP support based on Apache's HttpAsyncClient
Netflix · Oct 27, 2013 · 0655c80 · 0655c80
2 parents ec4de6a + 9bab116
commit 0655c80
Show file tree

Hide file tree

Showing 82 changed files with 5,973 additions and 661 deletions.
diff --git a/build.gradle b/build.gradle
@@ -26,34 +26,35 @@ subprojects {
 
     dependencies {
         compile 'org.slf4j:slf4j-api:1.6.4'
-        compile 'com.netflix.servo:servo-core:0.4.32'
+        compile 'com.netflix.servo:servo-core:0.4.44'
         compile 'com.google.guava:guava:14.0.1'
-        compile 'com.netflix.archaius:archaius-core:0.5.11'
+        compile 'com.netflix.archaius:archaius-core:0.5.12'
         compile 'com.netflix.netflix-commons:netflix-commons-util:0.1.1'
         compile 'commons-collections:commons-collections:3.2.1'
         testCompile 'junit:junit:4.10'
-        testCompile 'log4j:log4j:1.2.16'
-        testCompile 'org.slf4j:slf4j-log4j12:1.6.4'
+        testCompile 'org.slf4j:slf4j-log4j12:1.7.2'
 
     }   
 }
 
 project(':ribbon-core') {
     dependencies {
         compile 'com.netflix.netflix-commons:netflix-statistics:0.1.1'
+        compile 'com.netflix.rxjava:rxjava-core:0.14.2'
     }
 }
 
 project(':ribbon-httpclient') {
     dependencies {
         compile project(':ribbon-core')
         compile 'org.apache.httpcomponents:httpclient:4.2.1' 
-        compile 'com.sun.jersey:jersey-bundle:1.9.1'
+        compile 'com.sun.jersey:jersey-client:1.11'
+        compile 'com.sun.jersey:jersey-core:1.11'
         compile 'javax.ws.rs:jsr311-api:1.1.1' 
-        compile 'com.sun.jersey.contribs:jersey-apache-client4:1.8'
+        compile 'com.sun.jersey.contribs:jersey-apache-client4:1.11'
         testCompile 'asm:asm-all:3.2'
         testCompile 'commons-io:commons-io:2.0.1'
-        testCompile 'com.sun.jersey:jersey-server:1.9.1'
+        testCompile 'com.sun.jersey:jersey-server:1.11'
         testCompile 'com.google.mockwebserver:mockwebserver:20130505'
     }
 }
@@ -64,3 +65,25 @@ project(':ribbon-eureka') {
         compile 'com.netflix.eureka:eureka-client:1.1.107' 
     }    
 }
+
+project(':ribbon-httpasyncclient') {
+    dependencies {
+        compile project(':ribbon-core')
+        compile 'org.apache.httpcomponents:httpasyncclient:4.0-beta4'       
+        testCompile 'com.sun.jersey:jersey-server:1.11'
+        testCompile 'com.sun.jersey:jersey-core:1.11'        
+        testCompile 'asm:asm-all:3.2'
+        testCompile 'commons-io:commons-io:2.0.1' 
+    }
+}
+
+project(':ribbon-examples') {
+    dependencies {
+        compile project(':ribbon-httpclient')
+        compile project(':ribbon-httpasyncclient')
+        compile 'com.google.code.gson:gson:2.2.4'
+        compile 'com.thoughtworks.xstream:xstream:1.4.5'
+        compile 'com.sun.jersey:jersey-server:1.11'
+    }
+}
+
diff --git a/gradle.properties b/gradle.properties
@@ -1 +1,2 @@
-version=0.2.5-SNAPSHOT
+version=0.3.0
+
diff --git a/gradle/check.gradle b/gradle/check.gradle
@@ -1,11 +1,12 @@
 subprojects {
 // Checkstyle
+/* 
 apply plugin: 'checkstyle'
 checkstyle {
     ignoreFailures = true 
     configFile = rootProject.file('codequality/checkstyle.xml')
 }
-
+*/
 // FindBugs
 apply plugin: 'findbugs'
 tasks.withType(FindBugs) {