You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by at...@apache.org on 2012/06/27 21:41:47 UTC
svn commit: r1354689 - in /rave/sandbox/content-services:
demo-portal/pom.xml pom.xml
Author: ate
Date: Wed Jun 27 19:41:47 2012
New Revision: 1354689
URL: http://svn.apache.org/viewvc?rev=1354689&view=rev
Log:
RAVE-693: Keep sandbox-content-services in sync with latest Rave trunk
Modified:
rave/sandbox/content-services/demo-portal/pom.xml
rave/sandbox/content-services/pom.xml
Modified: rave/sandbox/content-services/demo-portal/pom.xml
URL: http://svn.apache.org/viewvc/rave/sandbox/content-services/demo-portal/pom.xml?rev=1354689&r1=1354688&r2=1354689&view=diff
==============================================================================
--- rave/sandbox/content-services/demo-portal/pom.xml (original)
+++ rave/sandbox/content-services/demo-portal/pom.xml Wed Jun 27 19:41:47 2012
@@ -16,7 +16,7 @@
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-
+
$Id$
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -43,7 +43,7 @@
<!-- if you want to start remote debugging session suspended override on command line with -Dcargo.debug.suspend=y -->
<cargo.debug.suspend>n</cargo.debug.suspend>
<cargo.args />
-
+
</properties>
<dependencies>
@@ -51,7 +51,7 @@
<dependency>
<groupId>org.apache.wookie</groupId>
<artifactId>wookie</artifactId>
- <version>0.9.2-incubating</version>
+ <version>${apache.wookie.version}</version>
<type>war</type>
<scope>provided</scope>
</dependency>
@@ -125,7 +125,7 @@
<artifactId>activation</artifactId>
<version>${javax.activation.version}</version>
</dependency>
-
+
<!-- apacheds-server-jndi needed for embedded Apache DS, not needed for external LDAP -->
<dependency>
<groupId>org.apache.directory.server</groupId>
@@ -161,13 +161,21 @@
<configuration>
<properties>
<cargo.jvmargs>
- <![CDATA[-Dh2.bindAddress="localhost" -Xdebug -Xrunjdwp:transport=dt_socket,address=${cargo.debug.address},server=y,suspend=${cargo.debug.suspend} -noverify ${javaagent} ${cargo.args}]]>
+ <![CDATA[-Dh2.bindAddress="localhost" -Xmx512m -XX:MaxPermSize=256m -Xdebug -Xrunjdwp:transport=dt_socket,address=${cargo.debug.address},server=y,suspend=${cargo.debug.suspend} -noverify ${javaagent} ${cargo.args}]]>
</cargo.jvmargs>
<cargo.tomcat.context.reloadable>true</cargo.tomcat.context.reloadable>
</properties>
<home>${project.build.directory}/tomcat6x</home>
<deployables>
<deployable>
+ <groupId>org.apache.wookie</groupId>
+ <artifactId>wookie</artifactId>
+ <type>war</type>
+ <properties>
+ <context>/wookie</context>
+ </properties>
+ </deployable>
+ <deployable>
<groupId>org.apache.rave</groupId>
<artifactId>rave-shindig</artifactId>
<type>war</type>
@@ -216,7 +224,7 @@
<repository.home>${rave.repository.home}</repository.home>
<repository.config>${rave.repository.config}</repository.config>
<repository.context.path>${rave.repository.context.path}</repository.context.path>
-
+
</systemProperties>
<dependencies>
<dependency>
Modified: rave/sandbox/content-services/pom.xml
URL: http://svn.apache.org/viewvc/rave/sandbox/content-services/pom.xml?rev=1354689&r1=1354688&r2=1354689&view=diff
==============================================================================
--- rave/sandbox/content-services/pom.xml (original)
+++ rave/sandbox/content-services/pom.xml Wed Jun 27 19:41:47 2012
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.rave</groupId>
<artifactId>rave-master</artifactId>
- <version>0.11-SNAPSHOT</version>
+ <version>0.10</version>
<relativePath>../rave-master-pom/pom.xml</relativePath>
</parent>
@@ -41,7 +41,8 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <apache.rave.version>0.10-SNAPSHOT</apache.rave.version>
+ <apache.rave.version>0.13-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>
@@ -53,7 +54,7 @@
<javax.activation.version>1.1</javax.activation.version>
<jackson.version>2.0.0</jackson.version>
- <com.h2database.version>1.3.154</com.h2database.version>
+ <com.h2database.version>1.3.167</com.h2database.version>
<org.slf4j.version>1.6.1</org.slf4j.version>
<log4j.version>1.2.16</log4j.version>
<junit.version>4.7</junit.version>