From 762bacbc03e460773da50c67a23751b8d1421bd1 Mon Sep 17 00:00:00 2001
From: Tim Brooks <tim@uncontended.net>
Date: Mon, 19 Mar 2018 12:08:13 -0400
Subject: [PATCH] Update start_trial version compatibility
 (elastic/x-pack-elasticsearch#4122)

This is related to elastic/x-pack-elasticsearch#3877. With the backport of elastic/x-pack-elasticsearch#4102 the type
parameter for start_trial is now on 6.3. This commit updates the
version check during stream serialization / deserialization.

Original commit: elastic/x-pack-elasticsearch@75e8537ab6d0cf71b52cd800333df1e01a193091
---
 .../org/elasticsearch/license/PostStartTrialRequest.java    | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/plugin/core/src/main/java/org/elasticsearch/license/PostStartTrialRequest.java b/plugin/core/src/main/java/org/elasticsearch/license/PostStartTrialRequest.java
index 5174281e8a4..882db4d622a 100644
--- a/plugin/core/src/main/java/org/elasticsearch/license/PostStartTrialRequest.java
+++ b/plugin/core/src/main/java/org/elasticsearch/license/PostStartTrialRequest.java
@@ -34,8 +34,7 @@ public class PostStartTrialRequest extends MasterNodeRequest<PostStartTrialReque
     @Override
     public void readFrom(StreamInput in) throws IOException {
         super.readFrom(in);
-        // TODO: Change to 6.3 after backport
-        if (in.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) {
+        if (in.getVersion().onOrAfter(Version.V_6_3_0)) {
             type = in.readString();
         } else {
             type = "trial";
@@ -45,8 +44,7 @@ public class PostStartTrialRequest extends MasterNodeRequest<PostStartTrialReque
     @Override
     public void writeTo(StreamOutput out) throws IOException {
         super.writeTo(out);
-        // TODO: Change to 6.3 after backport
-        Version version = Version.V_7_0_0_alpha1;
+        Version version = Version.V_6_3_0;
         if (out.getVersion().onOrAfter(version)) {
             out.writeString(type);
         } else {