Author: lresende
Date: Sat Feb 23 17:18:37 2008
New Revision: 630561
URL: http://svn.apache.org/viewvc?rev=630561&view=rev
Log:
TUSCANY-2036 - removing duplicated stax dependencies
Modified:
incubator/tuscany/java/sca/samples/calculator-webapp/pom.xml
incubator/tuscany/java/sca/samples/calculator-ws-secure-webapp/pom.xml
incubator/tuscany/java/sca/samples/calculator-ws-webapp/pom.xml
incubator/tuscany/java/sca/samples/chat-webapp/pom.xml
incubator/tuscany/java/sca/samples/domain-webapp/pom.xml
incubator/tuscany/java/sca/samples/feed-aggregator-webapp/pom.xml
incubator/tuscany/java/sca/samples/helloworld-dojo-webapp/pom.xml
incubator/tuscany/java/sca/samples/helloworld-jms-webapp/pom.xml
incubator/tuscany/java/sca/samples/helloworld-jsonrpc-webapp/pom.xml
incubator/tuscany/java/sca/samples/helloworld-ws-sdo-webapp/pom.xml
incubator/tuscany/java/sca/samples/helloworld-ws-service-webapp/pom.xml
incubator/tuscany/java/sca/samples/pom.xml
Modified: incubator/tuscany/java/sca/samples/calculator-webapp/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/calculator-webapp/pom.xml?rev=630561&r1=630560&r2=630561&view=diff
==============================================================================
--- incubator/tuscany/java/sca/samples/calculator-webapp/pom.xml (original)
+++ incubator/tuscany/java/sca/samples/calculator-webapp/pom.xml Sat Feb 23
17:18:37 2008
@@ -40,7 +40,7 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-host-webapp</artifactId>
- <version>1.2-incubating-SNAPSHOT</version>
+ <version>1.2-incubating-SNAPSHOT</version>
</dependency>
<dependency>
@@ -49,14 +49,22 @@
<version>1.2-incubating-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
-
+
+ <!-- exclude stax 1.0.1 as we're also pulling in
javax\xml\stream\stax-api\1.0-2 -->
+ <dependency>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ <version>1.0.1</version>
+ <scope>provided</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>
<dependency>
<groupId>junit</groupId>
Modified: incubator/tuscany/java/sca/samples/calculator-ws-secure-webapp/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/calculator-ws-secure-webapp/pom.xml?rev=630561&r1=630560&r2=630561&view=diff
==============================================================================
--- incubator/tuscany/java/sca/samples/calculator-ws-secure-webapp/pom.xml
(original)
+++ incubator/tuscany/java/sca/samples/calculator-ws-secure-webapp/pom.xml Sat
Feb 23 17:18:37 2008
@@ -42,13 +42,13 @@
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-host-webapp</artifactId>
- <version>1.2-incubating-SNAPSHOT</version>
+ <version>1.2-incubating-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-binding-ws-axis2</artifactId>
- <version>1.2-incubating-SNAPSHOT</version>
+ <version>1.2-incubating-SNAPSHOT</version>
</dependency>
<dependency>
@@ -57,16 +57,23 @@
<version>1.2-incubating-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
-
+
+ <!-- exclude stax 1.0.1 as we're also pulling in
javax\xml\stream\stax-api\1.0-2 -->
+ <dependency>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ <version>1.0.1</version>
+ <scope>provided</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>
+ </dependency>
+
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.2</version>
Modified: incubator/tuscany/java/sca/samples/calculator-ws-webapp/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/calculator-ws-webapp/pom.xml?rev=630561&r1=630560&r2=630561&view=diff
==============================================================================
--- incubator/tuscany/java/sca/samples/calculator-ws-webapp/pom.xml (original)
+++ incubator/tuscany/java/sca/samples/calculator-ws-webapp/pom.xml Sat Feb 23
17:18:37 2008
@@ -57,6 +57,14 @@
<scope>runtime</scope>
</dependency>
+ <!-- exclude stax 1.0.1 as we're also pulling in
javax\xml\stream\stax-api\1.0-2 -->
+ <dependency>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ <version>1.0.1</version>
+ <scope>provided</scope>
+ </dependency>
+
<!-- marking dependency as provided to exclude from war file -->
<dependency>
<groupId>javax.servlet</groupId>
Modified: incubator/tuscany/java/sca/samples/chat-webapp/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/chat-webapp/pom.xml?rev=630561&r1=630560&r2=630561&view=diff
==============================================================================
--- incubator/tuscany/java/sca/samples/chat-webapp/pom.xml (original)
+++ incubator/tuscany/java/sca/samples/chat-webapp/pom.xml Sat Feb 23 17:18:37
2008
@@ -58,6 +58,14 @@
<scope>runtime</scope>
</dependency>
+ <!-- exclude stax 1.0.1 as we're also pulling in
javax\xml\stream\stax-api\1.0-2 -->
+ <dependency>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ <version>1.0.1</version>
+ <scope>provided</scope>
+ </dependency>
+
<!-- marking dependency as provided to exclude from war file -->
<dependency>
<groupId>javax.servlet</groupId>
Modified: incubator/tuscany/java/sca/samples/domain-webapp/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/domain-webapp/pom.xml?rev=630561&r1=630560&r2=630561&view=diff
==============================================================================
--- incubator/tuscany/java/sca/samples/domain-webapp/pom.xml (original)
+++ incubator/tuscany/java/sca/samples/domain-webapp/pom.xml Sat Feb 23
17:18:37 2008
@@ -48,7 +48,6 @@
<version>1.2-incubating-SNAPSHOT</version>
</dependency>
-
<dependency>
<groupId>org.apache.tuscany.sca</groupId>
<artifactId>tuscany-node-impl</artifactId>
Modified: incubator/tuscany/java/sca/samples/feed-aggregator-webapp/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/feed-aggregator-webapp/pom.xml?rev=630561&r1=630560&r2=630561&view=diff
==============================================================================
--- incubator/tuscany/java/sca/samples/feed-aggregator-webapp/pom.xml (original)
+++ incubator/tuscany/java/sca/samples/feed-aggregator-webapp/pom.xml Sat Feb
23 17:18:37 2008
@@ -57,6 +57,14 @@
<scope>compile</scope>
</dependency>
+ <!-- exclude stax 1.0.1 as we're also pulling in
javax\xml\stream\stax-api\1.0-2 -->
+ <dependency>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ <version>1.0.1</version>
+ <scope>provided</scope>
+ </dependency>
+
<!-- marking dependency as provided to exclude from war file -->
<dependency>
<groupId>javax.servlet</groupId>
Modified: incubator/tuscany/java/sca/samples/helloworld-dojo-webapp/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/helloworld-dojo-webapp/pom.xml?rev=630561&r1=630560&r2=630561&view=diff
==============================================================================
--- incubator/tuscany/java/sca/samples/helloworld-dojo-webapp/pom.xml (original)
+++ incubator/tuscany/java/sca/samples/helloworld-dojo-webapp/pom.xml Sat Feb
23 17:18:37 2008
@@ -57,6 +57,22 @@
<scope>runtime</scope>
</dependency>
+ <!-- exclude stax 1.0.1 as we're also pulling in
javax\xml\stream\stax-api\1.0-2 -->
+ <dependency>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ <version>1.0.1</version>
+ <scope>provided</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/java/sca/samples/helloworld-jms-webapp/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/helloworld-jms-webapp/pom.xml?rev=630561&r1=630560&r2=630561&view=diff
==============================================================================
--- incubator/tuscany/java/sca/samples/helloworld-jms-webapp/pom.xml (original)
+++ incubator/tuscany/java/sca/samples/helloworld-jms-webapp/pom.xml Sat Feb 23
17:18:37 2008
@@ -44,6 +44,22 @@
<version>1.2-incubating-SNAPSHOT</version>
</dependency>
+ <!-- exclude stax 1.0.1 as we're also pulling in
javax\xml\stream\stax-api\1.0-2 -->
+ <dependency>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ <version>1.0.1</version>
+ <scope>provided</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/java/sca/samples/helloworld-jsonrpc-webapp/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/helloworld-jsonrpc-webapp/pom.xml?rev=630561&r1=630560&r2=630561&view=diff
==============================================================================
--- incubator/tuscany/java/sca/samples/helloworld-jsonrpc-webapp/pom.xml
(original)
+++ incubator/tuscany/java/sca/samples/helloworld-jsonrpc-webapp/pom.xml Sat
Feb 23 17:18:37 2008
@@ -57,6 +57,22 @@
<scope>runtime</scope>
</dependency>
+ <!-- exclude stax 1.0.1 as we're also pulling in
javax\xml\stream\stax-api\1.0-2 -->
+ <dependency>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ <version>1.0.1</version>
+ <scope>provided</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/java/sca/samples/helloworld-ws-sdo-webapp/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/helloworld-ws-sdo-webapp/pom.xml?rev=630561&r1=630560&r2=630561&view=diff
==============================================================================
--- incubator/tuscany/java/sca/samples/helloworld-ws-sdo-webapp/pom.xml
(original)
+++ incubator/tuscany/java/sca/samples/helloworld-ws-sdo-webapp/pom.xml Sat Feb
23 17:18:37 2008
@@ -94,11 +94,21 @@
<scope>runtime</scope>
</dependency>
-->
+
+ <!-- exclude stax 1.0.1 as we're also pulling in
javax\xml\stream\stax-api\1.0-2 -->
+ <dependency>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ <version>1.0.1</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- marking dependency as provided to exclude from war file -->
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>2.4</version> <!-- to keep compatible with older servlet
containers -->
- <scope>test</scope>
+ <version>2.3</version>
+ <scope>provided</scope>
</dependency>
<dependency>
Modified:
incubator/tuscany/java/sca/samples/helloworld-ws-service-webapp/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/helloworld-ws-service-webapp/pom.xml?rev=630561&r1=630560&r2=630561&view=diff
==============================================================================
--- incubator/tuscany/java/sca/samples/helloworld-ws-service-webapp/pom.xml
(original)
+++ incubator/tuscany/java/sca/samples/helloworld-ws-service-webapp/pom.xml Sat
Feb 23 17:18:37 2008
@@ -56,6 +56,14 @@
<scope>runtime</scope>
</dependency>
+ <!-- exclude stax 1.0.1 as we're also pulling in
javax\xml\stream\stax-api\1.0-2 -->
+ <dependency>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ <version>1.0.1</version>
+ <scope>provided</scope>
+ </dependency>
+
<!-- marking dependency as provided to exclude from war file -->
<dependency>
<groupId>javax.servlet</groupId>
Modified: incubator/tuscany/java/sca/samples/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/samples/pom.xml?rev=630561&r1=630560&r2=630561&view=diff
==============================================================================
--- incubator/tuscany/java/sca/samples/pom.xml (original)
+++ incubator/tuscany/java/sca/samples/pom.xml Sat Feb 23 17:18:37 2008
@@ -35,6 +35,7 @@
<url>http://people.apache.org/repo/m2-incubating-repository</url>
</repository>
</repositories>
+
<profiles>
<profile>
<id>default</id>
@@ -94,7 +95,6 @@
<module>web-resource</module>
</modules>
</profile>
-
</profiles>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
