-(def tk-version "1.1.1")
+(def clojure-version "1.7.0")
+(def tk-version "1.1.3")
 (def tk-jetty-version "1.3.1")
 (def ks-version "1.1.0")
 (def ps-version "2.2.2-master-SNAPSHOT")


             :testutils {:source-paths ^:replace ["test/unit" "test/integration"]}

             :ezbake {:dependencies ^:replace [[puppetlabs/puppetserver ~ps-version]
                                               [puppetlabs/trapperkeeper-webserver-jetty9 ~tk-jetty-version]
                                               [org.clojure/tools.nrepl "0.2.3"]]
                      :plugins [[puppetlabs/lein-ezbake "0.3.21"]]

(defproject puppetlabs/puppetserver ps-version
  :description "Puppet Server"

  :dependencies [[org.clojure/clojure ~clojure-version]

                 ;; begin version conflict resolution dependencies
                 [puppetlabs/typesafe-config "0.1.4"]
