diff options
| author | Adriaan Moors <adriaan.moors@typesafe.com> | 2015-01-28 13:47:23 -0800 |
|---|---|---|
| committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2015-01-28 13:47:23 -0800 |
| commit | 7b5998a0592ee707c02a13859fe1520687c76c38 (patch) | |
| tree | 002c8eed76932dd300bfcaae303c8b1c4e5756d3 /build.xml | |
| parent | 20cb778085bdbc9dc48f59e3a1a1e7a5e3915107 (diff) | |
| parent | 80d56a40755e0806d33959ad991acb282cd0ba54 (diff) | |
| download | scala-7b5998a0592ee707c02a13859fe1520687c76c38.tar.gz scala-7b5998a0592ee707c02a13859fe1520687c76c38.tar.bz2 scala-7b5998a0592ee707c02a13859fe1520687c76c38.zip | |
Merge pull request #4271 from retronym/ticket/8642
SI-8642 Enable OSGi tests under Java 8
Diffstat (limited to 'build.xml')
| -rwxr-xr-x | build.xml | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -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"/> |