geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bschucha...@apache.org
Subject geode git commit: GEODE-3403: Modify rolling upgrade test configurations for 1.2.x release
Date Fri, 11 Aug 2017 22:58:44 GMT
Repository: geode
Updated Branches:
  refs/heads/develop ed293e817 -> bdc8de00f


GEODE-3403: Modify rolling upgrade test configurations for 1.2.x release

Naba has already added a test120 source set in geode-old-versions.
This commit bumps the version of Geode to 1.3.0 so that tests can
tell the difference between 1.2.0 and builds based on this commit.


Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/bdc8de00
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/bdc8de00
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/bdc8de00

Branch: refs/heads/develop
Commit: bdc8de00f1c423aaa27fbb24b16c39e88ad537e0
Parents: ed293e8
Author: Bruce Schuchardt <bschuchardt@pivotal.io>
Authored: Fri Aug 11 15:55:46 2017 -0700
Committer: Bruce Schuchardt <bschuchardt@pivotal.io>
Committed: Fri Aug 11 15:57:43 2017 -0700

----------------------------------------------------------------------
 .../src/main/java/org/apache/geode/internal/Version.java    | 9 +++++++--
 .../internal/cache/tier/sockets/CommandInitializer.java     | 5 +++++
 2 files changed, 12 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/geode/blob/bdc8de00/geode-core/src/main/java/org/apache/geode/internal/Version.java
----------------------------------------------------------------------
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 39e3a3f..1e63000 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
@@ -59,7 +59,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 = 65;
+  public static final int HIGHEST_VERSION = 70;
 
   private static final Version[] VALUES = new Version[HIGHEST_VERSION + 1];
 
@@ -198,11 +198,16 @@ public class Version implements Comparable<Version> {
   public static final Version GEODE_120 =
       new Version("GEODE", "1.2.0", (byte) 1, (byte) 2, (byte) 0, (byte) 0, GEODE_120_ORDINAL);
 
+  private static final byte GEODE_130_ORDINAL = 70;
+
+  public static final Version GEODE_130 =
+      new Version("GEODE", "1.3.0", (byte) 1, (byte) 3, (byte) 0, (byte) 0, GEODE_130_ORDINAL);
+
   /**
    * 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_120;
+  public static final Version CURRENT = GEODE_130;
 
   /**
    * A lot of versioning code needs access to the current version's ordinal

http://git-wip-us.apache.org/repos/asf/geode/blob/bdc8de00/geode-core/src/main/java/org/apache/geode/internal/cache/tier/sockets/CommandInitializer.java
----------------------------------------------------------------------
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 9995e46..3f2bcd2 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
@@ -345,6 +345,11 @@ public class CommandInitializer {
       commands.putAll(ALL_COMMANDS.get(Version.GEODE_111));
       ALL_COMMANDS.put(Version.GEODE_120, commands);
     }
+    {
+      Map<Integer, Command> commands = new HashMap<Integer, Command>();
+      commands.putAll(ALL_COMMANDS.get(Version.GEODE_120));
+      ALL_COMMANDS.put(Version.GEODE_130, commands);
+    }
 
   }
 


Mime
View raw message