From 55a78d55b36f03692ceba19399d8e05244f96abd Mon Sep 17 00:00:00 2001
From: "Michael S. Klishin" <michael@novemberain.com>
Date: Tue, 13 Mar 2012 21:38:42 +0400
Subject: [PATCH] Switch to using Leiningen 2 aliases

---
 .travis.yml |  2 +-
 README.md   |  5 +++--
 project.clj | 18 +++++++++---------
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 81aec5c..b16bba6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,4 +2,4 @@ language: clojure
 lein: lein2
 before_script:
   - ./bin/ci/before_script.sh
-script: lein2 with-profile dev:1.4 test
+script: lein2 all test
diff --git a/README.md b/README.md
index d8621e1..0ca1f13 100644
--- a/README.md
+++ b/README.md
@@ -361,9 +361,10 @@ Neocons is part of the group of libraries known as ClojureWerkz, together with
 
 ## Development
 
-Monger uses [Leiningen 2](https://github.com/technomancy/leiningen/blob/master/doc/TUTORIAL.md). Make sure you have it installed and then run tests against Clojure 1.3.0 and 1.4.0[-beta4] using
+Monger uses [Leiningen 2](https://github.com/technomancy/leiningen/blob/master/doc/TUTORIAL.md). Make sure you have it installed and then run tests against
+Clojure 1.3.0 and 1.4.0[-beta4] using
 
-    lein2 with-profile test:1.4 test
+    lein2 all test
 
 Then create a branch and make your changes on it. Once you are done with your changes and all tests pass, submit a pull request
 on Github.
diff --git a/project.clj b/project.clj
index 48d2809..825cac0 100644
--- a/project.clj
+++ b/project.clj
@@ -10,19 +10,19 @@
   :mailing-list {:name "clojure-monger",
                  :archive "https://groups.google.com/group/clojure-monger",
                  :post "clojure-monger@googlegroups.com"}
-  :profiles {:all {:dependencies [[org.mongodb/mongo-java-driver "2.7.3"]
-                                  [com.novemberain/validateur "1.0.0"]]},
-             :1.4 {:resource-paths ["test/resources"],
-                   :dependencies [[org.clojure/clojure "1.4.0-beta4"]
-                                  [org.clojure/data.json "0.1.2" :exclusions [org.clojure/clojure]]
-                                  [clj-time "0.3.6"              :exclusions [org.clojure/clojure]]
-                                  [codox "0.3.4"                 :exclusions [org.clojure/clojure]]
-                                  [org.clojure/tools.cli "0.2.1" :exclusions [org.clojure/clojure]]]},
+  :profiles {:1.4 {:resource-paths ["test/resources"],
+                   :dependencies [[org.clojure/clojure "1.4.0-beta4"]]},
              :dev {:resource-paths ["test/resources"],
-                   :dependencies  [[org.clojure/data.json "0.1.2" :exclusions [org.clojure/clojure]]
+                   :dependencies  [[org.mongodb/mongo-java-driver "2.7.3"]
+                                   [com.novemberain/validateur "1.0.0"]
+                                   [clj-time "0.3.6"              :exclusions [org.clojure/clojure]]
+                                   [codox "0.3.4"                 :exclusions [org.clojure/clojure]]
+                                   [org.clojure/tools.cli "0.2.1" :exclusions [org.clojure/clojure]]
+                                   [org.clojure/data.json "0.1.2" :exclusions [org.clojure/clojure]]
                                    [clj-time "0.3.6"              :exclusions [org.clojure/clojure]]
                                    [codox "0.3.4"                 :exclusions [org.clojure/clojure]]
                                    [org.clojure/tools.cli "0.2.1" :exclusions [org.clojure/clojure]]]}}
+  :aliases { "all" ["with-profile" "dev:dev,1.4"] }
   :repositories {"sonatype" {:url "http://oss.sonatype.org/content/repositories/releases",
                              :snapshots false,
                              :releases {:checksum :fail, :update :always}}}