CLEREZZA-742: fixed scala scripting test dependencies issue

git-svn-id: https://svn.apache.org/repos/asf/clerezza/trunk@1455568 13f79535-47bb-0310-9956-ffa450edef68
apache · Mar 12, 2013 · 8cfb924 · 8cfb924
1 parent 301582e
commit 8cfb924
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 16 deletions.
diff --git a/scala-scripting/pom.xml b/scala-scripting/pom.xml
@@ -52,6 +52,11 @@
 				<artifactId>scala-actors</artifactId>
 				<version>2.10.0</version>
 			</dependency>
+            <dependency>
+                <groupId>org.scala-lang</groupId>
+                <artifactId>scala-reflect</artifactId>
+                <version>2.10.0</version>
+            </dependency>
 			<dependency>
 				<groupId>org.apache.felix</groupId>
 				<artifactId>org.apache.felix.scr.annotations</artifactId>

diff --git a/scala-scripting/script-engine/pom.xml b/scala-scripting/script-engine/pom.xml
@@ -73,7 +73,7 @@
 						<Service-Component>OSGI-INF/serviceComponents.xml</Service-Component>
 						<Export-Package>org.apache.clerezza.scala.scripting,org.apache.clerezza.scala.scripting.util</Export-Package>
                         <Import-Package>!com.sun.*,!javax.servlet,!javax.servlet.*,
-                            !org.fusesource.*,!org.mozilla.*,!scala.reflect.*,*
+                            !org.fusesource.*,!org.mozilla.*,!scala.reflect.*,!javax.ws.rs,!javax.ws.rs.*,*
                         </Import-Package>
                         <Private-Package>org.fusesource.*</Private-Package>
 						<DynamicImport-Package>*</DynamicImport-Package>

diff --git a/scala-scripting/tests/pom.xml b/scala-scripting/tests/pom.xml
@@ -47,38 +47,58 @@
 			<groupId>org.ops4j.pax.exam</groupId>
 			<artifactId>pax-exam</artifactId>
 			<scope>test</scope>
-			<version>1.2.1</version>
+			<version>1.2.4</version>
 		</dependency>
 		<dependency>
 			<groupId>org.ops4j.pax.exam</groupId>
 			<artifactId>pax-exam-junit</artifactId>
 			<scope>test</scope>
-			<version>1.2.1</version>
+			<version>1.2.4</version>
 		</dependency>
 		<dependency>
 			<groupId>org.ops4j.pax.exam</groupId>
 			<artifactId>pax-exam-container-default</artifactId>
 			<scope>test</scope>
-			<version>1.2.1</version>
+			<version>1.2.4</version>
 		</dependency>
-		<dependency>
-			<groupId>org.apache.servicemix.bundles</groupId>
-			<artifactId>org.apache.servicemix.bundles.scala-library</artifactId>
-			<version>2.9.1_3</version>
-			<scope>provided</scope>
+        <dependency>
+			<groupId>org.scala-lang</groupId>
+			<artifactId>scala-compiler</artifactId>
+            <scope>provided</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.apache.servicemix.bundles</groupId>
-			<artifactId>org.apache.servicemix.bundles.scala-compiler</artifactId>
-			<version>2.9.1_3</version>
-			<scope>provided</scope>
+			<groupId>org.scala-lang</groupId>
+			<artifactId>scala-library</artifactId>
+            <scope>provided</scope>
 		</dependency>
+        <dependency>
+            <groupId>org.scala-lang</groupId>
+            <artifactId>scala-actors</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.scala-lang</groupId>
+            <artifactId>scala-reflect</artifactId>
+            <scope>provided</scope>
+        </dependency>
 		<dependency>
 			<groupId>org.apache.clerezza.scala</groupId>
 			<artifactId>script-engine</artifactId>
 			<scope>provided</scope>
 			<version>0.2-SNAPSHOT</version>
 		</dependency>
+        <dependency>
+		  <groupId>org.apache.clerezza.ext</groupId>
+		  <artifactId>slf4j-scala-api</artifactId>
+          <version>1.6.2-SNAPSHOT</version>
+          <scope>provided</scope>
+		</dependency>
+        <dependency>
+            <groupId>org.apache.sling</groupId>
+            <artifactId>org.apache.sling.commons.log</artifactId>
+            <version>2.1.2</version>
+            <scope>provided</scope>
+        </dependency>
 	</dependencies>
 	<build>
 		<plugins>

diff --git a/...-scripting/tests/src/test/scala/org/apache/clerezza/scala/tests/CompilerServiceTest.scala b/...-scripting/tests/src/test/scala/org/apache/clerezza/scala/tests/CompilerServiceTest.scala
@@ -172,7 +172,7 @@ object """+objectName+""" {
 							testRunner ! (message, receivedMessage)
 						}
 					} catch {
-						case t => testRunner ! t
+						case t: Throwable => testRunner ! t
 					}
 				}
 			}
@@ -199,7 +199,7 @@ object """+objectName+""" {
 			})
 		} catch {
 			case e: PrivilegedActionException => throw e.getCause
-			case e => throw e
+			case e: Throwable => throw e
 		}
 	}
 

diff --git a/...ipting/tests/src/test/scala/org/apache/clerezza/scala/tests/ScriptEngineFactoryTest.scala b/...ipting/tests/src/test/scala/org/apache/clerezza/scala/tests/ScriptEngineFactoryTest.scala
@@ -170,7 +170,7 @@ class ScriptEngineFactoryTest {
 		try {
 			val compiledScript = engine.compile(script)
 		} catch {
-			case e => Assert.assertEquals(classOf[ScriptException], e.getClass)
+			case e: Throwable => Assert.assertEquals(classOf[ScriptException], e.getClass)
 		}
 		val string = "hello"
 		val script2 = "\""+string+"\""