drop support for Clojure 1.2 through 1.4 and related code cleanup

kumarshantanu · Jul 14, 2016 · 4a943c6 · 4a943c6
1 parent 18627dd
commit 4a943c6
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -4,7 +4,7 @@
 ## 0.9.0 / 2016-July-??
 
 * Drop support for JDK 1.5 (now Java 6 or higher is required)
-* [TODO] Drop support for Clojure `1.2` through `1.4` (for code cleanup)
+* Drop support for Clojure `1.2` through `1.4` (for code cleanup)
 * [TODO] Drop support for DSL API for JDBC params (use Cumulus instead)
 * [TODO] Drop support for `:val-query` option (use `:test-query` instead)
 * [TODO] Use Apache DBCP2 instead of DBCP1.x

diff --git a/project.clj b/project.clj
@@ -20,17 +20,14 @@
              :dev {:dependencies [[org.clojure/java.jdbc "0.2.3"]
                                   [oss-jdbc    "0.8.0"]
                                   [simple-jndi "0.11.4.1"]]}
-             :c12 {:dependencies [[org.clojure/clojure "1.2.1"]]}
-             :c13 {:dependencies [[org.clojure/clojure "1.3.0"]]}
-             :c14 {:dependencies [[org.clojure/clojure "1.4.0"]]}
              :c15 {:dependencies [[org.clojure/clojure "1.5.1"]]}
              :c16 {:dependencies [[org.clojure/clojure "1.6.0"]]}
              :c17 {:dependencies [[org.clojure/clojure "1.7.0"]]}
              :c18 {:dependencies [[org.clojure/clojure "1.8.0"]]}
              :c19 {:dependencies [[org.clojure/clojure "1.9.0-alpha10"]]}
 }
-  :aliases {"dev"     ["with-profile" "dev,c14"]
-            "all"     ["with-profile" "dev,c12:dev,c13:dev,c14:dev,c15:dev,c16:dev,c17:dev,c18:dev,c19"]
+  :aliases {"dev"     ["with-profile" "dev,c15"]
+            "all"     ["with-profile" "dev,c15:dev,c16:dev,c17:dev,c18:dev,c19"]
             "reflect" ["assoc" ":warn-on-reflection" "true" "compile"]}
   :min-lein-version "2.0.0"
   :jvm-opts ["-Xmx1g"])

diff --git a/src/clj_dbcp/core.clj b/src/clj_dbcp/core.clj
@@ -2,8 +2,8 @@
   "Create DataSource using Apache DBCP"
   (:require
     [clojure.string :as str]
-    [cumulus.core :as c])
-  (:use [clj-dbcp.util :only (as-str)])  ; FIXME refactor using `require :refer` in 0.9
+    [cumulus.core :as c]
+    [clj-dbcp.util :refer (as-str)])
   (:import (java.net URI)
     (java.sql DriverManager)
     (javax.sql DataSource)