[dna-commits] DNA SVN: r1336 - in trunk/web: dna-web-jcr-rest-client and 1 other directory.

[dna-commits at lists.jboss.org]

Author: rhauch
Date: 2009-11-23 21:19:50 -0500 (Mon, 23 Nov 2009)
New Revision: 1336

Modified:
   trunk/web/dna-web-jcr-rest-client/pom.xml
   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 23:25:59 UTC (rev 1335)
+++ trunk/web/dna-web-jcr-rest/pom.xml	2009-11-24 02:19:50 UTC (rev 1336)
@@ -15,17 +15,23 @@
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>
-            <version>1.2.GA</version>
+            <version>1.2.1.GA</version>
         </dependency>
 		<dependency>
 			<groupId>org.jboss.resteasy</groupId>
 			<artifactId>resteasy-jaxb-provider</artifactId>
-			<version>1.2.GA</version>
+			<version>1.2.1.GA</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.sun.xml.bind</groupId>
+                    <artifactId>jaxb-impl</artifactId>
+                </exclusion>
+            </exclusions>
 		</dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jettison-provider</artifactId>
-            <version>1.2.GA</version>
+            <version>1.2.1.GA</version>
         </dependency>
 		<dependency>
 			<groupId>org.jboss.dna</groupId>

Modified: trunk/web/dna-web-jcr-rest-client/pom.xml
===================================================================
--- trunk/web/dna-web-jcr-rest-client/pom.xml	2009-11-23 23:25:59 UTC (rev 1335)
+++ trunk/web/dna-web-jcr-rest-client/pom.xml	2009-11-24 02:19:50 UTC (rev 1336)
@@ -37,6 +37,27 @@
 			<version>${pom.version}</version>
 			<scope>integration-test</scope>
 		</dependency>
+        <dependency>
+            <groupId>org.jboss.resteasy</groupId>
+            <artifactId>resteasy-jaxrs</artifactId>
+            <version>1.2.1.GA</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.resteasy</groupId>
+            <artifactId>resteasy-jaxb-provider</artifactId>
+            <version>1.2.1.GA</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.sun.xml.bind</groupId>
+                    <artifactId>jaxb-impl</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.resteasy</groupId>
+            <artifactId>resteasy-jettison-provider</artifactId>
+            <version>1.2.1.GA</version>
+        </dependency>
 		<dependency>
 			<groupId>org.apache.httpcomponents</groupId>
 			<artifactId>httpclient</artifactId>
@@ -83,16 +104,6 @@
 			<groupId>net.jcip</groupId>
 			<artifactId>jcip-annotations</artifactId>
 		</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>
-		</dependency>
 	</dependencies>
 	<reporting>
 		<plugins>