From: Richard Millet <richard.millet@berkeley.edu>
Date: Wed, 23 Nov 2011 07:34:38 +0000 (+0000)
Subject: CSPACE-4526: Adding servlet-api dependency to imports/service pom.  For some reason... 
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=c9a288e50e5aa7711ca28b995f3d4ac285a599c0;p=tmp%2Fjakarta-migration.git

CSPACE-4526: Adding servlet-api dependency to imports/service pom.  For some reason, Maven 2.2.1 was finding this javax artifact somewhere in the dependency tree, but Maven 3 was not.  Seems like Maven 3 is being more rational.
---

diff --git a/services/imports/service/pom.xml b/services/imports/service/pom.xml
index 3a8eb0b03..bed980fe7 100755
--- a/services/imports/service/pom.xml
+++ b/services/imports/service/pom.xml
@@ -50,13 +50,17 @@
         
       <!-- javax -->
 
+	  	<dependency>
+			<artifactId>servlet-api</artifactId>
+			<groupId>javax.servlet</groupId>
+			<scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>javax.security</groupId>
             <artifactId>jaas</artifactId>
             <version>1.0.01</version>
             <scope>provided</scope>
         </dependency>
-
         <dependency>
             <groupId>dom4j</groupId>
             <artifactId>dom4j</artifactId>
diff --git a/services/pom.xml b/services/pom.xml
index f1bba55e4..58494cab7 100644
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -263,7 +263,12 @@
     </reporting>
     <dependencyManagement>
         <dependencies>
-	        	<dependency>
+			 <dependency>
+				<artifactId>servlet-api</artifactId>
+				<groupId>javax.servlet</groupId>
+				<version>2.5</version>
+			</dependency>
+	        <dependency>
 	            <groupId>org.nuxeo.ecm.core</groupId>
 	            <artifactId>nuxeo-core-api</artifactId>
 	            <version>${nuxeo.core.version}</version>