This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/3.5.x-fixes by this push:
new 5a1c6b67df Fix cxf-systests-cdi-owb-producers systests (post-backport
issue)
5a1c6b67df is described below
commit 5a1c6b67df2939180c74e3aa63d5cfbd643e0815
Author: Andriy Redko <[email protected]>
AuthorDate: Fri Mar 31 09:00:41 2023 -0400
Fix cxf-systests-cdi-owb-producers systests (post-backport issue)
---
.../java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyEmbeddedTest.java | 3 +--
.../test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java | 3 +--
.../java/org/apache/cxf/systest/jaxrs/cdi/tomcat/TomcatWarTest.java | 3 +--
3 files changed, 3 insertions(+), 6 deletions(-)
diff --git
a/systests/cdi/cdi-owb/cdi-producers-owb/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyEmbeddedTest.java
b/systests/cdi/cdi-owb/cdi-producers-owb/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyEmbeddedTest.java
index dde210107e..f9265734c9 100644
---
a/systests/cdi/cdi-owb/cdi-producers-owb/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyEmbeddedTest.java
+++
b/systests/cdi/cdi-owb/cdi-producers-owb/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyEmbeddedTest.java
@@ -89,8 +89,7 @@ public class JettyEmbeddedTest extends
AbstractCdiSingleAppTest {
@Test
public void testConfiguredProviders() {
- assertEquals("AtomFeedProvider,"
- + "CustomContextFeature,"
+ assertEquals("CustomContextFeature,"
+ "JacksonJsonProvider,"
+ "JacksonJsonProvider,"
+ "SampleFeature,"
diff --git
a/systests/cdi/cdi-owb/cdi-producers-owb/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java
b/systests/cdi/cdi-owb/cdi-producers-owb/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java
index 37ddd3a3d0..a7d6c720c7 100644
---
a/systests/cdi/cdi-owb/cdi-producers-owb/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java
+++
b/systests/cdi/cdi-owb/cdi-producers-owb/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java
@@ -91,8 +91,7 @@ public class JettyWarTest extends AbstractCdiSingleAppTest {
@Test
public void testConfiguredProviders() {
- assertEquals("AtomFeedProvider,"
- + "CustomContextFeature,"
+ assertEquals("CustomContextFeature,"
+ "JacksonJsonProvider,"
+ "JacksonJsonProvider,"
+ "SampleFeature,"
diff --git
a/systests/cdi/cdi-owb/cdi-producers-owb/src/test/java/org/apache/cxf/systest/jaxrs/cdi/tomcat/TomcatWarTest.java
b/systests/cdi/cdi-owb/cdi-producers-owb/src/test/java/org/apache/cxf/systest/jaxrs/cdi/tomcat/TomcatWarTest.java
index 99b229c744..d4b4556c91 100644
---
a/systests/cdi/cdi-owb/cdi-producers-owb/src/test/java/org/apache/cxf/systest/jaxrs/cdi/tomcat/TomcatWarTest.java
+++
b/systests/cdi/cdi-owb/cdi-producers-owb/src/test/java/org/apache/cxf/systest/jaxrs/cdi/tomcat/TomcatWarTest.java
@@ -88,8 +88,7 @@ public class TomcatWarTest extends AbstractCdiSingleAppTest {
@Test
public void testConfiguredProviders() {
- assertEquals("AtomFeedProvider,"
- + "CustomContextFeature,"
+ assertEquals("CustomContextFeature,"
+ "JacksonJsonProvider,"
+ "JacksonJsonProvider,"
+ "SampleFeature,"