[geode] branch feature/GEODE_5027 updated: GEODE-5027 Bump version to 1.6.0

[bschuchardt]

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

bschuchardt pushed a commit to branch feature/GEODE_5027
in repository https://gitbox.apache.org/repos/asf/geode.git


The following commit(s) were added to refs/heads/feature/GEODE_5027 by this 
push:
     new dacc759  GEODE-5027 Bump version to 1.6.0
dacc759 is described below

commit dacc759b31671cc4335ae7808cb81c7dcb190662
Author: Bruce Schuchardt <bschucha...@pivotal.io>
AuthorDate: Fri Apr 6 15:43:05 2018 -0700

    GEODE-5027 Bump version to 1.6.0
    
    adding the command set for 1.6.0
---
 .../internal/cache/tier/sockets/CommandInitializer.java  |  1 +
 .../java/org/apache/geode/internal/VersionJUnitTest.java | 16 ++++++++++------
 2 files changed, 11 insertions(+), 6 deletions(-)

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 8d2bb23..bb666ac 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
@@ -327,6 +327,7 @@ public class CommandInitializer {
     ALL_COMMANDS.put(Version.GEODE_130, commands);
     ALL_COMMANDS.put(Version.GEODE_140, commands);
     ALL_COMMANDS.put(Version.GEODE_150, commands);
+    ALL_COMMANDS.put(Version.GEODE_160, commands);
 
   }
 
diff --git 
a/geode-core/src/test/java/org/apache/geode/internal/VersionJUnitTest.java 
b/geode-core/src/test/java/org/apache/geode/internal/VersionJUnitTest.java
index 36897e8..3ce3736 100644
--- a/geode-core/src/test/java/org/apache/geode/internal/VersionJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/internal/VersionJUnitTest.java
@@ -20,6 +20,7 @@ import static org.junit.Assert.assertTrue;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
+import org.apache.geode.cache.UnsupportedVersionException;
 import org.apache.geode.internal.cache.tier.sockets.CommandInitializer;
 import org.apache.geode.test.junit.categories.UnitTest;
 
@@ -62,13 +63,16 @@ public class VersionJUnitTest {
   }
 
   @Test
-  public void testCommandMapContainsAllVersionsButCurrent() {
+  public void testCommandMapContainsAllVersions() {
     for (Version version : Version.getAllVersions()) {
-      if (version != Version.CURRENT) {
-        org.junit.Assert.assertNotNull(
-            "Please add a commnd set for " + version + " of Geode to 
CommandInitializer",
-            CommandInitializer.getCommands(version));
-      }
+      org.junit.Assert.assertNotNull(
+          "Please add a commnd set for " + version + " of Geode to 
CommandInitializer",
+          CommandInitializer.getCommands(version));
     }
   }
+
+  @Test
+  public void testFromOrdinalForCurrentVersionSucceeds() throws 
UnsupportedVersionException {
+    Version.fromOrdinal(Version.CURRENT_ORDINAL, true);
+  }
 }

-- 
To stop receiving notification emails like this one, please contact
bschucha...@apache.org.