Skip to content

Upgrade to jetty12 #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
austb wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Upgrade to jetty12 #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
269f6c6
Update webserver dependency to trapperkeeper-webserver-jetty12
austb Dec 27, 2025
ae70fae
Update test references from jetty10-service to jetty12-service
austb Dec 27, 2025
4f31155
(DO NOT MERGE) Pin trapperkeeper to dev deps
austb Dec 27, 2025
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
8 changes: 4 additions & 4 deletions project.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@
[org.openvoxproject/kitchensink "3.5.5"]
[org.openvoxproject/kitchensink "3.5.5" :classifier "test"]
[org.openvoxproject/ring-middleware "2.1.4"]
[org.openvoxproject/trapperkeeper "4.3.2"]
[org.openvoxproject/trapperkeeper "4.3.2" :classifier "test"]
[org.openvoxproject/trapperkeeper "4.3.3-SNAPSHOT"]
[org.openvoxproject/trapperkeeper "4.3.3-SNAPSHOT" :classifier "test"]
[org.openvoxproject/trapperkeeper-authorization "2.1.6"]
[org.openvoxproject/trapperkeeper-scheduler "1.3.1"]
[org.openvoxproject/trapperkeeper-webserver-jetty10 "1.1.4"]]
[org.openvoxproject/trapperkeeper-webserver-jetty12 "1.0.0-SNAPSHOT"]]

:dependencies [[org.clojure/clojure]
[cheshire]
Expand All @@ -67,6 +67,6 @@
[org.openvoxproject/http-client]
[org.openvoxproject/kitchensink :classifier "test"]
[org.openvoxproject/trapperkeeper :classifier "test"]
[org.openvoxproject/trapperkeeper-webserver-jetty10]]}}
[org.openvoxproject/trapperkeeper-webserver-jetty12]]}}

:plugins [[org.openvoxproject/i18n ~i18n-version :hooks false]])
16 changes: 8 additions & 8 deletions test/puppetlabs/trapperkeeper/services/status/status_proxy_service_test.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
[puppetlabs.trapperkeeper.services.status.status-proxy-service :refer [status-proxy-service]]
[puppetlabs.trapperkeeper.services.webrouting.webrouting-service :as webrouting-service]
[puppetlabs.trapperkeeper.services.scheduler.scheduler-service :as scheduler-service]
[puppetlabs.trapperkeeper.services.webserver.jetty10-service :as jetty10-service]))
[puppetlabs.trapperkeeper.services.webserver.jetty12-service :as jetty12-service]))

(use-fixtures :once schema-test/validate-schemas)

Expand Down Expand Up @@ -55,7 +55,7 @@
; Start status service
(with-app-with-config
status-app
[jetty10-service/jetty10-service
[jetty12-service/jetty12-service
webrouting-service/webrouting-service
status-service
foo-service
Expand All @@ -65,7 +65,7 @@
; Start the proxy service
(with-app-with-config
proxy-app
[jetty10-service/jetty10-service
[jetty12-service/jetty12-service
webrouting-service/webrouting-service
status-proxy-service]
status-proxy-service-config
Expand Down Expand Up @@ -149,7 +149,7 @@
(with-app-with-config
; Start status service
status-app
[jetty10-service/jetty10-service
[jetty12-service/jetty12-service
webrouting-service/webrouting-service
status-service
scheduler-service/scheduler-service
Expand All @@ -158,7 +158,7 @@
; Start the proxy service
(with-app-with-config
proxy-app
[jetty10-service/jetty10-service
[jetty12-service/jetty12-service
webrouting-service/webrouting-service
status-proxy-service]
status-proxy-service-config
Expand All @@ -182,7 +182,7 @@
(with-test-logging
(with-app-with-config
proxy-app
[jetty10-service/jetty10-service
[jetty12-service/jetty12-service
webrouting-service/webrouting-service
status-proxy-service]
bad-config))))))
Expand All @@ -197,7 +197,7 @@
(with-test-logging
(with-app-with-config
proxy-app
[jetty10-service/jetty10-service
[jetty12-service/jetty12-service
webrouting-service/webrouting-service
status-proxy-service]
bad-config))))))
Expand All @@ -212,7 +212,7 @@
(with-test-logging
(with-app-with-config
proxy-app
[jetty10-service/jetty10-service
[jetty12-service/jetty12-service
webrouting-service/webrouting-service
status-proxy-service]
bad-config)))))))
16 changes: 8 additions & 8 deletions test/puppetlabs/trapperkeeper/services/status/status_service_test.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
[puppetlabs.trapperkeeper.services.status.status-core :as status-core]
[puppetlabs.trapperkeeper.services.webrouting.webrouting-service :as webrouting-service]
[puppetlabs.trapperkeeper.services.authorization.authorization-service :as tk-auth]
[puppetlabs.trapperkeeper.services.webserver.jetty10-service :as jetty10-service]
[puppetlabs.trapperkeeper.services.webserver.jetty12-service :as jetty12-service]
[puppetlabs.trapperkeeper.services.scheduler.scheduler-service :as scheduler-service]
[puppetlabs.kitchensink.core :as ks]))

Expand Down Expand Up @@ -47,21 +47,21 @@
(:status (parse-response resp true)))

(defmacro with-status-service-with-config
"Macro to start the status service and its dependencies (jetty10 and
"Macro to start the status service and its dependencies (jetty12 and
webrouting service), along with any other services desired, with the given
config"
[app services config & body]
`(with-app-with-config
~app
(concat [jetty10-service/jetty10-service
(concat [jetty12-service/jetty12-service
webrouting-service/webrouting-service
scheduler-service/scheduler-service
status-service] ~services)
~config
(do ~@body)))

(defmacro with-status-service
"Macro to start the status service and its dependencies (jetty10 and
"Macro to start the status service and its dependencies (jetty12 and
webrouting service), along with any other services desired. Provides
a default tk config"
[app services & body]
Expand Down Expand Up @@ -126,7 +126,7 @@

(deftest get-status-test
(with-status-service app [foo-service
jetty10-service/jetty10-service
jetty12-service/jetty12-service
webrouting-service/webrouting-service
status-service]
(let [svc (get-service app :StatusService)]
Expand Down Expand Up @@ -198,7 +198,7 @@
(testing "can mount status endpoint at alternate location"
(with-app-with-config
app
[jetty10-service/jetty10-service
[jetty12-service/jetty12-service
webrouting-service/webrouting-service
scheduler-service/scheduler-service
status-service]
Expand All @@ -211,7 +211,7 @@
(testing "with auth service running and cert auth enabled for endpoint"
(with-app-with-config
app
[jetty10-service/jetty10-service
[jetty12-service/jetty12-service
webrouting-service/webrouting-service
scheduler-service/scheduler-service
status-service
Expand All @@ -236,7 +236,7 @@
(testing "with auth service running and cert auth disabled for endpoint"
(with-app-with-config
app
[jetty10-service/jetty10-service
[jetty12-service/jetty12-service
webrouting-service/webrouting-service
scheduler-service/scheduler-service
status-service
Expand Down
Loading