activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r1031848 - /activemq/activemq-apollo/trunk/apollo-scala/pom.xml
Date Fri, 05 Nov 2010 22:12:30 GMT
Author: chirino
Date: Fri Nov  5 22:12:30 2010
New Revision: 1031848

URL: http://svn.apache.org/viewvc?rev=1031848&view=rev
Log:
tweaking the pom configuration for scala modules so it works nicer /w IDEA.

Modified:
    activemq/activemq-apollo/trunk/apollo-scala/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=1031848&r1=1031847&r2=1031848&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-scala/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-scala/pom.xml Fri Nov  5 22:12:30 2010
@@ -86,16 +86,10 @@
               <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>
@@ -106,6 +100,13 @@
             </configuration>
           </execution>
         </executions>
+        <configuration>
+          <jvmArgs>
+            <jvmArg>-Xmx1024m</jvmArg>
+            <jvmArg>-Xss8m</jvmArg>
+          </jvmArgs>
+          <scalaVersion>${scala-version}</scalaVersion>
+        </configuration>
       </plugin>
       
       <plugin>
@@ -128,6 +129,34 @@
 
 
   <profiles>
+
+    <!-- helper for the IDEA scala integration, enable this profile in IDEA -->
+    <profile>
+      <id>idea</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.scala-tools</groupId>
+            <artifactId>maven-scala-plugin</artifactId>
+            <version>${maven-scala-plugin-version}</version>
+            <configuration>
+              <args>
+                <arg>-deprecation</arg>
+                <arg>-P:continuations:enable</arg>
+              </args>
+              <compilerPlugins>
+                <compilerPlugin>
+                  <groupId>org.scala-lang.plugins</groupId>
+                  <artifactId>continuations</artifactId>
+                  <version>${scala-version}</version>
+                </compilerPlugin>
+              </compilerPlugins>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+
     <profile>
       <id>apache-release</id>
       <build>
@@ -146,11 +175,6 @@
                   <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>                



Mime
View raw message