Author: reto
Date: Sun Mar 20 20:05:45 2011
New Revision: 1083555
URL: http://svn.apache.org/viewvc?rev=1083555&view=rev
Log:
CLEREZZA-469: using scala bundles rpovided by servicemix
Removed:
incubator/clerezza/trunk/scala-scripting/scala-compiler-osgi/
incubator/clerezza/trunk/scala-scripting/scala-library-osgi/
Modified:
incubator/clerezza/trunk/scala-scripting/pom.xml
incubator/clerezza/trunk/scala-scripting/tests/pom.xml
Modified: incubator/clerezza/trunk/scala-scripting/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/scala-scripting/pom.xml?rev=1083555&r1=1083554&r2=1083555&view=diff
==============================================================================
--- incubator/clerezza/trunk/scala-scripting/pom.xml (original)
+++ incubator/clerezza/trunk/scala-scripting/pom.xml Sun Mar 20 20:05:45 2011
@@ -9,8 +9,6 @@
<description>Provides bundles and services to allow compiling and
executing scala code
</description>
<modules>
- <module>scala-library-osgi</module>
- <module>scala-compiler-osgi</module>
<module>script-engine</module>
<module>tests</module>
</modules>
@@ -43,16 +41,6 @@
</dependency>
<dependency>
<groupId>org.apache.clerezza.scala</groupId>
- <artifactId>scala-library-osgi</artifactId>
- <version>0.1-incubating-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza.scala</groupId>
- <artifactId>scala-compiler-osgi</artifactId>
- <version>0.1-incubating-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza.scala</groupId>
<artifactId>script-engine</artifactId>
<version>0.1-incubating-SNAPSHOT</version>
</dependency>
Modified: incubator/clerezza/trunk/scala-scripting/tests/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/clerezza/trunk/scala-scripting/tests/pom.xml?rev=1083555&r1=1083554&r2=1083555&view=diff
==============================================================================
--- incubator/clerezza/trunk/scala-scripting/tests/pom.xml (original)
+++ incubator/clerezza/trunk/scala-scripting/tests/pom.xml Sun Mar 20 20:05:45
2011
@@ -43,15 +43,22 @@
<scope>test</scope>
<version>1.2.1</version>
</dependency>
-
<dependency>
- <groupId>org.apache.clerezza.scala</groupId>
- <artifactId>scala-library-osgi</artifactId>
+ <groupId>org.apache.servicemix.bundles</groupId>
+
<artifactId>org.apache.servicemix.bundles.scala-library</artifactId>
+ <version>2.8.1_1</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.clerezza.scala</groupId>
- <artifactId>scala-compiler-osgi</artifactId>
+ <groupId>org.apache.servicemix.bundles</groupId>
+
<artifactId>org.apache.servicemix.bundles.scala-compiler</artifactId>
+ <version>2.8.1_1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+
<artifactId>org.apache.servicemix.bundles.jline</artifactId>
+ <version>0.9.94_1</version>
<scope>provided</scope>
</dependency>
<dependency>
