Author: ningjiang
Date: Tue Dec 6 13:49:35 2011
New Revision: 1210916
URL: http://svn.apache.org/viewvc?rev=1210916&view=rev
Log:
Merged revisions 1210830 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1210830 | ningjiang | 2011-12-06 17:14:39 +0800 (Tue, 06 Dec 2011) | 1 line
CAMEL-4747 Add java compiler plugin into the camel-archetype-scala pom
........
Modified:
camel/branches/camel-2.8.x/ (props changed)
camel/branches/camel-2.8.x/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/pom.xml
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 6 13:49:35 2011
@@ -1 +1 @@
-/camel/trunk:1202148,1202167,1202204-1202206,1202215,1202223,1202659,1202685,1203879,1203978,1204338,1205124,1205372,1205412,1205429,1205431,1205713,1206116,1206414,1207743,1207784,1208301,1208930,1208964-1208965,1209006-1209007,1209382,1209401,1209477,1209845-1209846,1210113,1210771
+/camel/trunk:1202148,1202167,1202204-1202206,1202215,1202223,1202659,1202685,1203879,1203978,1204338,1205124,1205372,1205412,1205429,1205431,1205713,1206116,1206414,1207743,1207784,1208301,1208930,1208964-1208965,1209006-1209007,1209382,1209401,1209477,1209845-1209846,1210113,1210771,1210830
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-2.8.x/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/pom.xml
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/pom.xml?rev=1210916&r1=1210915&r2=1210916&view=diff
==============================================================================
---
camel/branches/camel-2.8.x/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/pom.xml
(original)
+++
camel/branches/camel-2.8.x/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/pom.xml
Tue Dec 6 13:49:35 2011
@@ -75,6 +75,16 @@
<sourceDirectory>src/main/scala</sourceDirectory>
<testSourceDirectory>src/test/scala</testSourceDirectory>
<plugins>
+ <!-- the Maven compiler plugin will compile Java source files -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>${maven-compiler-plugin-version}</version>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ </configuration>
+ </plugin>
<!-- the Maven Scala plugin will compile Scala source files -->
<plugin>
<groupId>org.scala-tools</groupId>
