[java-idp-testbed COMMIT] /trunk/pom.xml

[noreply at shibboleth.net]

Author: tzeller
Date: Wed Jun 11 15:05:17 2014
New Revision: 266

URL: http://svn.shibboleth.net/view/java-idp-testbed?rev=266&view=rev
Log:
Bump Jetty version to latest 9.2.x in parent-v3 POM and override Servlet API 3.0.1 with Servlet API 3.1.0 in the testbed POM.

Modified:
    trunk/pom.xml

Modified: trunk/pom.xml
URL: http://svn.shibboleth.net/view/java-idp-testbed/trunk/pom.xml?rev=266&r1=265&r2=266&view=diff
==============================================================================
--- trunk/pom.xml (original)
+++ trunk/pom.xml Wed Jun 11 15:05:17 2014
@@ -179,19 +179,17 @@
         </dependency>
 
         <!-- Provided scope -->
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>jstl</artifactId>
-            <scope>provided</scope>
-        </dependency>
+        <!-- Override Servlet API 3.0.1 with Servlet 3.1.0 for Jetty 9.1+  -->
         <dependency>
             <groupId>javax.servlet.jsp</groupId>
-            <artifactId>jsp-api</artifactId>
+            <artifactId>javax.servlet.jsp-api</artifactId>
+            <version>2.3.1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
+            <version>3.1.0</version><!--$NO-MVN-MAN-VER$ -->
             <scope>provided</scope>
         </dependency>