camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject svn commit: r1144822 - in /camel/trunk: components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/AggregatorTest.scala parent/pom.xml platforms/karaf/features/pom.xml
Date Sun, 10 Jul 2011 11:02:03 GMT
Author: davsclaus
Date: Sun Jul 10 11:02:03 2011
New Revision: 1144822

URL: http://svn.apache.org/viewvc?rev=1144822&view=rev
Log:
CAMEL-4206: Upgrade to scala 2.9.0

Modified:
    camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/AggregatorTest.scala
    camel/trunk/parent/pom.xml
    camel/trunk/platforms/karaf/features/pom.xml

Modified: camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/AggregatorTest.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/AggregatorTest.scala?rev=1144822&r1=1144821&r2=1144822&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/AggregatorTest.scala
(original)
+++ camel/trunk/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/AggregatorTest.scala
Sun Jul 10 11:02:03 2011
@@ -16,7 +16,6 @@
  */
 package org.apache.camel.scala.dsl;
  
-import org.w3c.dom.Document
 import org.apache.camel.processor.aggregate.UseLatestAggregationStrategy;
 import builder.RouteBuilder
 
@@ -47,10 +46,9 @@ class AggregatorTest extends ScalaTestSu
 
   val builder =
     new RouteBuilder {
-       //START SNIPPET: simple
-       "direct:a" aggregate (_.in[String].substring(0, 7), new UseLatestAggregationStrategy())
completionSize(100) to "mock:a"
-       //END SNIPPET: simple
-       
+       "direct:a" ==> {
+         aggregate (_.in[String].substring(0, 7), new UseLatestAggregationStrategy()) completionSize(100)
to "mock:a" }
+
        //START SNIPPET: block
        "direct:b" ==> {
          aggregate(_.in[String].substring(0,7), new UseLatestAggregationStrategy()).completionSize(100)
{

Modified: camel/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1144822&r1=1144821&r2=1144822&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Sun Jul 10 11:02:03 2011
@@ -132,8 +132,8 @@
     <restlet-version>2.0.8</restlet-version>
     <rome-version>1.0</rome-version>
     <saxon-version>9.1.0.8</saxon-version>
-    <scala-version>2.8.1</scala-version>
-    <scala-plugin-version>2.15.0</scala-plugin-version>
+    <scala-version>2.9.0</scala-version>
+    <scala-plugin-version>2.15.1</scala-plugin-version>
     <servicemix-specs-version>1.8.0</servicemix-specs-version>
     <shiro-bundle-version>1.1.0_1</shiro-bundle-version>
     <slf4j-version>1.6.1</slf4j-version>

Modified: camel/trunk/platforms/karaf/features/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/pom.xml?rev=1144822&r1=1144821&r2=1144822&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/pom.xml (original)
+++ camel/trunk/platforms/karaf/features/pom.xml Sun Jul 10 11:02:03 2011
@@ -118,7 +118,7 @@
       <regexp-bundle-version>1.3_1</regexp-bundle-version>      
       <rome-bundle-version>1.0_1</rome-bundle-version>
       <saxon-bundle-version>9.1.0.8_1</saxon-bundle-version>
-      <scala-bundle-version>2.8.1_1</scala-bundle-version>
+      <scala-bundle-version>2.9.0_1</scala-bundle-version>
       <jaxws.api.version>2.2</jaxws.api.version>
       <servlet-api-2.5-version>1.1.2</servlet-api-2.5-version>
       <serp-bundle-version>1.13.1_2</serp-bundle-version>



Mime
View raw message