[tez] branch master updated: TEZ-4066. Upgrade servlet-api from 2.5 to 3.1.0 (Jonathan Eagles via kshukla)

[ks...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

kshukla pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tez.git


The following commit(s) were added to refs/heads/master by this push:
     new 2202f04  TEZ-4066. Upgrade servlet-api from 2.5 to 3.1.0 (Jonathan Eagles via kshukla)
2202f04 is described below

commit 2202f04d4bee465e529a734d9ec855dced170f00
Author: Kuhu Shukla <ks...@apache.org>
AuthorDate: Tue May 7 09:55:03 2019 -0500

    TEZ-4066. Upgrade servlet-api from 2.5 to 3.1.0 (Jonathan Eagles via kshukla)
---
 pom.xml                             | 4 ++--
 tez-dag/pom.xml                     | 2 +-
 tez-dist/dist-files/full/LICENSE    | 2 +-
 tez-dist/dist-files/minimal/LICENSE | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2881702..89c081d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -266,8 +266,8 @@
       </dependency>
       <dependency>
         <groupId>javax.servlet</groupId>
-        <artifactId>servlet-api</artifactId>
-        <version>2.5</version>
+        <artifactId>javax.servlet-api</artifactId>
+        <version>3.1.0</version>
       </dependency>
       <dependency>
         <groupId>commons-codec</groupId>
diff --git a/tez-dag/pom.xml b/tez-dag/pom.xml
index c6962ae..01f5623 100644
--- a/tez-dag/pom.xml
+++ b/tez-dag/pom.xml
@@ -154,7 +154,7 @@
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
-      <artifactId>servlet-api</artifactId>
+      <artifactId>javax.servlet-api</artifactId>
       <scope>compile</scope>
     </dependency>
   </dependencies>
diff --git a/tez-dist/dist-files/full/LICENSE b/tez-dist/dist-files/full/LICENSE
index 2647d13..7b4c36c 100644
--- a/tez-dist/dist-files/full/LICENSE
+++ b/tez-dist/dist-files/full/LICENSE
@@ -306,7 +306,7 @@ The Apache TEZ binary distribution bundles the following files under the CDDL Li
   - jersey-json-*.jar
   - jaxb-api-*.jar
   - jaxb-impl-*.jar
-  - servlet-api-*.jar
+  - javax.servlet-api-*.jar
 
 The text for this license can be found in the LICENSE-CDDLv1.1-GPLv2_withCPE file.
 
diff --git a/tez-dist/dist-files/minimal/LICENSE b/tez-dist/dist-files/minimal/LICENSE
index c89bc24..11d7d0c 100644
--- a/tez-dist/dist-files/minimal/LICENSE
+++ b/tez-dist/dist-files/minimal/LICENSE
@@ -261,7 +261,7 @@ The Apache TEZ binary distribution bundles the following files under the CDDL Li
 
   - jersey-client-*.jar
   - jersey-json-*.jar
-  - servlet-api-*.jar
+  - javax.servlet-api-*.jar
 
 The full text of the license is available in LICENSE-CDDLv1.1-GPLv2_withCPE.