From 72fb2874b93ccb6bbd99905cf41fb1d49485ecc0 Mon Sep 17 00:00:00 2001
From: Richard Zowalla <rzo1@apache.org>
Date: Tue, 10 Dec 2024 17:39:49 +0100
Subject: [PATCH] TOMEE-4436: Skip default registration of CXF provider in
 JAX-RS TCK

---
 tck/jax-rs/jax-rs-tests/pom.xml                         | 8 --------
 tck/jax-rs/jax-rs-tests/src/test/conf/system.properties | 2 +-
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/tck/jax-rs/jax-rs-tests/pom.xml b/tck/jax-rs/jax-rs-tests/pom.xml
index a3cba64216f..0556ee1dc91 100644
--- a/tck/jax-rs/jax-rs-tests/pom.xml
+++ b/tck/jax-rs/jax-rs-tests/pom.xml
@@ -149,13 +149,6 @@
                                  ee.jakarta.tck.ws.rs.jaxrs31.spec.extensions.JAXRSClientIT#dynamicFeatureIsRegisteredTest
                                 -->
                                 <exclude>**/jaxrs31/spec/extensions/JAXRSClientIT.java</exclude>
-                                <!-- TODO: TOMEE-4436 -->
-                                <exclude>**/spec/provider/standard/JAXRSClientIT.java</exclude>
-                                <exclude>**/interceptor/clientwriter/interceptorcontext/JAXRSClientIT.java</exclude>
-                                <exclude>**/interceptor/containerreader/interceptorcontext/JAXRSClientIT.java</exclude>
-                                <exclude>**/interceptor/reader/interceptorcontext/JAXRSClientIT.java</exclude>
-                                <exclude>**/interceptor/containerwriter/interceptorcontext/JAXRSClientIT.java</exclude>
-                                <exclude>**/spec/client/invocations/JAXRSClientIT.java</exclude>
                             </excludes>
 
                             <dependenciesToScan>
@@ -175,7 +168,6 @@
                                 <password>j2ee</password>
                                 <authuser>javajoe</authuser>
                                 <authpassword>javajoe</authpassword>
-                                <openejb.jaxrs.skip.jakarta.json.providers.registration>false</openejb.jaxrs.skip.jakarta.json.providers.registration>
                             </systemPropertyVariables>
                         </configuration>
                     </plugin>
diff --git a/tck/jax-rs/jax-rs-tests/src/test/conf/system.properties b/tck/jax-rs/jax-rs-tests/src/test/conf/system.properties
index 19d74d8824e..134991d2f7a 100644
--- a/tck/jax-rs/jax-rs-tests/src/test/conf/system.properties
+++ b/tck/jax-rs/jax-rs-tests/src/test/conf/system.properties
@@ -23,4 +23,4 @@ authpassword=javajoe
 org.apache.cxf.transport.http.forceURLConnection=true
 porting.ts.url.class.1=ee.jakarta.tck.ws.rs.lib.implementation.sun.common.SunRIURL
 servlet_adaptor=org.apache.openejb.server.rest.OpenEJBRestServlet
-openejb.jaxrs.skip.jakarta.json.providers.registration=false
\ No newline at end of file
+openejb.jaxrs.skip.jakarta.json.providers.registration=true
\ No newline at end of file