You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2013/01/24 21:31:53 UTC
svn commit: r1438165 - in /camel/trunk: components/camel-web/pom.xml
parent/pom.xml platforms/karaf/features/src/main/resources/features.xml
Author: davsclaus
Date: Thu Jan 24 20:31:53 2013
New Revision: 1438165
URL: http://svn.apache.org/viewvc?rev=1438165&view=rev
Log:
CAMEL-6011: Upgrade to Scala 2.10
Modified:
camel/trunk/components/camel-web/pom.xml
camel/trunk/parent/pom.xml
camel/trunk/platforms/karaf/features/src/main/resources/features.xml
Modified: camel/trunk/components/camel-web/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-web/pom.xml?rev=1438165&r1=1438164&r2=1438165&view=diff
==============================================================================
--- camel/trunk/components/camel-web/pom.xml (original)
+++ camel/trunk/components/camel-web/pom.xml Thu Jan 24 20:31:53 2013
@@ -131,7 +131,7 @@
</dependency>
<dependency>
<groupId>org.fusesource.scalate</groupId>
- <artifactId>scalate-core_2.9</artifactId>
+ <artifactId>scalate-core_2.10</artifactId>
<version>${scalate-version}</version>
</dependency>
@@ -232,7 +232,7 @@
<plugin>
<groupId>org.fusesource.scalate</groupId>
- <artifactId>maven-scalate-plugin_2.9</artifactId>
+ <artifactId>maven-scalate-plugin_2.10</artifactId>
<version>${scalate-version}</version>
<executions>
<execution>
Modified: camel/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/parent/pom.xml?rev=1438165&r1=1438164&r2=1438165&view=diff
==============================================================================
--- camel/trunk/parent/pom.xml (original)
+++ camel/trunk/parent/pom.xml Thu Jan 24 20:31:53 2013
@@ -308,10 +308,8 @@
<saaj-impl-version>1.3.2_2</saaj-impl-version>
<saxon-bundle-version>9.4.0.4_1</saxon-bundle-version>
<saxon-version>9.4.0.4</saxon-version>
- <scala-bundle-version>2.9.2_2</scala-bundle-version>
- <scala-library-bundle-version>2.9.2_1</scala-library-bundle-version>
- <scala-version>2.9.2</scala-version>
- <scala-maven-plugin-version>3.1.0</scala-maven-plugin-version>
+ <scala-version>2.10.0</scala-version>
+ <scala-maven-plugin-version>3.1.2</scala-maven-plugin-version>
<scriptengines-version>1.1</scriptengines-version>
<serp-bundle-version>1.14.1_1</serp-bundle-version>
<servicemix-specs-version>2.2.0</servicemix-specs-version>
Modified: camel/trunk/platforms/karaf/features/src/main/resources/features.xml
URL: http://svn.apache.org/viewvc/camel/trunk/platforms/karaf/features/src/main/resources/features.xml?rev=1438165&r1=1438164&r2=1438165&view=diff
==============================================================================
--- camel/trunk/platforms/karaf/features/src/main/resources/features.xml (original)
+++ camel/trunk/platforms/karaf/features/src/main/resources/features.xml Thu Jan 24 20:31:53 2013
@@ -725,7 +725,7 @@
<bundle>mvn:org.apache.camel/camel-saxon/${project.version}</bundle>
</feature>
<feature name='camel-scala' version='${project.version}' resolver='(obr)' start-level='50'>
- <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.scala-library/${scala-library-bundle-version}</bundle>
+ <bundle dependency='true'>mvn:org.scala-lang/scala-library/${scala-version}</bundle>
<feature version='${project.version}'>camel-core</feature>
<bundle>mvn:org.apache.camel/camel-scala/${project.version}</bundle>
</feature>