From ed7b6eec19ed58ea49a55fd976c24a26a588e32d Mon Sep 17 00:00:00 2001
From: "Todd L. Montgomery" <tmont@nard.net>
Date: Mon, 29 Oct 2018 15:25:12 -0700
Subject: [PATCH] 1.11.3 released. De-dup of archive and cluster field ids.
 Remove unnecessary cast for Long2LongHashMap iterator.

---
 aeron-archive/src/main/resources/aeron-archive-codecs.xml     | 4 ++--
 .../src/main/java/io/aeron/cluster/TimerService.java          | 3 +--
 aeron-cluster/src/main/resources/aeron-cluster-codecs.xml     | 2 +-
 build.gradle                                                  | 4 ++--
 version.txt                                                   | 2 +-
 5 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/aeron-archive/src/main/resources/aeron-archive-codecs.xml b/aeron-archive/src/main/resources/aeron-archive-codecs.xml
index 5e37e40a70..f95ef5ffa5 100644
--- a/aeron-archive/src/main/resources/aeron-archive-codecs.xml
+++ b/aeron-archive/src/main/resources/aeron-archive-codecs.xml
@@ -164,7 +164,7 @@
                  description="Request a subscription stop recording">
         <field name="controlSessionId"     id="1" type="int64"/>
         <field name="correlationId"        id="2" type="int64"/>
-        <field name="subscriptionId"       id="2" type="int64"/>
+        <field name="subscriptionId"       id="3" type="int64"/>
     </sbe:message>
 
     <sbe:message name="StopPositionRequest"
@@ -181,7 +181,7 @@
         <field name="controlSessionId"     id="1" type="int64"/>
         <field name="correlationId"        id="2" type="int64"/>
         <field name="minRecordingId"       id="3" type="int64"/>
-        <field name="sessionId"            id="5" type="int32"/>
+        <field name="sessionId"            id="4" type="int32"/>
         <field name="streamId"             id="5" type="int32"/>
         <data  name="channel"              id="6" type="varAsciiEncoding"/>
     </sbe:message>
diff --git a/aeron-cluster/src/main/java/io/aeron/cluster/TimerService.java b/aeron-cluster/src/main/java/io/aeron/cluster/TimerService.java
index 145a51e1ff..982f30e31e 100644
--- a/aeron-cluster/src/main/java/io/aeron/cluster/TimerService.java
+++ b/aeron-cluster/src/main/java/io/aeron/cluster/TimerService.java
@@ -99,8 +99,7 @@ boolean cancelTimer(final long correlationId)
 
     void snapshot(final ConsensusModuleSnapshotTaker snapshotTaker)
     {
-        final Long2LongHashMap.EntryIterator iter =
-            (Long2LongHashMap.EntryIterator)timerIdByCorrelationIdMap.entrySet().iterator();
+        final Long2LongHashMap.EntryIterator iter = timerIdByCorrelationIdMap.entrySet().iterator();
 
         while (iter.hasNext())
         {
diff --git a/aeron-cluster/src/main/resources/aeron-cluster-codecs.xml b/aeron-cluster/src/main/resources/aeron-cluster-codecs.xml
index 7f6f336849..c5d603e7e8 100644
--- a/aeron-cluster/src/main/resources/aeron-cluster-codecs.xml
+++ b/aeron-cluster/src/main/resources/aeron-cluster-codecs.xml
@@ -516,7 +516,7 @@
                  description="Serialized state of Cluster Members">
         <field name="memberId"              id="1" type="int32"/>
         <field name="highMemberId"          id="2" type="int32"/>
-        <data  name="clusterMembers"        id="1" type="varAsciiEncoding"/>
+        <data  name="clusterMembers"        id="3" type="varAsciiEncoding"/>
     </sbe:message>
 
 </sbe:messageSchema>
diff --git a/build.gradle b/build.gradle
index 62c2d84a97..60da1fe70b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -30,8 +30,8 @@ def aeronGroup = 'io.aeron'
 def aeronVersion = file('version.txt').text.trim()
 def aeronJavaVersion = '1.8'
 
-def agronaVersion = '0.9.25'
-def sbeVersion = '1.8.9'
+def agronaVersion = '0.9.26'
+def sbeVersion = '1.9.0'
 
 group = aeronGroup
 version = aeronVersion
diff --git a/version.txt b/version.txt
index b0ad3b1108..1b1bfae6de 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-1.11.3-SNAPSHOT
\ No newline at end of file
+1.11.3
\ No newline at end of file