From e76f927a88d57cd69daa6a51ae2918ca48046f00 Mon Sep 17 00:00:00 2001 From: Mark Thomas Date: Thu, 7 Feb 2019 10:02:13 +0000 Subject: [PATCH] Fix #39. Ensure java.endorsed.dirs is correctly configured Signed-off-by: Mark Thomas --- install/servlet/bin/ts.jte | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/install/servlet/bin/ts.jte b/install/servlet/bin/ts.jte index 32c362787f..890586c121 100644 --- a/install/servlet/bin/ts.jte +++ b/install/servlet/bin/ts.jte @@ -143,6 +143,14 @@ ts.harness.classpath=${ts.home}/lib/jaxb-xjc.jar${pathsep}${ts.home}/lib/tsharne servlet.classes=${web.home}/modules/jakarta.servlet-api.jar${pathsep}${web.home}/modules/endorsed/jakarta.annotation-api.jar +######################################################################## +# @endorsedlib.dir - Location to be used for java.endorsed.dirs as some +# tests require some addition classes in the +# java.util.concurrent package that are not present +# in Java 8 as they were added in Java 9. +######################################################################## +endorsedlib.dir=${ts.home}/endorsedlib + ######################################################################## ## Common environment for both ts_unix and ts_win32 # @@ -161,6 +169,7 @@ command.testExecute=com.sun.ts.lib.harness.ExecTSTestCmd \ windir=${windir} \ SYSTEMROOT=${SYSTEMROOT} \ ${JAVA_HOME}/bin/java \ + -Djava.endorsed.dirs=${endorsedlib.dir} \ -Dbytecheck=true \ -Djava.protocol.handler.pkgs=javax.net.ssl \ -Djavax.net.ssl.keyStore=${ts.home}/bin/certificates/clientcert.jks \