(TK-97) Update dependencies to latest versions

Update dependencies (trapperkeeper, trapperkeeper-webserver-jetty9,
etc.) to the latest versions and fix tests accordingly.
This commit is contained in:
Chris Price 2014-10-17 19:12:43 -07:00
parent 9057fe3333
commit c2cbb11d5d
2 changed files with 5 additions and 5 deletions

View file

@ -1,5 +1,5 @@
(def ks-version "0.7.2") (def ks-version "0.7.2")
(def tk-version "0.4.2") (def tk-version "0.5.1")
(defproject puppetlabs/http-client "0.2.9-SNAPSHOT" (defproject puppetlabs/http-client "0.2.9-SNAPSHOT"
:description "HTTP client wrapper" :description "HTTP client wrapper"
@ -12,14 +12,14 @@
:pedantic? :abort :pedantic? :abort
:dependencies [[org.clojure/clojure "1.5.1"] :dependencies [[org.clojure/clojure "1.5.1"]
[puppetlabs/certificate-authority "0.1.5"] [puppetlabs/certificate-authority "0.6.0"]
[org.clojure/tools.logging "0.2.6"] [org.clojure/tools.logging "0.2.6"]
[puppetlabs/kitchensink ~ks-version] [puppetlabs/kitchensink ~ks-version]
[org.slf4j/slf4j-api "1.7.6"] [org.slf4j/slf4j-api "1.7.6"]
[org.apache.httpcomponents/httpasyncclient "4.0.2"] [org.apache.httpcomponents/httpasyncclient "4.0.2"]
[org.apache.httpcomponents/httpcore "4.3.2"] [org.apache.httpcomponents/httpcore "4.3.2"]
[commons-io "2.1"] [commons-io "2.1"]
[prismatic/schema "0.2.1"]] [prismatic/schema "0.2.2"]]
:source-paths ["src/clj"] :source-paths ["src/clj"]
:java-source-paths ["src/java"] :java-source-paths ["src/java"]
@ -33,7 +33,7 @@
:profiles {:dev {:dependencies [[puppetlabs/kitchensink ~ks-version :classifier "test"] :profiles {:dev {:dependencies [[puppetlabs/kitchensink ~ks-version :classifier "test"]
[puppetlabs/trapperkeeper ~tk-version] [puppetlabs/trapperkeeper ~tk-version]
[puppetlabs/trapperkeeper ~tk-version :classifier "test"] [puppetlabs/trapperkeeper ~tk-version :classifier "test"]
[puppetlabs/trapperkeeper-webserver-jetty9 "0.5.0"] [puppetlabs/trapperkeeper-webserver-jetty9 "0.9.0"]
[spyscope "0.1.4"]] [spyscope "0.1.4"]]
:injections [(require 'spyscope.core)]} :injections [(require 'spyscope.core)]}
:sources-jar {:java-source-paths ^:replace [] :sources-jar {:java-source-paths ^:replace []

View file

@ -28,7 +28,7 @@
[req] [req]
(condp = (:uri req) (condp = (:uri req)
"/hello/world" {:status 200 :body "Hello, World!"} "/hello/world" {:status 200 :body "Hello, World!"}
"/hello/" {:status 301 "/hello" {:status 302
:headers {"Location" "/hello/world"} :headers {"Location" "/hello/world"}
:body ""} :body ""}
{:status 404 :body "D'oh"})) {:status 404 :body "D'oh"}))