Skip to content

Commit

Permalink
Merge pull request #69 from updcon/master
Browse files Browse the repository at this point in the history
updated deps
  • Loading branch information
niwinz authored Jun 26, 2019
2 parents 37f7710 + 1264c26 commit cc52dc1
Show file tree
Hide file tree
Showing 3 changed files with 102 additions and 96 deletions.
9 changes: 7 additions & 2 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
# Changelog #

## Version 2.2.1 ##
## Version 2.2.2 ##

Date: 2018-06-02
Date: 2019-06-18

- Update dependencies.

## Version 2.2.1 ##

Date: 2018-05-31

- Update dependencies.

## Version 2.2.0 ##

Expand Down
145 changes: 73 additions & 72 deletions profiles.clj
Original file line number Diff line number Diff line change
@@ -1,94 +1,95 @@
{:dev
{:global-vars {*warn-on-reflection* false}
:aliases {"test-all" ["with-profile" "dev,1.9:dev,1.7:dev" "test"]}
:source-paths ["dev"]
:dependencies [[clj-http "3.8.0" :exclusions [org.clojure/tools.reader]]
[aleph "0.4.4" :exclusions [primitive-math io.netty/netty-all]]
[org.clojure/tools.namespace "0.2.11"]
[ring/ring-core "1.6.3" :exclusions [javax.servlet/servlet-api
org.clojure/tools.reader
org.clojure/clojure
clj-time]]]
:plugins [[lein-ancient "0.6.15"]
[funcool/codeina "0.4.0"]]
:codeina {:sources ["src/clojure"]
:exclude [catacumba.impl.context
catacumba.impl.atomic
catacumba.impl.executor
catacumba.impl.stream
catacumba.impl.stream.common
catacumba.impl.stream.channel
catacumba.impl.stream.promise
catacumba.impl.stream.pushstream
catacumba.impl.handlers
catacumba.impl.server
catacumba.impl.http
catacumba.impl.routing
catacumba.impl.stream
catacumba.impl.websocket
catacumba.impl.helpers
catacumba.impl.sse]
:reader :clojure
:target "doc/dist/latest/api"
:src-uri "http://github.com/funcool/catacumba/blob/master/"
:src-uri-prefix "#L"}}
{:global-vars {*warn-on-reflection* false}
:aliases {"test-all" ["with-profile" "dev,1.9:dev,1.10:dev,1.7:dev" "test"]}
:source-paths ["dev"]
:dependencies [[clj-http "3.10.0" :exclusions [org.clojure/tools.reader]]
[aleph "0.4.6" :exclusions [primitive-math io.netty/netty-all]]
[org.clojure/tools.namespace "0.3.0"]
[ring/ring-core "1.7.1" :exclusions [javax.servlet/servlet-api
org.clojure/tools.reader
org.clojure/clojure
clj-time]]]
:plugins [[lein-ancient "0.6.15"]
[funcool/codeina "0.4.0"]]
:codeina {:sources ["src/clojure"]
:exclude [catacumba.impl.context
catacumba.impl.atomic
catacumba.impl.executor
catacumba.impl.stream
catacumba.impl.stream.common
catacumba.impl.stream.channel
catacumba.impl.stream.promise
catacumba.impl.stream.pushstream
catacumba.impl.handlers
catacumba.impl.server
catacumba.impl.http
catacumba.impl.routing
catacumba.impl.stream
catacumba.impl.websocket
catacumba.impl.helpers
catacumba.impl.sse]
:reader :clojure
:target "doc/dist/latest/api"
:src-uri "http://github.com/funcool/catacumba/blob/master/"
:src-uri-prefix "#L"}}

:bench
[:dev
{:jvm-opts ^:replace ["-XX:+AggressiveOpts"
"-XX:+UseG1GC"
"-Xmx4g"
"-Xms4g"]
:main ^:skip-aot bench}]
[:dev
{:jvm-opts ^:replace ["-XX:+AggressiveOpts"
"-XX:+UseG1GC"
"-Xmx4g"
"-Xms4g"]
:main ^:skip-aot bench}]

:1.9 {:dependencies [[org.clojure/clojure "1.9.0"]]}
:1.7 {:dependencies [[org.clojure/clojure "1.7.0"]]}
:1.9 {:dependencies [[org.clojure/clojure "1.9.0"]]}
:1.10 {:dependencies [[org.clojure/clojure "1.10.1"]]}
:1.7 {:dependencies [[org.clojure/clojure "1.7.0"]]}

;; Examples
:examples
{:dependencies [[cheshire "5.8.0"]
[hiccup "1.0.5"]]}
{:dependencies [[cheshire "5.8.1"]
[hiccup "1.0.5"]]}

:websocket-echo-example
[:examples
{:source-paths ["examples/websocket-echo/src"]
:resource-paths ["examples/websocket-echo/resources"]
:main ^:skip-aot websocket-echo.core}]
[:examples
{:source-paths ["examples/websocket-echo/src"]
:resource-paths ["examples/websocket-echo/resources"]
:main ^:skip-aot websocket-echo.core}]

:sse-chat-example
[:examples
{:source-paths ["examples/sse-chat/src"]
:resource-paths ["examples/sse-chat/resources"]
:jvm-opts ^:replace ["-XX:+AggressiveOpts"
"-XX:+UseG1GC"
"-Xmx100m"
"-Xms100m"]
:main ^:skip-aot compchat.core}]
[:examples
{:source-paths ["examples/sse-chat/src"]
:resource-paths ["examples/sse-chat/resources"]
:jvm-opts ^:replace ["-XX:+AggressiveOpts"
"-XX:+UseG1GC"
"-Xmx100m"
"-Xms100m"]
:main ^:skip-aot compchat.core}]


:debugging-example
[:examples
{:dependencies [[funcool/catacumba-prone "0.4.0"]]
:source-paths ["examples/debugging/src"]
:resource-paths ["examples/debugging/resources"]
:main ^:skip-aot debugging.core}]
[:examples
{:dependencies [[funcool/catacumba-prone "0.4.0"]]
:source-paths ["examples/debugging/src"]
:resource-paths ["examples/debugging/resources"]
:main ^:skip-aot debugging.core}]

:interceptor-example
[:examples
{:source-paths ["examples/interceptor/src"]
:resource-paths ["examples/interceptor/resources"]
:main ^:skip-aot interceptor.core}]
[:examples
{:source-paths ["examples/interceptor/src"]
:resource-paths ["examples/interceptor/resources"]
:main ^:skip-aot interceptor.core}]

:website-example
[:examples
{:source-paths ["examples/website/src"]
:resource-paths ["examples/website/resources"]
:main ^:skip-aot website.core}]
[:examples
{:source-paths ["examples/website/src"]
:resource-paths ["examples/website/resources"]
:main ^:skip-aot website.core}]

:website-ssl-example
[:examples
{:source-paths ["examples/website-ssl/src"]
:resource-paths ["examples/website-ssl/resources"]
:main ^:skip-aot website.core}]
[:examples
{:source-paths ["examples/website-ssl/src"]
:resource-paths ["examples/website-ssl/resources"]
:main ^:skip-aot website.core}]
}

44 changes: 22 additions & 22 deletions project.clj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
(defproject funcool/catacumba "2.2.1"
(defproject funcool/catacumba "2.2.2"
:description "Ratpack Based Asynchronous Web Toolkit for Clojure."
:url "http://github.com/funcool/catacumba"
:license {:name "BSD (2-Clause)"
Expand All @@ -10,10 +10,10 @@
:jar-exclusions [#"\.swp|\.swo|bench\.clj|user\.clj"]
:javac-options ["-target" "1.8" "-source" "1.8" "-Xlint:-options"
"-Xlint:unchecked" "-Xlint:deprecation"]
:dependencies [[org.clojure/clojure "1.9.0" :scope "provided"]
[org.slf4j/slf4j-simple "1.7.25" :scope "provided"]
[org.clojure/core.async "0.4.474"]
[io.ratpack/ratpack-core "1.5.4"
:dependencies [[org.clojure/clojure "1.10.1" :scope "provided"]
[org.slf4j/slf4j-simple "1.7.26" :scope "provided"]
[org.clojure/core.async "0.4.500"]
[io.ratpack/ratpack-core "1.6.1"
:exclusions [[io.netty/netty-codec-http]
[io.netty/netty-handler]
[io.netty/netty-transport-native-epoll]
Expand All @@ -26,30 +26,30 @@

[io.netty/netty-all "4.1.25.Final"]

[cheshire "5.8.0"
[cheshire "5.8.1"
:exclusions [com.fasterxml.jackson.core/jackson-core
com.fasterxml.jackson.dataformat/jackson-dataformat-cbor
com.fasterxml.jackson.dataformat/jackson-dataformat-smile]]

;; Updated & forced dependencies of jackson (form cheshire & ratpack)
[com.fasterxml.jackson.core/jackson-core "2.9.5"]
[com.fasterxml.jackson.core/jackson-databind "2.9.5"]
[com.fasterxml.jackson.dataformat/jackson-dataformat-cbor "2.9.5"]
[com.fasterxml.jackson.dataformat/jackson-dataformat-smile "2.9.5"]
[com.fasterxml.jackson.dataformat/jackson-dataformat-yaml "2.9.5"]
[com.fasterxml.jackson.datatype/jackson-datatype-jdk8 "2.9.5"]
[com.fasterxml.jackson.datatype/jackson-datatype-jsr310 "2.9.5"]
[com.fasterxml.jackson.datatype/jackson-datatype-guava "2.9.5"
[com.fasterxml.jackson.core/jackson-core "2.9.9"]
[com.fasterxml.jackson.core/jackson-databind "2.9.9"]
[com.fasterxml.jackson.dataformat/jackson-dataformat-cbor "2.9.9"]
[com.fasterxml.jackson.dataformat/jackson-dataformat-smile "2.9.9"]
[com.fasterxml.jackson.dataformat/jackson-dataformat-yaml "2.9.9"]
[com.fasterxml.jackson.datatype/jackson-datatype-jdk8 "2.9.9"]
[com.fasterxml.jackson.datatype/jackson-datatype-jsr310 "2.9.9"]
[com.fasterxml.jackson.datatype/jackson-datatype-guava "2.9.9"
:exclusions [[org.yaml/snakeyaml]
[com.google.guava/guava]]]

[ns-tracker "0.3.1"]
[manifold "0.1.6"]
[ns-tracker "0.4.0"]
[manifold "0.1.8"]
[commons-io/commons-io "2.6"]
[buddy/buddy-sign "2.2.0"]
[funcool/beicon "4.1.0"]
[funcool/cuerdas "2.0.5"]
[funcool/promesa "1.9.0"]
[danlentz/clj-uuid "0.1.7"]
[buddy/buddy-sign "3.0.0"]
[funcool/beicon "5.0.0"]
[funcool/cuerdas "2.2.0"]
[funcool/promesa "2.0.1"]
[danlentz/clj-uuid "0.1.9"]
[environ "1.1.0"]
[com.cognitect/transit-clj "0.8.309"]])
[com.cognitect/transit-clj "0.8.313"]])

0 comments on commit cc52dc1

Please sign in to comment.