From f1e2c19ceec3e7265d7f2ac83cc29f0c6ca4b4a6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 22 Jun 2023 11:47:23 +1200
Subject: [PATCH 1/2] build(deps): bump netty.version from 4.1.93.Final to
 4.1.94.Final (#2096)

Bumps `netty.version` from 4.1.93.Final to 4.1.94.Final.

Updates `netty-bom` from 4.1.93.Final to 4.1.94.Final
- [Commits](https://github.com/netty/netty/compare/netty-4.1.93.Final...netty-4.1.94.Final)

Updates `netty-handler` from 4.1.93.Final to 4.1.94.Final
- [Commits](https://github.com/netty/netty/compare/netty-4.1.93.Final...netty-4.1.94.Final)

Updates `netty-codec-http` from 4.1.93.Final to 4.1.94.Final
- [Commits](https://github.com/netty/netty/compare/netty-4.1.93.Final...netty-4.1.94.Final)

---
updated-dependencies:
- dependency-name: io.netty:netty-bom
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: io.netty:netty-handler
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: io.netty:netty-codec-http
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 benchmark/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/benchmark/pom.xml b/benchmark/pom.xml
index 632ee0b53..a94c02817 100644
--- a/benchmark/pom.xml
+++ b/benchmark/pom.xml
@@ -30,7 +30,7 @@
     <jmh.version>1.36</jmh.version>
     <rx.netty.version>0.5.3</rx.netty.version>
     <rx.java.version>1.3.8</rx.java.version>
-    <netty.version>4.1.93.Final</netty.version>
+    <netty.version>4.1.94.Final</netty.version>
     <main.basedir>${project.basedir}/..</main.basedir>
 
     <moditect.skip>true</moditect.skip>

From e4d2bed76b56e65e234aa9280c93cddee7be9c20 Mon Sep 17 00:00:00 2001
From: Vitalij Berdinskih <vitalij_r2@outlook.com>
Date: Thu, 22 Jun 2023 02:48:24 +0300
Subject: [PATCH 2/2] The HTTP protocol version: it misses in
 AsyncApacheHttp5Client's response and hardcoded in Request.toString() (#2097)

* Missed the HTTP protocol version in HC5. The hardcoded protocol version in Request.toString()

* Fix formatting
---
 core/src/main/java/feign/Request.java                   | 3 ++-
 hc5/src/main/java/feign/hc5/AsyncApacheHttp5Client.java | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/feign/Request.java b/core/src/main/java/feign/Request.java
index 73c797d83..1e590a486 100644
--- a/core/src/main/java/feign/Request.java
+++ b/core/src/main/java/feign/Request.java
@@ -276,7 +276,8 @@ public ProtocolVersion protocolVersion() {
   @Override
   public String toString() {
     final StringBuilder builder = new StringBuilder();
-    builder.append(httpMethod).append(' ').append(url).append(" HTTP/1.1\n");
+    builder.append(httpMethod).append(' ').append(url).append(' ').append(protocolVersion)
+        .append('\n');
     for (final String field : headers.keySet()) {
       for (final String value : valuesOrEmpty(headers, field)) {
         builder.append(field).append(": ").append(value).append('\n');
diff --git a/hc5/src/main/java/feign/hc5/AsyncApacheHttp5Client.java b/hc5/src/main/java/feign/hc5/AsyncApacheHttp5Client.java
index d1dfbb2a8..09c89887e 100644
--- a/hc5/src/main/java/feign/hc5/AsyncApacheHttp5Client.java
+++ b/hc5/src/main/java/feign/hc5/AsyncApacheHttp5Client.java
@@ -28,6 +28,7 @@
 import java.util.concurrent.CompletableFuture;
 import feign.*;
 import feign.Request.Options;
+import static feign.Util.enumForName;
 
 /**
  * This module directs Feign's http requests to Apache's
@@ -179,6 +180,8 @@ Response toFeignResponse(SimpleHttpResponse httpResponse, Request request) {
     }
 
     return Response.builder()
+        .protocolVersion(
+            enumForName(Request.ProtocolVersion.class, httpResponse.getVersion().format()))
         .status(statusCode)
         .reason(reason)
         .headers(headers)