You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2015/07/21 08:01:59 UTC
svn commit: r1692047 - in /sling/trunk/launchpad/base: pom.xml
src/main/webapp/WEB-INF/web.xml
Author: cziegeler
Date: Tue Jul 21 06:01:59 2015
New Revision: 1692047
URL: http://svn.apache.org/r1692047
Log:
SLING-4887 : Move to Servlet 3
Modified:
sling/trunk/launchpad/base/pom.xml
sling/trunk/launchpad/base/src/main/webapp/WEB-INF/web.xml
Modified: sling/trunk/launchpad/base/pom.xml
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/base/pom.xml?rev=1692047&r1=1692046&r2=1692047&view=diff
==============================================================================
--- sling/trunk/launchpad/base/pom.xml (original)
+++ sling/trunk/launchpad/base/pom.xml Tue Jul 21 06:01:59 2015
@@ -268,8 +268,8 @@
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
+ <artifactId>javax.servlet-api</artifactId>
+ <version>3.0.1</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: sling/trunk/launchpad/base/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/base/src/main/webapp/WEB-INF/web.xml?rev=1692047&r1=1692046&r2=1692047&view=diff
==============================================================================
--- sling/trunk/launchpad/base/src/main/webapp/WEB-INF/web.xml (original)
+++ sling/trunk/launchpad/base/src/main/webapp/WEB-INF/web.xml Tue Jul 21 06:01:59 2015
@@ -17,10 +17,10 @@
specific language governing permissions and limitations
under the License.
-->
-<web-app version="2.4"
+<web-app version="3.0"
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">
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_3_0.xsd">
<display-name>Sling Launchpad Web Application</display-name>
<!-- The Felix Http Service Listener Proxy for HTTP Session events -->