Update of /var/cvs/all/maven-base
In directory james.mmbase.org:/tmp/cvs-serv1312
Modified Files:
pom.xml
Log Message:
rationalized dependency managment a bit, because it was not quite wokring
everywhere. Added a 'servlet25' profile.
See also: http://cvs.mmbase.org/viewcvs/all/maven-base
Index: pom.xml
===================================================================
RCS file: /var/cvs/all/maven-base/pom.xml,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- pom.xml 28 Apr 2009 15:16:09 -0000 1.24
+++ pom.xml 29 Apr 2009 07:01:49 -0000 1.25
@@ -552,7 +552,6 @@
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>${servlet.version}</version>
- <scope>provided</scope>
</dependency>
<dependency>
@@ -566,27 +565,23 @@
<groupId>${jsp.groupId}</groupId>
<artifactId>jsp-api</artifactId>
<version>${jsp.version}</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
<version>${jstl.version}</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>taglibs</groupId>
<artifactId>standard</artifactId>
<version>${taglib-standard.version}</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>${log4j.version}</version>
- <scope>provided</scope>
</dependency>
<dependency>
@@ -622,7 +617,6 @@
<artifactId>servlet-api</artifactId>
</exclusion>
</exclusions>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
@@ -633,7 +627,6 @@
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
<version>1.1</version>
- <scope>provided</scope>
</dependency>
<dependency>
@@ -645,19 +638,6 @@
</dependencies>
</dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>${jsp.groupId}</groupId>
- <artifactId>jsp-api</artifactId>
- <scope>provided</scope>
- </dependency>
-
- </dependencies>
<distributionManagement>
<repository>
@@ -868,6 +848,23 @@
</repository>
</distributionManagement>
</profile>
+
+ <profile>
+ <id>servlet25</id>
+ <properties>
+ <servlet.version>2.5</servlet.version>
+ <jsp.version>2.1</jsp.version>
+ <jsp.groupId>javax.servlet.jsp</jsp.groupId>
+ <jstl.version>1.2</jstl.version>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>taglibs</groupId>
+ <artifactId>standard</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
