tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jsdelf...@apache.org
Subject svn commit: r672827 - in /tuscany/java/sca: itest/contribution-import-export/import-resource/ modules/ modules/assembly-xml/ modules/binding-notification/ modules/contribution-impl/ modules/contribution-java/ modules/contribution-namespace/ modules/con...
Date Mon, 30 Jun 2008 17:27:46 GMT
Author: jsdelfino
Date: Mon Jun 30 10:27:45 2008
New Revision: 672827

URL: http://svn.apache.org/viewvc?rev=672827&view=rev
Log:
Cleaned up dependencies on stax-api to make sure that one copy of stax-api.jar is on the classpath.
Cleaned up dependencies on pluggable contribution-xyz modules.

Modified:
    tuscany/java/sca/itest/contribution-import-export/import-resource/pom.xml
    tuscany/java/sca/modules/assembly-xml/pom.xml
    tuscany/java/sca/modules/binding-notification/pom.xml
    tuscany/java/sca/modules/contribution-impl/pom.xml
    tuscany/java/sca/modules/contribution-java/pom.xml
    tuscany/java/sca/modules/contribution-namespace/pom.xml
    tuscany/java/sca/modules/contribution-osgi/pom.xml
    tuscany/java/sca/modules/contribution-resource/pom.xml
    tuscany/java/sca/modules/contribution-updater-impl/pom.xml
    tuscany/java/sca/modules/contribution-updater/pom.xml
    tuscany/java/sca/modules/contribution-xml/pom.xml
    tuscany/java/sca/modules/contribution/pom.xml
    tuscany/java/sca/modules/core-databinding/pom.xml
    tuscany/java/sca/modules/core-spi/pom.xml
    tuscany/java/sca/modules/core/pom.xml
    tuscany/java/sca/modules/databinding-axiom/pom.xml
    tuscany/java/sca/modules/databinding-jaxb/pom.xml
    tuscany/java/sca/modules/databinding-job/pom.xml
    tuscany/java/sca/modules/databinding-xstream/pom.xml
    tuscany/java/sca/modules/databinding/pom.xml
    tuscany/java/sca/modules/policy-xml/pom.xml
    tuscany/java/sca/modules/pom.xml
    tuscany/java/sca/modules/workspace-xml/pom.xml
    tuscany/java/sca/tools/java2wsdl/pom.xml
    tuscany/java/sca/tools/wsdl2java/pom.xml

Modified: tuscany/java/sca/itest/contribution-import-export/import-resource/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/itest/contribution-import-export/import-resource/pom.xml?rev=672827&r1=672826&r2=672827&view=diff
==============================================================================
--- tuscany/java/sca/itest/contribution-import-export/import-resource/pom.xml (original)
+++ tuscany/java/sca/itest/contribution-import-export/import-resource/pom.xml Mon Jun 30 10:27:45
2008
@@ -71,6 +71,13 @@
         </dependency>
 		
         <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-contribution-resource</artifactId>
+            <version>1.4-SNAPSHOT</version>
+            <scope>test</scope>
+        </dependency>
+		
+        <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
             <version>2.5</version>

Modified: tuscany/java/sca/modules/assembly-xml/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/assembly-xml/pom.xml?rev=672827&r1=672826&r2=672827&view=diff
==============================================================================
--- tuscany/java/sca/modules/assembly-xml/pom.xml (original)
+++ tuscany/java/sca/modules/assembly-xml/pom.xml Mon Jun 30 10:27:45 2008
@@ -66,9 +66,9 @@
         </dependency>        
 
         <dependency>
-            <groupId>stax</groupId>
+            <groupId>javax.xml.stream</groupId>
             <artifactId>stax-api</artifactId>
-            <version>1.0.1</version>
+            <version>1.0-2</version>
         </dependency>
 
         <dependency>
@@ -76,9 +76,14 @@
             <artifactId>wstx-asl</artifactId>
             <version>3.2.1</version>
             <scope>runtime</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>stax</groupId>
+                    <artifactId>stax-api</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         
-		<!-- Test Dependencies -->        
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>tuscany-definitions-xml</artifactId>

Modified: tuscany/java/sca/modules/binding-notification/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/binding-notification/pom.xml?rev=672827&r1=672826&r2=672827&view=diff
==============================================================================
--- tuscany/java/sca/modules/binding-notification/pom.xml (original)
+++ tuscany/java/sca/modules/binding-notification/pom.xml Mon Jun 30 10:27:45 2008
@@ -65,6 +65,12 @@
             <artifactId>wstx-asl</artifactId>
             <version>3.2.1</version>
             <scope>runtime</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>stax</groupId>
+                    <artifactId>stax-api</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>        
         <dependency>
             <groupId>javax.servlet</groupId>

Modified: tuscany/java/sca/modules/contribution-impl/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/contribution-impl/pom.xml?rev=672827&r1=672826&r2=672827&view=diff
==============================================================================
--- tuscany/java/sca/modules/contribution-impl/pom.xml (original)
+++ tuscany/java/sca/modules/contribution-impl/pom.xml Mon Jun 30 10:27:45 2008
@@ -42,28 +42,16 @@
         </dependency>
         
         <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-java</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-namespace</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-contribution-resource</artifactId>
-            <version>1.4-SNAPSHOT</version>
-        </dependency>
-        
-        <dependency>
             <groupId>org.codehaus.woodstox</groupId>
             <artifactId>wstx-asl</artifactId>
             <version>3.2.1</version>
             <scope>runtime</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>stax</groupId>
+                    <artifactId>stax-api</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
     </dependencies>
 

Modified: tuscany/java/sca/modules/contribution-java/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/contribution-java/pom.xml?rev=672827&r1=672826&r2=672827&view=diff
==============================================================================
--- tuscany/java/sca/modules/contribution-java/pom.xml (original)
+++ tuscany/java/sca/modules/contribution-java/pom.xml Mon Jun 30 10:27:45 2008
@@ -46,6 +46,12 @@
             <artifactId>wstx-asl</artifactId>
             <version>3.2.1</version>
             <scope>runtime</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>stax</groupId>
+                    <artifactId>stax-api</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
     </dependencies>
 

Modified: tuscany/java/sca/modules/contribution-namespace/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/contribution-namespace/pom.xml?rev=672827&r1=672826&r2=672827&view=diff
==============================================================================
--- tuscany/java/sca/modules/contribution-namespace/pom.xml (original)
+++ tuscany/java/sca/modules/contribution-namespace/pom.xml Mon Jun 30 10:27:45 2008
@@ -46,6 +46,12 @@
             <artifactId>wstx-asl</artifactId>
             <version>3.2.1</version>
             <scope>runtime</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>stax</groupId>
+                    <artifactId>stax-api</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
     </dependencies>
 

Modified: tuscany/java/sca/modules/contribution-osgi/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/contribution-osgi/pom.xml?rev=672827&r1=672826&r2=672827&view=diff
==============================================================================
--- tuscany/java/sca/modules/contribution-osgi/pom.xml (original)
+++ tuscany/java/sca/modules/contribution-osgi/pom.xml Mon Jun 30 10:27:45 2008
@@ -60,6 +60,12 @@
             <artifactId>wstx-asl</artifactId>
             <version>3.2.1</version>
             <scope>runtime</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>stax</groupId>
+                    <artifactId>stax-api</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
     </dependencies>
 

Modified: tuscany/java/sca/modules/contribution-resource/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/contribution-resource/pom.xml?rev=672827&r1=672826&r2=672827&view=diff
==============================================================================
--- tuscany/java/sca/modules/contribution-resource/pom.xml (original)
+++ tuscany/java/sca/modules/contribution-resource/pom.xml Mon Jun 30 10:27:45 2008
@@ -46,6 +46,12 @@
             <artifactId>wstx-asl</artifactId>
             <version>3.2.1</version>
             <scope>runtime</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>stax</groupId>
+                    <artifactId>stax-api</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
     </dependencies>
 

Modified: tuscany/java/sca/modules/contribution-updater-impl/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/contribution-updater-impl/pom.xml?rev=672827&r1=672826&r2=672827&view=diff
==============================================================================
--- tuscany/java/sca/modules/contribution-updater-impl/pom.xml (original)
+++ tuscany/java/sca/modules/contribution-updater-impl/pom.xml Mon Jun 30 10:27:45 2008
@@ -94,6 +94,12 @@
             <artifactId>wstx-asl</artifactId>
             <version>3.2.1</version>
             <scope>runtime</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>stax</groupId>
+                    <artifactId>stax-api</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
     </dependencies>
 

Modified: tuscany/java/sca/modules/contribution-updater/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/contribution-updater/pom.xml?rev=672827&r1=672826&r2=672827&view=diff
==============================================================================
--- tuscany/java/sca/modules/contribution-updater/pom.xml (original)
+++ tuscany/java/sca/modules/contribution-updater/pom.xml Mon Jun 30 10:27:45 2008
@@ -88,13 +88,6 @@
         <artifactId>tuscany-node-api</artifactId>
         <version>1.4-SNAPSHOT</version>
         </dependency>  
-	
-        <dependency>
-            <groupId>org.codehaus.woodstox</groupId>
-            <artifactId>wstx-asl</artifactId>
-            <version>3.2.1</version>
-            <scope>runtime</scope>
-        </dependency>
     </dependencies>
 
     <build>

Modified: tuscany/java/sca/modules/contribution-xml/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/contribution-xml/pom.xml?rev=672827&r1=672826&r2=672827&view=diff
==============================================================================
--- tuscany/java/sca/modules/contribution-xml/pom.xml (original)
+++ tuscany/java/sca/modules/contribution-xml/pom.xml Mon Jun 30 10:27:45 2008
@@ -40,6 +40,12 @@
             <artifactId>wstx-asl</artifactId>
             <version>3.2.1</version>
             <scope>runtime</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>stax</groupId>
+                    <artifactId>stax-api</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
     </dependencies>
 

Modified: tuscany/java/sca/modules/contribution/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/contribution/pom.xml?rev=672827&r1=672826&r2=672827&view=diff
==============================================================================
--- tuscany/java/sca/modules/contribution/pom.xml (original)
+++ tuscany/java/sca/modules/contribution/pom.xml Mon Jun 30 10:27:45 2008
@@ -42,9 +42,9 @@
         </dependency>
             	
         <dependency>
-            <groupId>stax</groupId>
+            <groupId>javax.xml.stream</groupId>
             <artifactId>stax-api</artifactId>
-            <version>1.0.1</version>
+            <version>1.0-2</version>
         </dependency>
         <dependency>
             <groupId>xml-apis</groupId>

Modified: tuscany/java/sca/modules/core-databinding/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/core-databinding/pom.xml?rev=672827&r1=672826&r2=672827&view=diff
==============================================================================
--- tuscany/java/sca/modules/core-databinding/pom.xml (original)
+++ tuscany/java/sca/modules/core-databinding/pom.xml Mon Jun 30 10:27:45 2008
@@ -78,6 +78,12 @@
             <artifactId>wstx-asl</artifactId>
             <scope>runtime</scope>
             <version>3.2.1</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>stax</groupId>
+                    <artifactId>stax-api</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
     </dependencies>
 

Modified: tuscany/java/sca/modules/core-spi/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/core-spi/pom.xml?rev=672827&r1=672826&r2=672827&view=diff
==============================================================================
--- tuscany/java/sca/modules/core-spi/pom.xml (original)
+++ tuscany/java/sca/modules/core-spi/pom.xml Mon Jun 30 10:27:45 2008
@@ -84,6 +84,12 @@
             <artifactId>wstx-asl</artifactId>
             <version>3.2.1</version>
             <scope>runtime</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>stax</groupId>
+                    <artifactId>stax-api</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
     </dependencies>

Modified: tuscany/java/sca/modules/core/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/core/pom.xml?rev=672827&r1=672826&r2=672827&view=diff
==============================================================================
--- tuscany/java/sca/modules/core/pom.xml (original)
+++ tuscany/java/sca/modules/core/pom.xml Mon Jun 30 10:27:45 2008
@@ -70,6 +70,12 @@
             <artifactId>wstx-asl</artifactId>
             <version>3.2.1</version>
             <scope>runtime</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>stax</groupId>
+                    <artifactId>stax-api</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <dependency>

Modified: tuscany/java/sca/modules/databinding-axiom/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/databinding-axiom/pom.xml?rev=672827&r1=672826&r2=672827&view=diff
==============================================================================
--- tuscany/java/sca/modules/databinding-axiom/pom.xml (original)
+++ tuscany/java/sca/modules/databinding-axiom/pom.xml Mon Jun 30 10:27:45 2008
@@ -41,9 +41,9 @@
         </dependency>
 
         <dependency>
-            <groupId>stax</groupId>
+            <groupId>javax.xml.stream</groupId>
             <artifactId>stax-api</artifactId>
-            <version>1.0.1</version>
+            <version>1.0-2</version>
         </dependency>
 
         <dependency>
@@ -84,6 +84,12 @@
             <artifactId>wstx-asl</artifactId>
             <version>3.2.1</version>
             <scope>runtime</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>stax</groupId>
+                    <artifactId>stax-api</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
     </dependencies>

Modified: tuscany/java/sca/modules/databinding-jaxb/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/databinding-jaxb/pom.xml?rev=672827&r1=672826&r2=672827&view=diff
==============================================================================
--- tuscany/java/sca/modules/databinding-jaxb/pom.xml (original)
+++ tuscany/java/sca/modules/databinding-jaxb/pom.xml Mon Jun 30 10:27:45 2008
@@ -57,12 +57,6 @@
             <artifactId>jaxb-impl</artifactId>
             <version>2.1.7</version>
             <scope>runtime</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>javax.xml.stream</groupId>
-                    <artifactId>stax-api</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
 
         <dependency>

Modified: tuscany/java/sca/modules/databinding-job/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/databinding-job/pom.xml?rev=672827&r1=672826&r2=672827&view=diff
==============================================================================
--- tuscany/java/sca/modules/databinding-job/pom.xml (original)
+++ tuscany/java/sca/modules/databinding-job/pom.xml Mon Jun 30 10:27:45 2008
@@ -48,9 +48,9 @@
         </dependency>
 	
         <dependency>
-            <groupId>stax</groupId>
+            <groupId>javax.xml.stream</groupId>
             <artifactId>stax-api</artifactId>
-            <version>1.0.1</version>
+            <version>1.0-2</version>
         </dependency>
 	
 	<dependency>
@@ -97,6 +97,12 @@
             <artifactId>wstx-asl</artifactId>
             <version>3.2.1</version>
             <scope>runtime</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>stax</groupId>
+                    <artifactId>stax-api</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
     </dependencies>

Modified: tuscany/java/sca/modules/databinding-xstream/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/databinding-xstream/pom.xml?rev=672827&r1=672826&r2=672827&view=diff
==============================================================================
--- tuscany/java/sca/modules/databinding-xstream/pom.xml (original)
+++ tuscany/java/sca/modules/databinding-xstream/pom.xml Mon Jun 30 10:27:45 2008
@@ -41,9 +41,9 @@
         </dependency>
 
         <dependency>
-            <groupId>stax</groupId>
+            <groupId>javax.xml.stream</groupId>
             <artifactId>stax-api</artifactId>
-            <version>1.0.1</version>
+            <version>1.0-2</version>
         </dependency>
 
         <dependency>
@@ -89,6 +89,12 @@
             <artifactId>wstx-asl</artifactId>
             <version>3.2.1</version>
             <scope>runtime</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>stax</groupId>
+                    <artifactId>stax-api</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
     </dependencies>

Modified: tuscany/java/sca/modules/databinding/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/databinding/pom.xml?rev=672827&r1=672826&r2=672827&view=diff
==============================================================================
--- tuscany/java/sca/modules/databinding/pom.xml (original)
+++ tuscany/java/sca/modules/databinding/pom.xml Mon Jun 30 10:27:45 2008
@@ -34,18 +34,18 @@
             <artifactId>tuscany-extensibility</artifactId>
             <version>1.4-SNAPSHOT</version>
         </dependency>
-	
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-interface</artifactId>
-			<version>1.4-SNAPSHOT</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.tuscany.sca</groupId>
-			<artifactId>tuscany-contribution</artifactId>
-			<version>1.4-SNAPSHOT</version>
-		</dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-interface</artifactId>
+            <version>1.4-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-contribution</artifactId>
+            <version>1.4-SNAPSHOT</version>
+        </dependency>
 
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
@@ -59,27 +59,33 @@
             <version>1.4-SNAPSHOT</version>
         </dependency>		
 
-		<dependency>
-			<groupId>stax</groupId>
-			<artifactId>stax-api</artifactId>
-			<version>1.0.1</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.codehaus.woodstox</groupId>
-			<artifactId>wstx-asl</artifactId>
-			<version>3.2.1</version>
-			<scope>runtime</scope>
-		</dependency>
-
-		<dependency>
-			<groupId>xmlunit</groupId>
-			<artifactId>xmlunit</artifactId>
-			<version>1.1</version>
-			<scope>test</scope>
-		</dependency>
+        <dependency>
+            <groupId>javax.xml.stream</groupId>
+            <artifactId>stax-api</artifactId>
+            <version>1.0-2</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.codehaus.woodstox</groupId>
+            <artifactId>wstx-asl</artifactId>
+            <version>3.2.1</version>
+            <scope>runtime</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>stax</groupId>
+                    <artifactId>stax-api</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>xmlunit</groupId>
+            <artifactId>xmlunit</artifactId>
+            <version>1.1</version>
+            <scope>test</scope>
+        </dependency>
 
-	</dependencies>
+    </dependencies>
 
     <build>
         <plugins>

Modified: tuscany/java/sca/modules/policy-xml/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/policy-xml/pom.xml?rev=672827&r1=672826&r2=672827&view=diff
==============================================================================
--- tuscany/java/sca/modules/policy-xml/pom.xml (original)
+++ tuscany/java/sca/modules/policy-xml/pom.xml Mon Jun 30 10:27:45 2008
@@ -102,6 +102,12 @@
             <artifactId>wstx-asl</artifactId>
             <version>3.2.1</version>
             <scope>runtime</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>stax</groupId>
+                    <artifactId>stax-api</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         
         <!--dependency>

Modified: tuscany/java/sca/modules/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/pom.xml?rev=672827&r1=672826&r2=672827&view=diff
==============================================================================
--- tuscany/java/sca/modules/pom.xml (original)
+++ tuscany/java/sca/modules/pom.xml Mon Jun 30 10:27:45 2008
@@ -147,6 +147,7 @@
                 <module>node2-impl</module>
                 <module>node2-launcher</module>
                 <module>node2-launcher-webapp</module>
+                <module>node-manager</module>
                 <module>osgi-runtime</module>
                 <module>policy</module>
                 <module>policy-xml</module>

Modified: tuscany/java/sca/modules/workspace-xml/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/workspace-xml/pom.xml?rev=672827&r1=672826&r2=672827&view=diff
==============================================================================
--- tuscany/java/sca/modules/workspace-xml/pom.xml (original)
+++ tuscany/java/sca/modules/workspace-xml/pom.xml Mon Jun 30 10:27:45 2008
@@ -40,6 +40,12 @@
             <artifactId>wstx-asl</artifactId>
             <version>3.2.1</version>
             <scope>runtime</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>stax</groupId>
+                    <artifactId>stax-api</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
     </dependencies>
 

Modified: tuscany/java/sca/tools/java2wsdl/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/tools/java2wsdl/pom.xml?rev=672827&r1=672826&r2=672827&view=diff
==============================================================================
--- tuscany/java/sca/tools/java2wsdl/pom.xml (original)
+++ tuscany/java/sca/tools/java2wsdl/pom.xml Mon Jun 30 10:27:45 2008
@@ -48,9 +48,9 @@
         </dependency>
 
         <dependency>
-            <groupId>stax</groupId>
+            <groupId>javax.xml.stream</groupId>
             <artifactId>stax-api</artifactId>
-            <version>1.0.1</version>
+            <version>1.0-2</version>
         </dependency>
 
         <dependency>

Modified: tuscany/java/sca/tools/wsdl2java/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/tools/wsdl2java/pom.xml?rev=672827&r1=672826&r2=672827&view=diff
==============================================================================
--- tuscany/java/sca/tools/wsdl2java/pom.xml (original)
+++ tuscany/java/sca/tools/wsdl2java/pom.xml Mon Jun 30 10:27:45 2008
@@ -65,7 +65,6 @@
             <artifactId>jaxb-impl</artifactId>
             <version>2.1.7</version>
             <scope>runtime</scope>
-            <!-- Replacing stax 1.0 with stax 1.0.1 -->
             <exclusions>
                 <exclusion>
                     <groupId>javax.xml.bind</groupId>
@@ -75,9 +74,9 @@
         </dependency>
 
         <dependency>
-            <groupId>stax</groupId>
+            <groupId>javax.xml.stream</groupId>
             <artifactId>stax-api</artifactId>
-            <version>1.0.1</version>
+            <version>1.0-2</version>
         </dependency>
 
         <dependency>



Mime
View raw message