Merge branch 'tomee-10-with-ee-91'
# Conflicts:
# pom.xml
diff --git a/pom.xml b/pom.xml
index 231ee20..0f89951 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,7 +52,7 @@
<tomcat.version>10.0.27</tomcat.version>
- <johnzon.version>1.2.20</johnzon.version>
+ <johnzon.version>1.2.21</johnzon.version>
<derby.version>10.15.2.0</derby.version>
<!--
diff --git a/src/test/resources/testsuite.properties b/src/test/resources/testsuite.properties
index a1c6cfc..345380b 100644
--- a/src/test/resources/testsuite.properties
+++ b/src/test/resources/testsuite.properties
@@ -33,7 +33,6 @@
${JAVA_HOME}/bin/java \
${command.testExecute.debugopts} \
-Dcts.tmp=$harness.temp.directory \
- -Djava.protocol.handler.pkgs=javax.net.ssl \
-Djavax.net.ssl.keyStore=${keystores.dir}/clientcert.jks \
-Djavax.net.ssl.keyStorePassword=changeit \
-Djavax.net.ssl.trustStore=${keystores.dir}/ssl-truststore \
@@ -62,7 +61,6 @@
-DResource/jakarta.jms.ConnectionFactory=connectionfactory:org.apache.activemq.ActiveMQConnectionFactory:tcp://localhost:61616 \
-DResource/org.omg.CORBA.ORB=orb:/ \
-Djdbc/DB1=link:Resource/javax.sql.DataSource \
- -Djava.protocol.handler.pkgs=javax.net.ssl \
-Djavax.net.ssl.keyStore=${keystores.dir}/clientcert.jks \
-Djavax.net.ssl.keyStorePassword=changeit \
-Djavax.net.ssl.trustStore=${keystores.dir}/ssl-truststore \
diff --git a/src/test/script/openejb/tck/commands/JavaTestCommand.groovy b/src/test/script/openejb/tck/commands/JavaTestCommand.groovy
index e76e744..1413982 100644
--- a/src/test/script/openejb/tck/commands/JavaTestCommand.groovy
+++ b/src/test/script/openejb/tck/commands/JavaTestCommand.groovy
@@ -147,9 +147,11 @@
// HACK: For some reason, need to quote JAVA_HOME on Windows...
//
def javaHome = require('java.home')
- if (SystemUtils.IS_OS_WINDOWS) {
- javaHome = "'${javaHome}'"
- }
+ // JRG: I commented this out, as this appeared to append the content of the JAVA_HOME environment variable to the current working directory
+ // on Windows 11 for me. 2023-08-07
+ //if (SystemUtils.IS_OS_WINDOWS) {
+ // javaHome = "${javaHome}"
+ //}
ant.mkdir(dir: workingDir)
@@ -253,13 +255,13 @@
// not sure about this ....
- if (tckJavaHome == null || !new File(tckJavaHome as String, '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}/endorsedlib")
- sysproperty(key: "command.testExecuteEjbEmbed.endorsed.dir", value: "-Djava.endorsed.dirs=${openejbHome}/endorsed")
-
- containerJavaOpts += " -Djava.locale.providers=COMPAT"
- }
+// if (tckJavaHome == null || !new File(tckJavaHome as String, '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}/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"
