From cfb2fd875816d742366144b70cd5b9c6013f1cde Mon Sep 17 00:00:00 2001
From: amckenzie <allan.mckenzie@agilesphere.co.uk>
Date: Sun, 8 Sep 2019 14:25:33 +0100
Subject: [PATCH] Update framework to 6.0.12

---
 .../example-service/example-it/pom.xml           |  9 ++++++++-
 .../services/example/cakeshop/it/RebuildIT.java  | 16 +++++++++++-----
 pom.xml                                          |  6 +++---
 3 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/example-context/example-service/example-it/pom.xml b/example-context/example-service/example-it/pom.xml
index c6e41444..b9797b5a 100644
--- a/example-context/example-service/example-it/pom.xml
+++ b/example-context/example-service/example-it/pom.xml
@@ -431,8 +431,15 @@
                         </configuration>
                     </execution>
                     <execution>
-                        <id>stop-server</id>
+                        <id>undeploy</id>
                         <phase>post-integration-test</phase>
+                        <goals>
+                            <goal>undeploy</goal>
+                        </goals>
+                    </execution>
+                    <execution>
+                        <id>stop-server</id>
+                        <phase>install</phase>
                         <goals>
                             <goal>shutdown</goal>
                         </goals>
diff --git a/example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/RebuildIT.java b/example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/RebuildIT.java
index b5dcbc33..62fe40ce 100644
--- a/example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/RebuildIT.java
+++ b/example-context/example-service/example-it/src/test/java/uk/gov/justice/services/example/cakeshop/it/RebuildIT.java
@@ -76,7 +76,7 @@ public void shouldRenumberTheEventLogTableAndRebuldPublishedEvents() throws Exce
         commandSender.addRecipe(randomUUID().toString(), "cake 2");
         commandSender.addRecipe(randomUUID().toString(), "cake 3");
 
-        final List<PublishedEvent> publishedEvents = getPublishedEvents();
+        final List<PublishedEvent> publishedEvents = getPublishedEvents(startNumber);
 
         assertThat(publishedEvents.size(), is(3));
         assertThat(publishedEvents.get(0).getEventNumber(), is(of(startNumber)));
@@ -89,14 +89,15 @@ public void shouldRenumberTheEventLogTableAndRebuldPublishedEvents() throws Exce
 
         invokeRebuild();
 
-        final List<PublishedEvent> rebuiltEvents = getPublishedEvents();
+        final long newStartNumber = 1L;
+        final List<PublishedEvent> rebuiltEvents = getPublishedEvents(newStartNumber);
         assertThat(rebuiltEvents.size(), is(3));
 
         final List<UUID> rebuiltEventIds = rebuiltEvents.stream()
                 .map(Event::getId)
                 .collect(toList());
 
-        assertThat(rebuiltEvents.get(0).getEventNumber(), is(of(1L)));
+        assertThat(rebuiltEvents.get(0).getEventNumber(), is(of(newStartNumber)));
 
         assertThat(rebuiltEventIds, hasItem(eventIds.get(0)));
         assertThat(rebuiltEventIds, hasItem(eventIds.get(1)));
@@ -117,14 +118,19 @@ private void invokeRebuild() throws Exception {
         }
     }
 
-    private List<PublishedEvent> getPublishedEvents() {
+    private List<PublishedEvent> getPublishedEvents(final long startNumber) {
 
         final Optional<List<PublishedEvent>> publishedEvents = poller.pollUntilFound(() -> {
 
             final List<PublishedEvent> events = doGetPublishedEvents();
 
             if (events.size() == 3) {
-                return of(events);
+                final Optional<Long> eventNumber = events.get(0).getEventNumber();
+                if(eventNumber.isPresent()) {
+                    if (eventNumber.get() == startNumber) {
+                        return of(events);
+                    }
+                }
             }
 
             return empty();
diff --git a/pom.xml b/pom.xml
index 50bfa4cc..28e51e27 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,9 +32,9 @@
         <cpp.repo.name>cake-shop</cpp.repo.name>
 
         <framework-api.version>4.0.1</framework-api.version>
-        <framework.version>6.0.11</framework.version>
-        <event-store.version>2.0.13</event-store.version>
-        <framework-generators.version>2.0.8</framework-generators.version>
+        <framework.version>6.0.12</framework.version>
+        <event-store.version>2.0.14</event-store.version>
+        <framework-generators.version>2.0.9</framework-generators.version>
         <file.service.version>1.17.11</file.service.version>
 
         <common-bom.version>2.4.0</common-bom.version>