You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2008/09/02 20:12:53 UTC

svn commit: r691336 - in /geronimo/components/jaspi/trunk: geronimo-jaspi/pom.xml pom.xml

Author: djencks
Date: Tue Sep  2 11:12:52 2008
New Revision: 691336

URL: http://svn.apache.org/viewvc?rev=691336&view=rev
Log:
fix up dependencies

Modified:
    geronimo/components/jaspi/trunk/geronimo-jaspi/pom.xml
    geronimo/components/jaspi/trunk/pom.xml

Modified: geronimo/components/jaspi/trunk/geronimo-jaspi/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/components/jaspi/trunk/geronimo-jaspi/pom.xml?rev=691336&r1=691335&r2=691336&view=diff
==============================================================================
--- geronimo/components/jaspi/trunk/geronimo-jaspi/pom.xml (original)
+++ geronimo/components/jaspi/trunk/geronimo-jaspi/pom.xml Tue Sep  2 11:12:52 2008
@@ -73,6 +73,7 @@
         <dependency>
             <groupId>com.sun.xml.bind</groupId>
             <artifactId>jaxb-xjc</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>

Modified: geronimo/components/jaspi/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/components/jaspi/trunk/pom.xml?rev=691336&r1=691335&r2=691336&view=diff
==============================================================================
--- geronimo/components/jaspi/trunk/pom.xml (original)
+++ geronimo/components/jaspi/trunk/pom.xml Tue Sep  2 11:12:52 2008
@@ -98,12 +98,18 @@
             <dependency>
                 <groupId>org.codehaus.woodstox</groupId>
                 <artifactId>wstx-asl</artifactId>
-                <version>3.2.0</version>
+                <version>3.2.1</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>stax</groupId>
+                        <artifactId>stax-api</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             <dependency>
                 <groupId>com.sun.xml.bind</groupId>
                 <artifactId>jaxb-impl</artifactId>
-                <version>2.0.5</version>
+                <version>2.1.7</version>
                 <exclusions>
                     <exclusion>
                         <groupId>javax.xml.bind</groupId>
@@ -126,7 +132,7 @@
             <dependency>
                 <groupId>com.sun.xml.bind</groupId>
                 <artifactId>jaxb-xjc</artifactId>
-                <version>2.0.5</version>
+                <version>2.1.7</version>
             </dependency>
 
             <dependency>
@@ -138,6 +144,14 @@
                         <groupId>javax.xml.bind</groupId>
                         <artifactId>jsr173_api</artifactId>
                     </exclusion>
+                    <exclusion>
+                        <groupId>javax.xml.stream</groupId>
+                        <artifactId>stax-api</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>javax.activation</groupId>
+                        <artifactId>activation</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>