diff options
Diffstat (limited to '')
18 files changed, 15 insertions, 39 deletions
diff --git a/branches/sca-equinox/modules/binding-atom-abdera/pom.xml b/branches/sca-equinox/modules/binding-atom-abdera/pom.xml index f10497c9c5..4b922be0a7 100644 --- a/branches/sca-equinox/modules/binding-atom-abdera/pom.xml +++ b/branches/sca-equinox/modules/binding-atom-abdera/pom.xml @@ -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> diff --git a/branches/sca-equinox/modules/binding-gdata-runtime-gsoc/pom.xml b/branches/sca-equinox/modules/binding-gdata-runtime-gsoc/pom.xml index 2f216faa55..85506087e5 100644 --- a/branches/sca-equinox/modules/binding-gdata-runtime-gsoc/pom.xml +++ b/branches/sca-equinox/modules/binding-gdata-runtime-gsoc/pom.xml @@ -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> diff --git a/branches/sca-equinox/modules/binding-gdata-runtime/pom.xml b/branches/sca-equinox/modules/binding-gdata-runtime/pom.xml index ec29af0b0f..b5d4ac94fd 100644 --- a/branches/sca-equinox/modules/binding-gdata-runtime/pom.xml +++ b/branches/sca-equinox/modules/binding-gdata-runtime/pom.xml @@ -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> diff --git a/branches/sca-equinox/modules/binding-http-runtime/pom.xml b/branches/sca-equinox/modules/binding-http-runtime/pom.xml index cd3d0e7c99..bb6f671dd1 100644 --- a/branches/sca-equinox/modules/binding-http-runtime/pom.xml +++ b/branches/sca-equinox/modules/binding-http-runtime/pom.xml @@ -52,7 +52,6 @@ <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> <version>2.5</version> - <scope>provided</scope> </dependency> <dependency> diff --git a/branches/sca-equinox/modules/binding-http/pom.xml b/branches/sca-equinox/modules/binding-http/pom.xml index 919f4c3d2b..1ad2168669 100644 --- a/branches/sca-equinox/modules/binding-http/pom.xml +++ b/branches/sca-equinox/modules/binding-http/pom.xml @@ -52,7 +52,6 @@ <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> <version>2.5</version> - <scope>provided</scope> </dependency> <dependency> diff --git a/branches/sca-equinox/modules/binding-rss-rome/pom.xml b/branches/sca-equinox/modules/binding-rss-rome/pom.xml index d0027caef6..9babfb8cb7 100644 --- a/branches/sca-equinox/modules/binding-rss-rome/pom.xml +++ b/branches/sca-equinox/modules/binding-rss-rome/pom.xml @@ -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> diff --git a/branches/sca-equinox/modules/binding-sca-axis2/pom.xml b/branches/sca-equinox/modules/binding-sca-axis2/pom.xml index 2314c139c8..9f4fbc6c9e 100644 --- a/branches/sca-equinox/modules/binding-sca-axis2/pom.xml +++ b/branches/sca-equinox/modules/binding-sca-axis2/pom.xml @@ -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>
diff --git a/branches/sca-equinox/modules/binding-ws-axis2/pom.xml b/branches/sca-equinox/modules/binding-ws-axis2/pom.xml index c0a5fe8465..87e675e16f 100644 --- a/branches/sca-equinox/modules/binding-ws-axis2/pom.xml +++ b/branches/sca-equinox/modules/binding-ws-axis2/pom.xml @@ -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> diff --git a/branches/sca-equinox/modules/core-spi/pom.xml b/branches/sca-equinox/modules/core-spi/pom.xml index 6246686d08..02cb36dc8b 100644 --- a/branches/sca-equinox/modules/core-spi/pom.xml +++ b/branches/sca-equinox/modules/core-spi/pom.xml @@ -76,7 +76,6 @@ <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> <version>2.5</version> - <scope>provided</scope> </dependency> <dependency> diff --git a/branches/sca-equinox/modules/domain-manager/pom.xml b/branches/sca-equinox/modules/domain-manager/pom.xml index 5a526b158a..d1afadb381 100644 --- a/branches/sca-equinox/modules/domain-manager/pom.xml +++ b/branches/sca-equinox/modules/domain-manager/pom.xml @@ -106,7 +106,6 @@ <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> <version>2.5</version> - <scope>provided</scope> </dependency> <dependency> diff --git a/branches/sca-equinox/modules/host-http/pom.xml b/branches/sca-equinox/modules/host-http/pom.xml index 258770c20b..9a6a6d5d3b 100644 --- a/branches/sca-equinox/modules/host-http/pom.xml +++ b/branches/sca-equinox/modules/host-http/pom.xml @@ -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> diff --git a/branches/sca-equinox/modules/host-webapp-junit/pom.xml b/branches/sca-equinox/modules/host-webapp-junit/pom.xml index 27c8359414..97defa3377 100644 --- a/branches/sca-equinox/modules/host-webapp-junit/pom.xml +++ b/branches/sca-equinox/modules/host-webapp-junit/pom.xml @@ -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> diff --git a/branches/sca-equinox/modules/host-webapp/pom.xml b/branches/sca-equinox/modules/host-webapp/pom.xml index 67d7791be3..7ef183ddeb 100644 --- a/branches/sca-equinox/modules/host-webapp/pom.xml +++ b/branches/sca-equinox/modules/host-webapp/pom.xml @@ -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> diff --git a/branches/sca-equinox/modules/implementation-node-runtime/pom.xml b/branches/sca-equinox/modules/implementation-node-runtime/pom.xml index bc4f0ae7bf..ddd26bf2e8 100644 --- a/branches/sca-equinox/modules/implementation-node-runtime/pom.xml +++ b/branches/sca-equinox/modules/implementation-node-runtime/pom.xml @@ -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> diff --git a/branches/sca-equinox/modules/implementation-widget-runtime/pom.xml b/branches/sca-equinox/modules/implementation-widget-runtime/pom.xml index 79d6d10ee4..f2703e59c4 100644 --- a/branches/sca-equinox/modules/implementation-widget-runtime/pom.xml +++ b/branches/sca-equinox/modules/implementation-widget-runtime/pom.xml @@ -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 --> diff --git a/branches/sca-equinox/modules/node-launcher-equinox/pom.xml b/branches/sca-equinox/modules/node-launcher-equinox/pom.xml index 4459ec0038..365e3830bb 100644 --- a/branches/sca-equinox/modules/node-launcher-equinox/pom.xml +++ b/branches/sca-equinox/modules/node-launcher-equinox/pom.xml @@ -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> diff --git a/branches/sca-equinox/modules/node-launcher/pom.xml b/branches/sca-equinox/modules/node-launcher/pom.xml index 606a4f9164..ca72f2776b 100644 --- a/branches/sca-equinox/modules/node-launcher/pom.xml +++ b/branches/sca-equinox/modules/node-launcher/pom.xml @@ -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> diff --git a/branches/sca-equinox/modules/node-manager/pom.xml b/branches/sca-equinox/modules/node-manager/pom.xml index 08152a6344..346a6554c4 100644 --- a/branches/sca-equinox/modules/node-manager/pom.xml +++ b/branches/sca-equinox/modules/node-manager/pom.xml @@ -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> |