From 7084739fa76bc2a902264825d81bda1e9e84a507 Mon Sep 17 00:00:00 2001
From: nash <nash@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 19 May 2010 22:06:30 +0000
Subject: Merge revision r945361 from 1.0 release branch

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@946448 13f79535-47bb-0310-9956-ffa450edef68
---
 .../travelsample/contributions/creditcard-payment-webapp/pom.xml    | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'sca-java-1.x/trunk/tutorials/travelsample/contributions/creditcard-payment-webapp/pom.xml')

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/contributions/creditcard-payment-webapp/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/contributions/creditcard-payment-webapp/pom.xml
index 273072562f..ee066f9692 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/contributions/creditcard-payment-webapp/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/contributions/creditcard-payment-webapp/pom.xml
@@ -57,6 +57,12 @@
             <artifactId>scatours-contribution-creditcard-payment-jaxb</artifactId>
             <version>${pom.version}</version>
             <scope>runtime</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>javax.servlet</groupId>
+                    <artifactId>servlet-api</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
     </dependencies>
 
-- 
cgit v1.2.3