This is an automated email from the ASF dual-hosted git repository. reta pushed a commit to branch 3.6.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 5afee25c7587609874e25dc4f4c6bf3809a18c41 Author: Andriy Redko <[email protected]> AuthorDate: Mon Jan 20 17:23:43 2025 -0500 Update Jackson to 2.18.2 (#2228) (cherry picked from commit ce63c47d70d97d70cfc20cbdf3dda93019a61721) # Conflicts: # systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java # systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwejws/JAXRSJweJwsTest.java # systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwejws/JAXRSJwsJsonTest.java # systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwejws/JweJwsAlgorithmTest.java # systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwejws/JweJwsReferenceTest.java # systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwejws/JwsHTTPHeaderTest.java # systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwt/JWTAlgorithmTest.java # systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwt/JWTAuthnAuthzTest.java # systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwt/JWTPropertiesTest.java # systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwejws/server.xml # systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwejws/serverJwsJson.xml --- parent/pom.xml | 10 ++++++-- .../cxf/jaxrs/provider/json/JSONProvider.java | 4 +-- .../systest/jaxrs/JAXRS20ClientServerBookTest.java | 3 +-- .../security/jose/jwejws/JAXRSJweJwsTest.java | 11 +++----- .../security/jose/jwejws/JAXRSJwsJsonTest.java | 7 ++---- .../security/jose/jwejws/JweJwsAlgorithmTest.java | 29 ++-------------------- .../security/jose/jwejws/JweJwsReferenceTest.java | 11 -------- .../security/jose/jwejws/JwsHTTPHeaderTest.java | 7 ------ .../jaxrs/security/jose/jwt/JWTAlgorithmTest.java | 20 --------------- .../jaxrs/security/jose/jwt/JWTAuthnAuthzTest.java | 18 -------------- .../jaxrs/security/jose/jwt/JWTPropertiesTest.java | 12 --------- .../systest/jaxrs/security/jose/jwejws/server.xml | 5 ---- .../jaxrs/security/jose/jwejws/serverJwsJson.xml | 3 --- 13 files changed, 18 insertions(+), 122 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index fda1a398b1..b48317e5bb 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -128,8 +128,8 @@ <cxf.httpcomponents.core.version>4.4.16</cxf.httpcomponents.core.version> <cxf.httpcomponents.client5.version>5.3.1</cxf.httpcomponents.client5.version> <cxf.httpcomponents.core5.version>5.2.5</cxf.httpcomponents.core5.version> - <cxf.jackson.version>2.17.2</cxf.jackson.version> - <cxf.jackson.databind.version>2.17.2</cxf.jackson.databind.version> + <cxf.jackson.version>2.18.2</cxf.jackson.version> + <cxf.jackson.databind.version>2.18.2</cxf.jackson.databind.version> <cxf.jacorb.version>3.9</cxf.jacorb.version> <cxf.jaeger.version>1.8.1</cxf.jaeger.version> <cxf.jakarta.activation.version>1.2.2</cxf.jakarta.activation.version> @@ -1570,6 +1570,12 @@ <groupId>com.fasterxml.jackson.jaxrs</groupId> <artifactId>jackson-jaxrs-json-provider</artifactId> <version>${cxf.jackson.version}</version> + <exclusions> + <exclusion> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> diff --git a/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JSONProvider.java b/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JSONProvider.java index 7422950ac6..a9eb0144ae 100644 --- a/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JSONProvider.java +++ b/rt/rs/extensions/providers/src/main/java/org/apache/cxf/jaxrs/provider/json/JSONProvider.java @@ -81,8 +81,8 @@ import org.codehaus.jettison.mapped.SimpleConverter; import org.codehaus.jettison.mapped.TypeConverter; import org.codehaus.jettison.util.StringIndenter; -@Produces({"application/json", "application/*+json" }) -@Consumes({"application/json", "application/*+json" }) +@Produces({"application/json", "application/*+json", "text/json" /* deprecated */ }) +@Consumes({"application/json", "application/*+json", "text/json"/* deprecated */ }) @Provider public class JSONProvider<T> extends AbstractJAXBProvider<T> { diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java index 99325fd9cf..064534a934 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRS20ClientServerBookTest.java @@ -604,8 +604,7 @@ public class JAXRS20ClientServerBookTest extends AbstractBusClientServerTestBase String endpointAddress = "http://localhost:"; + PORT + "/bookstore/collections"; - WebClient wc = WebClient.create(endpointAddress, - Collections.singletonList(new JacksonJaxbJsonProvider())); + WebClient wc = WebClient.create(endpointAddress); doTestPostGetCollectionGenericEntityAndType(wc, MediaType.APPLICATION_JSON_TYPE); } diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwejws/JAXRSJweJwsTest.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwejws/JAXRSJweJwsTest.java index b696515c1c..6723c23875 100644 --- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwejws/JAXRSJweJwsTest.java +++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwejws/JAXRSJweJwsTest.java @@ -29,8 +29,6 @@ import java.util.Properties; import javax.annotation.Priority; import javax.ws.rs.BadRequestException; -import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider; - import org.apache.cxf.Bus; import org.apache.cxf.bus.spring.SpringBusFactory; import org.apache.cxf.jaxrs.client.JAXRSClientFactoryBean; @@ -96,8 +94,7 @@ public class JAXRSJweJwsTest extends AbstractBusClientServerTestBase { @Test public void testJweJwkBookBeanRSA() throws Exception { String address = "https://localhost:"; + PORT + "/jwejwkrsa"; - BookStore bs = createJweBookStore(address, - Collections.singletonList(new JacksonJsonProvider())); + BookStore bs = createJweBookStore(address, List.of()); Book book = bs.echoBook(new Book("book", 123L)); assertEquals("book", book.getName()); assertEquals(123L, book.getId()); @@ -276,8 +273,7 @@ public class JAXRSJweJwsTest extends AbstractBusClientServerTestBase { String address = "https://localhost:"; + PORT + "/jwejwshmac"; HmacJwsSignatureProvider hmacProvider = new HmacJwsSignatureProvider(ENCODED_MAC_KEY, SignatureAlgorithm.HS256); - BookStore bs = createJweJwsBookStore(address, hmacProvider, - Collections.singletonList(new JacksonJsonProvider())); + BookStore bs = createJweJwsBookStore(address, hmacProvider, List.of()); Book book = bs.echoBook(new Book("book", 123L)); assertEquals("book", book.getName()); assertEquals(123L, book.getId()); @@ -314,8 +310,7 @@ public class JAXRSJweJwsTest extends AbstractBusClientServerTestBase { @Test public void testJwsJwkBookHMac() throws Exception { String address = "https://localhost:"; + PORT + "/jwsjwkhmac"; - BookStore bs = createJwsBookStore(address, - Collections.singletonList(new JacksonJsonProvider())); + BookStore bs = createJwsBookStore(address, List.of()); Book book = bs.echoBook(new Book("book", 123L)); assertEquals("book", book.getName()); assertEquals(123L, book.getId()); diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwejws/JAXRSJwsJsonTest.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwejws/JAXRSJwsJsonTest.java index ec2c3e1e7b..fff6ad2fc1 100644 --- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwejws/JAXRSJwsJsonTest.java +++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwejws/JAXRSJwsJsonTest.java @@ -31,8 +31,6 @@ import java.util.Map; import javax.ws.rs.BadRequestException; -import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider; - import org.apache.cxf.Bus; import org.apache.cxf.bus.spring.SpringBusFactory; import org.apache.cxf.jaxrs.client.JAXRSClientFactoryBean; @@ -98,7 +96,7 @@ public class JAXRSJwsJsonTest extends AbstractBusClientServerTestBase { String address = "https://localhost:"; + PORT + "/jwsjsonhmac"; BookStore bs = createBookStore(address, "org/apache/cxf/systest/jaxrs/security/secret.jwk.properties", - Collections.singletonList(new JacksonJsonProvider())); + List.of()); Book book = bs.echoBook(new Book("book", 123L)); assertEquals("book", book.getName()); assertEquals(123L, book.getId()); @@ -109,8 +107,7 @@ public class JAXRSJwsJsonTest extends AbstractBusClientServerTestBase { return; } String address = "https://localhost:"; + PORT + "/jwejwsjsonhmac"; - List<?> extraProviders = Arrays.asList(new JacksonJsonProvider(), - new JweWriterInterceptor(), + List<?> extraProviders = Arrays.asList(new JweWriterInterceptor(), new JweClientResponseFilter()); String jwkStoreProperty = "org/apache/cxf/systest/jaxrs/security/secret.jwk.properties"; Map<String, Object> props = new HashMap<>(); diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwejws/JweJwsAlgorithmTest.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwejws/JweJwsAlgorithmTest.java index bc4fd0cc3d..5596f92aed 100644 --- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwejws/JweJwsAlgorithmTest.java +++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwejws/JweJwsAlgorithmTest.java @@ -28,8 +28,6 @@ import java.util.Map; import javax.ws.rs.core.Response; -import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider; - import org.apache.cxf.jaxrs.client.WebClient; import org.apache.cxf.rs.security.jose.jaxrs.JweWriterInterceptor; import org.apache.cxf.rs.security.jose.jaxrs.JwsWriterInterceptor; @@ -79,7 +77,6 @@ public class JweJwsAlgorithmTest extends AbstractBusClientServerTestBase { URL busFile = JweJwsAlgorithmTest.class.getResource("client.xml"); List<Object> providers = new ArrayList<>(); - providers.add(new JacksonJsonProvider()); providers.add(new JweWriterInterceptor()); String address = "http://localhost:"; + PORT + "/jweoaepgcm/bookstore/books"; @@ -106,7 +103,6 @@ public class JweJwsAlgorithmTest extends AbstractBusClientServerTestBase { URL busFile = JweJwsAlgorithmTest.class.getResource("client.xml"); List<Object> providers = new ArrayList<>(); - providers.add(new JacksonJsonProvider()); providers.add(new JweWriterInterceptor()); String address = "http://localhost:"; + PORT + "/jweoaepgcm/bookstore/books"; @@ -136,7 +132,6 @@ public class JweJwsAlgorithmTest extends AbstractBusClientServerTestBase { URL busFile = JweJwsAlgorithmTest.class.getResource("client.xml"); List<Object> providers = new ArrayList<>(); - providers.add(new JacksonJsonProvider()); providers.add(new JweWriterInterceptor()); String address = "http://localhost:"; + PORT + "/jweoaepgcm/bookstore/books"; @@ -162,7 +157,6 @@ public class JweJwsAlgorithmTest extends AbstractBusClientServerTestBase { URL busFile = JweJwsAlgorithmTest.class.getResource("client.xml"); List<Object> providers = new ArrayList<>(); - providers.add(new JacksonJsonProvider()); providers.add(new JweWriterInterceptor()); String address = "http://localhost:"; + PORT + "/jweoaepgcm/bookstore/books"; @@ -192,7 +186,6 @@ public class JweJwsAlgorithmTest extends AbstractBusClientServerTestBase { URL busFile = JweJwsAlgorithmTest.class.getResource("client.xml"); List<Object> providers = new ArrayList<>(); - providers.add(new JacksonJsonProvider()); providers.add(new JweWriterInterceptor()); String address = "http://localhost:"; + PORT + "/jweoaepgcm/bookstore/books"; @@ -218,7 +211,6 @@ public class JweJwsAlgorithmTest extends AbstractBusClientServerTestBase { URL busFile = JweJwsAlgorithmTest.class.getResource("client.xml"); List<Object> providers = new ArrayList<>(); - providers.add(new JacksonJsonProvider()); providers.add(new JweWriterInterceptor()); String address = "http://localhost:"; + PORT + "/jweoaepgcm/bookstore/books"; @@ -244,7 +236,6 @@ public class JweJwsAlgorithmTest extends AbstractBusClientServerTestBase { URL busFile = JweJwsAlgorithmTest.class.getResource("client.xml"); List<Object> providers = new ArrayList<>(); - providers.add(new JacksonJsonProvider()); providers.add(new JweWriterInterceptor()); String address = "http://localhost:"; + PORT + "/jwesmallkey/bookstore/books"; @@ -271,12 +262,9 @@ public class JweJwsAlgorithmTest extends AbstractBusClientServerTestBase { URL busFile = JweJwsAlgorithmTest.class.getResource("client.xml"); - List<Object> providers = new ArrayList<>(); - providers.add(new JacksonJsonProvider()); - String address = "http://localhost:"; + PORT + "/jweoaepgcm/bookstore/books"; WebClient client = - WebClient.create(address, providers, busFile.toString()); + WebClient.create(address, List.of(), busFile.toString()); client.type("application/json").accept("application/json"); Map<String, Object> properties = new HashMap<>(); @@ -324,7 +312,6 @@ public class JweJwsAlgorithmTest extends AbstractBusClientServerTestBase { URL busFile = JweJwsAlgorithmTest.class.getResource("client.xml"); List<Object> providers = new ArrayList<>(); - providers.add(new JacksonJsonProvider()); providers.add(new JweWriterInterceptor()); String address = "http://localhost:"; + PORT + "/jwepbes/bookstore/books"; @@ -353,7 +340,6 @@ public class JweJwsAlgorithmTest extends AbstractBusClientServerTestBase { URL busFile = JweJwsAlgorithmTest.class.getResource("client.xml"); List<Object> providers = new ArrayList<>(); - providers.add(new JacksonJsonProvider()); providers.add(new JweWriterInterceptor()); String address = "http://localhost:"; + PORT + "/jwepbes/bookstore/books"; @@ -388,7 +374,6 @@ public class JweJwsAlgorithmTest extends AbstractBusClientServerTestBase { URL busFile = JweJwsAlgorithmTest.class.getResource("client.xml"); List<Object> providers = new ArrayList<>(); - providers.add(new JacksonJsonProvider()); providers.add(new JwsWriterInterceptor()); String address = "http://localhost:"; + PORT + "/jws/bookstore/books"; @@ -415,7 +400,6 @@ public class JweJwsAlgorithmTest extends AbstractBusClientServerTestBase { URL busFile = JweJwsAlgorithmTest.class.getResource("client.xml"); List<Object> providers = new ArrayList<>(); - providers.add(new JacksonJsonProvider()); providers.add(new JwsWriterInterceptor()); String address = "http://localhost:"; + PORT + "/jws/bookstore/books"; @@ -445,7 +429,6 @@ public class JweJwsAlgorithmTest extends AbstractBusClientServerTestBase { URL busFile = JweJwsAlgorithmTest.class.getResource("client.xml"); List<Object> providers = new ArrayList<>(); - providers.add(new JacksonJsonProvider()); providers.add(new JwsWriterInterceptor()); String address = "http://localhost:"; + PORT + "/jws/bookstore/books"; @@ -471,7 +454,6 @@ public class JweJwsAlgorithmTest extends AbstractBusClientServerTestBase { URL busFile = JweJwsAlgorithmTest.class.getResource("client.xml"); List<Object> providers = new ArrayList<>(); - providers.add(new JacksonJsonProvider()); providers.add(new JwsWriterInterceptor()); String address = "http://localhost:"; + PORT + "/jws/bookstore/books"; @@ -498,7 +480,6 @@ public class JweJwsAlgorithmTest extends AbstractBusClientServerTestBase { URL busFile = JweJwsAlgorithmTest.class.getResource("client.xml"); List<Object> providers = new ArrayList<>(); - providers.add(new JacksonJsonProvider()); providers.add(new JwsWriterInterceptor()); String address = "http://localhost:"; + PORT + "/jws/bookstore/books"; @@ -525,7 +506,6 @@ public class JweJwsAlgorithmTest extends AbstractBusClientServerTestBase { URL busFile = JweJwsAlgorithmTest.class.getResource("client.xml"); List<Object> providers = new ArrayList<>(); - providers.add(new JacksonJsonProvider()); providers.add(new JwsWriterInterceptor()); String address = "http://localhost:"; + PORT + "/jwsec/bookstore/books"; @@ -554,12 +534,9 @@ public class JweJwsAlgorithmTest extends AbstractBusClientServerTestBase { URL busFile = JweJwsAlgorithmTest.class.getResource("client.xml"); - List<Object> providers = new ArrayList<>(); - providers.add(new JacksonJsonProvider()); - String address = "http://localhost:"; + PORT + "/jws/bookstore/books"; WebClient client = - WebClient.create(address, providers, busFile.toString()); + WebClient.create(address, List.of(), busFile.toString()); client.type("application/json").accept("application/json"); Map<String, Object> properties = new HashMap<>(); @@ -602,7 +579,6 @@ public class JweJwsAlgorithmTest extends AbstractBusClientServerTestBase { URL busFile = JweJwsAlgorithmTest.class.getResource("client.xml"); List<Object> providers = new ArrayList<>(); - providers.add(new JacksonJsonProvider()); providers.add(new JwsWriterInterceptor()); String address = "http://localhost:"; + PORT + "/jwssmallkey/bookstore/books"; @@ -630,7 +606,6 @@ public class JweJwsAlgorithmTest extends AbstractBusClientServerTestBase { URL busFile = JweJwsAlgorithmTest.class.getResource("client.xml"); List<Object> providers = new ArrayList<>(); - providers.add(new JacksonJsonProvider()); JwsWriterInterceptor writerInterceptor = new JwsWriterInterceptor(); writerInterceptor.setSignatureProvider(new NoneJwsSignatureProvider()); providers.add(writerInterceptor); diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwejws/JweJwsReferenceTest.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwejws/JweJwsReferenceTest.java index bd7247b7e1..3906ecb36d 100644 --- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwejws/JweJwsReferenceTest.java +++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwejws/JweJwsReferenceTest.java @@ -28,8 +28,6 @@ import java.util.Map; import javax.ws.rs.core.Response; -import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider; - import org.apache.cxf.jaxrs.client.WebClient; import org.apache.cxf.rs.security.jose.jaxrs.JweWriterInterceptor; import org.apache.cxf.rs.security.jose.jaxrs.JwsWriterInterceptor; @@ -78,7 +76,6 @@ public class JweJwsReferenceTest extends AbstractBusClientServerTestBase { URL busFile = JweJwsReferenceTest.class.getResource("client.xml"); List<Object> providers = new ArrayList<>(); - providers.add(new JacksonJsonProvider()); providers.add(new JweWriterInterceptor()); String address = "http://localhost:"; + PORT + "/jweincludekey/bookstore/books"; @@ -105,7 +102,6 @@ public class JweJwsReferenceTest extends AbstractBusClientServerTestBase { URL busFile = JweJwsReferenceTest.class.getResource("client.xml"); List<Object> providers = new ArrayList<>(); - providers.add(new JacksonJsonProvider()); providers.add(new JweWriterInterceptor()); String address = "http://localhost:"; + PORT + "/jweincludecert/bookstore/books"; @@ -142,7 +138,6 @@ public class JweJwsReferenceTest extends AbstractBusClientServerTestBase { URL busFile = JweJwsReferenceTest.class.getResource("client.xml"); List<Object> providers = new ArrayList<>(); - providers.add(new JacksonJsonProvider()); providers.add(new JweWriterInterceptor()); String address = "http://localhost:"; + PORT + "/jweincludecert/bookstore/books"; @@ -172,7 +167,6 @@ public class JweJwsReferenceTest extends AbstractBusClientServerTestBase { URL busFile = JweJwsReferenceTest.class.getResource("client.xml"); List<Object> providers = new ArrayList<>(); - providers.add(new JacksonJsonProvider()); providers.add(new JweWriterInterceptor()); String address = "http://localhost:"; + PORT + "/jweincludecert/bookstore/books"; @@ -209,7 +203,6 @@ public class JweJwsReferenceTest extends AbstractBusClientServerTestBase { URL busFile = JweJwsReferenceTest.class.getResource("client.xml"); List<Object> providers = new ArrayList<>(); - providers.add(new JacksonJsonProvider()); providers.add(new JweWriterInterceptor()); String address = "http://localhost:"; + PORT + "/jweincludecert/bookstore/books"; @@ -243,7 +236,6 @@ public class JweJwsReferenceTest extends AbstractBusClientServerTestBase { URL busFile = JweJwsReferenceTest.class.getResource("client.xml"); List<Object> providers = new ArrayList<>(); - providers.add(new JacksonJsonProvider()); providers.add(new JwsWriterInterceptor()); String address = "http://localhost:"; + PORT + "/jwsincludecert/bookstore/books"; @@ -278,7 +270,6 @@ public class JweJwsReferenceTest extends AbstractBusClientServerTestBase { URL busFile = JweJwsReferenceTest.class.getResource("client.xml"); List<Object> providers = new ArrayList<>(); - providers.add(new JacksonJsonProvider()); providers.add(new JwsWriterInterceptor()); String address = "http://localhost:"; + PORT + "/jwsincludecert/bookstore/books"; @@ -306,7 +297,6 @@ public class JweJwsReferenceTest extends AbstractBusClientServerTestBase { URL busFile = JweJwsReferenceTest.class.getResource("client.xml"); List<Object> providers = new ArrayList<>(); - providers.add(new JacksonJsonProvider()); providers.add(new JwsWriterInterceptor()); String address = "http://localhost:"; + PORT + "/jwsincludecertsha1/bookstore/books"; @@ -342,7 +332,6 @@ public class JweJwsReferenceTest extends AbstractBusClientServerTestBase { URL busFile = JweJwsReferenceTest.class.getResource("client.xml"); List<Object> providers = new ArrayList<>(); - providers.add(new JacksonJsonProvider()); providers.add(new JwsWriterInterceptor()); String address = "http://localhost:"; + PORT + "/jwsincludecertsha1/bookstore/books"; diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwejws/JwsHTTPHeaderTest.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwejws/JwsHTTPHeaderTest.java index 8f74d4d2c7..bfc1c15ae3 100644 --- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwejws/JwsHTTPHeaderTest.java +++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwejws/JwsHTTPHeaderTest.java @@ -31,8 +31,6 @@ import java.util.Set; import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.Response; -import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider; - import org.apache.cxf.interceptor.Fault; import org.apache.cxf.jaxrs.client.WebClient; import org.apache.cxf.message.Message; @@ -66,7 +64,6 @@ public class JwsHTTPHeaderTest extends AbstractBusClientServerTestBase { URL busFile = JwsHTTPHeaderTest.class.getResource("client.xml"); List<Object> providers = new ArrayList<>(); - providers.add(new JacksonJsonProvider()); JwsWriterInterceptor jwsWriterInterceptor = new JwsWriterInterceptor(); providers.add(jwsWriterInterceptor); @@ -98,7 +95,6 @@ public class JwsHTTPHeaderTest extends AbstractBusClientServerTestBase { URL busFile = JwsHTTPHeaderTest.class.getResource("client.xml"); List<Object> providers = new ArrayList<>(); - providers.add(new JacksonJsonProvider()); JwsWriterInterceptor jwsWriterInterceptor = new JwsWriterInterceptor(); jwsWriterInterceptor.setProtectHttpHeaders(true); Set<String> headersToSign = new HashSet<>(); @@ -134,7 +130,6 @@ public class JwsHTTPHeaderTest extends AbstractBusClientServerTestBase { URL busFile = JwsHTTPHeaderTest.class.getResource("client.xml"); List<Object> providers = new ArrayList<>(); - providers.add(new JacksonJsonProvider()); JwsWriterInterceptor jwsWriterInterceptor = new JwsWriterInterceptor(); jwsWriterInterceptor.setProtectHttpHeaders(true); Set<String> headersToSign = new HashSet<>(); @@ -169,7 +164,6 @@ public class JwsHTTPHeaderTest extends AbstractBusClientServerTestBase { URL busFile = JwsHTTPHeaderTest.class.getResource("client.xml"); List<Object> providers = new ArrayList<>(); - providers.add(new JacksonJsonProvider()); JwsWriterInterceptor jwsWriterInterceptor = new JwsWriterInterceptor(); jwsWriterInterceptor.setProtectHttpHeaders(true); providers.add(jwsWriterInterceptor); @@ -209,7 +203,6 @@ public class JwsHTTPHeaderTest extends AbstractBusClientServerTestBase { URL busFile = JwsHTTPHeaderTest.class.getResource("client.xml"); List<Object> providers = new ArrayList<>(); - providers.add(new JacksonJsonProvider()); JwsWriterInterceptor jwsWriterInterceptor = new JwsWriterInterceptor(); jwsWriterInterceptor.setProtectHttpHeaders(true); Set<String> headersToSign = new HashSet<>(); diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwt/JWTAlgorithmTest.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwt/JWTAlgorithmTest.java index 690b8f4c49..37212f90db 100644 --- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwt/JWTAlgorithmTest.java +++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwt/JWTAlgorithmTest.java @@ -30,8 +30,6 @@ import java.util.Map; import javax.ws.rs.core.Response; -import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider; - import org.apache.cxf.jaxrs.client.WebClient; import org.apache.cxf.rs.security.jose.jaxrs.JwtAuthenticationClientFilter; import org.apache.cxf.rs.security.jose.jwt.JwtClaims; @@ -80,7 +78,6 @@ public class JWTAlgorithmTest extends AbstractBusClientServerTestBase { URL busFile = JWTAlgorithmTest.class.getResource("client.xml"); List<Object> providers = new ArrayList<>(); - providers.add(new JacksonJsonProvider()); JwtAuthenticationClientFilter clientFilter = new JwtAuthenticationClientFilter(); clientFilter.setJwsRequired(false); clientFilter.setJweRequired(true); @@ -120,7 +117,6 @@ public class JWTAlgorithmTest extends AbstractBusClientServerTestBase { URL busFile = JWTAlgorithmTest.class.getResource("client.xml"); List<Object> providers = new ArrayList<>(); - providers.add(new JacksonJsonProvider()); JwtAuthenticationClientFilter clientFilter = new JwtAuthenticationClientFilter(); clientFilter.setJwsRequired(false); clientFilter.setJweRequired(true); @@ -163,7 +159,6 @@ public class JWTAlgorithmTest extends AbstractBusClientServerTestBase { URL busFile = JWTAlgorithmTest.class.getResource("client.xml"); List<Object> providers = new ArrayList<>(); - providers.add(new JacksonJsonProvider()); JwtAuthenticationClientFilter clientFilter = new JwtAuthenticationClientFilter(); clientFilter.setJwsRequired(false); clientFilter.setJweRequired(true); @@ -205,7 +200,6 @@ public class JWTAlgorithmTest extends AbstractBusClientServerTestBase { URL busFile = JWTAlgorithmTest.class.getResource("client.xml"); List<Object> providers = new ArrayList<>(); - providers.add(new JacksonJsonProvider()); JwtAuthenticationClientFilter clientFilter = new JwtAuthenticationClientFilter(); clientFilter.setJwsRequired(false); clientFilter.setJweRequired(true); @@ -248,7 +242,6 @@ public class JWTAlgorithmTest extends AbstractBusClientServerTestBase { URL busFile = JWTAlgorithmTest.class.getResource("client.xml"); List<Object> providers = new ArrayList<>(); - providers.add(new JacksonJsonProvider()); JwtAuthenticationClientFilter clientFilter = new JwtAuthenticationClientFilter(); clientFilter.setJwsRequired(false); clientFilter.setJweRequired(true); @@ -291,7 +284,6 @@ public class JWTAlgorithmTest extends AbstractBusClientServerTestBase { URL busFile = JWTAlgorithmTest.class.getResource("client.xml"); List<Object> providers = new ArrayList<>(); - providers.add(new JacksonJsonProvider()); providers.add(new JwtAuthenticationClientFilter()); String address = "https://localhost:"; + PORT + "/signedjwt/bookstore/books"; @@ -328,7 +320,6 @@ public class JWTAlgorithmTest extends AbstractBusClientServerTestBase { URL busFile = JWTAlgorithmTest.class.getResource("client.xml"); List<Object> providers = new ArrayList<>(); - providers.add(new JacksonJsonProvider()); providers.add(new JwtAuthenticationClientFilter()); String address = "https://localhost:"; + PORT + "/signedjwt/bookstore/books"; @@ -368,7 +359,6 @@ public class JWTAlgorithmTest extends AbstractBusClientServerTestBase { URL busFile = JWTAlgorithmTest.class.getResource("client.xml"); List<Object> providers = new ArrayList<>(); - providers.add(new JacksonJsonProvider()); providers.add(new JwtAuthenticationClientFilter()); String address = "https://localhost:"; + PORT + "/signedjwt/bookstore/books"; @@ -404,7 +394,6 @@ public class JWTAlgorithmTest extends AbstractBusClientServerTestBase { URL busFile = JWTAlgorithmTest.class.getResource("client.xml"); List<Object> providers = new ArrayList<>(); - providers.add(new JacksonJsonProvider()); providers.add(new JwtAuthenticationClientFilter()); String address = "https://localhost:"; + PORT + "/signedjwt/bookstore/books"; @@ -441,7 +430,6 @@ public class JWTAlgorithmTest extends AbstractBusClientServerTestBase { URL busFile = JWTAlgorithmTest.class.getResource("client.xml"); List<Object> providers = new ArrayList<>(); - providers.add(new JacksonJsonProvider()); providers.add(new JwtAuthenticationClientFilter()); String address = "https://localhost:"; + PORT + "/signedjwtec/bookstore/books"; @@ -482,7 +470,6 @@ public class JWTAlgorithmTest extends AbstractBusClientServerTestBase { URL busFile = JWTAlgorithmTest.class.getResource("client.xml"); List<Object> providers = new ArrayList<>(); - providers.add(new JacksonJsonProvider()); providers.add(new JwtAuthenticationClientFilter()); String address = "https://localhost:"; + PORT + "/signedjwt/bookstore/books"; @@ -520,7 +507,6 @@ public class JWTAlgorithmTest extends AbstractBusClientServerTestBase { URL busFile = JWTAlgorithmTest.class.getResource("client.xml"); List<Object> providers = new ArrayList<>(); - providers.add(new JacksonJsonProvider()); providers.add(new JwtAuthenticationClientFilter()); String address = "https://localhost:"; + PORT + "/unsignedjwt/bookstore/books"; @@ -556,7 +542,6 @@ public class JWTAlgorithmTest extends AbstractBusClientServerTestBase { URL busFile = JWTAlgorithmTest.class.getResource("client.xml"); List<Object> providers = new ArrayList<>(); - providers.add(new JacksonJsonProvider()); providers.add(new JwtAuthenticationClientFilter()); String address = "https://localhost:"; + PORT + "/signedjwt/bookstore/books"; @@ -588,7 +573,6 @@ public class JWTAlgorithmTest extends AbstractBusClientServerTestBase { URL busFile = JWTAlgorithmTest.class.getResource("client.xml"); List<Object> providers = new ArrayList<>(); - providers.add(new JacksonJsonProvider()); JwtAuthenticationClientFilter clientFilter = new JwtAuthenticationClientFilter(); clientFilter.setJwsRequired(true); clientFilter.setJweRequired(true); @@ -631,7 +615,6 @@ public class JWTAlgorithmTest extends AbstractBusClientServerTestBase { URL busFile = JWTAlgorithmTest.class.getResource("client.xml"); List<Object> providers = new ArrayList<>(); - providers.add(new JacksonJsonProvider()); providers.add(new JwtAuthenticationClientFilter()); String address = "https://localhost:"; + PORT + "/signedjwtincludecert/bookstore/books"; @@ -674,7 +657,6 @@ public class JWTAlgorithmTest extends AbstractBusClientServerTestBase { URL busFile = JWTAlgorithmTest.class.getResource("client.xml"); List<Object> providers = new ArrayList<>(); - providers.add(new JacksonJsonProvider()); providers.add(new JwtAuthenticationClientFilter()); String address = "https://localhost:"; + PORT + "/signedjwtincludecert/bookstore/books"; @@ -712,7 +694,6 @@ public class JWTAlgorithmTest extends AbstractBusClientServerTestBase { URL busFile = JWTAlgorithmTest.class.getResource("client.xml"); List<Object> providers = new ArrayList<>(); - providers.add(new JacksonJsonProvider()); providers.add(new JwtAuthenticationClientFilter()); String address = "https://localhost:"; + PORT + "/hmacsignedjwt/bookstore/books"; @@ -751,7 +732,6 @@ public class JWTAlgorithmTest extends AbstractBusClientServerTestBase { URL busFile = JWTAlgorithmTest.class.getResource("client.xml"); List<Object> providers = new ArrayList<>(); - providers.add(new JacksonJsonProvider()); providers.add(new JwtAuthenticationClientFilter()); String address = "https://localhost:"; + PORT + "/hmacsignedjwt/bookstore/books"; diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwt/JWTAuthnAuthzTest.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwt/JWTAuthnAuthzTest.java index 82c05d1ce5..34479e1886 100644 --- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwt/JWTAuthnAuthzTest.java +++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwt/JWTAuthnAuthzTest.java @@ -30,8 +30,6 @@ import java.util.Map; import javax.ws.rs.core.Response; -import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider; - import org.apache.cxf.jaxrs.client.WebClient; import org.apache.cxf.rs.security.jose.jaxrs.JwtAuthenticationClientFilter; import org.apache.cxf.rs.security.jose.jwt.JwtClaims; @@ -64,7 +62,6 @@ public class JWTAuthnAuthzTest extends AbstractBusClientServerTestBase { URL busFile = JWTAuthnAuthzTest.class.getResource("client.xml"); List<Object> providers = new ArrayList<>(); - providers.add(new JacksonJsonProvider()); providers.add(new JwtAuthenticationClientFilter()); String address = "https://localhost:"; + PORT + "/signedjwt/bookstore/books"; @@ -104,7 +101,6 @@ public class JWTAuthnAuthzTest extends AbstractBusClientServerTestBase { URL busFile = JWTAuthnAuthzTest.class.getResource("client.xml"); List<Object> providers = new ArrayList<>(); - providers.add(new JacksonJsonProvider()); providers.add(new JwtAuthenticationClientFilter()); String address = "https://localhost:"; + PORT + "/signedjwt/bookstore/books"; @@ -141,7 +137,6 @@ public class JWTAuthnAuthzTest extends AbstractBusClientServerTestBase { URL busFile = JWTAuthnAuthzTest.class.getResource("client.xml"); List<Object> providers = new ArrayList<>(); - providers.add(new JacksonJsonProvider()); providers.add(new JwtAuthenticationClientFilter()); String address = "https://localhost:"; + PORT + "/signedjwtauthz/bookstore/books"; @@ -183,7 +178,6 @@ public class JWTAuthnAuthzTest extends AbstractBusClientServerTestBase { URL busFile = JWTAuthnAuthzTest.class.getResource("client.xml"); List<Object> providers = new ArrayList<>(); - providers.add(new JacksonJsonProvider()); providers.add(new JwtAuthenticationClientFilter()); String address = "https://localhost:"; + PORT + "/signedjwtauthz/bookstore/books"; @@ -225,7 +219,6 @@ public class JWTAuthnAuthzTest extends AbstractBusClientServerTestBase { URL busFile = JWTAuthnAuthzTest.class.getResource("client.xml"); List<Object> providers = new ArrayList<>(); - providers.add(new JacksonJsonProvider()); providers.add(new JwtAuthenticationClientFilter()); String address = "https://localhost:"; + PORT + "/signedjwtauthz/bookstore/books"; @@ -267,7 +260,6 @@ public class JWTAuthnAuthzTest extends AbstractBusClientServerTestBase { URL busFile = JWTAuthnAuthzTest.class.getResource("client.xml"); List<Object> providers = new ArrayList<>(); - providers.add(new JacksonJsonProvider()); providers.add(new JwtAuthenticationClientFilter()); String address = "https://localhost:"; + PORT + "/signedjwtauthz/bookstore/books"; @@ -303,7 +295,6 @@ public class JWTAuthnAuthzTest extends AbstractBusClientServerTestBase { URL busFile = JWTAuthnAuthzTest.class.getResource("client.xml"); List<Object> providers = new ArrayList<>(); - providers.add(new JacksonJsonProvider()); providers.add(new JwtAuthenticationClientFilter()); String address = "https://localhost:"; + PORT + "/signedjwtauthz/bookstore/books"; @@ -340,7 +331,6 @@ public class JWTAuthnAuthzTest extends AbstractBusClientServerTestBase { URL busFile = JWTAuthnAuthzTest.class.getResource("client.xml"); List<Object> providers = new ArrayList<>(); - providers.add(new JacksonJsonProvider()); providers.add(new JwtAuthenticationClientFilter()); String address = "https://localhost:"; + PORT + "/signedjwtauthzannotations/bookstore/booksrolesallowed"; @@ -382,7 +372,6 @@ public class JWTAuthnAuthzTest extends AbstractBusClientServerTestBase { URL busFile = JWTAuthnAuthzTest.class.getResource("client.xml"); List<Object> providers = new ArrayList<>(); - providers.add(new JacksonJsonProvider()); providers.add(new JwtAuthenticationClientFilter()); String address = "https://localhost:"; + PORT + "/signedjwtauthzannotations/bookstore/booksrolesallowed"; @@ -424,7 +413,6 @@ public class JWTAuthnAuthzTest extends AbstractBusClientServerTestBase { URL busFile = JWTAuthnAuthzTest.class.getResource("client.xml"); List<Object> providers = new ArrayList<>(); - providers.add(new JacksonJsonProvider()); providers.add(new JwtAuthenticationClientFilter()); String address = "https://localhost:"; + PORT + "/signedjwtauthzannotations/bookstore/booksrolesallowed"; @@ -462,7 +450,6 @@ public class JWTAuthnAuthzTest extends AbstractBusClientServerTestBase { URL busFile = JWTAuthnAuthzTest.class.getResource("client.xml"); List<Object> providers = new ArrayList<>(); - providers.add(new JacksonJsonProvider()); providers.add(new JwtAuthenticationClientFilter()); String address = "https://localhost:"; + PORT + "/signedjwtauthzannotations/bookstore/booksrolesallowed"; @@ -500,7 +487,6 @@ public class JWTAuthnAuthzTest extends AbstractBusClientServerTestBase { URL busFile = JWTAuthnAuthzTest.class.getResource("client.xml"); List<Object> providers = new ArrayList<>(); - providers.add(new JacksonJsonProvider()); providers.add(new JwtAuthenticationClientFilter()); String address = "https://localhost:"; + PORT + "/signedjwtauthzannotations/bookstore/booksrolesallowed"; @@ -538,7 +524,6 @@ public class JWTAuthnAuthzTest extends AbstractBusClientServerTestBase { URL busFile = JWTAuthnAuthzTest.class.getResource("client.xml"); List<Object> providers = new ArrayList<>(); - providers.add(new JacksonJsonProvider()); providers.add(new JwtAuthenticationClientFilter()); String address = "https://localhost:"; + PORT + "/signedjwtauthzannotations/bookstore/booksrolesallowed"; @@ -576,7 +561,6 @@ public class JWTAuthnAuthzTest extends AbstractBusClientServerTestBase { URL busFile = JWTAuthnAuthzTest.class.getResource("client.xml"); List<Object> providers = new ArrayList<>(); - providers.add(new JacksonJsonProvider()); providers.add(new JwtAuthenticationClientFilter()); String address = "https://localhost:"; + PORT + "/signedjwtauthz/bookstore/booksclaims"; @@ -620,7 +604,6 @@ public class JWTAuthnAuthzTest extends AbstractBusClientServerTestBase { URL busFile = JWTAuthnAuthzTest.class.getResource("client.xml"); List<Object> providers = new ArrayList<>(); - providers.add(new JacksonJsonProvider()); providers.add(new JwtAuthenticationClientFilter()); String address = "https://localhost:"; + PORT + "/signedjwtauthz/bookstore/booksclaims"; @@ -659,7 +642,6 @@ public class JWTAuthnAuthzTest extends AbstractBusClientServerTestBase { URL busFile = JWTAuthnAuthzTest.class.getResource("client.xml"); List<Object> providers = new ArrayList<>(); - providers.add(new JacksonJsonProvider()); providers.add(new JwtAuthenticationClientFilter()); String address = "https://localhost:"; + PORT + "/signedjwtauthz/bookstore/booksclaims"; diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwt/JWTPropertiesTest.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwt/JWTPropertiesTest.java index b5f7d0c5e7..fa1f7e88f3 100644 --- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwt/JWTPropertiesTest.java +++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/jose/jwt/JWTPropertiesTest.java @@ -30,8 +30,6 @@ import java.util.Map; import javax.ws.rs.core.Response; -import com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider; - import org.apache.cxf.jaxrs.client.WebClient; import org.apache.cxf.rs.security.jose.jaxrs.JwtAuthenticationClientFilter; import org.apache.cxf.rs.security.jose.jwt.JwtClaims; @@ -64,7 +62,6 @@ public class JWTPropertiesTest extends AbstractBusClientServerTestBase { URL busFile = JWTPropertiesTest.class.getResource("client.xml"); List<Object> providers = new ArrayList<>(); - providers.add(new JacksonJsonProvider()); providers.add(new JwtAuthenticationClientFilter()); String address = "https://localhost:"; + PORT + "/unsignedjwt/bookstore/books"; @@ -100,7 +97,6 @@ public class JWTPropertiesTest extends AbstractBusClientServerTestBase { URL busFile = JWTPropertiesTest.class.getResource("client.xml"); List<Object> providers = new ArrayList<>(); - providers.add(new JacksonJsonProvider()); providers.add(new JwtAuthenticationClientFilter()); String address = "https://localhost:"; + PORT + "/unsignedjwt/bookstore/books"; @@ -135,7 +131,6 @@ public class JWTPropertiesTest extends AbstractBusClientServerTestBase { URL busFile = JWTPropertiesTest.class.getResource("client.xml"); List<Object> providers = new ArrayList<>(); - providers.add(new JacksonJsonProvider()); providers.add(new JwtAuthenticationClientFilter()); String address = "https://localhost:"; + PORT + "/unsignedjwt/bookstore/books"; @@ -170,7 +165,6 @@ public class JWTPropertiesTest extends AbstractBusClientServerTestBase { URL busFile = JWTPropertiesTest.class.getResource("client.xml"); List<Object> providers = new ArrayList<>(); - providers.add(new JacksonJsonProvider()); providers.add(new JwtAuthenticationClientFilter()); String address = "https://localhost:"; + PORT + "/unsignedjwtnearfuture/bookstore/books"; @@ -205,7 +199,6 @@ public class JWTPropertiesTest extends AbstractBusClientServerTestBase { URL busFile = JWTPropertiesTest.class.getResource("client.xml"); List<Object> providers = new ArrayList<>(); - providers.add(new JacksonJsonProvider()); providers.add(new JwtAuthenticationClientFilter()); String address = "https://localhost:"; + PORT + "/unsignedjwt/bookstore/books"; @@ -241,7 +234,6 @@ public class JWTPropertiesTest extends AbstractBusClientServerTestBase { URL busFile = JWTPropertiesTest.class.getResource("client.xml"); List<Object> providers = new ArrayList<>(); - providers.add(new JacksonJsonProvider()); providers.add(new JwtAuthenticationClientFilter()); String address = "https://localhost:"; + PORT + "/unsignedjwtnearfuture/bookstore/books"; @@ -277,7 +269,6 @@ public class JWTPropertiesTest extends AbstractBusClientServerTestBase { URL busFile = JWTPropertiesTest.class.getResource("client.xml"); List<Object> providers = new ArrayList<>(); - providers.add(new JacksonJsonProvider()); providers.add(new JwtAuthenticationClientFilter()); String address = "https://localhost:"; + PORT + "/unsignedjwt/bookstore/books"; @@ -308,7 +299,6 @@ public class JWTPropertiesTest extends AbstractBusClientServerTestBase { URL busFile = JWTPropertiesTest.class.getResource("client.xml"); List<Object> providers = new ArrayList<>(); - providers.add(new JacksonJsonProvider()); providers.add(new JwtAuthenticationClientFilter()); String address = "https://localhost:"; + PORT + "/unsignedjwt/bookstore/books"; @@ -340,7 +330,6 @@ public class JWTPropertiesTest extends AbstractBusClientServerTestBase { URL busFile = JWTPropertiesTest.class.getResource("client.xml"); List<Object> providers = new ArrayList<>(); - providers.add(new JacksonJsonProvider()); providers.add(new JwtAuthenticationClientFilter()); String address = "https://localhost:"; + PORT + "/unsignedjwt/bookstore/books"; @@ -370,7 +359,6 @@ public class JWTPropertiesTest extends AbstractBusClientServerTestBase { URL busFile = JWTPropertiesTest.class.getResource("client.xml"); List<Object> providers = new ArrayList<>(); - providers.add(new JacksonJsonProvider()); providers.add(new JwtAuthenticationClientFilter()); String address = "https://localhost:"; + PORT + "/unsignedjwt/bookstore/books"; diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwejws/server.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwejws/server.xml index a8a1e8bac5..425e817776 100644 --- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwejws/server.xml +++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwejws/server.xml @@ -163,7 +163,6 @@ under the License. <entry key="rs.security.decryption.key.password.provider" value-ref="keyPasswordProvider"/> </jaxrs:properties> </jaxrs:server> - <bean id="jackson" class="com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider"/> <jaxrs:server address="https://localhost:${testutil.ports.jaxrs-jwt}/jwejwkrsa";> <jaxrs:serviceBeans> <ref bean="serviceBean"/> @@ -171,7 +170,6 @@ under the License. <jaxrs:providers> <ref bean="jweInFilter"/> <ref bean="jweOutFilter"/> - <ref bean="jackson"/> </jaxrs:providers> <jaxrs:properties> <entry key="rs.security.encryption.in.properties" value="org/apache/cxf/systest/jaxrs/security/alice.jwk.properties"/> @@ -212,7 +210,6 @@ under the License. <ref bean="jweOutFilter"/> <ref bean="jwsHmacInFilter"/> <ref bean="jwsOutFilter"/> - <ref bean="jackson"/> </jaxrs:providers> <jaxrs:properties> <entry key="rs.security.encryption.in.properties" value="org/apache/cxf/systest/jaxrs/security/alice.rs.properties"/> @@ -229,7 +226,6 @@ under the License. <jaxrs:providers> <ref bean="jwsInFilter"/> <ref bean="jwsOutFilter"/> - <ref bean="jackson"/> </jaxrs:providers> <jaxrs:properties> <entry key="rs.security.signature.properties" value="org/apache/cxf/systest/jaxrs/security/secret.jwk.properties"/> @@ -243,7 +239,6 @@ under the License. <ref bean="jwsInFilterHttpHeaders"/> <ref bean="httpHeaderFilter"/> <ref bean="jwsOutFilter"/> - <ref bean="jackson"/> </jaxrs:providers> <jaxrs:properties> <entry key="rs.security.signature.properties" value="org/apache/cxf/systest/jaxrs/security/secret.jwk.properties"/> diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwejws/serverJwsJson.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwejws/serverJwsJson.xml index a6f1998b48..1313eb84ce 100644 --- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwejws/serverJwsJson.xml +++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/jose/jwejws/serverJwsJson.xml @@ -48,7 +48,6 @@ under the License. <bean id="serviceBean" class="org.apache.cxf.systest.jaxrs.security.jose.BookStore"/> <bean id="jwsInFilter" class="org.apache.cxf.rs.security.jose.jaxrs.JwsJsonContainerRequestFilter"/> <bean id="jwsOutFilter" class="org.apache.cxf.rs.security.jose.jaxrs.JwsJsonWriterInterceptor"/> - <bean id="jackson" class="com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider"/> <jaxrs:server address="https://localhost:${testutil.ports.jaxrs-jws-json}/jwsjsonhmac";> <jaxrs:serviceBeans> <ref bean="serviceBean"/> @@ -56,7 +55,6 @@ under the License. <jaxrs:providers> <ref bean="jwsInFilter"/> <ref bean="jwsOutFilter"/> - <ref bean="jackson"/> </jaxrs:providers> <jaxrs:properties> <entry key="rs.security.signature.properties" value="org/apache/cxf/systest/jaxrs/security/secret.jwk.properties"/> @@ -73,7 +71,6 @@ under the License. <ref bean="jwsOutFilter"/> <ref bean="jweInFilter"/> <ref bean="jweOutFilter"/> - <ref bean="jackson"/> </jaxrs:providers> <jaxrs:properties> <entry key="rs.security.signature.properties" value="org/apache/cxf/systest/jaxrs/security/secret.jwk.properties"/>
