You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ch...@apache.org on 2010/07/28 16:41:51 UTC

svn commit: r980073 - in /activemq/activemq-apollo/trunk: apollo-scala/pom.xml pom.xml

Author: chirino
Date: Wed Jul 28 14:41:51 2010
New Revision: 980073

URL: http://svn.apache.org/viewvc?rev=980073&view=rev
Log:
Merge branch 'master' of github.com:chirino/activemq-apollo into trunk

Modified:
    activemq/activemq-apollo/trunk/apollo-scala/pom.xml   (contents, props changed)
    activemq/activemq-apollo/trunk/pom.xml

Modified: activemq/activemq-apollo/trunk/apollo-scala/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/apollo-scala/pom.xml?rev=980073&r1=980072&r2=980073&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-scala/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-scala/pom.xml Wed Jul 28 14:41:51 2010
@@ -90,6 +90,7 @@
         <configuration>
           <jvmArgs>
             <jvmArg>-Xmx1024m</jvmArg>
+            <jvmArg>-Xss8m</jvmArg>
           </jvmArgs>
           <args>
             <arg>-deprecation</arg>

Propchange: activemq/activemq-apollo/trunk/apollo-scala/pom.xml
------------------------------------------------------------------------------
    svn:executable = *

Modified: activemq/activemq-apollo/trunk/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/pom.xml?rev=980073&r1=980072&r2=980073&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/pom.xml (original)
+++ activemq/activemq-apollo/trunk/pom.xml Wed Jul 28 14:41:51 2010
@@ -110,7 +110,7 @@
     <logback-version>0.9.18</logback-version>
     
     <!-- maven plugin versions -->
-    <maven-scala-plugin-version>2.13.1</maven-scala-plugin-version>
+    <maven-scala-plugin-version>2.14</maven-scala-plugin-version>
     <maven-surefire-plugin-version>2.4.3</maven-surefire-plugin-version>
     <jetty-plugin-version>7.0.1.v20091125</jetty-plugin-version>