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 2012/07/27 19:39:44 UTC
svn commit: r1366470 - /activemq/activemq-apollo/trunk/apollo-scala/pom.xml
Author: chirino
Date: Fri Jul 27 17:39:44 2012
New Revision: 1366470
URL: http://svn.apache.org/viewvc?rev=1366470&view=rev
Log:
Only use fsc when the fsc maven profile is enabled.
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=1366470&r1=1366469&r2=1366470&view=diff
==============================================================================
--- activemq/activemq-apollo/trunk/apollo-scala/pom.xml (original)
+++ activemq/activemq-apollo/trunk/apollo-scala/pom.xml Fri Jul 27 17:39:44 2012
@@ -33,7 +33,11 @@
<name>${project.artifactId}</name>
<description>Holds the common Maven settings for Scala based modules.</description>
- <dependencies>
+ <properties>
+ <scala-plugin-compile-goal>compile</scala-plugin-compile-goal>
+ </properties>
+
+ <dependencies>
<!-- Scala Support: this needs to be copied into every scala project -->
<dependency>
@@ -78,12 +82,11 @@
<id>compile</id>
<phase>compile</phase>
<goals>
- <goal>cc</goal>
+ <goal>${scala-plugin-compile-goal}</goal>
</goals>
<configuration>
<useFsc>true</useFsc>
<once>true</once>
- <!-- <displayCmd>true</displayCmd> -->
<args>
<arg>-deprecation</arg>
</args>
@@ -98,15 +101,14 @@
</execution>
<execution>
<id>test</id>
- <phase>test-compile</phase>
+ <phase>test-compile</phase>
<goals>
- <goal>testCompile</goal>
+ <goal>${scala-plugin-compile-goal}</goal>
</goals>
<configuration>
<mainSourceDir>${project.build.sourceDirectory}/../../test/scala</mainSourceDir>
<useFsc>true</useFsc>
<once>true</once>
- <!-- <displayCmd>true</displayCmd> -->
<args>
<arg>-deprecation</arg>
</args>
@@ -149,7 +151,14 @@
<profiles>
-
+
+ <profile>
+ <id>fsc</id>
+ <properties>
+ <scala-plugin-compile-goal>cc</scala-plugin-compile-goal>
+ </properties>
+ </profile>
+
<!-- helper for the IDEA scala integration, enable this profile in IDEA -->
<profile>
<id>idea</id>