Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade dependencies #108

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Upgrade dependencies #108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion COPYRIGHT.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
All data and code in this repository is copyright © 2014-2017 Cognitect, Inc.
All data and code in this repository is copyright © 2014-2020 Cognitect, Inc.
6 changes: 3 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ Stable versions are currently deployed to the Clojars repository.
[Leiningen](https://github.com/technomancy/leiningen) dependency information:

```clj
[com.cognitect/pedestal.vase "0.9.3"]
[com.cognitect/pedestal.vase "0.9.4"]
```

[Maven](http://maven.apache.org/) dependency information:
Expand All @@ -54,7 +54,7 @@ Stable versions are currently deployed to the Clojars repository.
<dependency>
<groupId>com.cognitect</groupId>
<artifactId>pedestal.vase</artifactId>
<version>0.9.3</version>
<version>0.9.4</version>
</dependency>
```

Expand Down Expand Up @@ -242,4 +242,4 @@ channel.

## Copyright

Copyright © 2015-2018 Cognitect, Inc. All rights reserved.
Copyright © 2015-2020 Cognitect, Inc. All rights reserved.
10 changes: 5 additions & 5 deletions deps.edn
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{:paths ["src"]
:deps {com.datomic/datomic-free {:mvn/version "0.9.5697"}
com.datomic/client-cloud {:mvn/version "0.8.63"}
com.datomic/client-cloud {:mvn/version "0.8.102"}

io.rkn/conformity {:mvn/version "0.5.1"}
io.rkn/conformity {:mvn/version "0.5.4"}

;; Pedestal
io.pedestal/pedestal.service {:mvn/version "0.5.4"}
io.pedestal/pedestal.jetty {:mvn/version "0.5.4"}
io.pedestal/pedestal.service {:mvn/version "0.5.8"}
io.pedestal/pedestal.jetty {:mvn/version "0.5.8"}

com.cognitect/fern {:mvn/version "0.1.5"}}
com.cognitect/fern {:mvn/version "0.1.6"}}
:aliases {:repl {:extra-paths ["test" "test/resources"]}}}
58 changes: 33 additions & 25 deletions project.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,39 +1,47 @@
(defproject com.cognitect/pedestal.vase "0.9.4-SNAPSHOT"
:description "Vase: Pedestal API Container"
:url "https://github.com/cognitect-labs/vase"
:exclusions [org.eclipse.jetty/jetty-io
org.eclipse.jetty/jetty-util
org.eclipse.jetty/jetty-http
org.eclipse.jetty/jetty-client]
:dependencies [;; Platform
[org.clojure/clojure "1.10.1"]

;; Datomic
[com.datomic/datomic-free "0.9.5697" :exclusions [[org.slf4j/slf4j-api]
[org.slf4j/slf4j-nop]
[org.eclipse.jetty/jetty-util]
[org.eclipse.jetty/jetty-client]]]
[com.datomic/client-cloud "0.8.78" :exclusions [commons-logging]]
[io.rkn/conformity "0.5.1" :exclusions [com.datomic/datomic-free]]
[org.slf4j/slf4j-nop]]]

[com.datomic/client-cloud "0.8.102" :exclusions [commons-logging
org.clojure/data.priority-map
org.clojure/core.cache]]

[io.rkn/conformity "0.5.4" :exclusions [com.datomic/datomic-free]]

;; Pedestal
[io.pedestal/pedestal.service "0.5.7"]
[io.pedestal/pedestal.jetty "0.5.7"]
[io.pedestal/pedestal.service "0.5.8" :exclusions [org.clojure/tools.analyzer.jvm]]
[io.pedestal/pedestal.jetty "0.5.8"]

;; Pin Jetty versions to avoid conflict between Datomic and Pedestal
;; Pin to avoid conflicts between Datomic and Pedestal
[org.eclipse.jetty/jetty-client "9.4.18.v20190429"]

;; Pin core.async to avoid conflict between Datomic and Pedestal
[org.clojure/core.async "0.4.490"]

[org.clojure/core.async "1.3.610"]
[org.clojure/tools.analyzer.jvm "1.1.0"]
[org.clojure/core.cache "1.0.207"]
;; Pin joda-time to avoid conflict between Datomic and Pedestal
[joda-time "2.9.9"]
[joda-time "2.10.6"]

;; Configuration
[com.cognitect/fern "0.1.5"]
[com.cognitect/fern "0.1.6"]
[fipp "0.6.17"] ;; pin to avoid puget/fipp conflicts
[org.clojure/core.rrb-vector "0.0.14"]

;; Replace Java EE module for JDK 11
[javax.xml.bind/jaxb-api "2.3.0"]
[javax.xml.bind/jaxb-api "2.4.0-b180830.0359"]

;; Cleanup
[commons-codec "1.12"]
[cheshire "5.8.1"]]
[commons-codec "1.14"]
[cheshire "5.10.0"]]

:main ^:skip-aot com.cognitect.vase.main
:pedantic? :warn
Expand All @@ -57,17 +65,17 @@
"resources"
"test/resources"]
:dependencies [[org.clojure/tools.trace "0.7.10"]
[org.clojure/tools.namespace "0.3.0" :exclusions [[org.clojure/tools.reader]]]
[org.clojure/tools.namespace "1.0.0" :exclusions [[org.clojure/tools.reader]]]
[org.clojure/tools.reader "1.3.2"]
[org.clojure/test.check "0.9.0"]
[org.clojure/test.check "1.1.0"]
;; Logging
[org.slf4j/slf4j-api "1.7.26"]
[org.slf4j/slf4j-api "1.7.30"]
[ch.qos.logback/logback-classic "1.2.3" :exclusions [[org.slf4j/slf4j-api]]]
[org.slf4j/jul-to-slf4j "1.7.26"]
[org.slf4j/jcl-over-slf4j "1.7.26"]
[org.slf4j/log4j-over-slf4j "1.7.26"]]}
:test {:dependencies [[org.clojure/test.check "0.9.0"]
[io.pedestal/pedestal.service-tools "0.5.7" :exclusions [[org.slf4j/log4j-over-slf4j]
[org.slf4j/jul-to-slf4j "1.7.30"]
[org.slf4j/jcl-over-slf4j "1.7.30"]
[org.slf4j/log4j-over-slf4j "1.7.30"]]}
:test {:dependencies [[org.clojure/test.check "1.1.0"]
[io.pedestal/pedestal.service-tools "0.5.8" :exclusions [[org.slf4j/log4j-over-slf4j]
[org.slf4j/jul-to-slf4j]
[org.slf4j/jcl-over-slf4j]]]]
:resource-paths ["resources"
Expand Down