You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2010/11/06 10:19:41 UTC

svn commit: r1031979 - /wicket/trunk/pom.xml

Author: mgrigorov
Date: Sat Nov  6 09:19:40 2010
New Revision: 1031979

URL: http://svn.apache.org/viewvc?rev=1031979&view=rev
Log:
WICKET-3147 Servlet 3 Annotation @WebFilter is not supported

Revert the changes in pom.xml so that Wicket depends on Servlet API 2.3 again

Modified:
    wicket/trunk/pom.xml

Modified: wicket/trunk/pom.xml
URL: http://svn.apache.org/viewvc/wicket/trunk/pom.xml?rev=1031979&r1=1031978&r2=1031979&view=diff
==============================================================================
--- wicket/trunk/pom.xml (original)
+++ wicket/trunk/pom.xml Sat Nov  6 09:19:40 2010
@@ -417,9 +417,9 @@
 				<scope>test</scope>
 			</dependency>
 			<dependency>
-				<groupId>org.mortbay.jetty</groupId>
+				<groupId>javax.servlet</groupId>
 				<artifactId>servlet-api</artifactId>
-				<version>3.0.20100224</version>
+				<version>2.3</version>
 				<scope>provided</scope>
 			</dependency>
 			<dependency>
@@ -460,12 +460,12 @@
 				<version>${jetty.version}</version>
 				<scope>provided</scope>
 			</dependency>
-			<!--dependency>
+			<dependency>
 				<groupId>org.mortbay.jetty</groupId>
 				<artifactId>servlet-api-2.5</artifactId>
 				<version>${jetty.version}</version>
 				<scope>provided</scope>
-			</dependency-->
+			</dependency>
 			<dependency>
 				<groupId>mx4j</groupId>
 				<artifactId>mx4j</artifactId>
@@ -551,7 +551,7 @@
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.mortbay.jetty</groupId>
+			<groupId>javax.servlet</groupId>
 			<artifactId>servlet-api</artifactId>
 			<scope>provided</scope>
 		</dependency>