Merge 0a489ae into 357b825

CJSCommonPlatform · May 10, 2019 · 60a643e · 60a643e
2 parents 357b825 + 0a489ae
commit 60a643e
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,22 @@ on [Keep a CHANGELOG](http://keepachangelog.com/). This project adheres to
 
 ## [Unreleased]
 
+## [2.0.0-M3] - 2019-05-09
+
+### Changed
+- common-bom -> 2.0.2
+- framework -> 6.0.0-M22
+- event-store -> 2.0.0-M22
+- framework-generators -> 2.0.0-M15
+- file.service -> 1.17.7
+- framework-api -> 4.0.0-M18
+- generator-maven-plugin -> 2.7.0
+- json-schema-catalog -> 1.7.0
+- raml-maven-plugin -> 1.6.7
+- test-utils -> 1.23.0
+- utilities -> 1.18.0
+
+
 ### Added
 - Integration Test for Event Catchup
 ### Changed

diff --git a/...c/test/java/uk/gov/justice/services/example/cakeshop/it/helpers/RecipeTableInspector.java b/...c/test/java/uk/gov/justice/services/example/cakeshop/it/helpers/RecipeTableInspector.java
@@ -93,7 +93,7 @@ public List<Recipe> getAllRecipes() {
 
     public long countEventsPerStream(final UUID streamId) {
 
-        final String sql = "SELECT version FROM stream_status WHERE stream_id = ?";
+        final String sql = "SELECT position FROM stream_status WHERE stream_id = ?";
 
         try(final Connection connection = viewStoreDataSource.getConnection();
             final PreparedStatement preparedStatement = connection.prepareStatement(sql)) {

diff --git a/pom.xml b/pom.xml
@@ -30,20 +30,20 @@
 
     <properties>
         <cpp.repo.name>cake-shop</cpp.repo.name>
-        <common-bom.version>1.28.0</common-bom.version>
-        <framework.version>6.0.0-M20</framework.version>
+        <common-bom.version>2.0.2</common-bom.version>
+        <framework.version>6.0.0-M22</framework.version>
         <embedded-artemis.version>1.2.0</embedded-artemis.version>
-        <event-store.version>2.0.0-M18</event-store.version>
-        <framework-generators.version>2.0.0-M13</framework-generators.version>
-        <file.service.version>1.17.4</file.service.version>
-        <framework-api.version>4.0.0-M13</framework-api.version>
-        <generator-maven-plugin.version>2.6.2</generator-maven-plugin.version>
-        <json-schema-catalog.version>1.6.0</json-schema-catalog.version>
+        <event-store.version>2.0.0-M22</event-store.version>
+        <framework-generators.version>2.0.0-M15</framework-generators.version>
+        <file.service.version>1.17.7</file.service.version>
+        <framework-api.version>4.0.0-M18</framework-api.version>
+        <generator-maven-plugin.version>2.7.0</generator-maven-plugin.version>
+        <json-schema-catalog.version>1.7.0</json-schema-catalog.version>
         <jboss-ejb3-ext-api.version>2.2.0.Final</jboss-ejb3-ext-api.version>
         <jboss-vfs.version>3.2.12.Final</jboss-vfs.version>
-        <raml-maven-plugin.version>1.6.5</raml-maven-plugin.version>
-        <test-utils.version>1.22.0</test-utils.version>
-        <utilities.version>1.16.4</utilities.version>
+        <raml-maven-plugin.version>1.6.7</raml-maven-plugin.version>
+        <test-utils.version>1.23.0</test-utils.version>
+        <utilities.version>1.18.0</utilities.version>
         <annotation-validator-maven-plugin.version>1.0.1</annotation-validator-maven-plugin.version>
     </properties>