Make javax.servlet a provided dependency

This is so we can run in a servlet 3.0 environment as well (Jetty 8+)
jalpedersen · Sep 4, 2013 · 7b5fbf2 · 7b5fbf2
1 parent 0d92757
commit 7b5fbf2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git 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
@@ -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"]]}})