diff options
author | Bjørn Christian Seime <bjorncs@yahooinc.com> | 2022-11-02 15:35:23 +0100 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@yahooinc.com> | 2022-11-02 15:35:23 +0100 |
commit | f74e7bfb30858fe400678054f3bfc4f17ee8ea92 (patch) | |
tree | 36d22704cdcec9f118ee0738e63d33e327403dbd /cloud-tenant-base-dependencies-enforcer/pom.xml | |
parent | 520e6d0582615ca29a427bf681f0c18b4345a407 (diff) |
Revert "Upgrade Jetty from 9.4.49 to 11.0.12"
This reverts commit f1bc428759b3b1ef6a17b5dad79d237f5f2f7dbf.
Diffstat (limited to 'cloud-tenant-base-dependencies-enforcer/pom.xml')
-rw-r--r-- | cloud-tenant-base-dependencies-enforcer/pom.xml | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/cloud-tenant-base-dependencies-enforcer/pom.xml b/cloud-tenant-base-dependencies-enforcer/pom.xml index 907b249f726..05ffa0b5c97 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,21 +200,24 @@ <include>org.bouncycastle:bcpkix-jdk18on:${bouncycastle.version}:test</include> <include>org.bouncycastle:bcprov-jdk18on:${bouncycastle.version}:test</include> <include>org.bouncycastle:bcutil-jdk18on:${bouncycastle.version}:test</include> + <include>org.eclipse.jetty.alpn:alpn-api:jar:${jetty-alpn.version}:test</include> <include>org.eclipse.jetty.http2:http2-common:${jetty.version}:test</include> <include>org.eclipse.jetty.http2:http2-hpack:${jetty.version}:test</include> <include>org.eclipse.jetty.http2:http2-server:${jetty.version}:test</include> - <include>org.eclipse.jetty.toolchain:jetty-jakarta-servlet-api:5.0.2:test</include> - <include>org.eclipse.jetty:jetty-alpn-client:${jetty.version}:test</include> <include>org.eclipse.jetty:jetty-alpn-java-server:${jetty.version}:test</include> <include>org.eclipse.jetty:jetty-alpn-server:${jetty.version}:test</include> <include>org.eclipse.jetty:jetty-client:${jetty.version}:test</include> + <include>org.eclipse.jetty:jetty-continuation:jar:${jetty.version}:test</include> <include>org.eclipse.jetty:jetty-http:${jetty.version}:test</include> <include>org.eclipse.jetty:jetty-io:${jetty.version}:test</include> <include>org.eclipse.jetty:jetty-jmx:${jetty.version}:test</include> <include>org.eclipse.jetty:jetty-security:${jetty.version}:test</include> <include>org.eclipse.jetty:jetty-server:${jetty.version}:test</include> <include>org.eclipse.jetty:jetty-servlet:${jetty.version}:test</include> + <include>org.eclipse.jetty:jetty-servlets:jar:${jetty.version}:test</include> + <include>org.eclipse.jetty:jetty-util-ajax:jar:${jetty.version}:test</include> <include>org.eclipse.jetty:jetty-util:${jetty.version}:test</include> + <include>org.hamcrest:hamcrest-core:1.3:test</include> <include>org.hdrhistogram:HdrHistogram:2.1.12:test</include> <include>org.json:json:${org.json.version}:test</include> |