You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ff...@apache.org on 2011/09/19 07:13:51 UTC
svn commit: r1172427 - in /camel/branches/camel-2.8.x: ./ parent/pom.xml
platforms/karaf/features/pom.xml
Author: ffang
Date: Mon Sep 19 05:13:51 2011
New Revision: 1172427
URL: http://svn.apache.org/viewvc?rev=1172427&view=rev
Log:
Merged revisions 1172417 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
........
r1172417 | ffang | 2011-09-19 12:00:49 +0800 (δΈ€, 19 9 2011) | 1 line
[CAMEL-4443]Upgrade to Scala 2.9.1
........
Modified:
camel/branches/camel-2.8.x/ (props changed)
camel/branches/camel-2.8.x/parent/pom.xml
camel/branches/camel-2.8.x/platforms/karaf/features/pom.xml
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.8.x/parent/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/parent/pom.xml?rev=1172427&r1=1172426&r2=1172427&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/parent/pom.xml (original)
+++ camel/branches/camel-2.8.x/parent/pom.xml Mon Sep 19 05:13:51 2011
@@ -133,7 +133,7 @@
<restlet-version>2.0.9</restlet-version>
<rome-version>1.0</rome-version>
<saxon-version>9.1.0.8</saxon-version>
- <scala-version>2.9.0</scala-version>
+ <scala-version>2.9.1</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>
Modified: camel/branches/camel-2.8.x/platforms/karaf/features/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/platforms/karaf/features/pom.xml?rev=1172427&r1=1172426&r2=1172427&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/platforms/karaf/features/pom.xml (original)
+++ camel/branches/camel-2.8.x/platforms/karaf/features/pom.xml Mon Sep 19 05:13:51 2011
@@ -119,7 +119,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.9.0_1</scala-bundle-version>
+ <scala-bundle-version>2.9.1_1</scala-bundle-version>
<servlet-api-2.5-version>1.1.2</servlet-api-2.5-version>
<serp-bundle-version>1.13.1_2</serp-bundle-version>
<smack-bundle-version>3.1.0_1</smack-bundle-version>