diff options
author | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2008-09-19 06:38:51 +0000 |
---|---|---|
committer | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2008-09-19 06:38:51 +0000 |
commit | e78d25f094fd8179557bc6fd8e448ca3c7c23f12 (patch) | |
tree | 550f8579cf3f5adfc73e229b38837c32d3933f3a /branches/sca-equinox/samples | |
parent | 32c85a74bc5e26a202d0de8ccc0a9de5e5c3c34b (diff) |
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.
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@696936 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'branches/sca-equinox/samples')
8 files changed, 8 insertions, 14 deletions
diff --git a/branches/sca-equinox/samples/calculator-rcp/pom.xml b/branches/sca-equinox/samples/calculator-rcp/pom.xml index c50048c028..3b06fe37ea 100644 --- a/branches/sca-equinox/samples/calculator-rcp/pom.xml +++ b/branches/sca-equinox/samples/calculator-rcp/pom.xml @@ -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> diff --git a/branches/sca-equinox/samples/calculator-ws-secure-webapp/pom.xml b/branches/sca-equinox/samples/calculator-ws-secure-webapp/pom.xml index 5b506ee96c..76753eee39 100644 --- a/branches/sca-equinox/samples/calculator-ws-secure-webapp/pom.xml +++ b/branches/sca-equinox/samples/calculator-ws-secure-webapp/pom.xml @@ -70,10 +70,10 @@ WS Security and in a WebApp</name> <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>
diff --git a/branches/sca-equinox/samples/calculator-ws-webapp/pom.xml b/branches/sca-equinox/samples/calculator-ws-webapp/pom.xml index 0d8a74c2bf..167ddbfc63 100644 --- a/branches/sca-equinox/samples/calculator-ws-webapp/pom.xml +++ b/branches/sca-equinox/samples/calculator-ws-webapp/pom.xml @@ -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>
diff --git a/branches/sca-equinox/samples/feed-aggregator-webapp/pom.xml b/branches/sca-equinox/samples/feed-aggregator-webapp/pom.xml index 3176489de1..e6a51241df 100644 --- a/branches/sca-equinox/samples/feed-aggregator-webapp/pom.xml +++ b/branches/sca-equinox/samples/feed-aggregator-webapp/pom.xml @@ -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> diff --git a/branches/sca-equinox/samples/helloworld-dojo-webapp/pom.xml b/branches/sca-equinox/samples/helloworld-dojo-webapp/pom.xml index 35d4abd6c7..4fc75e1baa 100644 --- a/branches/sca-equinox/samples/helloworld-dojo-webapp/pom.xml +++ b/branches/sca-equinox/samples/helloworld-dojo-webapp/pom.xml @@ -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> diff --git a/branches/sca-equinox/samples/helloworld-jsonrpc-webapp/pom.xml b/branches/sca-equinox/samples/helloworld-jsonrpc-webapp/pom.xml index 8f4db306bd..d3999835c5 100644 --- a/branches/sca-equinox/samples/helloworld-jsonrpc-webapp/pom.xml +++ b/branches/sca-equinox/samples/helloworld-jsonrpc-webapp/pom.xml @@ -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> diff --git a/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/pom.xml b/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/pom.xml index 4b8f633640..7b85337332 100644 --- a/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/pom.xml +++ b/branches/sca-equinox/samples/helloworld-ws-sdo-webapp/pom.xml @@ -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> diff --git a/branches/sca-equinox/samples/helloworld-ws-service-webapp/pom.xml b/branches/sca-equinox/samples/helloworld-ws-service-webapp/pom.xml index 1fbfb2a49d..da2ac2a1eb 100644 --- a/branches/sca-equinox/samples/helloworld-ws-service-webapp/pom.xml +++ b/branches/sca-equinox/samples/helloworld-ws-service-webapp/pom.xml @@ -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> |