Skip to content

Commit c4dec90

Browse files
jceaserjceaser
committed
CMR-11117: Trying a different version mix, centralizing more version numbers
1 parent 3c68700 commit c4dec90

File tree

6 files changed

+47
-38
lines changed

6 files changed

+47
-38
lines changed

‎common-lib/project.clj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,8 @@
8888
; "-Dcom.sun.management.jmxremote.authenticate=false"
8989
; "-Dcom.sun.management.jmxremote.port=1098"]
9090
:source-paths ["src" "dev" "test"]}
91-
:static {:dependencies [[org.eclipse.jetty/jetty-http "12.0.21"]
92-
[org.eclipse.jetty/jetty-util "12.0.21"]]}
91+
:static {:dependencies [[org.eclipse.jetty/jetty-http]
92+
[org.eclipse.jetty/jetty-util]]}
9393
;; This profile is used for linting and static analysis. To run for this
9494
;; project, use `lein lint` from inside the project directory. To run for
9595
;; all projects at the same time, use the same command but from the top-

‎ingest-app/project.clj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@
6767
;; profile. An agent pool is being started when using the default profile which causes the wait of
6868
;; 60 seconds before allowing the JVM to shutdown since no call to shutdown-agents is made.
6969
;; Generate docs with: lein generate-static
70-
:static {:dependencies [[org.eclipse.jetty/jetty-http "12.0.21"]
71-
[org.eclipse.jetty/jetty-util "12.0.21"]]}
70+
:static {:dependencies [[org.eclipse.jetty/jetty-http]
71+
[org.eclipse.jetty/jetty-util]]}
7272
:uberjar {:main cmr.ingest.runner
7373
:aot :all}
7474
;; This profile is used for linting and static analysis. To run for this

‎project.clj‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
;; 'CMR_ELASTIC_PORT=9206 lein modules do clean, install, test-out' will set the elastic port to use
1313
;; as an environment variable, run clean in all project subdirectories, install in all project
1414
;; subdirectories, and then test-out in all project subdirectories.
15+
(def version-jetty-adapter "0.39.2") ;; several projects do this exact block, match them
16+
(def version-jetty "12.1.7") ;; serveral projects do this exact block, match them
1517
(defproject nasa-cmr/cmr "0.1.0-SNAPSHOT"
1618
:description "Top level project to support all CMR libraries and applications."
1719
:plugins [[lein-modules "0.3.11"]
@@ -30,16 +32,16 @@
3032
; :exclusions [org.eclipse.jetty/jetty-server]] ;; latest is 1.15.3
3133

3234

33-
[info.sunng/ring-jetty9-adapter "0.39.2"
35+
[info.sunng/ring-jetty9-adapter ~version-jetty-adapter
3436
:exclusions [org.eclipse.jetty/jetty-server]]
3537

3638
;; These libraries are all versioned together, was 12.0.21
37-
[org.eclipse.jetty/jetty-http "12.0.33"]
38-
[org.eclipse.jetty/jetty-util "12.0.33"]
39-
[org.eclipse.jetty/jetty-io "12.0.33"]
40-
[org.eclipse.jetty/jetty-server "12.0.33"]
41-
[org.eclipse.jetty/jetty-unixdomain-server "12.0.33"]
42-
[org.eclipse.jetty.ee9.websocket/jetty-ee9-websocket-jetty-server "12.0.33"]]
39+
[org.eclipse.jetty/jetty-http ~version-jetty]
40+
[org.eclipse.jetty/jetty-util ~version-jetty]
41+
[org.eclipse.jetty/jetty-io ~version-jetty]
42+
[org.eclipse.jetty/jetty-server ~version-jetty]
43+
[org.eclipse.jetty/jetty-unixdomain-server ~version-jetty]
44+
[org.eclipse.jetty.ee9.websocket/jetty-ee9-websocket-jetty-server ~version-jetty]]
4345
:profiles {:uberjar {:modules {:dirs ["access-control-app"
4446
"bootstrap-app"
4547
"indexer-app"

‎search-relevancy-test/project.clj‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
(def version-jetty-adapter "0.39.2")
2+
13
(defproject nasa-cmr/cmr-search-relevancy-test "0.1.0-SNAPSHOT"
24
:description "Tests for measuring CMR search relevancy"
35
:url "https://github.com/nasa/Common-Metadata-Repository/tree/master/search-relevancy-test"
@@ -55,7 +57,7 @@
5557
[lambdaisland/kaocha-cloverage "1.0.75"]
5658
[lambdaisland/kaocha-junit-xml "0.0.76"]
5759
;; ring is needed or this fails in sys int group3
58-
[info.sunng/ring-jetty9-adapter "0.39.2"]]}}
60+
[info.sunng/ring-jetty9-adapter ~version-jetty-adapter]]}}
5961
:aliases {;; Kaocha test aliases
6062
;; refer to tests.edn for test configuration
6163
"kaocha" ["with-profile" "+kaocha" "run" "-m" "kaocha.runner"]

‎system-int-test/project.clj‎

Lines changed: 25 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
(def version-jetty-adapter "0.39.2")
2+
(def version-jetty "12.1.7")
3+
14
(defproject nasa-cmr/cmr-system-int-test "0.1.0-SNAPSHOT"
25
:description "This project provides end to end integration testing for CMR components."
36
:url "https://github.com/nasa/Common-Metadata-Repository/tree/master/system-int-test"
@@ -41,11 +44,11 @@
4144
[ring/ring-core "1.15.3"]
4245

4346
;; Patch Jetty inside the ring adapter
44-
[org.eclipse.jetty/jetty-http "12.1.6"]
45-
[org.eclipse.jetty/jetty-io "12.1.6"]
46-
[org.eclipse.jetty/jetty-util "12.1.6"]
47-
[org.eclipse.jetty/jetty-server "12.1.6"]
48-
[org.eclipse.jetty/jetty-unixdomain-server "12.1.6"]
47+
[org.eclipse.jetty/jetty-http ~version-jetty]
48+
[org.eclipse.jetty/jetty-io ~version-jetty]
49+
[org.eclipse.jetty/jetty-util ~version-jetty]
50+
[org.eclipse.jetty/jetty-server ~version-jetty]
51+
[org.eclipse.jetty/jetty-unixdomain-server ~version-jetty]
4952
; AI suggested nonsense below:
5053
;[org.eclipse.jetty/jetty-security "12.1.6"]
5154
;[org.eclipse.jetty/jetty-session "12.1.6"]
@@ -64,7 +67,7 @@
6467
;[org.eclipse.jetty.websocket/jetty-websocket-core-common "12.1.6"]
6568
;[org.eclipse.jetty.websocket/jetty-websocket-core-server "12.1.6"]
6669

67-
[info.sunng/ring-jetty9-adapter "0.39.2"]
70+
[info.sunng/ring-jetty9-adapter ~version-jetty-adapter]
6871

6972
;[ring/ring-jetty-adapter "1.15.3"
7073
; :exclusions [org.eclipse.jetty/jetty-http
@@ -88,11 +91,11 @@
8891
;org.eclipse.jetty.websocket/jetty-websocket-core-common
8992
;org.eclipse.jetty.websocket/jetty-websocket-core-server
9093
;]]
91-
]
94+
]
9295
:plugins [[lein-shell "0.5.0"]]
9396
:jvm-opts ^:replace ["-server"
9497
"-XX:-OmitStackTraceInFastThrow"
95-
"-Dclojure.compiler.direct-linking=true"]
98+
"-Dclojure.compiler.direct-linking=true"]
9699
:profiles {:security {:plugins [[com.livingsocial/lein-dependency-check "1.4.1"]]
97100
:dependency-check {:output-format [:all]
98101
:suppression-file "resources/security/suppression.xml"
@@ -101,14 +104,14 @@
101104
[org.clojure/tools.namespace "0.2.11"]
102105
[org.clojure/tools.nrepl "0.2.13"]
103106
[pjstadig/humane-test-output "0.9.0"]
104-
[info.sunng/ring-jetty9-adapter "0.39.2"]
107+
[info.sunng/ring-jetty9-adapter ~version-jetty-adapter]
105108

106109
;; Patch Jetty inside the ring adapter
107-
[org.eclipse.jetty/jetty-http "12.1.6"]
108-
[org.eclipse.jetty/jetty-io "12.1.6"]
109-
[org.eclipse.jetty/jetty-util "12.1.6"]
110-
[org.eclipse.jetty/jetty-server "12.1.6"]
111-
[org.eclipse.jetty/jetty-unixdomain-server "12.1.6"]
110+
[org.eclipse.jetty/jetty-http ~version-jetty]
111+
[org.eclipse.jetty/jetty-io ~version-jetty]
112+
[org.eclipse.jetty/jetty-util ~version-jetty]
113+
[org.eclipse.jetty/jetty-server ~version-jetty]
114+
[org.eclipse.jetty/jetty-unixdomain-server ~version-jetty]
112115
; 🚩 AI suggested nonsense below:
113116
;[org.eclipse.jetty/jetty-security "12.1.6"]
114117
;[org.eclipse.jetty/jetty-session "12.1.6"]
@@ -120,7 +123,7 @@
120123
;[org.eclipse.jetty.ee9/jetty-ee9-webapp "12.1.6"]
121124
;[org.eclipse.jetty.ee/jetty-ee-webapp "12.1.6"]
122125

123-
[org.eclipse.jetty.ee9.websocket/jetty-ee9-websocket-jetty-server "12.1.6"]
126+
[org.eclipse.jetty.ee9.websocket/jetty-ee9-websocket-jetty-server ~version-jetty]
124127
;[org.eclipse.jetty.ee9.websocket/jetty-ee9-websocket-jetty-api "12.1.6"]
125128
;[org.eclipse.jetty.ee9.websocket/jetty-ee9-websocket-jetty-common "12.1.6"]
126129
;[org.eclipse.jetty.ee9.websocket/jetty-ee9-websocket-servlet "12.1.6"]
@@ -171,13 +174,13 @@
171174
:kaocha {:dependencies [;[ring/ring-jetty-adapter "1.15.3"]
172175

173176
;; Patch Jetty inside the ring adapter
174-
[org.eclipse.jetty/jetty-http "12.1.6"]
175-
[org.eclipse.jetty/jetty-io "12.1.6"]
176-
[org.eclipse.jetty/jetty-util "12.1.6"]
177-
[org.eclipse.jetty/jetty-unixdomain-server "12.1.6"]
178-
[org.eclipse.jetty.ee9.websocket/jetty-ee9-websocket-jetty-server "12.1.6"]
179-
[org.eclipse.jetty/jetty-server "12.1.6"]
180-
[info.sunng/ring-jetty9-adapter "0.39.2"]
177+
[org.eclipse.jetty/jetty-http ~version-jetty]
178+
[org.eclipse.jetty/jetty-io ~version-jetty]
179+
[org.eclipse.jetty/jetty-util ~version-jetty]
180+
[org.eclipse.jetty/jetty-unixdomain-server ~version-jetty]
181+
[org.eclipse.jetty.ee9.websocket/jetty-ee9-websocket-jetty-server ~version-jetty]
182+
[org.eclipse.jetty/jetty-server ~version-jetty]
183+
[info.sunng/ring-jetty9-adapter ~version-jetty-adapter]
181184
;[ring/ring-jetty-adapter "1.15.3"
182185
; :exclusions [org.eclipse.jetty/jetty-http
183186
; org.eclipse.jetty/jetty-io

‎virtual-product-app/project.clj‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
(def version-jetty-adapter "0.39.2")
2+
(def version-jetty "12.1.7")
13
(defproject nasa-cmr/cmr-virtual-product-app "0.1.0-SNAPSHOT"
24
:description "Adds virtual products to the CMR."
35
:url "https://github.com/nasa/Common-Metadata-Repository/tree/master/virtual-product-app"
@@ -15,11 +17,11 @@
1517
[nasa-cmr/cmr-umm-spec-lib "0.1.0-SNAPSHOT"]
1618
[org.clojure/clojure "1.11.2"]
1719
[org.clojure/tools.nrepl "0.2.13"]
18-
[org.eclipse.jetty/jetty-http "12.1.6"]
19-
[org.eclipse.jetty/jetty-util "12.1.6"]
20+
[org.eclipse.jetty/jetty-http ~version-jetty]
21+
[org.eclipse.jetty/jetty-util ~version-jetty]
2022
[ring/ring-codec "1.3.0"]
2123
[ring/ring-core "1.15.3"]
22-
[info.sunng/ring-jetty9-adapter "0.39.2"]
24+
[info.sunng/ring-jetty9-adapter ~version-jetty-adapter]
2325
[ring/ring-json "0.5.1"]]
2426
:plugins [[lein-shell "0.5.0"]]
2527
:jvm-opts ^:replace ["-server"
@@ -32,7 +34,7 @@
3234
:dev {:dependencies [[org.clojars.gjahad/debug-repl "0.3.3"]
3335
[org.clojure/tools.namespace "0.2.11"]
3436
[pjstadig/humane-test-output "0.9.0"]
35-
[info.sunng/ring-jetty9-adapter "0.39.2"]]
37+
[info.sunng/ring-jetty9-adapter ~version-jetty-adapter]]
3638
:jvm-opts ^:replace ["-server"]
3739
:source-paths ["src" "dev" "test" "int-test"]
3840
:injections [(require 'pjstadig.humane-test-output)

0 commit comments

Comments
 (0)