Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
env:
- FIPS=false
- # still jdk8
script: lein with-profile fips test
script: lein with-profile pseudo-dev,fips test
jdk: openjdk8
env:
- FIPS=true
Expand All @@ -21,7 +21,7 @@ jobs:
env:
- FIPS=false
- # still jdk11
script: lein with-profile fips test
script: lein with-profile pseudo-dev,fips test
jdk: openjdk11
env:
- FIPS=true
Expand Down
16 changes: 10 additions & 6 deletions project.clj
Original file line number Diff line number Diff line change
Expand Up @@ -76,22 +76,26 @@
[puppetlabs/trapperkeeper nil :classifier "test"]
[org.clojure/tools.namespace]
[compojure]
[stylefruits/gniazdo nil :exclusions [org.eclipse.jetty.websocket/websocket-api
org.eclipse.jetty.websocket/websocket-client
org.eclipse.jetty/jetty-util]]
[ring/ring-core]]
:resource-paths ["dev-resources"]
:jvm-opts ["-Djava.util.logging.config.file=dev-resources/logging.properties"]}

:dev [:defaults
{:dependencies [[org.bouncycastle/bcpkix-jdk18on]]}]
{:dependencies [[org.bouncycastle/bcpkix-jdk18on]
[stylefruits/gniazdo nil :exclusions [org.eclipse.jetty.websocket/websocket-api
org.eclipse.jetty.websocket/websocket-client
org.eclipse.jetty/jetty-util]]]}]

;; per https://github.com/technomancy/leiningen/issues/1907
;; the provided profile is necessary for lein jar / lein install
:provided {:dependencies [[org.bouncycastle/bcpkix-jdk18on]]
:resource-paths ["dev-resources"]}

:fips [:defaults ; merge in the dev profile
;; a pseudo dev profile that can be combined with the FIPS profiling for testing only
:pseudo-dev {:dependencies [
[stylefruits/gniazdo nil :exclusions [org.eclipse.jetty.websocket/websocket-api
org.eclipse.jetty.websocket/websocket-client
org.eclipse.jetty/jetty-util]]]}
:fips [:defaults ; merge in the default profile
{:dependencies [[org.bouncycastle/bcpkix-fips]
[org.bouncycastle/bc-fips]
[org.bouncycastle/bctls-fips]]
Expand Down