From 7b5fbf2e362140ce29e21483a14b085f2f302a7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jesper=20Andr=C3=A9=20Lyngesen=20Pedersen?= Date: Mon, 2 Sep 2013 21:44:49 +0200 Subject: [PATCH] Make javax.servlet a provided dependency This is so we can run in a servlet 3.0 environment as well (Jetty 8+) --- ring-core/project.clj | 5 +++-- ring-servlet/project.clj | 7 ++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ring-core/project.clj b/ring-core/project.clj index 0eb368f3..5431d658 100644 --- a/ring-core/project.clj +++ b/ring-core/project.clj @@ -8,8 +8,9 @@ [ring/ring-codec "1.0.0"] [commons-io "2.4"] [commons-fileupload "1.3"] - [javax.servlet/servlet-api "2.5"] [clj-time "0.4.4"]] :profiles - {:1.4 {:dependencies [[org.clojure/clojure "1.4.0"]]} + {:provided {:dependencies [[javax.servlet/servlet-api "2.5"]]} + :dev {:dependencies [[javax.servlet/servlet-api "2.5"]]} + :1.4 {:dependencies [[org.clojure/clojure "1.4.0"]]} :1.5 {:dependencies [[org.clojure/clojure "1.5.1"]]}}) diff --git a/ring-servlet/project.clj b/ring-servlet/project.clj index 8d185e55..c591c249 100644 --- a/ring-servlet/project.clj +++ b/ring-servlet/project.clj @@ -3,8 +3,9 @@ :url "https://github.com/ring-clojure/ring" :license {:name "The MIT License" :url "http://opensource.org/licenses/MIT"} - :dependencies [[ring/ring-core "1.2.0"] - [javax.servlet/servlet-api "2.5"]] + :dependencies [[ring/ring-core "1.2.0"]] :profiles - {:1.4 {:dependencies [[org.clojure/clojure "1.4.0"]]} + {:provided {:dependencies [[javax.servlet/servlet-api "2.5"]]} + :dev {:dependencies [[javax.servlet/servlet-api "2.5"]]} + :1.4 {:dependencies [[org.clojure/clojure "1.4.0"]]} :1.5 {:dependencies [[org.clojure/clojure "1.5.1"]]}})