From 47ae44e500a8cfe964f9fa156ec986fa4f3ec83c Mon Sep 17 00:00:00 2001
From: Alan Davis <alan.davis@alfresco.com>
Date: Thu, 3 Nov 2016 13:50:08 +0000
Subject: [PATCH] Merged 5.2.N (5.2.1) to HEAD (5.2)    131370 adavis: Merged
 5.2.N-SERVLET-3.0 (5.2.1) to 5.2.N (5.2.1)       130708: REPO-843 /
 REPO-1246: Upgrade to Servlet 3.0 (part I),       130714: REPO-843 /
 REPO-1246: Upgrade to Servlet 3.0 (part 1b)       - fix web.xml (web-app),   
    130727: REPO-843 / REPO-1246: Upgrade to Servlet 3.0 (part 1b)       -
 update other web.xml's (other than web-client project),       130844:
 REPO-843 / REPO-1251: Upgrade to Servlet API 3.0.x (part 2) - update to
 Spring WebScripts 6.9 (ACE-5584)       - update to servlet-api 3.0.1,      
 130847: REPO-843 / REPO-1251: Upgrade to Servlet API 3.0.x (part 2) - update
 to Spring WebScripts 6.9 (ACE-5584)       - follow-on to commit the correct
 pom.xml (ie. parent rather than overlay),       130852: REPO-843 / REPO-1251:
 Upgrade to Servlet API 3.0.x (part 2) - update to Spring WebScripts 6.9
 (ACE-5584)       - follow-on

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@132252 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 pom.xml                    | 2 +-
 source/web/WEB-INF/web.xml | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6d2b309c16..8e5a902c31 100644
--- a/pom.xml
+++ b/pom.xml
@@ -97,7 +97,7 @@
         <!-- 'provided' dependencies, not packaged in war -->
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/source/web/WEB-INF/web.xml b/source/web/WEB-INF/web.xml
index 3c1f134540..6b84d1f14e 100644
--- a/source/web/WEB-INF/web.xml
+++ b/source/web/WEB-INF/web.xml
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
-    version="2.4">
+<web-app xmlns="http://java.sun.com/xml/ns/javaee"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+         version="3.0">
    
    <display-name>Alfresco</display-name>