Browse files

updating dependencies, switching clojure to beta1, and fixing tests

  • Loading branch information...
1 parent dc2f5a1 commit c88b555335bb6991f8319237d46fa416efb50a84 @abedra abedra committed Aug 19, 2011
Showing with 37 additions and 34 deletions.
  1. +29 −26 pom.xml
  2. +7 −7 project.clj
  3. +1 −1 test/solutions/browser_mockup_test.clj
View
55 pom.xml
@@ -7,7 +7,10 @@
<name>labrepl</name>
<description>Clojure exercises, with integrated repl and webapp</description>
<scm>
- <tag>94d648132b23a6f412dd3074ad60311dac5e458d</tag>
+ <connection>scm:git:git://github.com/relevance/labrepl.git</connection>
+ <developerConnection>scm:git:ssh://git@github.com/relevance/labrepl.git</developerConnection>
+ <tag>dc2f5a1c43019e95f43cec00ea309464379c2f2b</tag>
+ <url>https://github.com/relevance/labrepl</url>
</scm>
<build>
<sourceDirectory>src</sourceDirectory>
@@ -46,10 +49,6 @@
</build>
<repositories>
<repository>
- <id>central</id>
- <url>http://repo1.maven.org/maven2</url>
- </repository>
- <repository>
<id>clojure</id>
<url>http://build.clojure.org/releases</url>
</repository>
@@ -58,15 +57,31 @@
<url>http://build.clojure.org/snapshots</url>
</repository>
<repository>
+ <id>central</id>
+ <url>http://repo1.maven.org/maven2</url>
+ </repository>
+ <repository>
<id>clojars</id>
<url>http://clojars.org/repo/</url>
</repository>
</repositories>
<dependencies>
<dependency>
+ <groupId>swank-clojure</groupId>
+ <artifactId>swank-clojure</artifactId>
+ <version>1.3.0</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <artifactId>clojure</artifactId>
+ <groupId>org.clojure</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
<groupId>org.clojure</groupId>
<artifactId>clojure</artifactId>
- <version>1.3.0-master-SNAPSHOT</version>
+ <version>1.3.0-beta1</version>
</dependency>
<dependency>
<groupId>org.clojure</groupId>
@@ -81,7 +96,7 @@
<dependency>
<groupId>ring</groupId>
<artifactId>ring-jetty-adapter</artifactId>
- <version>0.3.7</version>
+ <version>0.3.11</version>
<exclusions>
<exclusion>
<artifactId>clojure</artifactId>
@@ -96,7 +111,7 @@
<dependency>
<groupId>compojure</groupId>
<artifactId>compojure</artifactId>
- <version>0.6.3</version>
+ <version>0.6.5</version>
<exclusions>
<exclusion>
<artifactId>clojure</artifactId>
@@ -107,7 +122,7 @@
<dependency>
<groupId>hiccup</groupId>
<artifactId>hiccup</artifactId>
- <version>0.3.5</version>
+ <version>0.3.6</version>
<exclusions>
<exclusion>
<artifactId>clojure</artifactId>
@@ -141,7 +156,7 @@
<dependency>
<groupId>swank-clojure</groupId>
<artifactId>swank-clojure</artifactId>
- <version>1.3.0-SNAPSHOT</version>
+ <version>1.3.0</version>
<exclusions>
<exclusion>
<artifactId>clojure</artifactId>
@@ -154,22 +169,10 @@
<artifactId>jline</artifactId>
<version>0.9.94</version>
</dependency>
- <dependency>
- <groupId>swank-clojure</groupId>
- <artifactId>swank-clojure</artifactId>
- <version>1.3.0-SNAPSHOT</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <artifactId>clojure</artifactId>
- <groupId>org.clojure</groupId>
- </exclusion>
- </exclusions>
- </dependency>
</dependencies>
</project>
-<!-- This file was autogenerated by the Leiningen build tool.
- Please do not edit it directly; instead edit project.clj and regenerate it.
- It should not be considered canonical data. For more information see
- https://github.com/technomancy/leiningen -->
+<!-- This file was autogenerated by Leiningen.
+ Please do not edit it directly; instead edit project.clj and regenerate it.
+ It should not be considered canonical data. For more information see
+ https://github.com/technomancy/leiningen -->
View
14 project.clj
@@ -1,16 +1,16 @@
(defproject labrepl "0.0.2-SNAPSHOT"
:description "Clojure exercises, with integrated repl and webapp"
- :dependencies [[org.clojure/clojure "1.3.0-master-SNAPSHOT"]
+ :dependencies [[org.clojure/clojure "1.3.0-beta1"]
[org.clojure/tools.logging "0.1.2"]
[org.clojure/data.json "0.1.0"]
- [ring/ring-jetty-adapter "0.3.7" :exclusions [org.clojure/clojure
- org.clojure/clojure-contrib]]
- [compojure "0.6.3" :exclusions [org.clojure/clojure]]
- [hiccup "0.3.5" :exclusions [org.clojure/clojure]]
+ [ring/ring-jetty-adapter "0.3.11" :exclusions [org.clojure/clojure
+ org.clojure/clojure-contrib]]
+ [compojure "0.6.5" :exclusions [org.clojure/clojure]]
+ [hiccup "0.3.6" :exclusions [org.clojure/clojure]]
[log4j "1.2.16" :exclusions [javax.mail/mail
javax.jms/jms
com.sun.jdmk/jmxtools
com.sun.jmx/jmxri]]
- [swank-clojure "1.3.0-SNAPSHOT" :exclusions [org.clojure/clojure]]
+ [swank-clojure "1.3.0" :exclusions [org.clojure/clojure]]
[jline "0.9.94"]]
- :dev-dependencies [[swank-clojure "1.3.0-SNAPSHOT" :exclusions [org.clojure/clojure]]])
+ :dev-dependencies [[swank-clojure "1.3.0" :exclusions [org.clojure/clojure]]])
View
2 test/solutions/browser_mockup_test.clj
@@ -5,5 +5,5 @@
(deftest test-mockups
(doseq [url ["/m1" "/m2" "/m3" "/m4"]]
(let [resp (mockup-routes {:request-method :get :uri url})]
- (is (= {:status 200 :headers {"Content-Type" "text/html"}}
+ (is (= {:status 200 :headers {"Content-Type" "text/html; charset=utf-8"}}
(select-keys resp [:status :headers]))))))

0 comments on commit c88b555

Please sign in to comment.