This is an automated email from the ASF dual-hosted git repository. jlmonteiro pushed a commit to branch jakartaee9-tck in repository https://gitbox.apache.org/repos/asf/tomee-tck.git
commit b528a7f7f8eab33f75b4fb74487d6bcc4827d704 Author: Jean-Louis Monteiro <[email protected]> AuthorDate: Fri Apr 30 16:35:21 2021 +0200 fixes to support JDK11+ --- src/test/resources/testsuite.properties | 1 + src/test/script/openejb/tck/commands/JavaTestCommand.groovy | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/src/test/resources/testsuite.properties b/src/test/resources/testsuite.properties index 8187aaa..11d4ff7 100644 --- a/src/test/resources/testsuite.properties +++ b/src/test/resources/testsuite.properties @@ -199,6 +199,7 @@ porting.ts.jms.class.1=org.apache.openejb.cts.JMSAdminImpl porting.ts.login.class.1=org.apache.openejb.cts.LoginContextImpl porting.ts.url.class.1=org.apache.openejb.cts.URLImpl +jimage.dir=${ts.home}/tmp/jdk-bundles sigTestClasspath=${s1as.modules}/javax.servlet.jar${pathsep}${s1as.modules}/javax.ejb.jar${pathsep}${endorsed.dirs}/javax.annotation.jar${pathsep}${s1as.modules}/javax.enterprise.deploy.jar${pathsep}${s1as.modules}/javax.mail.jar${pathsep}${s1as.modules}/javax.persistence.jar${pathsep}${s1as.modules}/javax.resource.jar${pathsep}${s1as.modules}/javax.security.auth.message.jar${pathsep}${s1as.modules}/javax.security.jacc.jar${pathsep}${s1as.modules}/javax.servlet.jsp.jar${pathsep}${s1as.mo [...] ts.run.classpath=%ts.run.classpath% diff --git a/src/test/script/openejb/tck/commands/JavaTestCommand.groovy b/src/test/script/openejb/tck/commands/JavaTestCommand.groovy index b934df6..d3c6a30 100644 --- a/src/test/script/openejb/tck/commands/JavaTestCommand.groovy +++ b/src/test/script/openejb/tck/commands/JavaTestCommand.groovy @@ -204,6 +204,8 @@ class JavaTestCommand if (tckJavaHome != null) { log.info("Using java home (javatest) ${tckJavaHome}") jvmarg(value: "-Dtck.java.home=${tckJavaHome}") + } else { + tckJavaHome = javaHome } def tckJavaVersion = get('tck.java.version') @@ -222,6 +224,8 @@ class JavaTestCommand if (containerJavaHome != null) { log.info("Using java home (container) ${containerJavaHome}") jvmarg(value: "-Dcontainer.java.home=${containerJavaHome}") + } else { + containerJavaHome = javaHome } def containerJavaVersion = get('container.java.version')
