You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by lr...@apache.org on 2008/01/15 06:22:50 UTC

svn commit: r612018 - in /incubator/tuscany/branches/sca-java-1.1/samples: calculator-webapp/pom.xml calculator-ws-webapp/pom.xml chat-webapp/pom.xml feed-aggregator-webapp/pom.xml helloworld-ws-service-webapp/pom.xml

Author: lresende
Date: Mon Jan 14 21:22:49 2008
New Revision: 612018

URL: http://svn.apache.org/viewvc?rev=612018&view=rev
Log:
TUSCANY-1989 - Removing servlet-api jar from war file built with maven.

Modified:
    incubator/tuscany/branches/sca-java-1.1/samples/calculator-webapp/pom.xml
    incubator/tuscany/branches/sca-java-1.1/samples/calculator-ws-webapp/pom.xml
    incubator/tuscany/branches/sca-java-1.1/samples/chat-webapp/pom.xml
    incubator/tuscany/branches/sca-java-1.1/samples/feed-aggregator-webapp/pom.xml
    incubator/tuscany/branches/sca-java-1.1/samples/helloworld-ws-service-webapp/pom.xml

Modified: incubator/tuscany/branches/sca-java-1.1/samples/calculator-webapp/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.1/samples/calculator-webapp/pom.xml?rev=612018&r1=612017&r2=612018&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.1/samples/calculator-webapp/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-1.1/samples/calculator-webapp/pom.xml Mon Jan 14 21:22:49 2008
@@ -50,12 +50,20 @@
             <scope>runtime</scope>
         </dependency>
 
+        <!-- marking dependency as provided to exclude from war file -->
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+            <version>2.3</version>
+            <scope>provided</scope>
+        </dependency>
+
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <version>4.2</version>
             <scope>test</scope>
-        </dependency>
+        </dependency>        
 
     </dependencies>
 

Modified: incubator/tuscany/branches/sca-java-1.1/samples/calculator-ws-webapp/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.1/samples/calculator-ws-webapp/pom.xml?rev=612018&r1=612017&r2=612018&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.1/samples/calculator-ws-webapp/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-1.1/samples/calculator-ws-webapp/pom.xml Mon Jan 14 21:22:49 2008
@@ -57,6 +57,14 @@
             <scope>runtime</scope>
         </dependency>
 
+        <!-- marking dependency as provided to exclude from war file -->
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+            <version>2.3</version>
+            <scope>provided</scope>
+        </dependency>
+
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>

Modified: incubator/tuscany/branches/sca-java-1.1/samples/chat-webapp/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.1/samples/chat-webapp/pom.xml?rev=612018&r1=612017&r2=612018&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.1/samples/chat-webapp/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-1.1/samples/chat-webapp/pom.xml Mon Jan 14 21:22:49 2008
@@ -58,6 +58,14 @@
             <scope>runtime</scope>
         </dependency>
 
+        <!-- marking dependency as provided to exclude from war file -->
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+            <version>2.3</version>
+            <scope>provided</scope>
+        </dependency>
+
     </dependencies>
 
     <build>

Modified: incubator/tuscany/branches/sca-java-1.1/samples/feed-aggregator-webapp/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.1/samples/feed-aggregator-webapp/pom.xml?rev=612018&r1=612017&r2=612018&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.1/samples/feed-aggregator-webapp/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-1.1/samples/feed-aggregator-webapp/pom.xml Mon Jan 14 21:22:49 2008
@@ -57,6 +57,14 @@
             <scope>compile</scope>
         </dependency>   
 
+        <!-- marking dependency as provided to exclude from war file -->
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+            <version>2.3</version>
+            <scope>provided</scope>
+        </dependency>
+
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>

Modified: incubator/tuscany/branches/sca-java-1.1/samples/helloworld-ws-service-webapp/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.1/samples/helloworld-ws-service-webapp/pom.xml?rev=612018&r1=612017&r2=612018&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.1/samples/helloworld-ws-service-webapp/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-1.1/samples/helloworld-ws-service-webapp/pom.xml Mon Jan 14 21:22:49 2008
@@ -55,7 +55,14 @@
             <version>1.1-incubating-SNAPSHOT</version>
             <scope>runtime</scope>
         </dependency>
-
+        
+        <!-- marking dependency as provided to exclude from war file -->
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>servlet-api</artifactId>
+            <version>2.3</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
     
     <build>



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org