summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2012-09-14 12:00:09 +0300
committerArtur Signell <artur@vaadin.com>2012-09-14 12:00:40 +0300
commitc93fafc6b7ef4652cbf47b3dba2b233be4f95a6c (patch)
tree0efbe76def09f7f0b5b47434ce9d32e108c150fe
parent49609bb9caeb732eaf03f10abc2efc887a9fbab6 (diff)
downloadvaadin-framework-c93fafc6b7ef4652cbf47b3dba2b233be4f95a6c.tar.gz
vaadin-framework-c93fafc6b7ef4652cbf47b3dba2b233be4f95a6c.zip
Changed servlet api dependency to 2.4 (#9605)
-rw-r--r--server/ivy.xml4
-rw-r--r--theme-compiler/ivy.xml2
-rw-r--r--uitest/ivy.xml4
3 files changed, 5 insertions, 5 deletions
diff --git a/server/ivy.xml b/server/ivy.xml
index d798883100..5ef49db80a 100644
--- 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 17ea1952a9..ccabff0e25 100644
--- 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 00a5dce703..a261c741a1 100644
--- 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" />