aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@verizonmedia.com>2020-11-24 13:57:23 +0100
committerBjørn Christian Seime <bjorncs@verizonmedia.com>2020-11-24 14:13:10 +0100
commite1e3df77a87525eded88508293a6332ac8476190 (patch)
treef7fabdb81118b8468580e4be1fa419bd025795af
parentd9d815218c9a2a0de73b6450f156ee154cc196f6 (diff)
Upgrade Jetty to 9.4.35
Jetty-util-ajax is a new bundle that is used by the new version of jetty-servlet bundle
-rw-r--r--cloud-tenant-base-dependencies-enforcer/pom.xml3
-rw-r--r--container-dependency-versions/pom.xml2
-rw-r--r--jdisc_http_service/pom.xml1
3 files changed, 4 insertions, 2 deletions
diff --git a/cloud-tenant-base-dependencies-enforcer/pom.xml b/cloud-tenant-base-dependencies-enforcer/pom.xml
index 5b8bd2032d6..16dbd6b4014 100644
--- a/cloud-tenant-base-dependencies-enforcer/pom.xml
+++ b/cloud-tenant-base-dependencies-enforcer/pom.xml
@@ -30,7 +30,7 @@
<javax.inject.version>1</javax.inject.version>
<javax.servlet-api.version>3.1.0</javax.servlet-api.version>
<jaxb.version>2.3.0</jaxb.version>
- <jetty.version>9.4.32.v20200930</jetty.version>
+ <jetty.version>9.4.35.v20201120</jetty.version>
<junit5.version>5.7.0</junit5.version>
<junit5.platform.version>1.7.0</junit5.platform.version>
<org.lz4.version>1.7.1</org.lz4.version>
@@ -259,6 +259,7 @@
<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.hamcrest:hamcrest-core:1.3:jar:test</include>
<include>org.hdrhistogram:HdrHistogram:2.1.8:jar:test</include>
<include>org.junit.jupiter:junit-jupiter-api:[${junit5.version}]:jar:test</include>
diff --git a/container-dependency-versions/pom.xml b/container-dependency-versions/pom.xml
index b239518303d..8691d9a7ffb 100644
--- a/container-dependency-versions/pom.xml
+++ b/container-dependency-versions/pom.xml
@@ -446,7 +446,7 @@
<javax.inject.version>1</javax.inject.version>
<javax.servlet-api.version>3.1.0</javax.servlet-api.version>
<jaxb.version>2.3.0</jaxb.version>
- <jetty.version>9.4.32.v20200930</jetty.version>
+ <jetty.version>9.4.35.v20201120</jetty.version>
<org.lz4.version>1.7.1</org.lz4.version>
<org.json.version>20090211</org.json.version>
<slf4j.version>1.7.5</slf4j.version>
diff --git a/jdisc_http_service/pom.xml b/jdisc_http_service/pom.xml
index b140e66f28a..7333db96b91 100644
--- a/jdisc_http_service/pom.xml
+++ b/jdisc_http_service/pom.xml
@@ -152,6 +152,7 @@
jetty-servlet-${jetty.version}.jar,
jetty-servlets-${jetty.version}.jar,
jetty-util-${jetty.version}.jar,
+ jetty-util-ajax-${jetty.version}.jar,
component-jar-with-dependencies.jar
</discPreInstallBundle>
</configuration>