[tomee-tck] branch jakartaee9-tck updated: Only add endorsed for supported JVM Backward behaviour for dates

[jlmonteiro]

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


The following commit(s) were added to refs/heads/jakartaee9-tck by this push:
     new e151478  Only add endorsed for supported JVM Backward behaviour for 
dates
e151478 is described below

commit e151478aeb9920e4dbc772dff24aace9f92678db
Author: Jean-Louis Monteiro <jlmonte...@tomitribe.com>
AuthorDate: Fri Apr 30 17:20:10 2021 +0200

    Only add endorsed for supported JVM
    Backward behaviour for dates
---
 src/test/resources/testsuite.properties                     |  4 ++--
 src/test/script/openejb/tck/commands/JavaTestCommand.groovy | 13 +++++++++----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/test/resources/testsuite.properties 
b/src/test/resources/testsuite.properties
index 11d4ff7..e6382f0 100644
--- a/src/test/resources/testsuite.properties
+++ b/src/test/resources/testsuite.properties
@@ -39,7 +39,7 @@ command.testExecute=com.sun.ts.lib.harness.ExecTSTestCmd \
         -Djavax.net.ssl.keyStorePassword=changeit \
         -Djavax.net.ssl.trustStore=${keystores.dir}/ssl-truststore \
         -Djavax.net.ssl.trustStorePassword=changeit \
-        
-Djava.endorsed.dirs=${s1as.java.endorsed.dirs}${pathsep}${ts.home}/endorsedlib 
\
+        ${command.testExecute.endorsed.dir} \
         -Dcom.sun.aas.installRoot=${javaee.home} \
         -Dcatalina.base=${openejb.home} \
         -Dlog.file.location=${log.file.location} \
@@ -78,7 +78,7 @@ 
command.testExecuteEjbEmbed=com.sun.ts.lib.harness.ExecTSTestCmd \
         ${JAVA_HOME}/bin/java \
         -javaagent:${openejb.home}/lib/openejb-javaagent.jar \
         ${command.testExecuteEmbedded.debugopts} \
-        -Djava.endorsed.dirs=${openejb.home}/endorsed \
+        ${command.testExecuteEjbEmbed.endorsed.dir} \
         -DDB1=new://Resource?type=DataSource \
         -DDB1.JdbcDriver=org.apache.derby.jdbc.ClientDriver \
         
-DDB1.JdbcUrl=jdbc:derby://localhost:${derby.server.port}/derbydb;create=true \
diff --git a/src/test/script/openejb/tck/commands/JavaTestCommand.groovy 
b/src/test/script/openejb/tck/commands/JavaTestCommand.groovy
index d3c6a30..e9ffb26 100644
--- a/src/test/script/openejb/tck/commands/JavaTestCommand.groovy
+++ b/src/test/script/openejb/tck/commands/JavaTestCommand.groovy
@@ -235,10 +235,18 @@ class JavaTestCommand
 
                 def containerJavaOpts = get('container.java.opts', "")
 
+                // not sure about this ....
+                if (tckJavaHome == null || !new File(tckJavaHome, 
'jmods').exists()/*j9 doesnt support it*/) {
+                    sysproperty(key: "java.endorsed.dirs", file: 
"${javaeeRiHome}/lib/endorsed")
+                    sysproperty(key: "command.testExecute.endorsed.dir", 
value: "-Djava.endorsed.dirs=${javaeeCtsHome.home}/endorsedlib")
+                    sysproperty(key: 
"command.testExecuteEjbEmbed.endorsed.dir", value: 
"-Djava.endorsed.dirs=${openejbHome}/endorsed")
+
+                    containerJavaOpts += " -Djava.locale.providers=COMPAT"
+                }
+
                 // force memory on tasks because with JDK 8 it's computed with 
a bit too much
                 // containerJavaOpts += " -Xmx512m 
-Dtest.ejb.stateful.timeout.wait.seconds=60"
 
-
                 if (options.contains('security')) {
                     log.info("Enabling server security manager")
 
@@ -293,9 +301,6 @@ class JavaTestCommand
                 sysproperty(key: "java.security.policy", file: 
"${javaeeRiHome}/bin/harness.policy")
                 sysproperty(key: "J2EE_HOME_RI", file: javaeeRiHome)
                 sysproperty(key: "deliverable.class", value: 
require('deliverable.class'))
-                if (tckJavaHome == null || !new File(tckJavaHome, 
'jmods').exists()/*j9 doesnt support it*/) {
-                    sysproperty(key: "java.endorsed.dirs", file: 
"${javaeeRiHome}/lib/endorsed")
-                }
                 sysproperty(key: "com.sun.enterprise.home", file: javaeeRiHome)
                 sysproperty(key: "com.sun.aas.installRoot", file: javaeeRiHome)
                 sysproperty(key: "DEPLOY_DELAY_IN_MINUTES", value: 
require('deploy_delay_in_minutes'))