diff --git a/parent/pom.xml b/parent/pom.xml index e063ed23205..f528d4a2ab1 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -128,8 +128,8 @@ 4.5.14 [4.3,4.5.0) 4.4.16 - 5.5.1 - 5.3.6 + 5.6 + 5.4 3.0.3 3.0.3 2.20 diff --git a/systests/transport-hc5/src/test/java/org/apache/cxf/systest/hc5/jaxrs/BookServerAsyncClient.java b/systests/transport-hc5/src/test/java/org/apache/cxf/systest/hc5/jaxrs/BookServerAsyncClient.java index 1420af446e9..4a30fdb6b15 100644 --- a/systests/transport-hc5/src/test/java/org/apache/cxf/systest/hc5/jaxrs/BookServerAsyncClient.java +++ b/systests/transport-hc5/src/test/java/org/apache/cxf/systest/hc5/jaxrs/BookServerAsyncClient.java @@ -24,6 +24,7 @@ import java.io.OutputStream; import java.lang.annotation.Annotation; import java.lang.reflect.Type; +import java.util.List; import jakarta.ws.rs.Consumes; import jakarta.ws.rs.Produces; @@ -39,6 +40,7 @@ import org.apache.cxf.jaxrs.lifecycle.SingletonResourceProvider; import org.apache.cxf.jaxrs.provider.StreamingResponseProvider; import org.apache.cxf.testutil.common.AbstractServerTestServerBase; +import org.apache.cxf.transport.common.gzip.GZIPFeature; import tools.jackson.jakarta.rs.json.JacksonJsonProvider; public class BookServerAsyncClient extends AbstractServerTestServerBase { @@ -46,7 +48,10 @@ public class BookServerAsyncClient extends AbstractServerTestServerBase { @Override protected Server createServer(Bus bus) throws Exception { - JAXRSServerFactoryBean sf = new JAXRSServerFactoryBean(); + final GZIPFeature gzipFeature = new GZIPFeature(); + gzipFeature.setThreshold(1); + + final JAXRSServerFactoryBean sf = new JAXRSServerFactoryBean(); sf.setResourceClasses(BookStore.class); sf.setResourceProvider(BookStore.class, new SingletonResourceProvider(new BookStore(), true)); @@ -55,6 +60,7 @@ protected Server createServer(Bus bus) throws Exception { sf.setProvider(new JacksonJsonProvider()); sf.setProvider(new StreamingResponseProvider()); sf.getProperties(true).put("default.content.type", "*/*"); + sf.setFeatures(List.of(gzipFeature)); return sf.create(); } diff --git a/systests/transport-hc5/src/test/java/org/apache/cxf/systest/hc5/jaxrs/BookStore.java b/systests/transport-hc5/src/test/java/org/apache/cxf/systest/hc5/jaxrs/BookStore.java index abbd42acacc..c9dffd6cc8c 100644 --- a/systests/transport-hc5/src/test/java/org/apache/cxf/systest/hc5/jaxrs/BookStore.java +++ b/systests/transport-hc5/src/test/java/org/apache/cxf/systest/hc5/jaxrs/BookStore.java @@ -41,7 +41,6 @@ import jakarta.ws.rs.core.Response.Status; import jakarta.ws.rs.core.StreamingOutput; import jakarta.ws.rs.core.UriInfo; -import org.apache.cxf.annotations.GZIP; import org.apache.cxf.jaxrs.ext.MessageContext; import org.apache.cxf.jaxrs.ext.Oneway; import org.apache.cxf.jaxrs.ext.PATCH; @@ -51,7 +50,6 @@ import org.apache.cxf.phase.PhaseInterceptorChain; @Path("/bookstore") -@GZIP(threshold = 1) public class BookStore { private Map books = new HashMap<>();