diff --git a/NEWS.md b/NEWS.md index 539ae36d2..1f7ae74df 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,6 +1,6 @@ # Leiningen News -- history of user-visible changes -## 2.5.0 / ??? +## 2.5.0 / 2014-09-14 * Allow certain profiles to be `^:leaky` and affect downstream. (Hugo Duncan) * Allow profiles to be loaded out of plugins. (Phil Hagelberg, Hugo Duncan) diff --git a/leiningen-core/src/leiningen/core/project.clj b/leiningen-core/src/leiningen/core/project.clj index a966852cc..83f51d14d 100644 --- a/leiningen-core/src/leiningen/core/project.clj +++ b/leiningen-core/src/leiningen/core/project.clj @@ -478,6 +478,7 @@ {:displace true}) :test-selectors {:default (with-meta '(constantly true) {:displace true})} + ;; bump deps in leiningen's own project.clj with these :dependencies '[[org.clojure/tools.nrepl "0.2.6" :exclusions [org.clojure/clojure]] [clojure-complete "0.2.3" diff --git a/project.clj b/project.clj index 2da679929..ae98ac0e9 100644 --- a/project.clj +++ b/project.clj @@ -6,24 +6,25 @@ :url "https://github.com/technomancy/leiningen" :license {:name "Eclipse Public License" :url "http://www.eclipse.org/legal/epl-v10.html"} - :dependencies - ^:replace [[leiningen-core "2.5.0-SNAPSHOT"] - [org.clojure/data.xml "0.0.3"] - [commons-io "2.4"] - [bultitude "0.2.6"] - [stencil "0.3.3" :exclusions [org.clojure/core.cache]] - [org.apache.maven.indexer/indexer-core "4.1.3" - :exclusions [org.apache.maven/maven-model - org.sonatype.aether/aether-api - org.sonatype.aether/aether-util - org.sonatype.sisu/sisu-inject-plexus - jakarta-regexp]] - [reply "0.3.5" :exclusions [ring/ring-core - org.thnetos/cd-client]] - ;; bump versions of various common transitive deps - [slingshot "0.10.3"] - [cheshire "5.0.2"] - [clj-http "0.9.2" :exclusions [crouton]]] + :dependencies [[leiningen-core "2.5.0-SNAPSHOT"] + [org.clojure/data.xml "0.0.3"] + [commons-io "2.4"] + [bultitude "0.2.6"] + [stencil "0.3.3" :exclusions [org.clojure/core.cache]] + [org.apache.maven.indexer/indexer-core "4.1.3" + :exclusions [org.apache.maven/maven-model + org.sonatype.aether/aether-api + org.sonatype.aether/aether-util + org.sonatype.sisu/sisu-inject-plexus + jakarta-regexp]] + [reply "0.3.5" :exclusions [ring/ring-core + org.thnetos/cd-client]] + [org.clojure/tools.nrepl "0.2.6"] + [clojure-complete "0.2.3"] + ;; bump versions of various common transitive deps + [slingshot "0.10.3"] + [cheshire "5.0.2"] + [clj-http "0.9.2" :exclusions [crouton]]] ;; checkout-deps don't work with :eval-in :leiningen :profiles {:dev {:resource-paths ["leiningen-core/dev-resources"] :test-paths ["leiningen-core/test"]}