Merge pull request scala#4271 from retronym/ticket/8642

SI-8642 Enable OSGi tests under Java 8

Author: adriaanm

build.xml

@@ -280,7 +280,7 @@ TODO:
 
       <!-- Pax runner -->
       <property name="pax.exam.version" value="3.5.0"/><!-- Last version which supports Java 6 -->
-      <property name="osgi.felix.version" value="4.0.3"/>
+      <property name="osgi.felix.version" value="4.4.0"/>
       <property name="osgi.equinox.version" value="3.7.1"/>
       <artifact:dependencies pathId="pax.exam.classpath" filesetId="pax.exam.fileset">
         <dependency groupId="org.ops4j.pax.exam" artifactId="pax-exam-container-native" version="${pax.exam.version}">
@@ -294,6 +294,7 @@ TODO:
         <dependency groupId="ch.qos.logback" artifactId="logback-classic" version="1.1.2"/>
         <dependency groupId="junit" artifactId="junit" version="${junit.version}"/>
       </artifact:dependencies>
+      <copy-deps project="pax.exam"/>
 
       <artifact:dependencies pathId="osgi.framework.felix">
         <dependency groupId="org.apache.felix" artifactId="org.apache.felix.framework" version="${osgi.felix.version}"/>
@@ -1375,8 +1376,8 @@ TODO:
   </target>
 
   <target name="test.osgi" depends="test.osgi.comp">
-    <if><isset property="has.java8"/><then>
-      <echo message="Skipping OSGi JUnit tests on Java 8. See SI-8642"/>
+    <if><isset property="test.osgi.skip"/><then>
+      <echo message="Skipping OSGi JUnit tests"/>
     </then><else>
       <echo message="Running OSGi JUnit tests. Output in ${build-osgi.dir}"/>
       <stopwatch name="test.osgi.timer"/>

src/intellij/scala-lang.ipr.SAMPLE

@@ -218,6 +218,7 @@
       <module fileurl="file://$PROJECT_DIR$/scalap.iml" filepath="$PROJECT_DIR$/scalap.iml" />
       <module fileurl="file://$PROJECT_DIR$/test.iml" filepath="$PROJECT_DIR$/test.iml" />
       <module fileurl="file://$PROJECT_DIR$/test-junit.iml" filepath="$PROJECT_DIR$/test-junit.iml" />
+      <module fileurl="file://$PROJECT_DIR$/test-osgi.iml" filepath="$PROJECT_DIR$/test-osgi.iml" />
     </modules>
   </component>
   <component name="ProjectResources">

src/intellij/test-osgi.iml.SAMPLE

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$/../../test/osgi">
+      <sourceFolder url="file://$MODULE_DIR$/../../test/osgi/src" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="actors" />
+    <orderEntry type="module" module-name="asm" />
+    <orderEntry type="module" module-name="compiler" />
+    <orderEntry type="module" module-name="library" />
+    <orderEntry type="module" module-name="reflect" />
+    <orderEntry type="module" module-name="repl" />
+    <orderEntry type="module" module-name="partest-extras" />
+    <orderEntry type="module" module-name="forkjoin" />
+    <orderEntry type="library" name="junit" level="project" />
+    <orderEntry type="library" name="scaladoc-deps" level="project" />
+    <orderEntry type="library" name="scala-sdk" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="pax.exam-deps" level="project" />
+  </component>
+</module>