You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jl...@apache.org on 2021/04/30 14:37:14 UTC

[tomee-tck] branch jakartaee9-tck updated (92d513c -> 84a5a27)

This is an automated email from the ASF dual-hosted git repository.

jlmonteiro pushed a change to branch jakartaee9-tck
in repository https://gitbox.apache.org/repos/asf/tomee-tck.git.


    from 92d513c  Remove the suffix so the test really gets excluded
     new b528a7f  fixes to support JDK11+
     new 84a5a27  Include Yoko in the client side

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 pom.xml                                                     | 2 ++
 src/test/resources/testsuite.properties                     | 1 +
 src/test/script/openejb/tck/commands/JavaTestCommand.groovy | 4 ++++
 3 files changed, 7 insertions(+)

[tomee-tck] 02/02: Include Yoko in the client side

Posted by jl...@apache.org.
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 84a5a27f27b98a8ae54a8423ad9536d2256890bc
Author: Jean-Louis Monteiro <jl...@tomitribe.com>
AuthorDate: Fri Apr 30 16:35:38 2021 +0200

    Include Yoko in the client side
---
 pom.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pom.xml b/pom.xml
index 530c222..e67fdee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -963,6 +963,8 @@
 
                     <include name="eclipselink*.jar"/>
 
+                    <include name="yoko*.jar"/>
+
                   </fileset>
                 </copy>
                 <copy todir="${project.build.directory}/lib">

[tomee-tck] 01/02: fixes to support JDK11+

Posted by jl...@apache.org.
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 <jl...@tomitribe.com>
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')