Merge branch 'dev'

taoensso · Jun 4, 2015 · c02fb7f · c02fb7f
2 parents dfda6fe + 2201fc1
commit c02fb7f
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,14 +1,15 @@
 > This project uses [Break Versioning](https://github.com/ptaoussanis/encore/blob/master/BREAK-VERSIONING.md) as of **Aug 16, 2014**.
 
-## v1.7.0-RC1 / 2015 Apr 17
+## v1.7.0 / 2015 June 4
 
-> This should be a non-breaking release, but I haven't tested it personally.
+> This is a non-breaking maintenance elease
 
-* **Change**: stop unnecessarily pulling in entire AWS SDK [@jaley #61]
-* **Change**: use DefaultAWSCredentialsProviderChain as provider [@MichaelBlume #59]
+* **Deps**: stop unnecessarily pulling in entire AWS SDK [@jaley #61]
+* **Fix**: use DefaultAWSCredentialsProviderChain as provider [@MichaelBlume #59]
+* **Performance**: upgrade to Nippy v2.9.0
 
 ```clojure
-[com.taoensso/faraday "1.7.0-RC1"]
+[com.taoensso/faraday "1.7.0"]
 ```
 
 

diff --git a/README.md b/README.md
@@ -1,8 +1,7 @@
 **[API docs][]** | **[CHANGELOG][]** | [other Clojure libs][] | [Twitter][] | [contact/contrib](#contact--contributing) | current [Break Version][]:
 
 ```clojure
-[com.taoensso/faraday "1.6.0"]     ; Stable
-[com.taoensso/faraday "1.7.0-RC1"] ; Dev, see CHANGELOG for details
+[com.taoensso/faraday "1.7.0"] ; Dev, see CHANGELOG for details
 ```
 
 # Faraday, a Clojure DynamoDB client
@@ -27,7 +26,7 @@ DynamoDB's done a fantastic job of hiding (in a good way) a lot of the complexit
 Add the necessary dependency to your [Leiningen][] `project.clj` and `require` the library in your ns:
 
 ```clojure
-[com.taoensso/faraday "1.6.0"] ; project.clj
+[com.taoensso/faraday "1.7.0"] ; project.clj
 (ns my-app (:require [taoensso.faraday :as far])) ; ns
 ```
 

diff --git a/project.clj b/project.clj
@@ -1,4 +1,4 @@
-(defproject com.taoensso/faraday "1.7.0-RC1"
+(defproject com.taoensso/faraday "1.7.0"
   :author "Peter Taoussanis <https://www.taoensso.com>"
   :description "Clojure DynamoDB client"
   :url "https://github.com/ptaoussanis/faraday"
@@ -12,22 +12,21 @@
 
   :dependencies
   [[org.clojure/clojure "1.5.1"]
-   [com.taoensso/encore "1.24.0"]
-   [com.taoensso/nippy  "2.8.0"]
-   [joda-time           "2.7"] ; For exclusion, see Github #27
-   [com.amazonaws/aws-java-sdk-dynamodb "1.9.31"
+   [com.taoensso/encore "1.34.0"]
+   [com.taoensso/nippy  "2.9.0"]
+   [joda-time           "2.8"] ; For exclusion, see Github #27
+   [com.amazonaws/aws-java-sdk-dynamodb "1.9.39"
     :exclusions [joda-time]]]
 
   :profiles
   {;; :default [:base :system :user :provided :dev]
    :server-jvm {:jvm-opts ^:replace ["-server"]}
-   :1.7  {:dependencies [[org.clojure/clojure    "1.7.0-beta1"]]}
+   :1.7  {:dependencies [[org.clojure/clojure    "1.7.0-RC1"]]}
    :1.6  {:dependencies [[org.clojure/clojure    "1.6.0"]]}
    :test {:dependencies [[expectations           "2.1.0"]
                          [org.clojure/test.check "0.7.0"]]
           :plugins [[lein-expectations "0.0.8"]
-                    [lein-autoexpect   "1.4.2"]]}
-
+                    [lein-autoexpect   "1.5.0"]]}
    :dev
    [:1.7 :test
     {:plugins [[lein-ancient "0.6.4"]