You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2008/09/19 08:38:52 UTC

svn commit: r696936 - in /tuscany/branches/sca-equinox: demos/load-balancing-webapp/ itest/ itest/large-sdo-ws/ modules/binding-atom-abdera/ modules/binding-gdata-runtime-gsoc/ modules/binding-gdata-runtime/ modules/binding-http-runtime/ modules/bindin...

Author: jsdelfino
Date: Thu Sep 18 23:38:51 2008
New Revision: 696936

URL: http://svn.apache.org/viewvc?rev=696936&view=rev
Log:
Made level of servlet-api consistent, 2.5 in all modules. Changed scope from provided to compile in the core modules to make sure that servlet-api gets added to the dependencies at runtime.

Modified:
    tuscany/branches/sca-equinox/demos/load-balancing-webapp/pom.xml
    tuscany/branches/sca-equinox/itest/large-sdo-ws/pom.xml
    tuscany/branches/sca-equinox/itest/pom.xml
    tuscany/branches/sca-equinox/modules/binding-atom-abdera/pom.xml
    tuscany/branches/sca-equinox/modules/binding-gdata-runtime-gsoc/pom.xml
    tuscany/branches/sca-equinox/modules/binding-gdata-runtime/pom.xml
    tuscany/branches/sca-equinox/modules/binding-http-runtime/pom.xml
    tuscany/branches/sca-equinox/modules/binding-http/pom.xml
    tuscany/branches/sca-equinox/modules/binding-rss-rome/pom.xml
    tuscany/branches/sca-equinox/modules/binding-sca-axis2/pom.xml
    tuscany/branches/sca-equinox/modules/binding-ws-axis2/pom.xml
    tuscany/branches/sca-equinox/modules/core-spi/pom.xml
    tuscany/branches/sca-equinox/modules/domain-manager/pom.xml
    tuscany/branches/sca-equinox/modules/host-http/pom.xml
    tuscany/branches/sca-equinox/modules/host-webapp-junit/pom.xml
    tuscany/branches/sca-equinox/modules/host-webapp/pom.xml
    tuscany/branches/sca-equinox/modules/implementation-node-runtime/pom.xml
    tuscany/branches/sca-equinox/modules/implementation-widget-runtime/pom.xml
    tuscany/branches/sca-equinox/modules/node-launcher-equinox/pom.xml
    tuscany/branches/sca-equinox/modules/node-launcher/pom.xml
    tuscany/branches/sca-equinox/modules/node-manager/pom.xml
    tuscany/branches/sca-equinox/samples/calculator-rcp/pom.xml
    tuscany/branches/sca-equinox/samples/calculator-ws-secure-webapp/pom.xml
    tuscany/branches/sca-equinox/samples/calculator-ws-webapp/pom.xml
    tuscany/branches/sca-equinox/samples/feed-aggregator-webapp/pom.xml
    tuscany/branches/sca-equinox/samples/helloworld-dojo-webapp/pom.xml
    tuscany/branches/sca-equinox/samples/helloworld-jsonrpc-webapp/pom.xml
    tuscany/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/pom.xml
    tuscany/branches/sca-equinox/samples/helloworld-ws-service-webapp/pom.xml

Modified: tuscany/branches/sca-equinox/demos/load-balancing-webapp/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/demos/load-balancing-webapp/pom.xml?rev=696936&r1=696935&r2=696936&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/demos/load-balancing-webapp/pom.xml (original)
+++ tuscany/branches/sca-equinox/demos/load-balancing-webapp/pom.xml Thu Sep 18 23:38:51 2008
@@ -72,7 +72,7 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
-            <version>2.4</version> <!-- to keep compatible with older servlet containers --> 
+            <version>2.5</version>
             <scope>provided</scope>
         </dependency>        
         

Modified: tuscany/branches/sca-equinox/itest/large-sdo-ws/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/itest/large-sdo-ws/pom.xml?rev=696936&r1=696935&r2=696936&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/itest/large-sdo-ws/pom.xml (original)
+++ tuscany/branches/sca-equinox/itest/large-sdo-ws/pom.xml Thu Sep 18 23:38:51 2008
@@ -60,7 +60,7 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
-            <version>2.4</version> <!-- to keep compatible with older servlet containers --> 
+            <version>2.5</version>
             <scope>test</scope>
         </dependency>
 

Modified: tuscany/branches/sca-equinox/itest/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/itest/pom.xml?rev=696936&r1=696935&r2=696936&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/itest/pom.xml (original)
+++ tuscany/branches/sca-equinox/itest/pom.xml Thu Sep 18 23:38:51 2008
@@ -159,7 +159,7 @@
                 <dependency>
 	    	    <groupId>javax.servlet</groupId>
 	    	    <artifactId>servlet-api</artifactId>
-	    	    <version>2.3</version>
+	    	    <version>2.5</version>
                     <scope>provided</scope>
 	    	</dependency>
 	    </dependencies>    

Modified: tuscany/branches/sca-equinox/modules/binding-atom-abdera/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-atom-abdera/pom.xml?rev=696936&r1=696935&r2=696936&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/binding-atom-abdera/pom.xml (original)
+++ tuscany/branches/sca-equinox/modules/binding-atom-abdera/pom.xml Thu Sep 18 23:38:51 2008
@@ -133,8 +133,7 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
-            <version>2.4</version> 
-            <scope>provided</scope>
+            <version>2.5</version> 
         </dependency>
 
         <dependency>

Modified: tuscany/branches/sca-equinox/modules/binding-gdata-runtime-gsoc/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-gdata-runtime-gsoc/pom.xml?rev=696936&r1=696935&r2=696936&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/binding-gdata-runtime-gsoc/pom.xml (original)
+++ tuscany/branches/sca-equinox/modules/binding-gdata-runtime-gsoc/pom.xml Thu Sep 18 23:38:51 2008
@@ -118,8 +118,7 @@
 		<dependency>
 			<groupId>javax.servlet</groupId>
 			<artifactId>servlet-api</artifactId>
-			<version>2.4</version>
-			<scope>provided</scope>
+			<version>2.5</version>
 		</dependency>
 
 		<dependency>

Modified: tuscany/branches/sca-equinox/modules/binding-gdata-runtime/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-gdata-runtime/pom.xml?rev=696936&r1=696935&r2=696936&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/binding-gdata-runtime/pom.xml (original)
+++ tuscany/branches/sca-equinox/modules/binding-gdata-runtime/pom.xml Thu Sep 18 23:38:51 2008
@@ -87,8 +87,7 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
-            <version>2.4</version>
-            <scope>provided</scope> 
+            <version>2.5</version>
         </dependency>    
         
         <dependency>

Modified: tuscany/branches/sca-equinox/modules/binding-http-runtime/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-http-runtime/pom.xml?rev=696936&r1=696935&r2=696936&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/binding-http-runtime/pom.xml (original)
+++ tuscany/branches/sca-equinox/modules/binding-http-runtime/pom.xml Thu Sep 18 23:38:51 2008
@@ -52,7 +52,6 @@
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
             <version>2.5</version>
-            <scope>provided</scope>
         </dependency>
 
         <dependency>

Modified: tuscany/branches/sca-equinox/modules/binding-http/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-http/pom.xml?rev=696936&r1=696935&r2=696936&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/binding-http/pom.xml (original)
+++ tuscany/branches/sca-equinox/modules/binding-http/pom.xml Thu Sep 18 23:38:51 2008
@@ -52,7 +52,6 @@
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
             <version>2.5</version>
-            <scope>provided</scope>
         </dependency>
 
         <dependency>

Modified: tuscany/branches/sca-equinox/modules/binding-rss-rome/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-rss-rome/pom.xml?rev=696936&r1=696935&r2=696936&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/binding-rss-rome/pom.xml (original)
+++ tuscany/branches/sca-equinox/modules/binding-rss-rome/pom.xml Thu Sep 18 23:38:51 2008
@@ -87,8 +87,7 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
-            <version>2.4</version> 
-            <scope>provided</scope>
+            <version>2.5</version> 
         </dependency>
 
         <dependency>

Modified: tuscany/branches/sca-equinox/modules/binding-sca-axis2/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-sca-axis2/pom.xml?rev=696936&r1=696935&r2=696936&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/binding-sca-axis2/pom.xml (original)
+++ tuscany/branches/sca-equinox/modules/binding-sca-axis2/pom.xml Thu Sep 18 23:38:51 2008
@@ -47,8 +47,7 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
-            <version>2.4</version> <!-- to keep compatible with older servlet containers --> 
-            <scope>provided</scope>
+            <version>2.5</version>
         </dependency>       
 
         <dependency>

Modified: tuscany/branches/sca-equinox/modules/binding-ws-axis2/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/binding-ws-axis2/pom.xml?rev=696936&r1=696935&r2=696936&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/binding-ws-axis2/pom.xml (original)
+++ tuscany/branches/sca-equinox/modules/binding-ws-axis2/pom.xml Thu Sep 18 23:38:51 2008
@@ -249,14 +249,7 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
-            <version>2.4</version><!-- to keep compatible with older servlet containers -->
-            <scope>provided</scope>
-            <exclusions>
-               <exclusion>
-                   <groupId>javax.servlet</groupId>
-                   <artifactId>servlet-api</artifactId>
-               </exclusion>
-            </exclusions>            
+            <version>2.5</version>
         </dependency>
 
         <dependency>

Modified: tuscany/branches/sca-equinox/modules/core-spi/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/core-spi/pom.xml?rev=696936&r1=696935&r2=696936&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/core-spi/pom.xml (original)
+++ tuscany/branches/sca-equinox/modules/core-spi/pom.xml Thu Sep 18 23:38:51 2008
@@ -76,7 +76,6 @@
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
             <version>2.5</version>
-            <scope>provided</scope>
         </dependency>
 
         <dependency>

Modified: tuscany/branches/sca-equinox/modules/domain-manager/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/domain-manager/pom.xml?rev=696936&r1=696935&r2=696936&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/domain-manager/pom.xml (original)
+++ tuscany/branches/sca-equinox/modules/domain-manager/pom.xml Thu Sep 18 23:38:51 2008
@@ -106,7 +106,6 @@
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
             <version>2.5</version>
-            <scope>provided</scope>
         </dependency>
 
         <dependency>

Modified: tuscany/branches/sca-equinox/modules/host-http/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/host-http/pom.xml?rev=696936&r1=696935&r2=696936&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/host-http/pom.xml (original)
+++ tuscany/branches/sca-equinox/modules/host-http/pom.xml Thu Sep 18 23:38:51 2008
@@ -38,8 +38,7 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
-            <version>2.4</version> <!-- to keep compatible with older servlet containers --> 
-            <scope>provided</scope>
+            <version>2.5</version>
         </dependency>
     </dependencies>
 

Modified: tuscany/branches/sca-equinox/modules/host-webapp-junit/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/host-webapp-junit/pom.xml?rev=696936&r1=696935&r2=696936&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/host-webapp-junit/pom.xml (original)
+++ tuscany/branches/sca-equinox/modules/host-webapp-junit/pom.xml Thu Sep 18 23:38:51 2008
@@ -40,8 +40,7 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
-            <version>2.4</version><!-- to keep compatible with older servlet containers -->
-            <scope>provided</scope>
+            <version>2.5</version>
         </dependency>
 
     </dependencies>

Modified: tuscany/branches/sca-equinox/modules/host-webapp/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/host-webapp/pom.xml?rev=696936&r1=696935&r2=696936&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/host-webapp/pom.xml (original)
+++ tuscany/branches/sca-equinox/modules/host-webapp/pom.xml Thu Sep 18 23:38:51 2008
@@ -51,8 +51,7 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
-            <version>2.4</version> <!-- to keep compatible with older servlet containers --> 
-            <scope>provided</scope>
+            <version>2.5</version>
         </dependency>
 
         <dependency>

Modified: tuscany/branches/sca-equinox/modules/implementation-node-runtime/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/implementation-node-runtime/pom.xml?rev=696936&r1=696935&r2=696936&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/implementation-node-runtime/pom.xml (original)
+++ tuscany/branches/sca-equinox/modules/implementation-node-runtime/pom.xml Thu Sep 18 23:38:51 2008
@@ -70,8 +70,7 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
-            <version>2.4</version> <!-- to keep compatible with older servlet containers --> 
-            <scope>provided</scope>
+            <version>2.5</version>
         </dependency>
 
         <dependency>

Modified: tuscany/branches/sca-equinox/modules/implementation-widget-runtime/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/implementation-widget-runtime/pom.xml?rev=696936&r1=696935&r2=696936&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/implementation-widget-runtime/pom.xml (original)
+++ tuscany/branches/sca-equinox/modules/implementation-widget-runtime/pom.xml Thu Sep 18 23:38:51 2008
@@ -69,11 +69,10 @@
             <scope>test</scope>
         </dependency>
         
-       <dependency>
+        <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
-            <version>2.4</version> <!-- to keep compatible with older servlet containers --> 
-            <scope>provided</scope>
+            <version>2.5</version>
         </dependency>
         
         <!-- Test dependencies -->

Modified: tuscany/branches/sca-equinox/modules/node-launcher-equinox/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/node-launcher-equinox/pom.xml?rev=696936&r1=696935&r2=696936&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/node-launcher-equinox/pom.xml (original)
+++ tuscany/branches/sca-equinox/modules/node-launcher-equinox/pom.xml Thu Sep 18 23:38:51 2008
@@ -34,8 +34,7 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
-            <version>2.5</version> <!-- To be compatible with Jetty 6 --> 
-            <scope>provided</scope>
+            <version>2.5</version>
         </dependency>
 
         <dependency>

Modified: tuscany/branches/sca-equinox/modules/node-launcher/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/node-launcher/pom.xml?rev=696936&r1=696935&r2=696936&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/node-launcher/pom.xml (original)
+++ tuscany/branches/sca-equinox/modules/node-launcher/pom.xml Thu Sep 18 23:38:51 2008
@@ -34,8 +34,7 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
-            <version>2.4</version> <!-- to keep compatible with older servlet containers --> 
-            <scope>provided</scope>
+            <version>2.5</version>
         </dependency>
     </dependencies>
 

Modified: tuscany/branches/sca-equinox/modules/node-manager/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/node-manager/pom.xml?rev=696936&r1=696935&r2=696936&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/node-manager/pom.xml (original)
+++ tuscany/branches/sca-equinox/modules/node-manager/pom.xml Thu Sep 18 23:38:51 2008
@@ -75,8 +75,7 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
-            <version>2.4</version> <!-- to keep compatible with older servlet containers --> 
-            <scope>provided</scope>
+            <version>2.5</version>
         </dependency>
 
         <dependency>

Modified: tuscany/branches/sca-equinox/samples/calculator-rcp/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/samples/calculator-rcp/pom.xml?rev=696936&r1=696935&r2=696936&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/samples/calculator-rcp/pom.xml (original)
+++ tuscany/branches/sca-equinox/samples/calculator-rcp/pom.xml Thu Sep 18 23:38:51 2008
@@ -145,12 +145,6 @@
         </dependency>
 
         <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.5</version> <!-- To be compatible with Jetty 6 -->
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <version>4.2</version>

Modified: tuscany/branches/sca-equinox/samples/calculator-ws-secure-webapp/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/samples/calculator-ws-secure-webapp/pom.xml?rev=696936&r1=696935&r2=696936&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/samples/calculator-ws-secure-webapp/pom.xml (original)
+++ tuscany/branches/sca-equinox/samples/calculator-ws-secure-webapp/pom.xml Thu Sep 18 23:38:51 2008
@@ -70,10 +70,10 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
-            <version>2.3</version>
+            <version>2.5</version>
             <scope>provided</scope>
         </dependency>
-
        <dependency>
+        <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <version>4.2</version>

Modified: tuscany/branches/sca-equinox/samples/calculator-ws-webapp/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/samples/calculator-ws-webapp/pom.xml?rev=696936&r1=696935&r2=696936&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/samples/calculator-ws-webapp/pom.xml (original)
+++ tuscany/branches/sca-equinox/samples/calculator-ws-webapp/pom.xml Thu Sep 18 23:38:51 2008
@@ -69,7 +69,7 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
-            <version>2.3</version>
+            <version>2.5</version>
             <scope>provided</scope>
         </dependency>
 

Modified: tuscany/branches/sca-equinox/samples/feed-aggregator-webapp/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/samples/feed-aggregator-webapp/pom.xml?rev=696936&r1=696935&r2=696936&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/samples/feed-aggregator-webapp/pom.xml (original)
+++ tuscany/branches/sca-equinox/samples/feed-aggregator-webapp/pom.xml Thu Sep 18 23:38:51 2008
@@ -74,7 +74,7 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
-            <version>2.3</version>
+            <version>2.5</version>
             <scope>provided</scope>
         </dependency>
 

Modified: tuscany/branches/sca-equinox/samples/helloworld-dojo-webapp/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/samples/helloworld-dojo-webapp/pom.xml?rev=696936&r1=696935&r2=696936&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/samples/helloworld-dojo-webapp/pom.xml (original)
+++ tuscany/branches/sca-equinox/samples/helloworld-dojo-webapp/pom.xml Thu Sep 18 23:38:51 2008
@@ -69,7 +69,7 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
-            <version>2.3</version>
+            <version>2.5</version>
             <scope>provided</scope>
         </dependency>
 

Modified: tuscany/branches/sca-equinox/samples/helloworld-jsonrpc-webapp/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/samples/helloworld-jsonrpc-webapp/pom.xml?rev=696936&r1=696935&r2=696936&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/samples/helloworld-jsonrpc-webapp/pom.xml (original)
+++ tuscany/branches/sca-equinox/samples/helloworld-jsonrpc-webapp/pom.xml Thu Sep 18 23:38:51 2008
@@ -69,7 +69,7 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
-            <version>2.3</version>
+            <version>2.5</version>
             <scope>provided</scope>
         </dependency>
 

Modified: tuscany/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/pom.xml?rev=696936&r1=696935&r2=696936&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/pom.xml (original)
+++ tuscany/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/pom.xml Thu Sep 18 23:38:51 2008
@@ -107,7 +107,7 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
-            <version>2.3</version>
+            <version>2.5</version>
             <scope>provided</scope>
         </dependency>
 

Modified: tuscany/branches/sca-equinox/samples/helloworld-ws-service-webapp/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/samples/helloworld-ws-service-webapp/pom.xml?rev=696936&r1=696935&r2=696936&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/samples/helloworld-ws-service-webapp/pom.xml (original)
+++ tuscany/branches/sca-equinox/samples/helloworld-ws-service-webapp/pom.xml Thu Sep 18 23:38:51 2008
@@ -68,7 +68,7 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
-            <version>2.3</version>
+            <version>2.5</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>