Permalink
Browse files

Updated some libraries to fix issues with conjure.

  • Loading branch information...
1 parent 361d094 commit ae9e6fa65a8d1baa875c69d84d394c22f8fd1408 @macourtney committed Aug 8, 2012
View
@@ -2,8 +2,8 @@
:description "Conjure view is a library to render html for conjure."
:dependencies [[org.clojure/clojure "1.3.0"]
[org.conjure/conjure-util "0.9.0-SNAPSHOT"]]
- :dev-dependencies [[log4j/log4j "1.2.16"]
- [org.clojure/clojure "1.2.1"]
- [org.conjure/conjure-model "0.9.0-SNAPSHOT"]
- [org.conjure/conjure-view "0.9.0-SNAPSHOT"]
- [org.drift-db/drift-db-h2 "1.0.7"]])
+
+ :profiles { :dev { :dependencies [[log4j/log4j "1.2.16"]
+ [org.conjure/conjure-model "0.9.0-SNAPSHOT"]
+ [org.conjure/conjure-view "0.9.0-SNAPSHOT"]
+ [org.drift-db/drift-db-h2 "1.1.2"]] } })
@@ -6,6 +6,6 @@
[org.clojure/tools.logging "0.2.3"]
[org.conjure/conjure-config "0.9.0-SNAPSHOT"]
[org.conjure/conjure-util "0.9.0-SNAPSHOT"]
- [org.drift-db/drift-db "1.0.7-SNAPSHOT"]]
- :dev-dependencies [[org.drift-db/drift-db-h2 "1.0.7-SNAPSHOT"]
- [org.clojure/clojure "1.2.1"]])
+ [org.drift-db/drift-db "1.1.2"]]
+
+ :profiles { :dev { :dependencies [[org.drift-db/drift-db-h2 "1.1.2"]] } })
@@ -1,5 +1,4 @@
(defproject org.conjure/conjure-script-model "0.9.0-SNAPSHOT"
:description "The generator and destroyers for the view files."
:dependencies [[org.conjure/conjure-model "0.9.0-SNAPSHOT"]
- [org.conjure/conjure-test "0.9.0-SNAPSHOT"]]
- :dev-dependencies [[org.clojure/clojure "1.2.1"]])
+ [org.conjure/conjure-test "0.9.0-SNAPSHOT"]])
@@ -5,5 +5,4 @@
[org.conjure/conjure-script-model "0.9.0-SNAPSHOT"]
[org.conjure/conjure-script-view "0.9.0-SNAPSHOT"]
[org.conjure/conjure-test "0.9.0-SNAPSHOT"]
- [org.conjure/conjure-view "0.9.0-SNAPSHOT"]]
- :dev-dependencies [[org.clojure/clojure "1.2.1"]])
+ [org.conjure/conjure-view "0.9.0-SNAPSHOT"]])
@@ -1,19 +1,17 @@
(defproject org.conjure/conjure-server "0.9.0-SNAPSHOT"
:description "Conjure view is a library to render html for conjure."
:dependencies [[clojure-tools "1.1.1"]
- [org.clojure/clojure "1.3.0"]
[org.clojure/tools.cli "0.2.1"]
[org.clojure/tools.logging "0.2.0"]
[org.conjure/conjure-config "0.9.0-SNAPSHOT"]
[org.conjure/conjure-plugin "0.9.0-SNAPSHOT"]
[org.conjure/conjure-util "0.9.0-SNAPSHOT"]
[org.drift-db/drift-db "1.0.7"]
- [ring/ring-devel "1.0.1"]
- [ring/ring-jetty-adapter "1.0.1"]
- [ring/ring-servlet "1.0.1"]]
+ [ring/ring-devel "1.1.0"]
+ [ring/ring-jetty-adapter "1.1.0"]
+ [ring/ring-servlet "1.1.0"]]
:profiles { :dev { :dependencies [[log4j/log4j "1.2.16"]
- [org.clojure/clojure "1.2.1"]
[org.conjure/conjure-flow "0.9.0-SNAPSHOT"]
[org.conjure/conjure-model "0.9.0-SNAPSHOT"]
[org.conjure/conjure-view "0.9.0-SNAPSHOT"]
@@ -14,4 +14,4 @@
(deftest test-parse-arguments
(is (parse-arguments []))
- (is (= [ { :mode "development" } [] "Usage:\n\n Switches Default Desc \n -------- ------- ---- \n -m, --mode The server mode. For example, development, production, or test. \n" ] (parse-arguments ["-m" "development"]))))
+ (is (= [ { :mode "development" } [] "Usage:\r\n\r\n Switches Default Desc \r\n -------- ------- ---- \r\n -m, --mode The server mode. For example, development, production, or test. \r\n" ] (parse-arguments ["-m" "development"]))))
View
@@ -1,12 +1,12 @@
(defproject org.conjure/conjure-view "0.9.0-SNAPSHOT"
:description "Conjure view is a library to render html for conjure."
:dependencies [[clojure-tools "1.1.1-SNAPSHOT"]
- [hiccup "0.3.8"]
- [org.clojure/clojure "1.3.0"]
+ [hiccup "1.0.0"]
[org.conjure/conjure-config "0.9.0-SNAPSHOT"]
[org.conjure/conjure-html "0.9.0"]
[org.conjure/conjure-util "0.9.0-SNAPSHOT"]
[scriptjure "0.1.24"]]
- :dev-dependencies [[org.clojure/clojure "1.2.1"]
- [org.conjure/conjure-model "0.9.0-SNAPSHOT"]
- [org.drift-db/drift-db-h2 "1.0.7"]])
+
+ :profiles { :dev { :dependencies [[org.conjure/conjure-model "0.9.0-SNAPSHOT"]
+ [org.drift-db/drift-db "1.1.2"]
+ [org.drift-db/drift-db-h2 "1.1.2"]] } })

0 comments on commit ae9e6fa

Please sign in to comment.