Author: antelder
Date: Fri Sep 14 07:21:02 2007
New Revision: 575694
URL: http://svn.apache.org/viewvc?rev=575694&view=rev
Log:
Exclude various unwantted dependencies
Modified:
incubator/tuscany/branches/sca-java-1.0/distribution/bundle/pom.xml
incubator/tuscany/branches/sca-java-1.0/distribution/manifest/pom.xml
incubator/tuscany/branches/sca-java-1.0/distribution/pom.xml
incubator/tuscany/branches/sca-java-1.0/distribution/src/main/assembly/bin.xml
incubator/tuscany/branches/sca-java-1.0/modules/binding-ws-axis2/pom.xml
incubator/tuscany/branches/sca-java-1.0/modules/host-jetty/pom.xml
Modified: incubator/tuscany/branches/sca-java-1.0/distribution/bundle/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/distribution/bundle/pom.xml?rev=575694&r1=575693&r2=575694&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/distribution/bundle/pom.xml
(original)
+++ incubator/tuscany/branches/sca-java-1.0/distribution/bundle/pom.xml Fri Sep
14 07:21:02 2007
@@ -301,6 +301,13 @@
<groupId>org.apache.tuscany.sdo</groupId>
<artifactId>tuscany-sdo-impl</artifactId>
<version>1.0-incubating</version>
+ <exclusions>
+ <exclusion>
+ <!-- sdo 1.0 uses 3.2.0 but sca uses 3.2.1 -->
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>wstx-asl</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sdo</groupId>
Modified: incubator/tuscany/branches/sca-java-1.0/distribution/manifest/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/distribution/manifest/pom.xml?rev=575694&r1=575693&r2=575694&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/distribution/manifest/pom.xml
(original)
+++ incubator/tuscany/branches/sca-java-1.0/distribution/manifest/pom.xml Fri
Sep 14 07:21:02 2007
@@ -299,6 +299,13 @@
<groupId>org.apache.tuscany.sdo</groupId>
<artifactId>tuscany-sdo-impl</artifactId>
<version>1.0-incubating</version>
+ <exclusions>
+ <exclusion>
+ <!-- sdo 1.0 uses 3.2.0 but sca uses 3.2.1 -->
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>wstx-asl</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.tuscany.sdo</groupId>
Modified: incubator/tuscany/branches/sca-java-1.0/distribution/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/distribution/pom.xml?rev=575694&r1=575693&r2=575694&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/distribution/pom.xml (original)
+++ incubator/tuscany/branches/sca-java-1.0/distribution/pom.xml Fri Sep 14
07:21:02 2007
@@ -84,6 +84,13 @@
<groupId>org.apache.tuscany.sdo</groupId>
<artifactId>tuscany-sdo-impl</artifactId>
<version>1.0-incubating</version>
+ <exclusions>
+ <exclusion>
+ <!-- sdo 1.0 uses 3.2.0 but sca uses 3.2.1 -->
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>wstx-asl</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
Modified:
incubator/tuscany/branches/sca-java-1.0/distribution/src/main/assembly/bin.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/distribution/src/main/assembly/bin.xml?rev=575694&r1=575693&r2=575694&view=diff
==============================================================================
---
incubator/tuscany/branches/sca-java-1.0/distribution/src/main/assembly/bin.xml
(original)
+++
incubator/tuscany/branches/sca-java-1.0/distribution/src/main/assembly/bin.xml
Fri Sep 14 07:21:02 2007
@@ -125,6 +125,15 @@
<exclude>*/target/sdo-source</exclude>
<exclude>*/target/sdo-source/**/*</exclude>
<exclude>*/**/*.svg</exclude>
+
+
<exclude>calculator-ws-webapp/target/sample-calculator-ws-webapp.war</exclude>
+
<exclude>helloworld-ws-sdo-webapp/target/sample-helloworld-ws-sdo-webapp.war</exclude>
+
<exclude>helloworld-ws-service-webapp/target/sample-helloworld-ws-service-webapp.war</exclude>
+
<exclude>helloworld-dojo-webapp/target/sample-helloworld-dojo-webapp.war</exclude>
+
<exclude>helloworld-jsonrpc-webapp/target/sample-helloworld-jsonrpc-webapp.war</exclude>
+ <exclude>chat-webapp/target/sample-chat-webapp.war</exclude>
+
<exclude>feed-aggregator-webapp/target/sample-feed-aggregator-webapp.war</exclude>
+
</excludes>
</fileSet>
<!-- Add all the demos to the demos directory -->
@@ -162,6 +171,7 @@
<exclude>*/target/surefire-reports/**/*</exclude>
<exclude>*/**/*.svg</exclude>
<exclude>*/**/*.ruleset</exclude>
+
</excludes>
</fileSet>
<!-- Add the generated tuscany manifest classpath jar to the lib
directory -->
Modified:
incubator/tuscany/branches/sca-java-1.0/modules/binding-ws-axis2/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/binding-ws-axis2/pom.xml?rev=575694&r1=575693&r2=575694&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/modules/binding-ws-axis2/pom.xml
(original)
+++ incubator/tuscany/branches/sca-java-1.0/modules/binding-ws-axis2/pom.xml
Fri Sep 14 07:21:02 2007
@@ -276,6 +276,16 @@
<version>1.3</version>
<type>mar</type>
<scope>runtime</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant-nodeps</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xmlbeans</groupId>
+ <artifactId>xbean</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
Modified: incubator/tuscany/branches/sca-java-1.0/modules/host-jetty/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/branches/sca-java-1.0/modules/host-jetty/pom.xml?rev=575694&r1=575693&r2=575694&view=diff
==============================================================================
--- incubator/tuscany/branches/sca-java-1.0/modules/host-jetty/pom.xml
(original)
+++ incubator/tuscany/branches/sca-java-1.0/modules/host-jetty/pom.xml Fri Sep
14 07:21:02 2007
@@ -39,6 +39,12 @@
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
<version>6.1.3</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>servlet-api-2.5</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
