Author: reto
Date: Thu Jan 20 11:57:05 2011
New Revision: 1061250
URL: http://svn.apache.org/viewvc?rev=1061250&view=rev
Log:
CLEREZZA-403: update to scala 2.8.1
Modified:
incubator/clerezza/trunk/org.apache.clerezza.parent/pom.xml
incubator/clerezza/trunk/scala-scripting/pom.xml
incubator/clerezza/trunk/scala-scripting/script-engine/src/main/scala/org/apache/clerezza/scala/scripting/ScriptEngineFactory.scala
Modified: incubator/clerezza/trunk/org.apache.clerezza.parent/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/org.apache.clerezza.parent/pom.xml?rev=1061250&r1=1061249&r2=1061250&view=diff
==============================================================================
--- incubator/clerezza/trunk/org.apache.clerezza.parent/pom.xml (original)
+++ incubator/clerezza/trunk/org.apache.clerezza.parent/pom.xml Thu Jan 20
11:57:05 2011
@@ -9,7 +9,7 @@
<version>0.2-incubating-SNAPSHOT</version>
<description>The direct or indirect parent of all Clerezza
Artifacts</description>
<properties>
- <scala.version>2.8.0</scala.version>
+ <scala.version>2.8.1</scala.version>
</properties>
<licenses>
<license>
Modified: incubator/clerezza/trunk/scala-scripting/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/scala-scripting/pom.xml?rev=1061250&r1=1061249&r2=1061250&view=diff
==============================================================================
--- incubator/clerezza/trunk/scala-scripting/pom.xml (original)
+++ incubator/clerezza/trunk/scala-scripting/pom.xml Thu Jan 20 11:57:05 2011
@@ -20,13 +20,12 @@
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
-<!-- test failures with RC>2, see
http://groups.google.com/group/scalatest-users/browse_thread/thread/1c68b6ebba676bc8
-->
- <version>2.8.0</version>
+ <version>2.8.1</version>
</dependency>
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-compiler</artifactId>
- <version>2.8.0</version>
+ <version>2.8.1</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza.scala</groupId>
Modified:
incubator/clerezza/trunk/scala-scripting/script-engine/src/main/scala/org/apache/clerezza/scala/scripting/ScriptEngineFactory.scala
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/scala-scripting/script-engine/src/main/scala/org/apache/clerezza/scala/scripting/ScriptEngineFactory.scala?rev=1061250&r1=1061249&r2=1061250&view=diff
==============================================================================
---
incubator/clerezza/trunk/scala-scripting/script-engine/src/main/scala/org/apache/clerezza/scala/scripting/ScriptEngineFactory.scala
(original)
+++
incubator/clerezza/trunk/scala-scripting/script-engine/src/main/scala/org/apache/clerezza/scala/scripting/ScriptEngineFactory.scala
Thu Jan 20 11:57:05 2011
@@ -71,12 +71,12 @@ class ScriptEngineFactory() extends Jav
//methods from ScriptEngineFactory
override def getEngineName() = "Scala Scripting Engine for OSGi"
- override def getEngineVersion() = "0.2/scala 2.8.0"
+ override def getEngineVersion() = "0.2/scala 2.8.1"
override def getExtensions() =
java.util.Collections.singletonList("scala")
override def getMimeTypes() =
java.util.Collections.singletonList("application/x-scala")
override def getNames() = java.util.Collections.singletonList("scala")
override def getLanguageName() = "Scala"
- override def getLanguageVersion ="2.8.0.RC5"
+ override def getLanguageVersion ="2.8.1"
override def getParameter(key : String) = {
key match {
case ScriptEngine.ENGINE => getEngineName
