Bump BWC version for settings serialization to 6.1.0

Author: s1monw

core/src/main/java/org/elasticsearch/common/settings/Settings.java

@@ -545,7 +545,7 @@ public int hashCode() {
     public static Settings readSettingsFromStream(StreamInput in) throws IOException {
         Builder builder = new Builder();
         int numberOfSettings = in.readVInt();
-        if (in.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) {
+        if (in.getVersion().onOrAfter(Version.V_6_1_0)) {
             for (int i = 0; i < numberOfSettings; i++) {
                 String key = in.readString();
                 Object value = in.readGenericValue();
@@ -570,7 +570,7 @@ public static Settings readSettingsFromStream(StreamInput in) throws IOException
     public static void writeSettingsToStream(Settings settings, StreamOutput out) throws IOException {
         // pull settings to exclude secure settings in size()
         Set<Map.Entry<String, Object>> entries = settings.settings.entrySet();
-        if (out.getVersion().onOrAfter(Version.V_7_0_0_alpha1)) {
+        if (out.getVersion().onOrAfter(Version.V_6_1_0)) {
             out.writeVInt(entries.size());
             for (Map.Entry<String, Object> entry : entries) {
                 out.writeString(entry.getKey());

core/src/test/java/org/elasticsearch/common/settings/SettingsTests.java

@@ -648,7 +648,7 @@ public void testMissingValue() throws Exception {
 
     public void testReadLegacyFromStream() throws IOException {
         BytesStreamOutput output = new BytesStreamOutput();
-        output.setVersion(VersionUtils.getPreviousVersion(Version.CURRENT));
+        output.setVersion(VersionUtils.getPreviousVersion(Version.V_6_1_0));
         output.writeVInt(5);
         output.writeString("foo.bar.1");
         output.writeOptionalString("1");
@@ -661,7 +661,7 @@ public void testReadLegacyFromStream() throws IOException {
         output.writeString("foo.bar.baz");
         output.writeOptionalString("baz");
         StreamInput in = StreamInput.wrap(BytesReference.toBytes(output.bytes()));
-        in.setVersion(VersionUtils.getPreviousVersion(Version.CURRENT));
+        in.setVersion(VersionUtils.getPreviousVersion(Version.V_6_1_0));
         Settings settings = Settings.readSettingsFromStream(in);
         assertEquals(2, settings.size());
         assertArrayEquals(new String[]{"0", "1", "2", "3"}, settings.getAsArray("foo.bar"));
@@ -670,7 +670,7 @@ public void testReadLegacyFromStream() throws IOException {
 
     public void testWriteLegacyOutput() throws IOException {
         BytesStreamOutput output = new BytesStreamOutput();
-        output.setVersion(VersionUtils.getPreviousVersion(Version.CURRENT));
+        output.setVersion(VersionUtils.getPreviousVersion(Version.V_6_1_0));
         Settings settings = Settings.builder().putArray("foo.bar", "0", "1", "2", "3")
             .put("foo.bar.baz", "baz").putNull("foo.null").build();
         Settings.writeSettingsToStream(settings, output);
@@ -700,7 +700,7 @@ public void testWriteLegacyOutput() throws IOException {
 
     public void testReadWriteArray() throws IOException {
         BytesStreamOutput output = new BytesStreamOutput();
-        output.setVersion(Version.CURRENT);
+        output.setVersion(randomFrom(Version.CURRENT, Version.V_6_1_0));
         Settings settings = Settings.builder().putArray("foo.bar", "0", "1", "2", "3").put("foo.bar.baz", "baz").build();
         Settings.writeSettingsToStream(settings, output);
         StreamInput in = StreamInput.wrap(BytesReference.toBytes(output.bytes()));