Changed servlet api dependency to 2.4 (#9605)

diff --git a/server/ivy.xml b/server/ivy.xml
index d7988831008e4002767595b526d3856980df2e22..5ef49db80aa9c2b5ef0cd780750520e20a42fd59 100644 (file)
--- a/server/ivy.xml
+++ b/server/ivy.xml
@@ -25,9 +25,9 @@
         <!-- Liferay Portal Service -->
         <dependency org="com.liferay.portal" name="portal-service"
             rev="6.0.2" conf="build-provided,ide -> default" />
-        <!--Servlet API version 2.5 -->
+        <!--Servlet API version 2.4 -->
         <dependency org="javax.servlet" name="servlet-api"
-            rev="2.5" conf="build-provided,ide,tests -> default" />
+            rev="2.4" conf="build-provided,ide,tests -> default" />
 
         <!--Portlet API version 2.0 (JSR-286) -->
         <dependency org="javax.portlet" name="portlet-api"

diff --git a/theme-compiler/ivy.xml b/theme-compiler/ivy.xml
index 17ea1952a901ea3e3b279e1deb152986b5722026..ccabff0e25b08b90fbdafd373cab84f4d4f741ec 100644 (file)
--- a/theme-compiler/ivy.xml
+++ b/theme-compiler/ivy.xml
@@ -39,7 +39,7 @@
 
         <!-- Provided build libs -->
         <dependency org="javax.servlet" name="servlet-api"
-            rev="2.5" conf="build-provided->default" />
+            rev="2.4" conf="build-provided->default" />
 
         <!-- Testing libs -->
         <dependency org="junit" name="junit" rev="4.5"

diff --git a/uitest/ivy.xml b/uitest/ivy.xml
index 00a5dce70370659b946cfd64069eb30682e4be31..a261c741a1e48969dfd9af14fb6c872a63c24a8d 100644 (file)
--- a/uitest/ivy.xml
+++ b/uitest/ivy.xml
@@ -23,9 +23,9 @@
 
         <dependency org="javax.validation" name="validation-api"
             rev="1.0.0.GA" conf="build,ide -> default,sources" />
-        <!--Servlet API version 2.5 -->
+        <!-- Servlet API -->
         <dependency org="javax.servlet" name="servlet-api"
-            rev="2.5" conf="build-provided,ide -> default" />
+            rev="2.4" conf="build-provided,ide -> default" />
         <!-- Google App Engine -->
         <dependency org="com.google.appengine" name="appengine-api-1.0-sdk"
             rev="1.2.1" conf="build-provided,ide -> default" />