This is an automated email from the ASF dual-hosted git repository. nnag pushed a commit to branch release/1.7.0 in repository https://gitbox.apache.org/repos/asf/geode.git
commit 0936c9fa41aa1e70a381df2aef6dde4be028c8d2 Author: nabarun <[email protected]> AuthorDate: Fri Aug 31 15:56:17 2018 -0700 Revert "Adding 1.8 as a version in Version.java" This reverts commit ca0f662 --- geode-core/src/main/java/org/apache/geode/internal/Version.java | 9 ++------- .../geode/internal/cache/tier/sockets/CommandInitializer.java | 1 - 2 files changed, 2 insertions(+), 8 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 c8721e0..f60e9bb 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 @@ -56,7 +56,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 = 95; + public static final int HIGHEST_VERSION = 90; private static final Version[] VALUES = new Version[HIGHEST_VERSION + 1]; @@ -220,18 +220,13 @@ public class Version implements Comparable<Version> { public static final Version GEODE_170 = new Version("GEODE", "1.7.0", (byte) 1, (byte) 7, (byte) 0, (byte) 0, GEODE_170_ORDINAL); - private static final byte GEODE_180_ORDINAL = 95; - - public static final Version GEODE_180 = - new Version("GEODE", "1.8.0", (byte) 1, (byte) 8, (byte) 0, (byte) 0, GEODE_180_ORDINAL); - /* NOTE: when adding a new version bump the ordinal by 5. Ordinals can be short ints */ /** * This constant must be set to the most current version of the product. !!! NOTE: update * HIGHEST_VERSION when changing CURRENT !!! */ - public static final Version CURRENT = GEODE_180; + public static final Version CURRENT = GEODE_170; /** * 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 70857c7..08e76b7 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 @@ -329,7 +329,6 @@ public class CommandInitializer { ALL_COMMANDS.put(Version.GEODE_150, commands); ALL_COMMANDS.put(Version.GEODE_160, commands); ALL_COMMANDS.put(Version.GEODE_170, commands); - ALL_COMMANDS.put(Version.GEODE_180, commands); }
