Author: ate
Date: Wed Aug 1 15:51:19 2012
New Revision: 1368068
URL: http://svn.apache.org/viewvc?rev=1368068&view=rev
Log:
RAVE-693: Keep sandbox-content-services in sync with latest Rave trunk
Modified:
rave/sandbox/content-services/pom.xml
rave/sandbox/content-services/rave-web-hmvc/pom.xml
Modified: rave/sandbox/content-services/pom.xml
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/pom.xml?rev=1368068&r1=1368067&r2=1368068&view=diff
==============================================================================
--- rave/sandbox/content-services/pom.xml (original)
+++ rave/sandbox/content-services/pom.xml Wed Aug 1 15:51:19 2012
@@ -41,11 +41,11 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <apache.rave.version>0.14-SNAPSHOT</apache.rave.version>
+ <apache.rave.version>0.15-SNAPSHOT</apache.rave.version>
<apache.wookie.version>0.10.0-incubating</apache.wookie.version>
<apache.jackrabbit.version>2.4.1</apache.jackrabbit.version>
<apacheds.version>1.5.5</apacheds.version>
- <org.springframework.version>3.1.0.RELEASE</org.springframework.version>
+ <org.springframework.version>3.1.2.RELEASE</org.springframework.version>
<javax.jcr.version>2.0</javax.jcr.version>
<servlet-api.version>2.5</servlet-api.version>
@@ -103,6 +103,14 @@
<scope>provided</scope>
</dependency>
+ <!-- enforced versioning for certain springframework libraries
+ otherwise might be transitively pulled in with wrong/older version
+ -->
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-aop</artifactId>
+ <version>${org.springframework.version}</version>
+ </dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
Modified: rave/sandbox/content-services/rave-web-hmvc/pom.xml
URL:
http://svn.apache.org/viewvc/rave/sandbox/content-services/rave-web-hmvc/pom.xml?rev=1368068&r1=1368067&r2=1368068&view=diff
==============================================================================
--- rave/sandbox/content-services/rave-web-hmvc/pom.xml (original)
+++ rave/sandbox/content-services/rave-web-hmvc/pom.xml Wed Aug 1 15:51:19 2012
@@ -34,11 +34,6 @@
<description>Apache Rave Web HMVC</description>
<packaging>jar</packaging>
- <properties>
- <javax.servlet.version>2.5</javax.servlet.version>
- <jsp-api.version>2.1</jsp-api.version>
- <el-api.version>1.0</el-api.version>
- </properties>
<dependencies>
<dependency>
<groupId>org.apache.rave</groupId>
@@ -59,7 +54,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>${javax.servlet.version}</version>
+ <version>${servlet-api.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
