Repository: tez Updated Branches: refs/heads/master ff81cc4f8 -> bb40cf5b8
TEZ-3888: Update Jetty to org.eclipse.jetty 9.x (Eric Wohlstadter, reviewed by Rohini Palaniswamy) Signed-off-by: Gopal V <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/tez/repo Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/bb40cf5b Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/bb40cf5b Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/bb40cf5b Branch: refs/heads/master Commit: bb40cf5b8a49833e13760a0ffe566092eb464d88 Parents: ff81cc4 Author: Eric Wohlstadter <[email protected]> Authored: Thu Feb 22 13:24:16 2018 -0800 Committer: Gopal V <[email protected]> Committed: Thu Feb 22 13:24:20 2018 -0800 ---------------------------------------------------------------------- pom.xml | 20 ++++++++++++++++---- tez-dag/pom.xml | 6 +++--- 2 files changed, 19 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tez/blob/bb40cf5b/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index c703e2e..34240cf 100644 --- a/pom.xml +++ b/pom.xml @@ -38,7 +38,7 @@ <maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile> <clover.license>${user.home}/clover.license</clover.license> <hadoop.version>2.7.0</hadoop.version> - <jetty.version>6.1.26</jetty.version> + <jetty.version>9.3.22.v20171030</jetty.version> <netty.version>3.6.2.Final</netty.version> <pig.version>0.13.0</pig.version> <javac.version>1.8</javac.version> @@ -239,8 +239,8 @@ <version>2.6</version> </dependency> <dependency> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty</artifactId> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-server</artifactId> <scope>compile</scope> <version>${jetty.version}</version> </dependency> @@ -251,7 +251,7 @@ <version>${netty.version}</version> </dependency> <dependency> - <groupId>org.mortbay.jetty</groupId> + <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-util</artifactId> <scope>compile</scope> <version>${jetty.version}</version> @@ -285,6 +285,18 @@ <artifactId>commons-logging-api</artifactId> </exclusion> <exclusion> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-server</artifactId> + </exclusion> + <exclusion> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-util</artifactId> + </exclusion> + <exclusion> + <groupId>org.eclipse.jetty</groupId> + <artifactId>servlet-api-2.5</artifactId> + </exclusion> + <exclusion> <groupId>org.mortbay.jetty</groupId> <artifactId>jetty</artifactId> </exclusion> http://git-wip-us.apache.org/repos/asf/tez/blob/bb40cf5b/tez-dag/pom.xml ---------------------------------------------------------------------- diff --git a/tez-dag/pom.xml b/tez-dag/pom.xml index 210ed2b..9fa9b44 100644 --- a/tez-dag/pom.xml +++ b/tez-dag/pom.xml @@ -142,12 +142,12 @@ <artifactId>jettison</artifactId> </dependency> <dependency> - <groupId>org.mortbay.jetty</groupId> - <artifactId>jetty</artifactId> + <groupId>org.eclipse.jetty</groupId> + <artifactId>jetty-server</artifactId> <scope>compile</scope> </dependency> <dependency> - <groupId>org.mortbay.jetty</groupId> + <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-util</artifactId> <scope>compile</scope> </dependency>
