[tomee-tck] branch jakartaee9-tck updated: Fix JSON-P Pluggability tests. To work, this needs a build with the TOMEE-4048 change

[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


The following commit(s) were added to refs/heads/jakartaee9-tck by this push:
     new 5e875a4  Fix JSON-P Pluggability tests. To work, this needs a build with the TOMEE-4048 change
5e875a4 is described below

commit 5e875a454fad10ade59b3b7e2cff5e902b69e28a
Author: Jean-Louis Monteiro <jl...@tomitribe.com>
AuthorDate: Fri Sep 16 17:19:40 2022 +0200

    Fix JSON-P Pluggability tests. To work, this needs a build with the TOMEE-4048 change
---
 pom.xml                                                    |  1 -
 src/test/script/openejb/tck/commands/CommandSupport.groovy | 12 +++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index e0c41d9..6a4903e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -929,7 +929,6 @@
                     <include name="jackson-databind*.jar"/>
                     <include name="jackson-annotations*.jar"/>
                     <include name="jackson-core*.jar"/>
-                    <include name="johnzon*.jar"/>
                     <include name="xbean-asm*.jar"/>
                     <include name="xbean-finder*.jar"/>
                     <include name="xbean-reflect*.jar"/>
diff --git a/src/test/script/openejb/tck/commands/CommandSupport.groovy b/src/test/script/openejb/tck/commands/CommandSupport.groovy
index d179a07..ea2e31e 100644
--- a/src/test/script/openejb/tck/commands/CommandSupport.groovy
+++ b/src/test/script/openejb/tck/commands/CommandSupport.groovy
@@ -190,24 +190,26 @@ abstract class CommandSupport {
 
         builder.appendAll("openejb-core-*.jar")
         builder.directory = "${project.build.directory}/lib"
-        builder.appendAll("*.jar")
+        builder.appendAll("*.jar") // probably adds way to many things
         builder.getPath("openejb.porting.classes")
 
         // openejb.jee.classes  -- spec classes used for
         // signature tests
         builder = new PathBuilder(this)
         builder.directory = openejbLib
-        builder.append("el-api.jar")
+        builder.append("jakartaee-api-*.jar")
+
+        // mail is a special case because api and impl are together
         builder.append("geronimo-mail_2.1_spec*.jar")
         builder.append("geronimo-mail_2.1_provider*.jar")
         // builder.append("jakarta.activation-*.jar")
-        builder.append("jakartaee-api-*.jar")
 
-        // only for plume
+        // only for plume because api and impl are mixed
         if (webcontainer.contains("plume")) {
             builder.append("jakarta.faces-*.jar")
         }
-
+        // Tomcat provided APIs because they are not in uber jar jakartaee-api
+        builder.append("el-api.jar")
         builder.append("jaspic-api.jar")
         builder.append("jsp-api.jar")
         builder.append("servlet-api.jar")