Browse Source

Changed servlet api dependency to 2.4 (#9605)

tags/7.0.0.beta1
Artur Signell 11 years ago
parent
commit
c93fafc6b7
3 changed files with 5 additions and 5 deletions
  1. 2
    2
      server/ivy.xml
  2. 1
    1
      theme-compiler/ivy.xml
  3. 2
    2
      uitest/ivy.xml

+ 2
- 2
server/ivy.xml View File

@@ -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"

+ 1
- 1
theme-compiler/ivy.xml View File

@@ -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"

+ 2
- 2
uitest/ivy.xml View File

@@ -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" />

Loading…
Cancel
Save