[geode] branch release/1.9.1 updated: Remove 1.9.1 from Version

[klund]

This is an automated email from the ASF dual-hosted git repository.

klund pushed a commit to branch release/1.9.1
in repository https://gitbox.apache.org/repos/asf/geode.git


The following commit(s) were added to refs/heads/release/1.9.1 by this push:
     new 85c42fe  Remove 1.9.1 from Version
85c42fe is described below

commit 85c42fe591a1a72e3d9d123dc79dbf3f04fb5d94
Author: Kirk Lund <unknown>
AuthorDate: Thu Aug 29 14:15:24 2019 -0700

    Remove 1.9.1 from Version
---
 .../src/main/java/org/apache/geode/internal/Version.java       | 10 ++--------
 .../geode/internal/cache/tier/sockets/CommandInitializer.java  |  1 -
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/geode-core/src/main/java/org/apache/geode/internal/Version.java 
b/geode-core/src/main/java/org/apache/geode/internal/Version.java
index a4a9a1d..29492dc 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/Version.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/Version.java
@@ -57,7 +57,7 @@ public class Version implements Comparable<Version> {
   /** byte used as ordinal to represent this <code>Version</code> */
   private final short ordinal;
 
-  public static final int HIGHEST_VERSION = 101;
+  public static final int HIGHEST_VERSION = 100;
 
   @Immutable
   private static final Version[] VALUES = new Version[HIGHEST_VERSION + 1];
@@ -263,12 +263,6 @@ public class Version implements Comparable<Version> {
   public static final Version GEODE_1_9_0 =
       new Version("GEODE", "1.9.0", (byte) 1, (byte) 9, (byte) 0, (byte) 0, 
GEODE_1_9_0_ORDINAL);
 
-  private static final byte GEODE_1_9_1_ORDINAL = 101;
-
-  @Immutable
-  public static final Version GEODE_1_9_1 =
-      new Version("GEODE", "1.9.1", (byte) 1, (byte) 9, (byte) 1, (byte) 0, 
GEODE_1_9_1_ORDINAL);
-
   /* NOTE: when adding a new version bump the ordinal by 5. Ordinals can be 
short ints */
 
   /**
@@ -276,7 +270,7 @@ public class Version implements Comparable<Version> {
    * HIGHEST_VERSION when changing CURRENT !!!
    */
   @Immutable
-  public static final Version CURRENT = GEODE_1_9_1;
+  public static final Version CURRENT = GEODE_1_9_0;
 
   /**
    * A lot of versioning code needs access to the current version's ordinal
diff --git 
a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CommandInitializer.java
 
b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CommandInitializer.java
index 0f8b6ab..fd4b784 100644
--- 
a/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CommandInitializer.java
+++ 
b/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CommandInitializer.java
@@ -337,7 +337,6 @@ public class CommandInitializer {
         ExecuteRegionFunctionGeode18.getCommand());
     allCommands.put(Version.GEODE_1_8_0, geode18Commands);
     allCommands.put(Version.GEODE_1_9_0, geode18Commands);
-    allCommands.put(Version.GEODE_1_9_1, geode18Commands);
 
     return Collections.unmodifiableMap(allCommands);
   }