Skip to content

Commit dfecdaf

Browse files
nmburgannmburgan
committed
Replace all instances of Jetty 9 with 10
1 parent 9388b7d commit dfecdaf

File tree

5 files changed

+35
-36
lines changed

5 files changed

+35
-36
lines changed

‎project.clj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@
3939
[org.openvoxproject/kitchensink :classifier "test"]
4040
[org.openvoxproject/trapperkeeper]
4141
[org.openvoxproject/trapperkeeper :classifier "test"]
42-
[org.openvoxproject/trapperkeeper-webserver-jetty9]
43-
[org.openvoxproject/trapperkeeper-webserver-jetty9 :classifier "test"]
42+
[org.openvoxproject/trapperkeeper-webserver-jetty10]
43+
[org.openvoxproject/trapperkeeper-webserver-jetty10 :classifier "test"]
4444
[org.openvoxproject/ring-middleware]]
4545
:resource-paths ["dev-resources"]
4646
:jvm-opts ["-Djava.util.logging.config.file=dev-resources/logging.properties"]}

‎test/puppetlabs/http/client/async_plaintext_test.clj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
[puppetlabs.http.client.test-common :as test-common]
77
[puppetlabs.i18n.core :as i18n]
88
[puppetlabs.trapperkeeper.core :as tk]
9-
[puppetlabs.trapperkeeper.services.webserver.jetty9-service :as jetty9]
9+
[puppetlabs.trapperkeeper.services.webserver.jetty10-service :as jetty10]
1010
[puppetlabs.trapperkeeper.testutils.bootstrap :as testutils]
1111
[puppetlabs.trapperkeeper.testutils.logging :as testlogging]
1212
[puppetlabs.trapperkeeper.testutils.webserver :as testwebserver]
@@ -71,7 +71,7 @@
7171
(deftest persistent-async-client-test
7272
(testlogging/with-test-logging
7373
(testutils/with-app-with-config app
74-
[jetty9/jetty9-service test-web-service]
74+
[jetty10/jetty10-service test-web-service]
7575
{:webserver {:port 10000}}
7676
(testing "java async client"
7777
(let [request-options (RequestOptions. (URI. "http://localhost:10000/hello/"))
@@ -171,7 +171,7 @@
171171
(deftest java-api-cookie-test
172172
(testlogging/with-test-logging
173173
(testutils/with-app-with-config app
174-
[jetty9/jetty9-service test-cookie-service]
174+
[jetty10/jetty10-service test-cookie-service]
175175
{:webserver {:port 10000}}
176176
(let [client (Async/createClient (ClientOptions.))]
177177
(testing "Set a cookie using Java API"
@@ -184,7 +184,7 @@
184184
(deftest clj-api-cookie-test
185185
(testlogging/with-test-logging
186186
(testutils/with-app-with-config app
187-
[jetty9/jetty9-service test-cookie-service]
187+
[jetty10/jetty10-service test-cookie-service]
188188
{:webserver {:port 10000}}
189189
(let [client (async/create-client {})]
190190
(testing "Set a cookie using Clojure API"
@@ -197,7 +197,7 @@
197197
(deftest request-with-client-test
198198
(testlogging/with-test-logging
199199
(testutils/with-app-with-config app
200-
[jetty9/jetty9-service test-web-service]
200+
[jetty10/jetty10-service test-web-service]
201201
{:webserver {:port 10000}}
202202
(let [client (HttpAsyncClients/createDefault)
203203
opts {:method :get :url "http://localhost:10000/hello/"}]
@@ -215,7 +215,7 @@
215215
(deftest query-params-test-async
216216
(testlogging/with-test-logging
217217
(testutils/with-app-with-config app
218-
[jetty9/jetty9-service test-common/test-params-web-service]
218+
[jetty10/jetty10-service test-common/test-params-web-service]
219219
{:webserver {:port 8080}}
220220
(testing "URI Query Parameters work with the Java client"
221221
(let [client (Async/createClient (ClientOptions.))]
@@ -324,7 +324,7 @@
324324
"WWW-Authenticate", "Proxy-Authorization", "Proxy-Authenticate"}]
325325
(create-redirect-web-service state)
326326
(testutils/with-app-with-config app
327-
[jetty9/jetty9-service redirect-web-service-with-state]
327+
[jetty10/jetty10-service redirect-web-service-with-state]
328328
{:webserver {:hello {:port 8081} :world {:port 8082}}}
329329
(testing "default redirect policy does not include authorization headers"
330330
(let [client (Async/createClient (ClientOptions.))
@@ -449,7 +449,7 @@
449449
(deftest redirect-test-async
450450
(testlogging/with-test-logging
451451
(testutils/with-app-with-config app
452-
[jetty9/jetty9-service test-common/redirect-web-service]
452+
[jetty10/jetty10-service test-common/redirect-web-service]
453453
{:webserver {:port 8080}}
454454
(testing (str "redirects on POST not followed by persistent Java client "
455455
"when forceRedirects option not set to true")

‎test/puppetlabs/http/client/metrics_test.clj‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
[puppetlabs.http.client.metrics :as metrics]
77
[puppetlabs.http.client.sync :as sync]
88
[puppetlabs.trapperkeeper.core :as tk]
9-
[puppetlabs.trapperkeeper.services.webserver.jetty9-service :as jetty9]
9+
[puppetlabs.trapperkeeper.services.webserver.jetty10-service :as jetty10]
1010
[puppetlabs.trapperkeeper.testutils.bootstrap :as testutils]
1111
[puppetlabs.trapperkeeper.testutils.logging :as testlogging]
1212
[puppetlabs.trapperkeeper.testutils.webserver :as testwebserver]
@@ -67,7 +67,7 @@
6767
(testlogging/with-test-logging
6868
(testutils/with-app-with-config
6969
app
70-
[jetty9/jetty9-service test-metric-web-service]
70+
[jetty10/jetty10-service test-metric-web-service]
7171
{:webserver {:port 10000}}
7272
(let [metric-registry (MetricRegistry.)
7373
hello-request-opts (RequestOptions. hello-url)
@@ -165,7 +165,7 @@
165165
(testlogging/with-test-logging
166166
(testutils/with-app-with-config
167167
app
168-
[jetty9/jetty9-service test-metric-web-service]
168+
[jetty10/jetty10-service test-metric-web-service]
169169
{:webserver {:port 10000}}
170170
(let [metric-registry (MetricRegistry.)]
171171
(with-open [client (async/create-client
@@ -253,7 +253,7 @@
253253
(testlogging/with-test-logging
254254
(testutils/with-app-with-config
255255
app
256-
[jetty9/jetty9-service test-metric-web-service]
256+
[jetty10/jetty10-service test-metric-web-service]
257257
{:webserver {:port 10000}}
258258
(let [metric-registry (MetricRegistry.)
259259
hello-request-opts (RequestOptions. hello-url)
@@ -352,7 +352,7 @@
352352
(testlogging/with-test-logging
353353
(testutils/with-app-with-config
354354
app
355-
[jetty9/jetty9-service test-metric-web-service]
355+
[jetty10/jetty10-service test-metric-web-service]
356356
{:webserver {:port 10000}}
357357
(let [metric-registry (MetricRegistry.)]
358358
(with-open [client (sync/create-client {:metric-registry metric-registry})]
@@ -630,7 +630,7 @@
630630
(testlogging/with-test-logging
631631
(testutils/with-app-with-config
632632
app
633-
[jetty9/jetty9-service test-metric-web-service]
633+
[jetty10/jetty10-service test-metric-web-service]
634634
{:webserver {:port 10000}}
635635
(testing "custom metric namespace works for java async client"
636636
(testing "metric prefix works"
@@ -744,7 +744,7 @@
744744
(testlogging/with-test-logging
745745
(testutils/with-app-with-config
746746
app
747-
[jetty9/jetty9-service test-metric-web-service]
747+
[jetty10/jetty10-service test-metric-web-service]
748748
{:webserver {:port 10000}}
749749
(testing "url-metrics can be disabled for clojure async client"
750750
(with-open [client (async/create-client {:metric-registry (MetricRegistry.)

‎test/puppetlabs/http/client/sync_plaintext_test.clj‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
[puppetlabs.http.client.sync :as sync]
66
[puppetlabs.http.client.test-common :refer :all]
77
[puppetlabs.trapperkeeper.core :as tk]
8-
[puppetlabs.trapperkeeper.services.webserver.jetty9-service :as jetty9]
8+
[puppetlabs.trapperkeeper.services.webserver.jetty10-service :as jetty10]
99
[puppetlabs.trapperkeeper.testutils.bootstrap :as testutils]
1010
[puppetlabs.trapperkeeper.testutils.logging :as testlogging]
1111
[puppetlabs.trapperkeeper.testutils.webserver :as testwebserver]
@@ -58,7 +58,7 @@
5858
(testing (format "sync client: HTTP method: '%s'" http-method)
5959
(testlogging/with-test-logging
6060
(testutils/with-app-with-config app
61-
[jetty9/jetty9-service test-web-service]
61+
[jetty10/jetty10-service test-web-service]
6262
{:webserver {:port 10000}}
6363
(testing "java sync client"
6464
(let [request-options (SimpleRequestOptions. (URI. "http://localhost:10000/hello/"))
@@ -75,7 +75,7 @@
7575
(deftest sync-client-head-test
7676
(testlogging/with-test-logging
7777
(testutils/with-app-with-config app
78-
[jetty9/jetty9-service test-web-service]
78+
[jetty10/jetty10-service test-web-service]
7979
{:webserver {:port 10000}}
8080
(testing "java sync client"
8181
(let [request-options (SimpleRequestOptions. (URI. "http://localhost:10000/hello/"))
@@ -115,7 +115,7 @@
115115
(deftest sync-client-persistent-test
116116
(testlogging/with-test-logging
117117
(testutils/with-app-with-config app
118-
[jetty9/jetty9-service test-web-service]
118+
[jetty10/jetty10-service test-web-service]
119119
{:webserver {:port 10000}}
120120
(testing "persistent java client"
121121
(let [request-options (RequestOptions. "http://localhost:10000/hello/")
@@ -209,7 +209,7 @@
209209
(deftest sync-client-as-test
210210
(testlogging/with-test-logging
211211
(testutils/with-app-with-config app
212-
[jetty9/jetty9-service test-web-service]
212+
[jetty10/jetty10-service test-web-service]
213213
{:webserver {:port 10000}}
214214
(testing "java sync client: :as unspecified"
215215
(let [request-options (SimpleRequestOptions. (URI. "http://localhost:10000/hello/"))
@@ -250,7 +250,7 @@
250250
(deftest request-with-client-test
251251
(testlogging/with-test-logging
252252
(testutils/with-app-with-config app
253-
[jetty9/jetty9-service test-web-service]
253+
[jetty10/jetty10-service test-web-service]
254254
{:webserver {:port 10000}}
255255
(let [client (HttpAsyncClients/createDefault)
256256
opts {:method :get :url "http://localhost:10000/hello/"}]
@@ -268,7 +268,7 @@
268268
(deftest java-api-cookie-test
269269
(testlogging/with-test-logging
270270
(testutils/with-app-with-config app
271-
[jetty9/jetty9-service test-cookie-service]
271+
[jetty10/jetty10-service test-cookie-service]
272272
{:webserver {:port 10000}}
273273
(let [client (Sync/createClient (ClientOptions.))]
274274
(testing "Set a cookie using Java API"
@@ -282,7 +282,7 @@
282282
(deftest clj-api-cookie-test
283283
(testlogging/with-test-logging
284284
(testutils/with-app-with-config app
285-
[jetty9/jetty9-service test-cookie-service]
285+
[jetty10/jetty10-service test-cookie-service]
286286
{:webserver {:port 10000}}
287287
(let [client (sync/create-client {})]
288288
(testing "Set a cookie using Clojure API"
@@ -308,7 +308,7 @@
308308
(deftest sync-client-request-headers-test
309309
(testlogging/with-test-logging
310310
(testutils/with-app-with-config header-app
311-
[jetty9/jetty9-service test-header-web-service]
311+
[jetty10/jetty10-service test-header-web-service]
312312
{:webserver {:port 10000}}
313313
(testing "java sync client"
314314
(let [request-options (-> (SimpleRequestOptions. (URI. "http://localhost:10000/hello/"))
@@ -360,7 +360,7 @@
360360
(deftest sync-client-request-body-test
361361
(testlogging/with-test-logging
362362
(testutils/with-app-with-config req-body-app
363-
[jetty9/jetty9-service test-body-web-service]
363+
[jetty10/jetty10-service test-body-web-service]
364364
{:webserver {:port 10000}}
365365
(testing "java sync client: string body for post request with explicit
366366
content type and UTF-8 encoding uses UTF-8 encoding"
@@ -448,7 +448,7 @@
448448
[desc opts accept-encoding content-encoding content-should-match?]
449449
(testlogging/with-test-logging
450450
(testutils/with-app-with-config req-body-app
451-
[jetty9/jetty9-service test-compression-web-service]
451+
[jetty10/jetty10-service test-compression-web-service]
452452
{:webserver {:port 10000}}
453453
(testing (str "java sync client: compression headers / response: " desc)
454454
(let [request-opts (cond-> (SimpleRequestOptions. (URI. "http://localhost:10000/hello/"))
@@ -486,7 +486,7 @@
486486
(deftest query-params-test-sync
487487
(testlogging/with-test-logging
488488
(testutils/with-app-with-config app
489-
[jetty9/jetty9-service test-params-web-service]
489+
[jetty10/jetty10-service test-params-web-service]
490490
{:webserver {:port 8080}}
491491
(testing "URL Query Parameters work with the Java client"
492492
(let [request-options (SimpleRequestOptions. (URI. "http://localhost:8080/params?foo=bar&baz=lux"))
@@ -506,7 +506,7 @@
506506
(deftest redirect-test-sync
507507
(testlogging/with-test-logging
508508
(testutils/with-app-with-config app
509-
[jetty9/jetty9-service redirect-web-service]
509+
[jetty10/jetty10-service redirect-web-service]
510510
{:webserver {:port 8080}}
511511
(testing (str "redirects on POST not followed by Java client "
512512
"when forceRedirects option not set to true")

‎test/puppetlabs/http/client/sync_ssl_test.clj‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
(:require [clojure.test :refer :all]
33
[puppetlabs.http.client.sync :as sync]
44
[puppetlabs.trapperkeeper.core :as tk]
5-
[puppetlabs.trapperkeeper.services.webserver.jetty9-service :as jetty9]
5+
[puppetlabs.trapperkeeper.services.webserver.jetty10-service :as jetty10]
66
[puppetlabs.trapperkeeper.testutils.bootstrap :as testutils]
77
[puppetlabs.trapperkeeper.testutils.logging :as testlogging]
88
[schema.test :as schema-test])
@@ -30,7 +30,7 @@
3030
(deftest sync-client-test-from-pems
3131
(testlogging/with-test-logging
3232
(testutils/with-app-with-config app
33-
[jetty9/jetty9-service test-web-service]
33+
[jetty10/jetty10-service test-web-service]
3434
{:webserver {:ssl-host "0.0.0.0"
3535
:ssl-port 10080
3636
:ssl-ca-cert "./dev-resources/ssl/ca.pem"
@@ -55,7 +55,7 @@
5555
(deftest sync-client-test-from-ca-cert
5656
(testlogging/with-test-logging
5757
(testutils/with-app-with-config app
58-
[jetty9/jetty9-service test-web-service]
58+
[jetty10/jetty10-service test-web-service]
5959
{:webserver {:ssl-host "0.0.0.0"
6060
:ssl-port 10080
6161
:ssl-ca-cert "./dev-resources/ssl/ca.pem"
@@ -77,7 +77,7 @@
7777
(deftest sync-client-test-with-invalid-ca-cert
7878
(testlogging/with-test-logging
7979
(testutils/with-app-with-config app
80-
[jetty9/jetty9-service test-web-service]
80+
[jetty10/jetty10-service test-web-service]
8181
{:webserver {:ssl-host "0.0.0.0"
8282
:ssl-port 10081
8383
:ssl-ca-cert "./dev-resources/ssl/ca.pem"
@@ -112,7 +112,7 @@
112112
[server-protocols server-cipher-suites & body]
113113
`(testlogging/with-test-logging
114114
(testutils/with-app-with-config app#
115-
[jetty9/jetty9-service test-web-service]
115+
[jetty10/jetty10-service test-web-service]
116116
{:webserver (merge
117117
{:ssl-host "0.0.0.0"
118118
:ssl-port 10080
@@ -184,4 +184,3 @@
184184
(java-https-get-with-protocols ["TLSv1.2"] nil))))
185185
(testing "clojure sync client"
186186
(is (java-unsupported-protocol-exception? (clj-https-get-with-protocols ["TLSv1.2"] nil)))))))
187-

0 commit comments

Comments
 (0)