diff options
4 files changed, 17 insertions, 17 deletions
diff --git a/cloud-tenant-base-dependencies-enforcer/pom.xml b/cloud-tenant-base-dependencies-enforcer/pom.xml index 14b39867348..daf3683ad26 100644 --- a/cloud-tenant-base-dependencies-enforcer/pom.xml +++ b/cloud-tenant-base-dependencies-enforcer/pom.xml @@ -44,7 +44,7 @@ <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.13</jetty.version> + <jetty.version>11.0.14</jetty.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 --> diff --git a/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerTest.java b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerTest.java index 9097012ecfc..d56daa34f03 100644 --- a/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerTest.java +++ b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerTest.java @@ -171,7 +171,7 @@ public class HttpServerTest { binder -> binder.bind(MetricConsumer.class).toInstance(metricConsumer.mockitoMock())); driver.client() .newGet("/status.html").addHeader("Host", "localhost").addHeader("Host", "vespa.ai").execute() - .expectStatusCode(is(BAD_REQUEST)).expectContent(containsString("Bad Host: multiple headers")); + .expectStatusCode(is(BAD_REQUEST)).expectContent(containsString("reason: Duplicate Host Header")); assertTrue(driver.close()); var aggregator = ResponseMetricAggregator.getBean(driver.server()); var metric = waitForStatistics(aggregator); diff --git a/parent/pom.xml b/parent/pom.xml index fb6b0abf395..48e28895891 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -1142,7 +1142,7 @@ <felix.log.version>1.0.1</felix.log.version> <findbugs.version>3.0.2</findbugs.version> <!-- Should be kept in sync with guava --> <hdrhistogram.version>2.1.12</hdrhistogram.version> - <jetty.version>11.0.13</jetty.version> + <jetty.version>11.0.14</jetty.version> <jetty-servlet-api.version>5.0.2</jetty-servlet-api.version> <jjwt.version>0.11.2</jjwt.version> <jna.version>5.11.0</jna.version> diff --git a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt index 02f75c19907..18475a8e4d9 100644 --- a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt +++ b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt @@ -145,20 +145,20 @@ org.codehaus.plexus:plexus-sec-dispatcher:2.0 org.codehaus.plexus:plexus-utils:3.3.1 org.eclipse.collections:eclipse-collections:11.0.0 org.eclipse.collections:eclipse-collections-api:11.0.0 -org.eclipse.jetty:jetty-alpn-client:11.0.13 -org.eclipse.jetty:jetty-alpn-java-server:11.0.13 -org.eclipse.jetty:jetty-alpn-server:11.0.13 -org.eclipse.jetty:jetty-client:11.0.13 -org.eclipse.jetty:jetty-http:11.0.13 -org.eclipse.jetty:jetty-io:11.0.13 -org.eclipse.jetty:jetty-jmx:11.0.13 -org.eclipse.jetty:jetty-security:11.0.13 -org.eclipse.jetty:jetty-server:11.0.13 -org.eclipse.jetty:jetty-servlet:11.0.13 -org.eclipse.jetty:jetty-util:11.0.13 -org.eclipse.jetty.http2:http2-common:11.0.13 -org.eclipse.jetty.http2:http2-hpack:11.0.13 -org.eclipse.jetty.http2:http2-server:11.0.13 +org.eclipse.jetty:jetty-alpn-client:11.0.14 +org.eclipse.jetty:jetty-alpn-java-server:11.0.14 +org.eclipse.jetty:jetty-alpn-server:11.0.14 +org.eclipse.jetty:jetty-client:11.0.14 +org.eclipse.jetty:jetty-http:11.0.14 +org.eclipse.jetty:jetty-io:11.0.14 +org.eclipse.jetty:jetty-jmx:11.0.14 +org.eclipse.jetty:jetty-security:11.0.14 +org.eclipse.jetty:jetty-server:11.0.14 +org.eclipse.jetty:jetty-servlet:11.0.14 +org.eclipse.jetty:jetty-util:11.0.14 +org.eclipse.jetty.http2:http2-common:11.0.14 +org.eclipse.jetty.http2:http2-hpack:11.0.14 +org.eclipse.jetty.http2:http2-server:11.0.14 org.eclipse.jetty.toolchain:jetty-jakarta-servlet-api:5.0.2 org.eclipse.sisu:org.eclipse.sisu.inject:0.3.5 org.eclipse.sisu:org.eclipse.sisu.plexus:0.3.5 |