You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by rw...@apache.org on 2010/11/03 08:55:00 UTC
svn commit: r1030352 - /geronimo/server/branches/2.1/pom.xml
Author: rwonly
Date: Wed Nov 3 07:55:00 2010
New Revision: 1030352
URL: http://svn.apache.org/viewvc?rev=1030352&view=rev
Log:
a little bit clean up
Modified:
geronimo/server/branches/2.1/pom.xml
Modified: geronimo/server/branches/2.1/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/pom.xml?rev=1030352&r1=1030351&r2=1030352&view=diff
==============================================================================
--- geronimo/server/branches/2.1/pom.xml (original)
+++ geronimo/server/branches/2.1/pom.xml Wed Nov 3 07:55:00 2010
@@ -1352,26 +1352,26 @@
</dependency>
<dependency>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- <!--version>2.1</version-->
- <version>2.0</version>
+ <groupId>com.sun.xml.messaging.saaj</groupId>
+ <artifactId>saaj-impl</artifactId>
+ <version>1.3.2</version>
<exclusions>
<exclusion>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jsr173_api</artifactId>
+ <groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
- <groupId>com.sun.xml.messaging.saaj</groupId>
- <artifactId>saaj-impl</artifactId>
- <version>1.3.2</version>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <!--version>2.1</version-->
+ <version>2.0</version>
<exclusions>
<exclusion>
- <groupId>javax.activation</groupId>
- <artifactId>activation</artifactId>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jsr173_api</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -1393,6 +1393,24 @@
</exclusions>
</dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-xjc</artifactId>
+ <version>2.0.5</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.sun.xml.ws</groupId>
+ <artifactId>jaxws-tools</artifactId>
+ <version>2.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.sun.xml.ws</groupId>
+ <artifactId>jaxws-rt</artifactId>
+ <version>2.0</version>
+ </dependency>
+
<!--JSF 1.2 JARs from Apache MyFaces -->
<dependency>
<groupId>org.apache.myfaces.core</groupId>
@@ -1514,24 +1532,6 @@
</dependency>
<dependency>
- <groupId>com.sun.xml.ws</groupId>
- <artifactId>jaxws-tools</artifactId>
- <version>2.0</version>
- </dependency>
-
- <dependency>
- <groupId>com.sun.xml.ws</groupId>
- <artifactId>jaxws-rt</artifactId>
- <version>2.0</version>
- </dependency>
-
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-xjc</artifactId>
- <version>2.0.5</version>
- </dependency>
-
- <dependency>
<groupId>annogen</groupId>
<artifactId>annogen</artifactId>
<version>0.1.0</version>