Update VersionHelper

(merge 14.1.1-2206 -> ce/22.06 118244)

[git-p4: depot-paths = "//dev/coherence-ce/release/coherence-ce-v22.06/": change = 118247]

Author: thegridman

prj/coherence-core/src/main/java/com/tangosol/internal/util/VersionHelper.java

@@ -82,7 +82,11 @@ public static int encodeVersion(int nMajor, int nMinor, int nMicro, int nPatchSe
      */
     public static int getVersionPrefix(int nYear, int nMonth)
         {
-        if (nYear > 23)
+        if (nYear > 25)
+            {
+            return encodeVersion(15, 1, 1, 0, 0);
+            }
+        else if (nYear > 23)
             {
             return encodeVersion(15, 0, 0, 0, 0);
             }
@@ -402,6 +406,11 @@ public static void main(String[] args)
 
     // ----- constants ------------------------------------------------------
 
+    /**
+     * The encoded 15.1.1.0.0 version.
+     */
+    public static final int VERSION_15_1_1_0_0 = encodeVersion(15, 1, 1, 0, 0);
+
     /**
      * The encoded CE 25.03.0 version.
      */

prj/test/unit/coherence-core-tests/src/test/java/com/tangosol/internal/util/VersionHelperTest.java

@@ -178,4 +178,19 @@ public void shouldParseFusionAppsVersions()
         assertThat(nFA12PatchOne, is(greaterThan(nFA12PatchZero)));
         }
 
+    @Test
+    public void shouldCompareTo_15_1_1()
+        {
+        int v1 = VersionHelper.encodeVersion(15, 1, 1, 0, 0);
+
+        int v2 = VersionHelper.encodeVersion(15, 1, 1, 0, 1);
+        assertThat(v2, is(greaterThan(v1)));
+
+        int v3 = VersionHelper.encodeVersion(26, 3, 0);
+        assertThat(v3, is(greaterThan(v1)));
+        assertThat(v3, is(greaterThan(v2)));
+
+        int v4 = VersionHelper.encodeVersion(25, 3, 0);
+        assertThat(v4, is(lessThan(v1)));
+        }
     }