activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r1031639 - in /activemq/activemq-apollo/trunk: apollo-scala/pom.xml pom.xml
Date Fri, 05 Nov 2010 15:42:08 GMT
Author: chirino
Date: Fri Nov  5 15:42:07 2010
New Revision: 1031639

URL: http://svn.apache.org/viewvc?rev=1031639&view=rev
Log:
Trying to get build to work better when the -P apache-release profile is used.

Modified:
    activemq/activemq-apollo/trunk/apollo-scala/pom.xml
    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=1031639&r1=1031638&r2=1031639&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-scala/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-scala/pom.xml Fri Nov  5 15:42:07 2010
@@ -85,27 +85,27 @@
               <goal>compile</goal>
               <goal>testCompile</goal>
             </goals>
+            <configuration>
+              <jvmArgs>
+                <jvmArg>-Xmx1024m</jvmArg>
+                <jvmArg>-Xss8m</jvmArg>
+              </jvmArgs>
+              <args>
+                <!-- <arg>-optimise</arg> -->
+                <arg>-deprecation</arg>
+                <arg>-P:continuations:enable</arg>
+              </args>
+              <scalaVersion>${scala-version}</scalaVersion>
+              <compilerPlugins>
+                <compilerPlugin>
+                  <groupId>org.scala-lang.plugins</groupId>
+                  <artifactId>continuations</artifactId>
+                  <version>${scala-version}</version>
+                </compilerPlugin>
+              </compilerPlugins>
+            </configuration>
           </execution>
         </executions>
-        <configuration>
-          <jvmArgs>
-            <jvmArg>-Xmx1024m</jvmArg>
-            <jvmArg>-Xss8m</jvmArg>
-          </jvmArgs>
-          <args>
-            <!-- <arg>-optimise</arg> -->
-            <arg>-deprecation</arg>
-            <arg>-P:continuations:enable</arg>
-          </args>
-          <scalaVersion>${scala-version}</scalaVersion>
-          <compilerPlugins>
-            <compilerPlugin>
-              <groupId>org.scala-lang.plugins</groupId>
-              <artifactId>continuations</artifactId>
-              <version>${scala-version}</version>
-            </compilerPlugin>
-          </compilerPlugins>
-        </configuration>
       </plugin>
       
       <plugin>
@@ -146,6 +146,11 @@
                   <goal>doc</goal>
                 </goals>
                 <configuration>
+                  <jvmArgs>
+                    <jvmArg>-Xmx1024m</jvmArg>
+                    <jvmArg>-Xss8m</jvmArg>
+                  </jvmArgs>
+                  <scalaVersion>${scala-version}</scalaVersion>
                   <reportOutputDirectory>${project.build.directory}</reportOutputDirectory>
                   <outputDirectory>apidocs</outputDirectory>
                 </configuration>                

Modified: activemq/activemq-apollo/trunk/pom.xml
URL: http://svn.apache.org/viewvc/activemq/activemq-apollo/trunk/pom.xml?rev=1031639&r1=1031638&r2=1031639&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/pom.xml (original)
+++ activemq/activemq-apollo/trunk/pom.xml Fri Nov  5 15:42:07 2010
@@ -119,6 +119,8 @@
     <maven-surefire-plugin-version>2.4.3</maven-surefire-plugin-version>
     <jetty-plugin-version>7.0.1.v20091125</jetty-plugin-version>
     
+    <!-- disable unique version timestamps in snapshots -->
+    <uniqueVersion>false</uniqueVersion>
   </properties>
 
   <prerequisites>



Mime
View raw message