simon/smeagol
1
0
Fork 0
mirror of https://github.com/journeyman-cc/smeagol.git synced 2026-04-12 18:05:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into develop

Browse source
This commit is contained in:
Simon Brooke 2017-07-24 07:00:09 +01:00
commit a1fa392699
2 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -17,3 +17,4 @@ pom.xml.asc
smeagol.log*
/node_modules/
.DS_Store

35
project.clj
View file

@ -1,28 +1,30 @@
(defproject smeagol "0.5.2-SNAPSHOT"
(defproject smeagol "0.5.0-rc3"
:description "A simple Git-backed Wiki inspired by Gollum"
:url "https://github.com/simon-brooke/smeagol"
:dependencies [[org.clojure/clojure "1.7.0"]
[org.clojure/core.memoize "0.5.9"]
[com.taoensso/encore "2.80.0"]
[com.taoensso/encore "2.91.1"]
[lib-noir "0.9.9" :exclusions [org.clojure/tools.reader]]
[com.cemerick/url "0.1.1"]
[ring-server "0.4.0"]
[selmer "1.0.7"]
[org.clojure/tools.logging "0.3.1"]
[org.slf4j/slf4j-log4j12 "1.7.21"]
[log4j/log4j "1.2.17" :exclusions [javax.mail/mail
javax.jms/jms
com.sun.jmdk/jmxtools
com.sun.jmx/jmxri]]
[com.taoensso/timbre "4.7.4" :exclusions [org.clojure/tools.reader]]
[selmer "1.10.9"]
[org.clojure/tools.logging "0.4.0"]
[com.taoensso/timbre "4.10.0"]
[com.fzakaria/slf4j-timbre "0.3.7"]
[org.slf4j/slf4j-api "1.7.25"]
[org.slf4j/log4j-over-slf4j "1.7.25"]
[org.slf4j/jul-to-slf4j "1.7.25"]
[org.slf4j/jcl-over-slf4j "1.7.25"]
[com.taoensso/tower "3.0.2" :exclusions [com.taoensso/encore]]
[markdown-clj "0.9.91" :exclusions [com.keminglabs/cljx]]
[markdown-clj "0.9.99" :exclusions [com.keminglabs/cljx]]
[crypto-password "0.2.0"]
[clj-jgit "0.8.9"]
[environ "1.1.0"]
[im.chit/cronj "1.4.4"]
[noir-exception "0.2.5"]
[prone "1.1.1"]]
[prone "1.1.4"]]
:repl-options {:init-ns smeagol.repl}
:jvm-opts ["-server"]
@ -30,11 +32,8 @@
[lein-environ "1.0.0"]
[lein-bower "0.5.1"]
[lein-ancient "0.5.5" :exclusions [org.clojure/clojure org.clojure/data.xml]]
[lein-marginalia "0.7.1" :exclusions [org.clojure/clojure]]
[io.sarnowski/lein-docker "1.1.0"]]
[lein-marginalia "0.7.1" :exclusions [org.clojure/clojure]]]
:bower-dependencies [[simplemde "1.11.2"]]
:docker {:image-name "simonbrooke/smeagol"
:dockerfile "Dockerfile"}
:ring {:handler smeagol.handler/app
:init smeagol.handler/init
:destroy smeagol.handler/destroy}
@ -47,8 +46,8 @@
:stacktraces? false
:auto-reload? false}}
:dev {:dependencies [[ring-mock "0.1.5"]
[ring/ring-devel "1.5.0"]
[pjstadig/humane-test-output "0.8.1"]]
[ring/ring-devel "1.6.2"]
[pjstadig/humane-test-output "0.8.2"]]
:injections [(require 'pjstadig.humane-test-output)
(pjstadig.humane-test-output/activate!)]
:env {:dev true}}}