Merge remote-tracking branch 'origin/2.11.x' into merge/2.11.x-to-2.12.x

1 files changed, 18 insertions, 14 deletions

diff --git a/build.xml b/build.xml
index 937905636a..6d301e436c 100755
--- a/build.xml
+++ b/build.xml
@@ -1357,20 +1357,24 @@ TODO:
   </target>
 
   <target name="test.osgi" depends="test.osgi.comp">
-    <stopwatch name="test.osgi.timer"/>
-    <mkdir dir="${test.osgi.classes}"/>
-
-    <echo message="Running OSGi JUnit tests. Output in ${build-osgi.dir}"/>
-    <junit fork="yes" haltonfailure="yes">
-      <classpath refid="test.osgi.compiler.build.path"/>
-      <batchtest fork="yes" todir="${build-osgi.dir}">
-        <fileset dir="${test.osgi.classes}">
-          <include name="**/*Test.class"/>
-        </fileset>
-      </batchtest>
-      <formatter type="xml" /> <!-- silenced by having it use a file; I tried for an hour to use other formatters but classpath issues drove me to this usefile="false" -->
-    </junit>
-    <stopwatch name="test.osgi.timer" action="total"/>
+    <if><isset property="has.java8"/><then>
+      <echo message="Skipping OSGi JUnit tests on Java 8. See SI-8642"/>
+    </then><else>
+      <echo message="Running OSGi JUnit tests. Output in ${build-osgi.dir}"/>
+      <stopwatch name="test.osgi.timer"/>
+      <mkdir dir="${test.osgi.classes}"/>
+
+      <junit fork="yes" haltonfailure="yes">
+        <classpath refid="test.osgi.compiler.build.path"/>
+        <batchtest fork="yes" todir="${build-osgi.dir}">
+          <fileset dir="${test.osgi.classes}">
+            <include name="**/*Test.class"/>
+          </fileset>
+        </batchtest>
+        <formatter type="xml" /> <!-- silenced by having it use a file; I tried for an hour to use other formatters but classpath issues drove me to this usefile="false" -->
+      </junit>
+      <stopwatch name="test.osgi.timer" action="total"/>
+    </else></if>
   </target>