Permalink
Browse files

Removing dependencies on old contrib for normal use

  • Loading branch information...
1 parent 352a286 commit 18a2c2a99abe3444c51d4d9bfbb0563d0a4f5536 @abedra abedra committed May 4, 2011
Showing with 12 additions and 12 deletions.
  1. +9 −9 project.clj
  2. +2 −2 src/compojure/core.clj
  3. +1 −1 src/compojure/response.clj
View
@@ -1,15 +1,15 @@
(defproject compojure "0.6.2"
:description "A concise web framework for Clojure"
:url "http://github/weavejester/compojure"
- :dependencies
- [[org.clojure/clojure "1.2.0"]
- [org.clojure/clojure-contrib "1.2.0"]
- [clout "0.4.1"]
- [ring/ring-core "0.3.7"]]
- :dev-dependencies
- [[ring-mock "0.1.1"]
- [autodoc "0.7.1" :exclusions [org.clojure/clojure
- org.clojure/clojure-contrib]]]
+ :dependencies [[org.clojure/clojure "1.2.0"]
+ [org.clojure/core.incubator "0.1.0"]
+ [org.clojure/tools.macro "0.1.0"]
+ [clout "0.4.1"]
+ [ring/ring-core "0.3.7"]]
+ :dev-dependencies [[ring-mock "0.1.1"]
+ [org.clojure/clojure-contrib "1.2.0"]
+ [autodoc "0.7.1" :exclusions [org.clojure/clojure
+ org.clojure/clojure-contrib]]]
:autodoc
{:name "Compojure"
:description "A concise web framework for Clojure"
View
@@ -3,8 +3,8 @@
(:require [clojure.string :as str])
(:use clout.core
compojure.response
- [clojure.contrib.core :only (-?>)]
- [clojure.contrib.def :only (name-with-attributes)]))
+ [clojure.core.incubator :only (-?>)]
+ [clojure.tools.macro :only (name-with-attributes)]))
(defn- method-matches?
"True if this request matches the supplied request method."
@@ -1,6 +1,6 @@
(ns compojure.response
"Methods for generating Ring response maps"
- (:use clojure.contrib.core
+ (:use [clojure.core.incubator :only (-?>)]
[ring.util.response :only (response content-type)])
(:require [clojure.java.io :as io])
(:import [java.io File InputStream]

0 comments on commit 18a2c2a

Please sign in to comment.