Skip to content

Commit 3513302

Browse files
(maint) move stylefruits/gniazdo to dev section
The stylefruits library is only used in tests, and as a result doesn't need to be a full dependency. This moves it to the dev section so that it is available for tests, but not part of the overall jar.
1 parent da2895d commit 3513302

File tree

2 files changed

+12
-8
lines changed

2 files changed

+12
-8
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
env:
1111
- FIPS=false
1212
- # still jdk8
13-
script: lein with-profile fips test
13+
script: lein with-profile pseudo-dev,fips test
1414
jdk: openjdk8
1515
env:
1616
- FIPS=true
@@ -21,7 +21,7 @@ jobs:
2121
env:
2222
- FIPS=false
2323
- # still jdk11
24-
script: lein with-profile fips test
24+
script: lein with-profile pseudo-dev,fips test
2525
jdk: openjdk11
2626
env:
2727
- FIPS=true

project.clj

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -76,22 +76,26 @@
7676
[puppetlabs/trapperkeeper nil :classifier "test"]
7777
[org.clojure/tools.namespace]
7878
[compojure]
79-
[stylefruits/gniazdo nil :exclusions [org.eclipse.jetty.websocket/websocket-api
80-
org.eclipse.jetty.websocket/websocket-client
81-
org.eclipse.jetty/jetty-util]]
8279
[ring/ring-core]]
8380
:resource-paths ["dev-resources"]
8481
:jvm-opts ["-Djava.util.logging.config.file=dev-resources/logging.properties"]}
8582

8683
:dev [:defaults
87-
{:dependencies [[org.bouncycastle/bcpkix-jdk18on]]}]
84+
{:dependencies [[org.bouncycastle/bcpkix-jdk18on]
85+
[stylefruits/gniazdo nil :exclusions [org.eclipse.jetty.websocket/websocket-api
86+
org.eclipse.jetty.websocket/websocket-client
87+
org.eclipse.jetty/jetty-util]]]}]
8888

8989
;; per https://github.com/technomancy/leiningen/issues/1907
9090
;; the provided profile is necessary for lein jar / lein install
9191
:provided {:dependencies [[org.bouncycastle/bcpkix-jdk18on]]
9292
:resource-paths ["dev-resources"]}
93-
94-
:fips [:defaults ; merge in the dev profile
93+
;; a pseudo dev profile that can be combined with the FIPS profiling for testing only
94+
:pseudo-dev {:dependencies [
95+
[stylefruits/gniazdo nil :exclusions [org.eclipse.jetty.websocket/websocket-api
96+
org.eclipse.jetty.websocket/websocket-client
97+
org.eclipse.jetty/jetty-util]]]}
98+
:fips [:defaults ; merge in the default profile
9599
{:dependencies [[org.bouncycastle/bcpkix-fips]
96100
[org.bouncycastle/bc-fips]
97101
[org.bouncycastle/bctls-fips]]

0 commit comments

Comments
 (0)