diff options
author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2022-10-31 12:06:09 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-10-31 12:06:09 +0100 |
commit | 097923307e80929f43271ebba27bb5ef52218e5c (patch) | |
tree | 1e1298fe68e5a9d67bcc493ec5148eeebc58fb85 /cloud-tenant-base-dependencies-enforcer | |
parent | 5c7c221d98120c0eaf826f06c2a24bd305024ae6 (diff) |
Revert "Upgrade Jetty from 9.4.49 to 11.0.12"
Diffstat (limited to 'cloud-tenant-base-dependencies-enforcer')
-rw-r--r-- | cloud-tenant-base-dependencies-enforcer/pom.xml | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/cloud-tenant-base-dependencies-enforcer/pom.xml b/cloud-tenant-base-dependencies-enforcer/pom.xml index 8ba9794d75c..03f14d7d65f 100644 --- a/cloud-tenant-base-dependencies-enforcer/pom.xml +++ b/cloud-tenant-base-dependencies-enforcer/pom.xml @@ -43,7 +43,8 @@ <javax.servlet-api.version>3.1.0</javax.servlet-api.version> <javax.ws.rs-api.version>2.0.1</javax.ws.rs-api.version> <jaxb.version>2.3.0</jaxb.version> - <jetty.version>11.0.12</jetty.version> + <jetty.version>9.4.49.v20220914</jetty.version> + <jetty-alpn.version>1.1.3.v20160715</jetty-alpn.version> <org.lz4.version>1.8.0</org.lz4.version> <org.json.version>20220320</org.json.version> <!-- TODO: Remove on Vespa 9 --> <slf4j.version>1.7.32</slf4j.version> <!-- WARNING: when updated, also update c.y.v.tenant:base pom --> @@ -199,20 +200,22 @@ <include>org.bouncycastle:bcpkix-jdk18on:[${bouncycastle.version}]:jar:test</include> <include>org.bouncycastle:bcprov-jdk18on:[${bouncycastle.version}]:jar:test</include> <include>org.bouncycastle:bcutil-jdk18on:[${bouncycastle.version}]:jar:test</include> + <include>org.eclipse.jetty.alpn:alpn-api:[${jetty-alpn.version}]:jar:test</include> <include>org.eclipse.jetty.http2:http2-common:[${jetty.version}]:jar:test</include> <include>org.eclipse.jetty.http2:http2-hpack:[${jetty.version}]:jar:test</include> <include>org.eclipse.jetty.http2:http2-server:[${jetty.version}]:jar:test</include> - <include>org.eclipse.jetty.toolchain:jetty-jakarta-servlet-api:5.0.2:jar:test</include> - <include>org.eclipse.jetty:jetty-alpn-client:[${jetty.version}]:jar:test</include> <include>org.eclipse.jetty:jetty-alpn-java-server:[${jetty.version}]:jar:test</include> <include>org.eclipse.jetty:jetty-alpn-server:[${jetty.version}]:jar:test</include> <include>org.eclipse.jetty:jetty-client:[${jetty.version}]:jar:test</include> + <include>org.eclipse.jetty:jetty-continuation:[${jetty.version}]:jar:test</include> <include>org.eclipse.jetty:jetty-http:[${jetty.version}]:jar:test</include> <include>org.eclipse.jetty:jetty-io:[${jetty.version}]:jar:test</include> <include>org.eclipse.jetty:jetty-jmx:[${jetty.version}]:jar:test</include> <include>org.eclipse.jetty:jetty-security:[${jetty.version}]:jar:test</include> <include>org.eclipse.jetty:jetty-server:[${jetty.version}]:jar:test</include> <include>org.eclipse.jetty:jetty-servlet:[${jetty.version}]:jar:test</include> + <include>org.eclipse.jetty:jetty-servlets:[${jetty.version}]:jar:test</include> + <include>org.eclipse.jetty:jetty-util-ajax:[${jetty.version}]:jar:test</include> <include>org.eclipse.jetty:jetty-util:[${jetty.version}]:jar:test</include> <include>org.hamcrest:hamcrest-core:1.3:jar:test</include> <include>org.hdrhistogram:HdrHistogram:2.1.8:jar:test</include> |