Skip to content
Snippets Groups Projects
Commit 6ae9b5d0 authored by Cam Saül's avatar Cam Saül
Browse files

Merge pull request #1087 from metabase/dependency-bump-4000 

bump dependencies
parents 47afd090 09b32a11
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
project.clj
+ 16
− 16
View file @ 6ae9b5d0
......@@ -12,9 +12,9 @@
[org.clojure/core.logic "0.8.10"]
[org.clojure/core.match "0.3.0-alpha4"] ; optimized pattern matching library for Clojure
[org.clojure/core.memoize "0.5.7"] ; needed by core.match; has useful FIFO, LRU, etc. caching mechanisms
[org.clojure/data.csv "0.1.2"] ; CSV parsing / generation
[org.clojure/data.csv "0.1.3"] ; CSV parsing / generation
[org.clojure/java.classpath "0.2.2"]
[org.clojure/java.jdbc "0.4.1"] ; basic jdbc access from clojure
[org.clojure/java.jdbc "0.4.2"] ; basic jdbc access from clojure
[org.clojure/math.numeric-tower "0.0.4"] ; math functions like `ceil`
[org.clojure/tools.logging "0.3.1"] ; logging framework
[org.clojure/tools.macro "0.1.5"] ; tools for writing macros
......@@ -22,17 +22,17 @@
[org.clojure/tools.reader "0.9.2"] ; Need to explictly specify this dep otherwise expectations doesn't seem to work right :'(
[amalloy/ring-gzip-middleware "0.1.3"] ; Ring middleware to GZIP responses if client can handle it
[cheshire "5.5.0"] ; fast JSON encoding (used by Ring JSON middleware)
[clj-http-lite "0.2.1"] ; HTTP client; lightweight version of clj-http that uses HttpURLConnection instead of Apache
[clj-time "0.10.0"] ; library for dealing with date/time
[clj-http-lite "0.3.0"] ; HTTP client; lightweight version of clj-http that uses HttpURLConnection instead of Apache
[clj-time "0.11.0"] ; library for dealing with date/time
[clojurewerkz/quartzite "2.0.0"] ; scheduling library
[colorize "0.1.1" :exclusions [org.clojure/clojure]] ; string output with ANSI color codes (for logging)
[com.cemerick/friend "0.2.1"] ; auth library
[com.draines/postal "1.11.3"] ; SMTP library
[com.h2database/h2 "1.4.187"] ; embedded SQL database
[com.draines/postal "1.11.4"] ; SMTP library
[com.h2database/h2 "1.4.189"] ; embedded SQL database
[com.mattbertolini/liquibase-slf4j "1.2.1"] ; Java Migrations lib
[com.novemberain/monger "3.0.0"] ; MongoDB Driver
[com.novemberain/monger "3.0.1"] ; MongoDB Driver
[compojure "1.4.0"] ; HTTP Routing library built on Ring
[environ "1.0.0"] ; easy environment management
[environ "1.0.1"] ; easy environment management
[hiccup "1.0.5"] ; HTML templating
[korma "0.4.2"] ; SQL lib
[log4j/log4j "1.2.17"
......@@ -42,13 +42,13 @@
com.sun.jmx/jmxri]]
[medley "0.7.0"] ; lightweight lib of useful functions
[mysql/mysql-connector-java "5.1.36"] ; MySQL JDBC driver
[org.liquibase/liquibase-core "3.4.0"] ; migration management (Java lib)
[org.liquibase/liquibase-core "3.4.1"] ; migration management (Java lib)
[org.slf4j/slf4j-log4j12 "1.7.12"]
[org.yaml/snakeyaml "1.15"] ; YAML parser (required by liquibase)
[org.yaml/snakeyaml "1.16"] ; YAML parser (required by liquibase)
[postgresql "9.3-1102.jdbc41"] ; Postgres driver
[ring/ring-jetty-adapter "1.4.0"] ; Ring adapter using Jetty webserver (used to run a Ring server for unit tests)
[ring/ring-json "0.3.1"] ; Ring middleware for reading/writing JSON automatically
[stencil "0.4.0"] ; Mustache templates for Clojure
[ring/ring-json "0.4.0"] ; Ring middleware for reading/writing JSON automatically
[stencil "0.5.0"] ; Mustache templates for Clojure
[swiss-arrows "1.0.0"]] ; 'Magic wand' macro -<>, etc.
:plugins [[lein-environ "1.0.0"] ; easy access to environment variables
[lein-ring "0.9.3"]] ; start the HTTP server with 'lein ring server'
......@@ -66,10 +66,10 @@
:exclude-linters [:constant-test ; korma macros generate some forms with if statements that are always logically true or false
:suspicious-expression ; core.match macros generate some forms like (and expr) which is "suspicious"
:unused-ret-vals]} ; gives too many false positives for functions with side-effects like conj!
:profiles {:dev {:dependencies [[org.clojure/tools.nrepl "0.2.10"] ; REPL <3
[expectations "2.1.2"] ; unit tests
:profiles {:dev {:dependencies [[org.clojure/tools.nrepl "0.2.11"] ; REPL <3
[expectations "2.1.3"] ; unit tests
[marginalia "0.8.0"] ; for documentation
[ring/ring-mock "0.2.0"]]
[ring/ring-mock "0.3.0"]]
:plugins [[cider/cider-nrepl "0.10.0-SNAPSHOT"] ; Interactive development w/ cider NREPL in Emacs
[jonase/eastwood "0.2.1"] ; Linting
[lein-ancient "0.6.7"] ; Check project for outdated dependencies + plugins w/ 'lein ancient'
......@@ -98,7 +98,7 @@
"-Xverify:none"]} ; disable bytecode verification when running tests so they start slightly faster
:uberjar {:aot :all}
:generate-sample-dataset {:dependencies [[faker "0.2.2"] ; Fake data generator -- port of Perl/Ruby
[incanter/incanter-core "1.5.6"]] ; Satistical functions like normal distibutions}})
[incanter/incanter-core "1.9.0"]] ; Satistical functions like normal distibutions}})
:source-paths ["sample_dataset"]
:global-vars {*warn-on-reflection* false}
:main ^:skip-aot metabase.sample-dataset.generate}})
src/metabase/driver/mongo/util.clj
+ 8
− 5
View file @ 6ae9b5d0
......@@ -46,11 +46,14 @@
(:dbname (:details database)) (:details database) ; entire Database obj
(:dbname database) database ; connection details map only
:else (throw (Exception. (str "with-mongo-connection failed: bad connection details:" (:details database)))))
server-address (mg/server-address host port)
credentials (when user
(mcred/create user dbname pass))
conn (mg/connect server-address mongo-connection-options credentials)
mongo-connection (mg/get-db conn dbname)]
server-address (mg/server-address host port)
credentials (when user
(mcred/create user dbname pass))
connect (partial mg/connect server-address mongo-connection-options)
conn (if credentials
(connect credentials)
(connect))
mongo-connection (mg/get-db conn dbname)]
(log/debug (color/cyan "<< OPENED NEW MONGODB CONNECTION >>"))
(try
(binding [*mongo-connection* mongo-connection]
......
test/metabase/test_setup.clj
+ 4
− 4
View file @ 6ae9b5d0
......@@ -79,10 +79,10 @@
{:expectations-options :before-run}
[]
;; We can shave about a second from unit test launch time by doing the various setup stages in on different threads
(let [setup-db (future (time (do (log/info "Setting up test DB and running migrations...")
(db/setup-db :auto-migrate true)
(load-test-datasets)
(metabase.models.setting/set :site-name "Metabase Test"))))]
(let [setup-db (future (time (do (log/info "Setting up test DB and running migrations...")
(db/setup-db :auto-migrate true)
(load-test-datasets)
(metabase.models.setting/set :site-name "Metabase Test"))))]
(core/start-jetty)
@setup-db))
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment