diff options
| author | Bjørn Christian Seime <bjorncs@yahooinc.com> | 2022-10-27 17:59:33 +0200 |
|---|---|---|
| committer | Bjørn Christian Seime <bjorncs@yahooinc.com> | 2022-10-27 17:59:33 +0200 |
| commit | 5259f39f086f4ff8b71a29064830424b45ef3d0b (patch) | |
| tree | 8413a7e0e25a0d849bbfa2181d183bed44d95274 | |
| parent | dc3e88a049341082dcd774af0204e8d70add3c22 (diff) | |
Revert "Use Jetty 9.4.x for vespa-hadoop unit tests"
This reverts commit b625822c3a6d24c459debbe3c2e5e11372a9ab10.
| -rw-r--r-- | vespa-hadoop/pom.xml | 65 |
1 files changed, 2 insertions, 63 deletions
diff --git a/vespa-hadoop/pom.xml b/vespa-hadoop/pom.xml index ca5360a482e..c10ad590a53 100644 --- a/vespa-hadoop/pom.xml +++ b/vespa-hadoop/pom.xml @@ -19,76 +19,15 @@ <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> - <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> + <!-- Force newer version of jetty-util (to match Jetty version of jdisc) --> <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-util</artifactId> - <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> + <version>${jetty.version}</version> </dependency> </dependencies> </dependencyManagement> |