(PE-35511) Update to tk-webserver-jetty-10 #3915
Conversation
rileynewton
force-pushed
the
PE-35511-update-to-jetty-10
branch
4 times, most recently
from
2a95668
to
8d82c6b
Compare
| "libjetty9-java", | ||
| "libjetty10-java", |
There was a problem hiding this comment.
Not sure you wanted to make this change here.
There was a problem hiding this comment.
Was thinking it's a doc so doesn't matter though not sure about that, reverted it
rileynewton
force-pushed
the
PE-35511-update-to-jetty-10
branch
from
8d82c6b
to
37eb6cc
Compare
| [puppetlabs.trapperkeeper.services.webserver.jetty9 :as jetty9] | ||
| [puppetlabs.trapperkeeper.services.webserver.jetty10 :as jetty10] |
There was a problem hiding this comment.
Both requires can be removed. It was just used for the name spacing, which doesn't exist in jetty10.
There was a problem hiding this comment.
Removed this one, which is the other?
rileynewton
force-pushed
the
PE-35511-update-to-jetty-10
branch
14 times, most recently
from
a42e2db
to
ca7bd20
Compare
|
I think your parent version needs to be updated too. |
rileynewton
force-pushed
the
PE-35511-update-to-jetty-10
branch
from
ca7bd20
to
6d9b021
Compare
| @@ -177,8 +177,8 @@ | |||
| [puppetlabs/stockpile "0.0.4"] | |||
| [puppetlabs/structured-logging] | |||
| [puppetlabs/trapperkeeper] | |||
| [puppetlabs/trapperkeeper-webserver-jetty9] | |||
| [puppetlabs/trapperkeeper-metrics] | |||
| [com.puppetlabs/trapperkeeper-webserver-jetty10] | |||
There was a problem hiding this comment.
Don't forget to update the version here too if you want to test!
rileynewton
force-pushed
the
PE-35511-update-to-jetty-10
branch
from
6d9b021
to
3c964c0
Compare
Didn't release a new one yet--seeing if this fixes the issue whenever tk-metrics manages to release. |
rileynewton
force-pushed
the
PE-35511-update-to-jetty-10
branch
2 times, most recently
from
f97b7d3
to
683e569
Compare
|
If you rebase this on the current We just merged some work to further separate puppetdb/puppetserver in our integration tests #3919 that should help with testing this jetty work. |
rileynewton
force-pushed
the
PE-35511-update-to-jetty-10
branch
4 times, most recently
from
81be291
to
7d60668
Compare
| ;; See https://www.ietf.org/rfc/rfc4627.txt, UTF-8 is assumed as a default | ||
| ;; encoding. | ||
| json? #(= ctype "application/json")] | ||
| (if (some-> ctype (or json-utf8-ctype? json?)) |
There was a problem hiding this comment.
| (if (some-> ctype (or json-utf8-ctype? json?)) | |
| (if (and ctype (or json? (json-utf8-ctype? ctype))) |
rileynewton
force-pushed
the
PE-35511-update-to-jetty-10
branch
3 times, most recently
from
e57d71d
to
e8dd8cf
Compare
rileynewton
force-pushed
the
PE-35511-update-to-jetty-10
branch
from
e8dd8cf
to
8e8bdd0
Compare
No description provided.