Author: ningjiang Date: Tue Dec 6 14:01:19 2011 New Revision: 1210920 URL: http://svn.apache.org/viewvc?rev=1210920&view=rev Log: Merged revisions 1210916 via svnmerge from https://svn.apache.org/repos/asf/camel/branches/camel-2.8.x
................ r1210916 | ningjiang | 2011-12-06 21:49:35 +0800 (Tue, 06 Dec 2011) | 9 lines 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.7.x/ (props changed) camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/pom.xml Propchange: camel/branches/camel-2.7.x/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Dec 6 14:01:19 2011 @@ -1,2 +1,2 @@ -/camel/branches/camel-2.8.x:1170965,1171400,1174571,1175323,1176329,1176787,1177397,1177946,1177949,1180598,1187226,1189704,1199138,1199732,1199766,1199807,1200867,1201638-1201639,1202171,1202222,1202662,1204355,1205709,1208933,1210779 -/camel/trunk:1146608,1146903,1147216,1170956,1171396,1174565,1175321,1176274,1176781-1176782,1177394,1177945,1177948,1180597,1187221,1189693,1199137,1199703,1199739,1199804,1200861,1201623,1201637,1202167,1202215,1202659,1204338,1205412,1208930,1210771 +/camel/branches/camel-2.8.x:1170965,1171400,1174571,1175323,1176329,1176787,1177397,1177946,1177949,1180598,1187226,1189704,1199138,1199732,1199766,1199807,1200867,1201638-1201639,1202171,1202222,1202662,1204355,1205709,1208933,1210779,1210916 +/camel/trunk:1146608,1146903,1147216,1170956,1171396,1174565,1175321,1176274,1176781-1176782,1177394,1177945,1177948,1180597,1187221,1189693,1199137,1199703,1199739,1199804,1200861,1201623,1201637,1202167,1202215,1202659,1204338,1205412,1208930,1210771,1210830 Propchange: camel/branches/camel-2.7.x/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/pom.xml URL: http://svn.apache.org/viewvc/camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/pom.xml?rev=1210920&r1=1210919&r2=1210920&view=diff ============================================================================== --- camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/pom.xml (original) +++ camel/branches/camel-2.7.x/tooling/archetypes/camel-archetype-scala/src/main/resources/archetype-resources/pom.xml Tue Dec 6 14:01:19 2011 @@ -70,6 +70,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>
