[dna-commits] DNA SVN: r1335 - trunk/web/dna-web-jcr-rest.

[dna-commits at lists.jboss.org]

Author: rhauch
Date: 2009-11-23 18:25:59 -0500 (Mon, 23 Nov 2009)
New Revision: 1335

Modified:
   trunk/web/dna-web-jcr-rest/pom.xml
Log:
Merge branch 'patches'

Modified: trunk/web/dna-web-jcr-rest/pom.xml
===================================================================
--- trunk/web/dna-web-jcr-rest/pom.xml	2009-11-23 22:46:41 UTC (rev 1334)
+++ trunk/web/dna-web-jcr-rest/pom.xml	2009-11-23 23:25:59 UTC (rev 1335)
@@ -12,39 +12,25 @@
 	<description>JBoss DNA REST support library</description>
 	<url>http://labs.jboss.org/dna</url>
 	<dependencies>
+        <dependency>
+            <groupId>org.jboss.resteasy</groupId>
+            <artifactId>resteasy-jaxrs</artifactId>
+            <version>1.2.GA</version>
+        </dependency>
 		<dependency>
 			<groupId>org.jboss.resteasy</groupId>
-			<artifactId>resteasy-jaxrs</artifactId>
-			<version>1.1.GA</version>
-		</dependency>
-		<dependency>
-			<groupId>org.jboss.resteasy</groupId>
 			<artifactId>resteasy-jaxb-provider</artifactId>
-			<version>1.1.GA</version>
-			<exclusions>
-				<exclusion>
-					<groupId>com.sun.xml.bind</groupId>
-					<artifactId>jaxb-impl</artifactId>
-				</exclusion>
-			</exclusions>
+			<version>1.2.GA</version>
 		</dependency>
-
-		<!--
-			This is only included as a temp. workaround. Current release of
-			RESTEasy depends on 2.1.8, which is not in our repo at this time This
-			should be removed after RESTEasy 1.1GA is released and added to this
-			pom.
-		-->
+        <dependency>
+            <groupId>org.jboss.resteasy</groupId>
+            <artifactId>resteasy-jettison-provider</artifactId>
+            <version>1.2.GA</version>
+        </dependency>
 		<dependency>
-			<groupId>com.sun.xml.bind</groupId>
-			<artifactId>jaxb-impl</artifactId>
-			<version>2.1.9</version>
-		</dependency>
-		<dependency>
 			<groupId>org.jboss.dna</groupId>
 			<artifactId>dna-jcr</artifactId>
 		</dependency>
-
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-log4j12</artifactId>