JAVA-2396: Support Protocol V6 (apache#1546)

emerkle826 · adutra · web-flow · commit 9f4939c58b90 · 2021-04-28T10:27:38.000+02:00
Co-authored-by: Alexandre Dutra &lt;adutra@users.noreply.github.com&gt;
diff --git a/changelog/README.md b/changelog/README.md
@@ -2,8 +2,9 @@
 
 <!-- Note: contrary to 3.x, insert new entries *first* in their section -->
 
-### 4.12.0 (in progress)
+### 4.11.1
 
+- [bug] JAVA-2936: Support Protocol V6
 - [bug] JAVA-2934: Handle empty non-final pages in ReactiveResultSetSubscription
 
 ### 4.11.0
diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/context/DefaultDriverContext.java b/core/src/main/java/com/datastax/oss/driver/internal/core/context/DefaultDriverContext.java
@@ -91,6 +91,7 @@
 import com.datastax.oss.protocol.internal.PrimitiveCodec;
 import com.datastax.oss.protocol.internal.ProtocolV3ClientCodecs;
 import com.datastax.oss.protocol.internal.ProtocolV5ClientCodecs;
+import com.datastax.oss.protocol.internal.ProtocolV6ClientCodecs;
 import com.datastax.oss.protocol.internal.SegmentCodec;
 import edu.umd.cs.findbugs.annotations.NonNull;
 import edu.umd.cs.findbugs.annotations.Nullable;
@@ -435,6 +436,7 @@ protected FrameCodec<ByteBuf> buildFrameCodec() {
         new ProtocolV3ClientCodecs(),
         new ProtocolV4ClientCodecsForDse(),
         new ProtocolV5ClientCodecs(),
+        new ProtocolV6ClientCodecs(),
         new DseProtocolV1ClientCodecs(),
         new DseProtocolV2ClientCodecs());
   }
