CMR-11117: trying a new library

jceaser · jceaser · commit 4879231b0971 · 2026-03-17T14:21:53.000-04:00
diff --git a/access-control-app/project.clj b/access-control-app/project.clj
@@ -43,7 +43,7 @@
                            [org.eclipse.jetty/jetty-http]
                            [org.eclipse.jetty/jetty-util]
                            [ring/ring-core]
-                           [ring/ring-jetty-adapter]
+                           [info.sunng/ring-jetty9-adapter]
                            [ring/ring-codec "1.3.0"]
                            [ring/ring-json "0.5.1"]]
                          project-dependencies)
@@ -65,7 +65,7 @@
                                   [pjstadig/humane-test-output "0.9.0"]
                                   [proto-repl "0.3.1"]
                                   [ring/ring-codec "1.3.0"]
-                                  [ring/ring-jetty-adapter]
+                                  [info.sunng/ring-jetty9-adapter]
                                   [ring-mock "0.1.5"]]
                    :jvm-opts ^:replace ["-server"]
                    :source-paths ["src" "dev" "test" "int-test"]
diff --git a/acl-lib/project.clj b/acl-lib/project.clj
@@ -37,7 +37,7 @@
                                      [lambdaisland/kaocha-cloverage "1.0.75"]
                                      [lambdaisland/kaocha-junit-xml "0.0.76"]
                                      ;; ring is needed or this fails in sys int group3
-                                     [ring/ring-jetty-adapter]]}}
+                                     [info.sunng/ring-jetty9-adapter]]}}
   :aliases {;; Kaocha test aliases
             ;; refer to tests.edn for test configuration
             "kaocha" ["with-profile" "+kaocha" "run" "-m" "kaocha.runner"]
diff --git a/bootstrap-app/project.clj b/bootstrap-app/project.clj
@@ -28,7 +28,7 @@
                  [org.eclipse.jetty/jetty-http]
                  [org.eclipse.jetty/jetty-util]
                  [ring/ring-core]
-                 [ring/ring-jetty-adapter]
+                 [info.sunng/ring-jetty9-adapter]
                  [ring/ring-codec "1.3.0"]
                  [ring/ring-json "0.5.1"]]
   :plugins [[io.github.jaybarra/drift "1.5.4.2-SNAPSHOT" :exclusions [clojure-tools]]
@@ -43,7 +43,7 @@
                                            :suppression-file "resources/security/suppression.xml"}}
              :dev {:dependencies [[org.clojure/tools.namespace "0.2.11"]
                                   [org.clojars.gjahad/debug-repl "0.3.3"]
-                                  [ring/ring-jetty-adapter]]
+                                  [info.sunng/ring-jetty9-adapter]]
                    :jvm-opts ^:replace ["-server"]
                    :source-paths ["src" "dev" "test"]}
              :uberjar {:main cmr.bootstrap.runner
diff --git a/common-app-lib/project.clj b/common-app-lib/project.clj
@@ -17,7 +17,7 @@
                  [com.vladsch.flexmark/flexmark-all "0.64.0"]
                  [org.eclipse.jetty/jetty-util]
                  [ring/ring-core ]
-                 [ring/ring-jetty-adapter]
+                 [info.sunng/ring-jetty9-adapter]
                  [ring/ring-json "0.5.1"]
                  [selmer "1.12.5"]]
   :plugins [[lein-parent "0.3.9"]
@@ -30,7 +30,7 @@
              :dev {:dependencies [[org.clojure/tools.namespace "0.2.11"]
                                   [org.clojure/tools.nrepl "0.2.13"]
                                   [ring/ring-codec "1.3.0"]
-                                  [ring/ring-jetty-adapter]
+                                  [info.sunng/ring-jetty9-adapter]
                                   [ring/ring-core]
                                   [org.clojars.gjahad/debug-repl "0.3.3"]]
                    :jvm-opts ^:replace ["-server"]
diff --git a/common-lib/project.clj b/common-lib/project.clj
@@ -55,7 +55,7 @@
                  [org.ow2.asm/asm "7.0"]
                  [potemkin "0.4.5"]
                  [ring/ring-core]
-                 [ring/ring-jetty-adapter]
+                 [info.sunng/ring-jetty9-adapter]
                  [ring/ring-json "0.5.1"]]
   :repositories [["jitpack.io" "https://jitpack.io"]]
   :plugins [[lein-exec "0.3.7"]
@@ -74,7 +74,7 @@
                                   [criterium "0.4.4"]
                                   [proto-repl "0.3.1"]
                                   [ring/ring-core]
-                                  [ring/ring-jetty-adapter]
+                                  [info.sunng/ring-jetty9-adapter]
                                   [clj-http]]
                    :jvm-opts ^:replace ["-server"]
                    ;; XXX Note that profiling can be kept in a profile,
diff --git a/common-lib/src/cmr/common/api/web_server.clj b/common-lib/src/cmr/common/api/web_server.clj
@@ -6,7 +6,7 @@
    [cmr.common.lifecycle :as lifecycle]
    [cmr.common.log :refer [info error]]
    [cmr.common.mime-types :as mt]
-   [ring.adapter.jetty :as jetty])
+   [ring.adapter.jetty9 :as jetty])
   (:import
    (java.io ByteArrayInputStream InputStream)
    (org.eclipse.jetty.server Server CustomRequestLog Connector HttpConnectionFactory)
diff --git a/dev-system/project.clj b/dev-system/project.clj
@@ -53,7 +53,7 @@
   :dependencies ~(concat '[[commons-codec/commons-codec "1.11"]
                            [org.clojure/clojure "1.11.2"]
                            [ring/ring-codec "1.3.0"]
-                           [ring/ring-jetty-adapter]]
+                           [info.sunng/ring-jetty9-adapter]]
                          project-dependencies)
   :plugins [[lein-environ "1.1.0"]
             [lein-parent "0.3.9"]
diff --git a/elastic-utils-lib/project.clj b/elastic-utils-lib/project.clj
@@ -66,7 +66,7 @@
                                      [lambdaisland/kaocha-cloverage "1.0.75"]
                                      [lambdaisland/kaocha-junit-xml "0.0.76"]
                                      ;; ring is needed or this fails in sys int group3
-                                     [ring/ring-jetty-adapter]]}}
+                                     [info.sunng/ring-jetty9-adapter]]}}
   :aliases {;; Kaocha test aliases
             ;; refer to tests.edn for test configuration
             "kaocha" ["with-profile" "+kaocha" "run" "-m" "kaocha.runner"]
diff --git a/indexer-app/project.clj b/indexer-app/project.clj
@@ -21,7 +21,7 @@
                  [org.eclipse.jetty/jetty-util]
                  [ring/ring-codec "1.3.0"]
                  [ring/ring-core]
-                 [ring/ring-jetty-adapter]
+                 [info.sunng/ring-jetty9-adapter]
                  [ring/ring-json "0.5.1"]]
   :plugins [[lein-parent "0.3.9"]
             [lein-shell "0.5.0"]]
@@ -34,7 +34,7 @@
                                            :suppression-file "resources/security/suppression.xml"}}
              :dev {:dependencies [[org.clojars.gjahad/debug-repl "0.3.3"]
                                   [org.clojure/tools.namespace "0.2.11"]
-                                  [ring/ring-jetty-adapter]]
+                                  [info.sunng/ring-jetty9-adapter]]
                    :jvm-opts ^:replace ["-server"]
                    :source-paths ["src" "dev" "test"]}
              :uberjar {:main cmr.indexer.runner
diff --git a/ingest-app/project.clj b/ingest-app/project.clj
@@ -46,7 +46,7 @@
                  [org.eclipse.jetty/jetty-util]
                  [ring/ring-codec "1.3.0"]
                  [ring/ring-core]
-                 [ring/ring-jetty-adapter]
+                 [info.sunng/ring-jetty9-adapter]
                  [ring/ring-json "0.5.1"]]
   :plugins [[io.github.jaybarra/drift "1.5.4.2-SNAPSHOT" :exclusions [clojure-tools]]
             [lein-exec "0.3.7"]
@@ -59,7 +59,7 @@
                                            :suppression-file "resources/security/suppression.xml"}}
              :dev {:dependencies [[org.clojars.gjahad/debug-repl "0.3.3"]
                                   [org.clojure/tools.namespace "0.2.11"]
-                                  [ring/ring-jetty-adapter]
+                                  [info.sunng/ring-jetty9-adapter]
                                   [ring-mock "0.1.5"]]
                    :jvm-opts ^:replace ["-server"]
                    :source-paths ["src" "dev" "test"]}
diff --git a/message-queue-lib/project.clj b/message-queue-lib/project.clj
@@ -46,7 +46,7 @@
 
                  [potemkin "0.4.5"]
                  [ring/ring-core]
-                 [ring/ring-jetty-adapter]]
+                 [info.sunng/ring-jetty9-adapter]]
   :plugins [[lein-parent "0.3.9"]
             [lein-shell "0.5.0"]]
   :jvm-opts ^:replace ["-server"
@@ -58,7 +58,7 @@
              :dev {:dependencies [[org.clojure/tools.namespace "0.2.11"]
                                   [org.clojars.gjahad/debug-repl "0.3.3"]
                                   [org.clojure/tools.nrepl "0.2.13"]
-                                  [ring/ring-jetty-adapter]]
+                                  [info.sunng/ring-jetty9-adapter]]
                    :jvm-opts ^:replace ["-server"]
                    :source-paths ["src" "dev" "test"]}
              :static {}
@@ -79,7 +79,7 @@
                                      [lambdaisland/kaocha-cloverage "1.0.75"]
                                      [lambdaisland/kaocha-junit-xml "0.0.76"]
                                      ;; ring is needed or this fails in sys int group3
-                                     [ring/ring-jetty-adapter]]}}
+                                     [info.sunng/ring-jetty9-adapter]]}}
   :aliases {;; Kaocha test aliases
             ;; refer to tests.edn for test configuration
             "kaocha" ["with-profile" "+kaocha" "run" "-m" "kaocha.runner"]
diff --git a/metadata-db-app/project.clj b/metadata-db-app/project.clj
@@ -29,7 +29,7 @@
                  [org.eclipse.jetty/jetty-util]
                  [ring/ring-codec "1.3.0"]
                  [ring/ring-core]
-                 [ring/ring-jetty-adapter] ;; used by migration
+                 [info.sunng/ring-jetty9-adapter] ;; used by migration
                  [ring/ring-json "0.5.1"]]
   :plugins [[io.github.jaybarra/drift "1.5.4.2-SNAPSHOT" :exclusions [clojure-tools]]
             [lein-exec "0.3.7"]
@@ -45,7 +45,7 @@
              :dev {:dependencies [[nasa-cmr/cmr-mock-echo-app "0.1.0-SNAPSHOT"]
                                   [org.clojars.gjahad/debug-repl "0.3.3"]
                                   [org.clojure/tools.namespace "0.2.11"]
-                                  [ring/ring-jetty-adapter]
+                                  [info.sunng/ring-jetty9-adapter]
                                   [nasa-cmr/cmr-common-lib "0.1.1-SNAPSHOT"]
                                   [nasa-cmr/cmr-message-queue-lib "0.1.0-SNAPSHOT"]
                                   [pjstadig/humane-test-output "0.9.0"]
diff --git a/mock-echo-app/project.clj b/mock-echo-app/project.clj
@@ -15,7 +15,7 @@
                  [org.eclipse.jetty/jetty-util]
                  [ring/ring-codec "1.3.0"]
                  [ring/ring-core]
-                 [ring/ring-jetty-adapter]
+                 [info.sunng/ring-jetty9-adapter]
                  [ring/ring-json "0.5.1"]]
   :plugins [[lein-exec "0.3.7"]
             [lein-parent "0.3.9"]
@@ -31,7 +31,7 @@
                                   [org.clojars.gjahad/debug-repl "0.3.3"]
                                   [org.clojure/tools.namespace "0.2.11"]
                                   [org.clojure/tools.nrepl "0.2.13"]
-                                  [ring/ring-jetty-adapter]]
+                                  [info.sunng/ring-jetty9-adapter]]
                    :jvm-opts ^:replace ["-server"]
                    :source-paths ["src" "dev" "test"]}
              :uberjar {:main cmr.mock-echo.runner
diff --git a/project.clj b/project.clj
@@ -26,8 +26,12 @@
                           [org.testcontainers/testcontainers "2.0.2" ;; latest
                            :exclusions [[org.apache.commons/commons-compress]]]
                           [ring/ring-core "1.14.2"];; latest is 1.15.2 was 1.14.2
-                          [ring/ring-jetty-adapter "1.14.2" ;;"1.15.3"
-                           :exclusions [org.eclipse.jetty/jetty-server]] ;; latest is 1.15.3
+                          ;[ring/ring-jetty-adapter "1.14.2" ;;"1.15.3"
+                          ; :exclusions [org.eclipse.jetty/jetty-server]] ;; latest is 1.15.3
+
+
+                          [info.sunng/ring-jetty9-adapter "0.33.5"
+                           :exclusions [org.eclipse.jetty/jetty-server]]
 
                           ;; These libraries are all versioned together, was 12.0.21
                           [org.eclipse.jetty/jetty-http "12.0.33"]
diff --git a/redis-utils-lib/project.clj b/redis-utils-lib/project.clj
@@ -58,7 +58,7 @@
                                      [lambdaisland/kaocha-cloverage "1.0.75"]
                                      [lambdaisland/kaocha-junit-xml "0.0.76"]
                                      ;; ring is needed or this fails in sys int group3
-                                     [ring/ring-jetty-adapter]]}}
+                                     [info.sunng/ring-jetty9-adapter]]}}
   :aliases {"bikeshed" ["with-profile" "lint" "bikeshed" "--max-line-length=100"]
             "check-deps" ["with-profile" "lint" "ancient" ":all"]
             "check-sec" ["with-profile" "security" "dependency-check"]
diff --git a/search-app/project.clj b/search-app/project.clj
@@ -39,12 +39,13 @@
                  [org.eclipse.jetty/jetty-io]
                  [org.eclipse.jetty/jetty-server]
                  [org.eclipse.jetty.ee9.websocket/jetty-ee9-websocket-jetty-server]
-                 [ring/ring-jetty-adapter
-                  :exclusions [org.eclipse.jetty/jetty-http
-                               org.eclipse.jetty/jetty-io
-                               org.eclipse.jetty/jetty-util
-                               org.eclipse.jetty/jetty-server
-                               org.eclipse.jetty.ee9.websocket/jetty-ee9-websocket-jetty-server]]
+                 [info.sunng/ring-jetty9-adapter
+                  ;:exclusions [org.eclipse.jetty/jetty-http
+                  ;             org.eclipse.jetty/jetty-io
+                  ;             org.eclipse.jetty/jetty-util
+                  ;             org.eclipse.jetty/jetty-server
+                  ;             org.eclipse.jetty.ee9.websocket/jetty-ee9-websocket-jetty-server]
+                  ]
 
                  [ring/ring-json "0.5.1"]
                  [selmer "1.12.5"]
@@ -79,13 +80,14 @@
                                   [org.eclipse.jetty/jetty-io]
                                   [org.eclipse.jetty/jetty-unixdomain-server]
                                   [org.eclipse.jetty/jetty-server]
-                                  [ring/ring-jetty-adapter
-                                   :exclusions [org.eclipse.jetty/jetty-http
-                                                org.eclipse.jetty/jetty-io
-                                                org.eclipse.jetty/jetty-util
-                                                org.eclipse.jetty/jetty-unixdomain-server
-                                                org.eclipse.jetty/jetty-server
-                                                org.eclipse.jetty.ee9.websocket/jetty-ee9-websocket-jetty-server]]
+                                  [info.sunng/ring-jetty9-adapter
+                                   ;:exclusions [org.eclipse.jetty/jetty-http
+                                   ;             org.eclipse.jetty/jetty-io
+                                   ;             org.eclipse.jetty/jetty-util
+                                   ;             org.eclipse.jetty/jetty-unixdomain-server
+                                   ;             org.eclipse.jetty/jetty-server
+                                   ;t             org.eclipse.jetty.ee9.websocket/jetty-ee9-websocket-jetty-server]
+                                   ]
 
                                   [pjstadig/humane-test-output "0.9.0"]
                                   [ring-mock "0.1.5"]]
@@ -102,11 +104,6 @@
              ;; static profile).
              :static {:dependencies [[org.eclipse.jetty/jetty-http]
                                      [org.eclipse.jetty/jetty-util]]}
-             ;:test {:plugins [[lein-shell "0.5.0"]]
-             ;       :dependencies [[org.eclips.jetty/jetty-server "12.1.7"]
-             ;                      [ring/ring-jetty-adapter :exclusions [org.eclipse.jetty/jetty-server]]
-             ;                      [org.eclipse.jetty/jetty-server "12.1.7"]
-             ;                      [org.eclipse.jetty.websocket/websocket-jetty-server "11.0.26"]]}
              :uberjar {:main cmr.search.runner
                        :aot :all}
 
diff --git a/search-relevancy-test/project.clj b/search-relevancy-test/project.clj
@@ -55,7 +55,7 @@
                                      [lambdaisland/kaocha-cloverage "1.0.75"]
                                      [lambdaisland/kaocha-junit-xml "0.0.76"]
                                      ;; ring is needed or this fails in sys int group3
-                                     [ring/ring-jetty-adapter "1.15.3"]]}}
+                                     [info.sunng/ring-jetty9-adapter "0.33.5"]]}}
   :aliases {;; Kaocha test aliases
             ;; refer to tests.edn for test configuration
             "kaocha" ["with-profile" "+kaocha" "run" "-m" "kaocha.runner"]
diff --git a/system-int-test/project.clj b/system-int-test/project.clj
diff --git a/transmit-lib/project.clj b/transmit-lib/project.clj
diff --git a/umm-lib/project.clj b/umm-lib/project.clj
diff --git a/umm-spec-lib/project.clj b/umm-spec-lib/project.clj
diff --git a/virtual-product-app/project.clj b/virtual-product-app/project.clj
