From 4bd8e4ca70a0ed3f4a0e1d3c20d3c2daee78cf0b Mon Sep 17 00:00:00 2001
From: Alan Davis <alan.davis@alfresco.com>
Date: Wed, 12 Oct 2016 11:33:40 +0000
Subject: [PATCH] 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/BRANCHES/DEV/5.2.N/root@131370 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 pom.xml                    | 15 +++++++++++----
 source/web/WEB-INF/web.xml |  9 ++++-----
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/pom.xml b/pom.xml
index a26f1ac64b..f3bea5e94e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -267,10 +267,6 @@
             <groupId>org.codehaus.jackson</groupId>
             <artifactId>jackson-mapper-asl</artifactId>
         </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>jstl</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.apache.myfaces.core</groupId>
             <artifactId>myfaces-api</artifactId>
@@ -460,6 +456,17 @@
             <artifactId>netcdf</artifactId>
             <version>4.2.20</version>
         </dependency>
+
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>jstl</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        
         <!-- Spring Surf -->
         <dependency>
             <groupId>org.alfresco.surf</groupId>
diff --git a/source/web/WEB-INF/web.xml b/source/web/WEB-INF/web.xml
index 320a759feb..bbfa30557b 100644
--- a/source/web/WEB-INF/web.xml
+++ b/source/web/WEB-INF/web.xml
@@ -1,9 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
 
-<!DOCTYPE web-app PUBLIC
-  "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
-  "http://java.sun.com/dtd/web-app_2_3.dtd">
-
-<web-app>
+<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>Repository</display-name>
 </web-app>