Author: davsclaus
Date: Tue Jun 12 09:43:01 2012
New Revision: 1349217
URL: http://svn.apache.org/viewvc?rev=1349217&view=rev
Log:
CAMEL-5350: Using the new scala maven plugin.
Modified:
camel/trunk/components/camel-scala/pom.xml
camel/trunk/parent/pom.xml
camel/trunk/tooling/archetypes/camel-archetype-component-scala/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
camel/trunk/tooling/archetypes/camel-archetype-component-scala/src/main/resources/archetype-resources/pom.xml
camel/trunk/tooling/archetypes/camel-archetype-scala/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
camel/trunk/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/pom.xml
Modified: camel/trunk/components/camel-scala/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/pom.xml?rev=1349217&r1=1349216&r2=1349217&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/pom.xml (original)
+++ camel/trunk/components/camel-scala/pom.xml Tue Jun 12 09:43:01 2012
@@ -89,9 +89,9 @@
<testSourceDirectory>src/test/scala</testSourceDirectory>
<plugins>
<plugin>
- <groupId>org.scala-tools</groupId>
- <artifactId>maven-scala-plugin</artifactId>
- <version>${scala-plugin-version}</version>
+ <groupId>net.alchim31.maven</groupId>
+ <artifactId>scala-maven-plugin</artifactId>
+ <version>${scala-maven-plugin-version}</version>
<configuration>
<args><arg>-deprecation</arg></args>
</configuration>
Modified: camel/trunk/parent/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1349217&r1=1349216&r2=1349217&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Tue Jun 12 09:43:01 2012
@@ -159,6 +159,7 @@
<saxon-version>9.3.0.11</saxon-version>
<scala-version>2.9.1</scala-version>
<scala-plugin-version>2.15.2</scala-plugin-version>
+ <scala-maven-plugin-version>3.0.2</scala-maven-plugin-version>
<servicemix-specs-version>1.9.0</servicemix-specs-version>
<shiro-version>1.2.0</shiro-version>
<slf4j-api-version>1.6.1</slf4j-api-version>
Modified:
camel/trunk/tooling/archetypes/camel-archetype-component-scala/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/tooling/archetypes/camel-archetype-component-scala/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml?rev=1349217&r1=1349216&r2=1349217&view=diff
==============================================================================
---
camel/trunk/tooling/archetypes/camel-archetype-component-scala/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
(original)
+++
camel/trunk/tooling/archetypes/camel-archetype-component-scala/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
Tue Jun 12 09:43:01 2012
@@ -42,8 +42,8 @@
<requiredProperty key="scala-version">
<defaultValue>${scala-version}</defaultValue>
</requiredProperty>
- <requiredProperty key="scala-plugin-version">
- <defaultValue>${scala-plugin-version}</defaultValue>
+ <requiredProperty key="scala-maven-plugin-version">
+ <defaultValue>${scala-maven-plugin-version}</defaultValue>
</requiredProperty>
</requiredProperties>
<fileSets>
Modified:
camel/trunk/tooling/archetypes/camel-archetype-component-scala/src/main/resources/archetype-resources/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/tooling/archetypes/camel-archetype-component-scala/src/main/resources/archetype-resources/pom.xml?rev=1349217&r1=1349216&r2=1349217&view=diff
==============================================================================
---
camel/trunk/tooling/archetypes/camel-archetype-component-scala/src/main/resources/archetype-resources/pom.xml
(original)
+++
camel/trunk/tooling/archetypes/camel-archetype-component-scala/src/main/resources/archetype-resources/pom.xml
Tue Jun 12 09:43:01 2012
@@ -101,9 +101,9 @@
</plugin>
<!-- the Maven Scala plugin will compile Scala source files -->
<plugin>
- <groupId>org.scala-tools</groupId>
- <artifactId>maven-scala-plugin</artifactId>
- <version>${scala-plugin-version}</version>
+ <groupId>net.alchim31.maven</groupId>
+ <artifactId>scala-maven-plugin</artifactId>
+ <version>${scala-maven-plugin-version}</version>
<executions>
<execution>
<goals>
Modified:
camel/trunk/tooling/archetypes/camel-archetype-scala/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/tooling/archetypes/camel-archetype-scala/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml?rev=1349217&r1=1349216&r2=1349217&view=diff
==============================================================================
---
camel/trunk/tooling/archetypes/camel-archetype-scala/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
(original)
+++
camel/trunk/tooling/archetypes/camel-archetype-scala/src/main/resources-filtered/META-INF/maven/archetype-metadata.xml
Tue Jun 12 09:43:01 2012
@@ -39,8 +39,8 @@
<requiredProperty key="scala-version">
<defaultValue>${scala-version}</defaultValue>
</requiredProperty>
- <requiredProperty key="scala-plugin-version">
- <defaultValue>${scala-plugin-version}</defaultValue>
+ <requiredProperty key="scala-maven-plugin-version">
+ <defaultValue>${scala-maven-plugin-version}</defaultValue>
</requiredProperty>
<requiredProperty key="slf4j-version">
<defaultValue>${slf4j-version}</defaultValue>
Modified:
camel/trunk/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/pom.xml?rev=1349217&r1=1349216&r2=1349217&view=diff
==============================================================================
---
camel/trunk/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/pom.xml
(original)
+++
camel/trunk/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/pom.xml
Tue Jun 12 09:43:01 2012
@@ -99,9 +99,9 @@
<!-- the Maven Scala plugin will compile Scala source files -->
<plugin>
- <groupId>org.scala-tools</groupId>
- <artifactId>maven-scala-plugin</artifactId>
- <version>${scala-plugin-version}</version>
+ <groupId>net.alchim31.maven</groupId>
+ <artifactId>scala-maven-plugin</artifactId>
+ <version>${scala-maven-plugin-version}</version>
<executions>
<execution>
<goals>
