Skip to content

Commit 08df952

Browse files
jceaserijallison
jceaser
authored and
ijallison
committed
CMR-11410: initial change, forcing a new version of a library (#2480)
* CMR-11410: initial change, forcing a new version of a library
1 parent 3369d01 commit 08df952

13 files changed

Lines changed: 64 additions & 39 deletions

File tree

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ profiles.clj
2424
dev-system/local.edn
2525
*pycache*
2626
.portal
27+
.snyk
2728

2829
###############################
2930
### Test Files

‎access-control-app/project.clj‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,19 @@
3737
[compojure "1.6.1"
3838
:exclusions [commons-fileupload]]
3939
[gov.nasa.earthdata/cmr-site-templates "0.1.1-SNAPSHOT"]
40+
;; replaces org.bouncycastle/bcpkix-jdk15on
41+
[org.bouncycastle/bcpkix-jdk18on "1.85"]
4042
[org.clojure/clojure "1.11.2"]
4143
[org.clojure/tools.reader "1.3.2"]
4244
[org.eclipse.jetty.ee9/jetty-ee9-servlet "12.1.10"]
4345
[org.eclipse.jetty/jetty-http "12.1.8"]
4446
[org.eclipse.jetty/jetty-util "12.1.8"]
4547
[ring/ring-core "1.15.4"]
48+
49+
[ring/ring-codec "1.3.0" :exclusions [org.bouncycastle/bcpkix-jdk15on]]
50+
4651
[ring/ring-jetty-adapter "1.15.4"
4752
:exclusions [org.eclipse.jetty.ee9/jetty-ee9-servlet]]
48-
[ring/ring-codec "1.3.0"]
4953
[ring/ring-json "0.5.1"]]
5054
project-dependencies)
5155
:plugins [[lein-modules "0.3.11"]
@@ -59,13 +63,15 @@
5963
:dependency-check {:output-format [:all]
6064
:suppression-file "resources/security/suppression.xml"}}
6165
:dev {:dependencies [[org.apache.httpcomponents/httpclient "4.5.13"]
66+
[org.bouncycastle/bcpkix-jdk18on "1.85"]
6267
[org.clojure/core.async "0.4.500"]
6368
[org.clojure/tools.namespace "0.2.11"]
6469
[org.clojure/tools.nrepl "0.2.13"]
6570
[org.eclipse.jetty.ee9/jetty-ee9-servlet "12.1.10"]
6671
[pjstadig/humane-test-output "0.9.0"]
6772
[proto-repl "0.3.1"]
68-
[ring/ring-codec "1.3.0"]
73+
[ring/ring-codec "1.3.0" :exclusions
74+
[org.bouncycastle/bcpkix-jdk15on]]
6975
[ring/ring-jetty-adapter "1.15.4"
7076
:exclusions [org.eclipse.jetty.ee9/jetty-ee9-servlet]]
7177
[ring-mock "0.1.5"]]

‎bootstrap-app/project.clj‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
[nasa-cmr/cmr-virtual-product-app "0.1.0-SNAPSHOT"]
2222
[org.apache.httpcomponents/httpclient "4.5.13"]
2323
[org.apache.httpcomponents/httpcore "4.4.10"]
24+
;; replaces org.bouncycastle/bcpkix-jdk15on
25+
[org.bouncycastle/bcpkix-jdk18on "1.85"]
2426
[org.clojure/clojure "1.11.2"]
2527
[org.clojure/tools.nrepl "0.2.13"]
2628
[org.clojure/tools.reader "1.3.2"]
@@ -29,9 +31,9 @@
2931
[org.eclipse.jetty/jetty-http "12.1.8"]
3032
[org.eclipse.jetty/jetty-util "12.1.8"]
3133
[ring/ring-core "1.15.4"]
34+
[ring/ring-codec "1.3.0" :exclusions [org.bouncycastle/bcpkix-jdk15on]]
3235
[ring/ring-jetty-adapter "1.15.4"
3336
:exclusions [org.eclipse.jetty.ee9/jetty-ee9-servlet]]
34-
[ring/ring-codec "1.3.0"]
3537
[ring/ring-json "0.5.1"]]
3638
:plugins [[io.github.jaybarra/drift "1.5.4.2-SNAPSHOT" :exclusions [clojure-tools]]
3739
[lein-exec "0.3.7"]

‎common-app-lib/project.clj‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,16 @@
2828
:profiles {:security {:plugins [[com.livingsocial/lein-dependency-check "1.4.1"]]
2929
:dependency-check {:output-format [:all]
3030
:suppression-file "resources/security/suppression.xml"}}
31-
:dev {:dependencies [[org.clojure/tools.namespace "0.2.11"]
31+
:dev {:dependencies [[org.bouncycastle/bcpkix-jdk18on "1.85"]
32+
[org.clojure/tools.namespace "0.2.11"]
3233
[org.clojure/tools.nrepl "0.2.13"]
34+
[org.clojars.gjahad/debug-repl "0.3.3"]
3335
[org.eclipse.jetty.ee9/jetty-ee9-servlet "12.1.10"]
34-
[ring/ring-codec "1.3.0"]
36+
[ring/ring-codec "1.3.0"
37+
:exclusions [org.bouncycastle/bcpkix-jdk15on]]
3538
[ring/ring-jetty-adapter "1.15.4"
3639
:exclusions [org.eclipse.jetty.ee9/jetty-ee9-servlet]]
37-
[ring/ring-core "1.15.4"]
38-
[org.clojars.gjahad/debug-repl "0.3.3"]]
40+
[ring/ring-core "1.15.4"]]
3941
:jvm-opts ^:replace ["-server"]
4042
:source-paths ["src" "dev" "test"]}
4143
:static {}

‎dev-system/project.clj‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,11 @@
4949
:license {:name "Eclipse Public License"
5050
:url "http://www.eclipse.org/legal/epl-v10.html"}
5151
:dependencies ~(concat '[[commons-codec/commons-codec "1.11"]
52+
;; replaces org.bouncycastle/bcpkix-jdk15on
53+
[org.bouncycastle/bcpkix-jdk18on "1.85"]
5254
[org.clojure/clojure "1.11.2"]
5355
[org.eclipse.jetty.ee9/jetty-ee9-servlet "12.1.10"]
54-
[ring/ring-codec "1.3.0"]
56+
[ring/ring-codec "1.3.0" :exclusions [org.bouncycastle/bcpkix-jdk15on]]
5557
[ring/ring-jetty-adapter "1.15.4"
5658
:exclusions [org.eclipse.jetty.ee9/jetty-ee9-servlet]]]
5759
project-dependencies)

‎indexer-app/project.clj‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,14 @@
1313
[nasa-cmr/cmr-transmit-lib "0.1.0-SNAPSHOT"]
1414
[nasa-cmr/cmr-umm-lib "0.1.0-SNAPSHOT"]
1515
[nasa-cmr/cmr-umm-spec-lib "0.1.0-SNAPSHOT"]
16+
;; replaces org.bouncycastle/bcpkix-jdk15on
17+
[org.bouncycastle/bcpkix-jdk18on "1.85"]
1618
[org.clojure/clojure "1.11.2"]
1719
[org.clojure/tools.nrepl "0.2.13"]
1820
[org.eclipse.jetty.ee9/jetty-ee9-servlet "12.1.10"]
1921
[org.eclipse.jetty/jetty-http "12.1.8"]
2022
[org.eclipse.jetty/jetty-util "12.1.8"]
21-
[ring/ring-codec "1.3.0"]
23+
[ring/ring-codec "1.3.0" :exclusions [org.bouncycastle/bcpkix-jdk15on]]
2224
[ring/ring-core "1.15.4"]
2325
[ring/ring-jetty-adapter "1.15.4"
2426
:exclusions [org.eclipse.jetty.ee9/jetty-ee9-servlet]]

‎ingest-app/project.clj‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,17 @@
44
:dependencies [[camel-snake-kebab "0.4.2"]
55
[clj-http "2.3.0"]
66
[com.draines/postal "2.0.3"]
7-
[jakarta.servlet/jakarta.servlet-api "4.0.4"] ;;5.x and 6.x did not work
8-
[commons-fileupload "1.6.0"]
7+
[com.mchange/c3p0 "0.12.0"]
8+
[com.mchange/mchange-commons-java "0.6.0"]
99
[commons-codec/commons-codec "1.11"]
10+
[commons-fileupload "1.6.0"]
1011
[commons-io "2.18.0"]
11-
[compojure "1.6.1"
12-
:exclusions [commons-fileupload]]
13-
[io.github.jaybarra/drift "1.5.4.2-SNAPSHOT" :exclusions [clojure-tools]]
12+
[compojure "1.6.1" :exclusions [commons-fileupload]]
1413
[gov.nasa.earthdata/cmr-site-templates "0.1.1-SNAPSHOT"]
15-
[instaparse "1.4.10"]
1614
[inflections "0.13.0"]
15+
[instaparse "1.4.10"]
16+
[io.github.jaybarra/drift "1.5.4.2-SNAPSHOT" :exclusions [clojure-tools]]
17+
[jakarta.servlet/jakarta.servlet-api "4.0.4"] ;;5.x and 6.x did not work
1718
[markdown-clj "1.10.5"]
1819
[nasa-cmr/cmr-acl-lib "0.1.0-SNAPSHOT"]
1920
[nasa-cmr/cmr-common-app-lib "0.1.0-SNAPSHOT"]
@@ -28,23 +29,21 @@
2829
[net.sf.saxon/Saxon-HE "9.9.0-2"]
2930
[org.apache.httpcomponents/httpclient "4.5.13"]
3031
[org.apache.httpcomponents/httpcore "4.4.10"]
32+
[org.bouncycastle/bcpkix-jdk18on "1.85"]
3133
[org.clojure/clojure "1.11.2"]
3234
[org.clojure/data.xml "0.0.8"]
3335
[org.clojure/tools.nrepl "0.2.13"]
36+
[org.eclipse.jetty.ee9/jetty-ee9-servlet "12.1.10"]
37+
[org.eclipse.jetty/jetty-http "12.1.8"]
38+
[org.eclipse.jetty/jetty-util "12.1.8"]
3439
[org.quartz-scheduler/quartz "2.3.2"
3540
:exclusions [com.mchange/c3p0 com.mchange/mchange-commons-java]]
36-
[com.mchange/c3p0 "0.12.0"]
37-
[com.mchange/mchange-commons-java "0.6.0"]
3841
[org.slf4j/slf4j-api "1.7.30"]
3942
[org.yaml/snakeyaml "1.31"]
4043
[potemkin "0.4.5"]
41-
[org.eclipse.jetty.ee9/jetty-ee9-servlet "12.1.10"]
42-
[org.eclipse.jetty/jetty-http "12.1.8"]
43-
[org.eclipse.jetty/jetty-util "12.1.8"]
44-
[ring/ring-codec "1.3.0"]
44+
[ring/ring-codec "1.3.0" :exclusions [org.bouncycastle/bcpkix-jdk15on]]
4545
[ring/ring-core "1.15.4"]
46-
[ring/ring-jetty-adapter "1.15.4"
47-
:exclusions [org.eclipse.jetty.ee9/jetty-ee9-servlet]]
46+
[ring/ring-jetty-adapter "1.15.4" :exclusions [org.eclipse.jetty.ee9/jetty-ee9-servlet]]
4847
[ring/ring-json "0.5.1"]]
4948
:plugins [[io.github.jaybarra/drift "1.5.4.2-SNAPSHOT" :exclusions [clojure-tools]]
5049
[lein-exec "0.3.7"]]

‎metadata-db-app/project.clj‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,14 @@
22
:description "The metadata db is a micro-service that provides
33
support for persisting metadata concepts."
44
:url "https://github.com/nasa/Common-Metadata-Repository/tree/master/metadata-db-app"
5-
:dependencies [[cheshire "5.12.0"
6-
:exclusions [com.fasterxml.jackson.core/jackson-core]]
7-
[com.fasterxml.jackson.core/jackson-core "2.21.2"]
5+
:dependencies [[cheshire "5.12.0" :exclusions [com.fasterxml.jackson.core/jackson-core]]
86
[clj-http "3.11.0"]
97
[clj-time "0.15.1"]
8+
[com.fasterxml.jackson.core/jackson-core "2.21.2"]
109
[commons-io "2.18.0"] ;; used by migration
11-
[compojure "1.6.1"
12-
:exclusions [commons-fileupload]]
13-
[io.github.jaybarra/drift "1.5.4.2-SNAPSHOT" :exclusions [clojure-tools]]
10+
[compojure "1.6.1" :exclusions [commons-fileupload]]
1411
[inflections "0.13.0"]
12+
[io.github.jaybarra/drift "1.5.4.2-SNAPSHOT" :exclusions [clojure-tools]]
1513
[nasa-cmr/cmr-acl-lib "0.1.0-SNAPSHOT"]
1614
[nasa-cmr/cmr-common-app-lib "0.1.0-SNAPSHOT"]
1715
[nasa-cmr/cmr-common-lib "0.1.1-SNAPSHOT"]
@@ -20,15 +18,17 @@
2018
[nasa-cmr/cmr-redis-utils-lib "0.1.0-SNAPSHOT"]
2119
[nasa-cmr/cmr-schemas "0.0.1-SNAPSHOT"]
2220
[nasa-cmr/cmr-umm-spec-lib "0.1.0-SNAPSHOT"]
21+
;; replacment for org.bouncycastle/bcpkix-jdk15on
22+
[org.bouncycastle/bcpkix-jdk18on "1.85"]
2323
[org.clojure/clojure "1.11.2"]
2424
[org.clojure/tools.nrepl "0.2.13"]
2525
[org.clojure/tools.reader "1.3.2"]
26-
[org.quartz-scheduler/quartz "2.3.2"]
27-
[org.slf4j/slf4j-api "1.7.30"]
2826
[org.eclipse.jetty.ee9/jetty-ee9-servlet "12.1.10"]
2927
[org.eclipse.jetty/jetty-http "12.1.8"]
3028
[org.eclipse.jetty/jetty-util "12.1.8"]
31-
[ring/ring-codec "1.3.0"]
29+
[org.quartz-scheduler/quartz "2.3.2"]
30+
[org.slf4j/slf4j-api "1.7.30"]
31+
[ring/ring-codec "1.3.0" :exclusions [org.bouncycastle/bcpkix-jdk15on]]
3232
[ring/ring-core "1.15.4"]
3333
[ring/ring-jetty-adapter "1.15.4"
3434
:exclusions [org.eclipse.jetty.ee9/jetty-ee9-servlet]] ;; used by migration

‎mock-echo-app/project.clj‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,14 @@
77
[instaparse "1.4.10"]
88
[nasa-cmr/cmr-common-app-lib "0.1.0-SNAPSHOT"]
99
[nasa-cmr/cmr-transmit-lib "0.1.0-SNAPSHOT"]
10+
;; replacment for org.bouncycastle/bcpkix-jdk15on
11+
[org.bouncycastle/bcpkix-jdk18on "1.85"]
1012
[org.clojure/clojure "1.11.2"]
1113
[org.clojure/tools.reader "1.3.2"]
1214
[org.eclipse.jetty.ee9/jetty-ee9-servlet "12.1.10"]
1315
[org.eclipse.jetty/jetty-http "12.1.8"]
1416
[org.eclipse.jetty/jetty-util "12.1.8"]
15-
[ring/ring-codec "1.3.0"]
17+
[ring/ring-codec "1.3.0" :exclusions [org.bouncycastle/bcpkix-jdk15on]]
1618
[ring/ring-core "1.15.4"]
1719
[ring/ring-jetty-adapter "1.15.4"
1820
:exclusions [org.eclipse.jetty.ee9/jetty-ee9-servlet]]

‎search-app/project.clj‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
[nasa-cmr/cmr-umm-spec-lib "0.1.0-SNAPSHOT"]
2121
[net.sf.saxon/Saxon-HE "9.9.0-2"]
2222
[org.apache.httpcomponents/httpclient "4.5.13"]
23+
;; replacment for org.bouncycastle/bcpkix-jdk15on
24+
[org.bouncycastle/bcpkix-jdk18on "1.85"]
2325
[org.clojure/clojure "1.11.2"]
2426
[org.clojure/data.csv "0.1.4"]
2527
[org.clojure/math.numeric-tower "0.0.4"]
@@ -39,7 +41,7 @@
3941
[org.eclipse.jetty.ee9/jetty-ee9-servlet "12.1.10"]
4042
[org.eclipse.jetty/jetty-http "12.1.8"]
4143
[org.eclipse.jetty/jetty-util "12.1.8"]
42-
[ring/ring-codec "1.3.0"]
44+
[ring/ring-codec "1.3.0" :exclusions [org.bouncycastle/bcpkix-jdk15on]]
4345
[ring/ring-core "1.15.4"]
4446
[ring/ring-jetty-adapter "1.15.4"
4547
:exclusions [org.eclipse.jetty.ee9/jetty-ee9-servlet]]

0 commit comments

Comments
 (0)