[dna-commits] DNA SVN: r1072 - in trunk/extensions: dna-web-jcr-rest-war and 1 other directory.

[dna-commits at lists.jboss.org]

Author: bcarothers
Date: 2009-07-04 20:16:52 -0400 (Sat, 04 Jul 2009)
New Revision: 1072

Modified:
   trunk/extensions/dna-web-jcr-rest-war/pom.xml
   trunk/extensions/dna-web-jcr-rest/pom.xml
Log:
DNA-473 Upgrade REST API to Latest Version of RESTEasy

Committed patch that upgrades RESTEasy version to 1.1.GA, adds separate HTTP servlet API dependency, and removes unused resteasy-client dependency.

Modified: trunk/extensions/dna-web-jcr-rest/pom.xml
===================================================================
--- trunk/extensions/dna-web-jcr-rest/pom.xml	2009-07-04 20:01:17 UTC (rev 1071)
+++ trunk/extensions/dna-web-jcr-rest/pom.xml	2009-07-05 00:16:52 UTC (rev 1072)
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<artifactId>dna</artifactId>
@@ -15,12 +16,12 @@
 		<dependency>
 			<groupId>org.jboss.resteasy</groupId>
 			<artifactId>resteasy-jaxrs</artifactId>
-			<version>1.1-RC2</version>
+			<version>1.1.GA</version>
 		</dependency>
 		<dependency>
 			<groupId>org.jboss.resteasy</groupId>
 			<artifactId>resteasy-jaxb-provider</artifactId>
-			<version>1.1-RC2</version>
+			<version>1.1.GA</version>
 			<exclusions>
 				<exclusion>
 					<groupId>com.sun.xml.bind</groupId>
@@ -29,8 +30,11 @@
 			</exclusions>
 		</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.
+		<!--
+			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>com.sun.xml.bind</groupId>
@@ -56,6 +60,13 @@
 			<artifactId>jcr</artifactId>
 		</dependency>
 
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>servlet-api</artifactId>
+			<version>2.5</version>
+			<scope>compile</scope>
+		</dependency>
+
 		<!--  TESTING DEPENDENCIES -->
 		<dependency>
 			<groupId>junit</groupId>
@@ -63,12 +74,6 @@
 			<version>4.4</version>
 			<scope>integration-test</scope>
 		</dependency>
-		<dependency>
-			<groupId>org.jboss.resteasy</groupId>
-			<artifactId>resteasy-client</artifactId>
-			<version>1.0-beta-8</version>
-			<scope>integration-test</scope>
-		</dependency>
 
 		<dependency>
 			<groupId>javax.xml.bind</groupId>

Modified: trunk/extensions/dna-web-jcr-rest-war/pom.xml
===================================================================
--- trunk/extensions/dna-web-jcr-rest-war/pom.xml	2009-07-04 20:01:17 UTC (rev 1071)
+++ trunk/extensions/dna-web-jcr-rest-war/pom.xml	2009-07-05 00:16:52 UTC (rev 1072)
@@ -32,12 +32,6 @@
 			<version>4.4</version>
 			<scope>integration-test</scope>
 		</dependency>
-		<dependency>
-			<groupId>org.jboss.resteasy</groupId>
-			<artifactId>resteasy-client</artifactId>
-			<version>1.0-beta-8</version>
-			<scope>integration-test</scope>
-		</dependency>
 	</dependencies>
 	<build>
 		<finalName>resources</finalName>