diff options
| author | Bjørn Christian Seime <bjorncs@yahooinc.com> | 2023-04-25 11:05:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-25 11:05:49 +0200 |
| commit | cfebb0bb64b8764bac31b372ff98cf59b0e30ec6 (patch) | |
| tree | 1bf820280d8a337977760aa5bc2afcda2f2f8769 | |
| parent | 277aeaaeac78ada698a20919dbef0999076ecea9 (diff) | |
| parent | 08716baecae31948bf2d46f20d9fa90d3fef1784 (diff) | |
Merge pull request #26839 from vespa-engine/balder/jetty-11.0.15
Jetty 11.0.14 -> 11.0.15
| -rw-r--r-- | cloud-tenant-base-dependencies-enforcer/pom.xml | 2 | ||||
| -rw-r--r-- | parent/pom.xml | 2 | ||||
| -rw-r--r-- | vespa-dependencies-enforcer/allowed-maven-dependencies.txt | 28 |
3 files changed, 16 insertions, 16 deletions
diff --git a/cloud-tenant-base-dependencies-enforcer/pom.xml b/cloud-tenant-base-dependencies-enforcer/pom.xml index 69e1a94a813..7971f4eebcf 100644 --- a/cloud-tenant-base-dependencies-enforcer/pom.xml +++ b/cloud-tenant-base-dependencies-enforcer/pom.xml @@ -45,7 +45,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.14</jetty.version> + <jetty.version>11.0.15</jetty.version> <org.lz4.version>1.8.0</org.lz4.version> <org.json.version>20230227</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/parent/pom.xml b/parent/pom.xml index e6ef7e873fd..f3b9fc9baeb 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -1155,7 +1155,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.14</jetty.version> + <jetty.version>11.0.15</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 0d007097fa2..1c2db273653 100644 --- a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt +++ b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt @@ -154,20 +154,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.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:jetty-alpn-client:11.0.15 +org.eclipse.jetty:jetty-alpn-java-server:11.0.15 +org.eclipse.jetty:jetty-alpn-server:11.0.15 +org.eclipse.jetty:jetty-client:11.0.15 +org.eclipse.jetty:jetty-http:11.0.15 +org.eclipse.jetty:jetty-io:11.0.15 +org.eclipse.jetty:jetty-jmx:11.0.15 +org.eclipse.jetty:jetty-security:11.0.15 +org.eclipse.jetty:jetty-server:11.0.15 +org.eclipse.jetty:jetty-servlet:11.0.15 +org.eclipse.jetty:jetty-util:11.0.15 +org.eclipse.jetty.http2:http2-common:11.0.15 +org.eclipse.jetty.http2:http2-hpack:11.0.15 +org.eclipse.jetty.http2:http2-server:11.0.15 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 |