diff options
| author | Bjørn Christian Seime <bjorncs@yahooinc.com> | 2022-10-17 13:10:58 +0200 |
|---|---|---|
| committer | Bjørn Christian Seime <bjorncs@yahooinc.com> | 2022-10-28 13:08:57 +0200 |
| commit | c4d46a5468b6b3f7b6aaeee33980a13f8d8268e1 (patch) | |
| tree | 0b0ea8613bde024a842e3cfaae255b19d4811dba /vespa-hadoop | |
| parent | eb9a7717a0dc3bca7b6618a9a70f26f01a4c9725 (diff) | |
Upgrade Jetty from 9.4.49 to 11.0.12
Diffstat (limited to 'vespa-hadoop')
| -rw-r--r-- | vespa-hadoop/pom.xml | 65 |
1 files changed, 63 insertions, 2 deletions
diff --git a/vespa-hadoop/pom.xml b/vespa-hadoop/pom.xml index c10ad590a53..ca5360a482e 100644 --- a/vespa-hadoop/pom.xml +++ b/vespa-hadoop/pom.xml @@ -19,15 +19,76 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <hadoop.version>3.3.4</hadoop.version> <pig.version>0.16.0</pig.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> </dependencies> </dependencyManagement> |