summaryrefslogtreecommitdiffstats
path: root/vespa-hadoop/pom.xml
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@yahooinc.com>2022-10-17 13:10:58 +0200
committerBjørn Christian Seime <bjorncs@yahooinc.com>2022-11-01 14:31:19 +0100
commitf1bc428759b3b1ef6a17b5dad79d237f5f2f7dbf (patch)
tree17c3e792ba086f8200f52bb51e613361ac203f2e /vespa-hadoop/pom.xml
parent2cb0b824c13021c2075f6573ffe8666cdbd83fdc (diff)
Upgrade Jetty from 9.4.49 to 11.0.12
Diffstat (limited to 'vespa-hadoop/pom.xml')
-rw-r--r--vespa-hadoop/pom.xml65
1 files changed, 63 insertions, 2 deletions
diff --git a/vespa-hadoop/pom.xml b/vespa-hadoop/pom.xml
index b497fda2aab..42ee990e727 100644
--- a/vespa-hadoop/pom.xml
+++ b/vespa-hadoop/pom.xml
@@ -23,15 +23,76 @@
<jettison.version>1.5.1</jettison.version>
<pig.version>0.16.0</pig.version>
<tomcat-jasper.version>5.5.23</tomcat-jasper.version>
+ <jetty9.version>9.4.49.v20220914</jetty9.version>
</properties>
<dependencyManagement>
+ <!-- Force 9.4.x version of transitive Jetty dependencies. Required by hadoop libraries -->
<dependencies>
- <!-- Force newer version of jetty-util (to match Jetty version of jdisc) -->
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-alpn-client</artifactId>
+ <version>${jetty9.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-client</artifactId>
+ <version>${jetty9.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-http</artifactId>
+ <version>${jetty9.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-io</artifactId>
+ <version>${jetty9.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-security</artifactId>
+ <version>${jetty9.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ <version>${jetty9.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-servlet</artifactId>
+ <version>${jetty9.version}</version>
+ </dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
- <version>${jetty.version}</version>
+ <version>${jetty9.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-webapp</artifactId>
+ <version>${jetty9.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-xml</artifactId>
+ <version>${jetty9.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty.websocket</groupId>
+ <artifactId>jetty-websocket-api</artifactId>
+ <version>${jetty9.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty.websocket</groupId>
+ <artifactId>jetty-websocket-client</artifactId>
+ <version>${jetty9.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty.websocket</groupId>
+ <artifactId>jetty-websocket-common</artifactId>
+ <version>${jetty9.version}</version>
</dependency>
<!-- Force fresh woodstox-core without security issue -->
<dependency>