(MAINT) Update to latest apache httpasyncclient

This commit updates us to the latest version of the Apache
HTTPAsyncClient.  This is necessary in order to make it
possible to use this library in the same VM as the latest
version of clj-http, because they have some common dependencies.

The commit also cleans up some other dependencies while I was
in there.

project.clj

@@ -1,6 +1,6 @@
-(def ks-version "1.0.0")
-(def tk-version "1.1.0")
-(def tk-jetty-version "1.2.0")
+(def ks-version "1.2.0")
+(def tk-version "1.1.1")
+(def tk-jetty-version "1.5.0")
 
 (defproject puppetlabs/http-client "0.4.6-SNAPSHOT"
   :description "HTTP client wrapper"
@@ -12,16 +12,14 @@
   ;; requires lein 2.2.0+.
   :pedantic? :abort
 
-  :dependencies [[org.clojure/clojure "1.6.0"]
-                 [puppetlabs/ssl-utils "0.8.0"]
-                 [org.clojure/tools.logging "0.2.6"]
-                 [puppetlabs/kitchensink ~ks-version]
-                 [org.slf4j/slf4j-api "1.7.6"]
-                 [org.apache.httpcomponents/httpasyncclient "4.0.2"]
-                 [org.apache.httpcomponents/httpcore "4.3.2"]
-                 [commons-io "2.1"]
-                 [prismatic/schema "0.4.0"]
-                 [prismatic/plumbing "0.4.2"]]
+  :dependencies [[org.clojure/clojure "1.7.0"]
+
+                 [org.apache.httpcomponents/httpasyncclient "4.1.1"]
+                 [prismatic/schema "1.0.4"]
+                 [org.slf4j/slf4j-api "1.7.13"]
+                 [commons-io "2.4"]
+
+                 [puppetlabs/ssl-utils "0.8.1"]] 
 
   :source-paths ["src/clj"]
   :java-source-paths ["src/java"]
@@ -36,9 +34,7 @@
                                   [puppetlabs/trapperkeeper ~tk-version]
                                   [puppetlabs/trapperkeeper ~tk-version :classifier "test"]
                                   [puppetlabs/trapperkeeper-webserver-jetty9 ~tk-jetty-version]
-                                  [puppetlabs/trapperkeeper-webserver-jetty9 ~tk-jetty-version :classifier "test"]
-                                  [spyscope "0.1.4" :exclusions [clj-time]]]
-                   :injections [(require 'spyscope.core)]
+                                  [puppetlabs/trapperkeeper-webserver-jetty9 ~tk-jetty-version :classifier "test"]]
                    ;; TK-143, enable SSLv3 for unit tests that exercise SSLv3
                    :jvm-opts ["-Djava.security.properties=./dev-resources/java.security"]}
              :sources-jar {:java-source-paths ^:replace []

src/clj/puppetlabs/http/client/async.clj

@@ -29,13 +29,12 @@
            (org.apache.http.client.config RequestConfig)
            (org.apache.http.nio.client.methods HttpAsyncMethods)
            (org.apache.http.nio.client HttpAsyncClient)
-           (org.apache.http.client.protocol ResponseContentEncoding))
+           (org.apache.http.client.protocol ResponseContentEncoding)
+           (org.apache.http.protocol BasicHttpContext))
   (:require [puppetlabs.ssl-utils.core :as ssl]
             [clojure.string :as str]
-            [puppetlabs.kitchensink.core :as ks]
             [puppetlabs.http.client.common :as common]
-            [schema.core :as schema]
-            [clojure.tools.logging :as log])
+            [schema.core :as schema])
   (:refer-clojure :exclude (get)))
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -192,16 +191,18 @@
   [opts http-response]
   (let [headers       (get-resp-headers http-response)
         orig-encoding (headers "content-encoding")]
-    {:opts                  opts
+    {:opts opts
      :orig-content-encoding orig-encoding
-     :status                (.. http-response getStatusLine getStatusCode)
-     :headers               headers
-     :content-type          (parse-content-type (headers "content-type"))
-     :body                  (do
-		              (if (:decompress-body opts)
-		                (.process (ResponseContentEncoding.) http-response nil))
-		              (when-let [entity (.getEntity http-response)]
-		                (.getContent entity)))}))
+     :status (.. http-response getStatusLine getStatusCode)
+     :headers headers
+     :content-type (parse-content-type (headers "content-type"))
+     :body (do
+             (if (:decompress-body opts)
+               (.process (ResponseContentEncoding.)
+                         http-response
+                         (BasicHttpContext.)))
+             (when-let [entity (.getEntity http-response)]
+               (.getContent entity)))}))
 
 (schema/defn error-response :- common/ErrorResponse
   [opts :- common/UserRequestOptions

test/puppetlabs/http/client/async_plaintext_test.clj

@@ -6,7 +6,6 @@
            (java.util.concurrent TimeoutException)
            (java.util UUID))
   (:require [clojure.test :refer :all]
-            [clojure.java.io :as io]
             [puppetlabs.http.client.test-common :refer :all]
             [puppetlabs.trapperkeeper.core :as tk]
             [puppetlabs.trapperkeeper.testutils.bootstrap :as testutils]
@@ -15,8 +14,7 @@
             [puppetlabs.trapperkeeper.services.webserver.jetty9-service :as jetty9]
             [puppetlabs.http.client.common :as common]
             [puppetlabs.http.client.async :as async]
-            [schema.test :as schema-test]
-            [clojure.tools.logging :as log]))
+            [schema.test :as schema-test]))
 
 (use-fixtures :once schema-test/validate-schemas)