This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/main by this push:
new 2bf0e78c1b6 Update Apache HttpClient5 to 5.6 and HttpCore5 to 5.4
(#2812)
2bf0e78c1b6 is described below
commit 2bf0e78c1b6b754cdbbcb07a0adfada4ae49ed0c
Author: Andriy Redko <[email protected]>
AuthorDate: Thu Jan 8 09:57:29 2026 -0500
Update Apache HttpClient5 to 5.6 and HttpCore5 to 5.4 (#2812)
---
parent/pom.xml | 4 ++--
.../org/apache/cxf/systest/hc5/jaxrs/BookServerAsyncClient.java | 8 +++++++-
.../src/test/java/org/apache/cxf/systest/hc5/jaxrs/BookStore.java | 2 --
3 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 4efafe6c41c..420ec132d31 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -128,8 +128,8 @@
<cxf.httpcomponents.client.version>4.5.14</cxf.httpcomponents.client.version>
<cxf.httpcomponents.core.version.range>[4.3,4.5.0)</cxf.httpcomponents.core.version.range>
<cxf.httpcomponents.core.version>4.4.16</cxf.httpcomponents.core.version>
-
<cxf.httpcomponents.client5.version>5.5.1</cxf.httpcomponents.client5.version>
-
<cxf.httpcomponents.core5.version>5.3.6</cxf.httpcomponents.core5.version>
+
<cxf.httpcomponents.client5.version>5.6</cxf.httpcomponents.client5.version>
+
<cxf.httpcomponents.core5.version>5.4</cxf.httpcomponents.core5.version>
<cxf.jackson.version>3.0.3</cxf.jackson.version>
<cxf.jackson.databind.version>3.0.3</cxf.jackson.databind.version>
<cxf.jackson.annotations.version>2.20</cxf.jackson.annotations.version>
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.InputStream;
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.JAXRSServerFactoryBean;
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 @@ public class BookServerAsyncClient extends
AbstractServerTestServerBase {
sf.setProvider(new JacksonJsonProvider());
sf.setProvider(new StreamingResponseProvider<Book>());
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;
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.message.Message;
import org.apache.cxf.phase.PhaseInterceptorChain;
@Path("/bookstore")
-@GZIP(threshold = 1)
public class BookStore {
private Map<Long, Book> books = new HashMap<>();