Merge pull request #69 from muellerfabian/master

Removed conflicting dependency
jfrog · Dec 14, 2015 · cd8956f · cd8956f
2 parents 571a583 + 52de1ad
commit cd8956f
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/services/build.gradle b/services/build.gradle
@@ -6,7 +6,9 @@ dependencies {
     compile addGroovy('groovy')
     compile addGroovy('groovy-json')
     compile addGroovy('groovy-xml')
-    compile group: 'org.codehaus.groovy.modules.http-builder', name: 'http-builder', version: '0.7.1'
+    compile (group:'org.codehaus.groovy.modules.http-builder', name: 'http-builder', version: '0.7.1') {
+        exclude group: 'org.apache.httpcomponents', module: 'httpclient'
+    }
     compile group: 'net.sourceforge.nekohtml', name: 'nekohtml', version: '1.9.17'
     compile addSlf4J('slf4j-api')
     compile addSlf4J('log4j-over-slf4j')