Update to 1.1.0-SNAPSHOT for development

CJSCommonPlatform · Jan 8, 2019 · a4f906c · a4f906c
1 parent 2ca7734
commit a4f906c
Show file tree

Hide file tree

Showing 40 changed files with 43 additions and 42 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,10 @@ on [Keep a CHANGELOG](http://keepachangelog.com/). This project adheres to
 
 ## [Unreleased]
 
+## [1.1.0-M8] - 2019-01-08
+### Fixed
+- Fixed error of two subscriptions created in database for each subscription
+
 ## [1.1.0-M7] - 2019-01-03
 ### Changed
 - Fix checksum issue with liquibase scripts

diff --git a/aggregate-snapshot/aggregate-snapshot-domain/pom.xml b/aggregate-snapshot/aggregate-snapshot-domain/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>aggregate-snapshot</artifactId>
         <groupId>uk.gov.justice.event-store</groupId>
-        <version>1.1.0-M7</version>
+        <version>1.1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/aggregate-snapshot/aggregate-snapshot-repository-liquibase/pom.xml b/aggregate-snapshot/aggregate-snapshot-repository-liquibase/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>aggregate-snapshot</artifactId>
         <groupId>uk.gov.justice.event-store</groupId>
-        <version>1.1.0-M7</version>
+        <version>1.1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/aggregate-snapshot/aggregate-snapshot-repository/pom.xml b/aggregate-snapshot/aggregate-snapshot-repository/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>aggregate-snapshot</artifactId>
         <groupId>uk.gov.justice.event-store</groupId>
-        <version>1.1.0-M7</version>
+        <version>1.1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/aggregate-snapshot/aggregate-snapshot-service/pom.xml b/aggregate-snapshot/aggregate-snapshot-service/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>aggregate-snapshot</artifactId>
         <groupId>uk.gov.justice.event-store</groupId>
-        <version>1.1.0-M7</version>
+        <version>1.1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/aggregate-snapshot/pom.xml b/aggregate-snapshot/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>event-store</artifactId>
         <groupId>uk.gov.justice.event-store</groupId>
-        <version>1.1.0-M7</version>
+        <version>1.1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/event-buffer/event-buffer-api/pom.xml b/event-buffer/event-buffer-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>event-buffer</artifactId>
         <groupId>uk.gov.justice.event-store</groupId>
-        <version>1.1.0-M7</version>
+        <version>1.1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/event-buffer/event-buffer-core/pom.xml b/event-buffer/event-buffer-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>event-buffer</artifactId>
         <groupId>uk.gov.justice.event-store</groupId>
-        <version>1.1.0-M7</version>
+        <version>1.1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/event-buffer/event-buffer-liquibase/pom.xml b/event-buffer/event-buffer-liquibase/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>event-buffer</artifactId>
         <groupId>uk.gov.justice.event-store</groupId>
-        <version>1.1.0-M7</version>
+        <version>1.1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/event-buffer/pom.xml b/event-buffer/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>event-store</artifactId>
         <groupId>uk.gov.justice.event-store</groupId>
-        <version>1.1.0-M7</version>
+        <version>1.1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/event-source-subscriptions/pom.xml b/event-source-subscriptions/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>event-store</artifactId>
         <groupId>uk.gov.justice.event-store</groupId>
-        <version>1.1.0-M7</version>
+        <version>1.1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/event-source-subscriptions/subscription-repository/pom.xml b/event-source-subscriptions/subscription-repository/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>event-source-subscriptions</artifactId>
         <groupId>uk.gov.justice.event-store</groupId>
-        <version>1.1.0-M7</version>
+        <version>1.1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/event-source-subscriptions/subscription-repository/subscription-repository-jdbc/pom.xml b/event-source-subscriptions/subscription-repository/subscription-repository-jdbc/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>subscription-repository</artifactId>
         <groupId>uk.gov.justice.event-store</groupId>
-        <version>1.1.0-M7</version>
+        <version>1.1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/event-source-subscriptions/subscription-repository/subscription-repository-liquibase/pom.xml b/event-source-subscriptions/subscription-repository/subscription-repository-liquibase/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>subscription-repository</artifactId>
         <groupId>uk.gov.justice.event-store</groupId>
-        <version>1.1.0-M7</version>
+        <version>1.1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/event-sourcing/event-publisher/event-publisher-jms/pom.xml b/event-sourcing/event-publisher/event-publisher-jms/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>event-publisher</artifactId>
         <groupId>uk.gov.justice.event-store</groupId>
-        <version>1.1.0-M7</version>
+        <version>1.1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/event-sourcing/event-publisher/event-publisher-process/pom.xml b/event-sourcing/event-publisher/event-publisher-process/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>event-publisher</artifactId>
         <groupId>uk.gov.justice.event-store</groupId>
-        <version>1.1.0-M7</version>
+        <version>1.1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/event-sourcing/event-publisher/pom.xml b/event-sourcing/event-publisher/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>event-sourcing</artifactId>
         <groupId>uk.gov.justice.event-store</groupId>
-        <version>1.1.0-M7</version>
+        <version>1.1.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/event-sourcing/event-repository/event-repository-jdbc/pom.xml b/event-sourcing/event-repository/event-repository-jdbc/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>event-repository</artifactId>
         <groupId>uk.gov.justice.event-store</groupId>
-        <version>1.1.0-M7</version>
+        <version>1.1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/event-sourcing/event-repository/event-repository-liquibase/pom.xml b/event-sourcing/event-repository/event-repository-liquibase/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>event-repository</artifactId>
         <groupId>uk.gov.justice.event-store</groupId>
-        <version>1.1.0-M7</version>
+        <version>1.1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/event-sourcing/event-repository/pom.xml b/event-sourcing/event-repository/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>event-sourcing</artifactId>
         <groupId>uk.gov.justice.event-store</groupId>
-        <version>1.1.0-M7</version>
+        <version>1.1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>event-repository</artifactId>

diff --git a/event-sourcing/event-source-api-integration-test/pom.xml b/event-sourcing/event-source-api-integration-test/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>event-sourcing</artifactId>
         <groupId>uk.gov.justice.event-store</groupId>
-        <version>1.1.0-M7</version>
+        <version>1.1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/event-sourcing/event-source-api/pom.xml b/event-sourcing/event-source-api/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>event-sourcing</artifactId>
         <groupId>uk.gov.justice.event-store</groupId>
-        <version>1.1.0-M7</version>
+        <version>1.1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/event-sourcing/event-source/pom.xml b/event-sourcing/event-source/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>event-sourcing</artifactId>
         <groupId>uk.gov.justice.event-store</groupId>
-        <version>1.1.0-M7</version>
+        <version>1.1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/event-sourcing/event-subscription-registry/pom.xml b/event-sourcing/event-subscription-registry/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>event-sourcing</artifactId>
         <groupId>uk.gov.justice.event-store</groupId>
-        <version>1.1.0-M7</version>
+        <version>1.1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/event-sourcing/event-subscription-test-utils/pom.xml b/event-sourcing/event-subscription-test-utils/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>event-sourcing</artifactId>
         <groupId>uk.gov.justice.event-store</groupId>
-        <version>1.1.0-M7</version>
+        <version>1.1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/event-sourcing/event-subscription/pom.xml b/event-sourcing/event-subscription/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>event-sourcing</artifactId>
         <groupId>uk.gov.justice.event-store</groupId>
-        <version>1.1.0-M7</version>
+        <version>1.1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/event-sourcing/pom.xml b/event-sourcing/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>event-store</artifactId>
         <groupId>uk.gov.justice.event-store</groupId>
-        <version>1.1.0-M7</version>
+        <version>1.1.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/event-sourcing/subscription-manager/pom.xml b/event-sourcing/subscription-manager/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>event-sourcing</artifactId>
         <groupId>uk.gov.justice.event-store</groupId>
-        <version>1.1.0-M7</version>
+        <version>1.1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/...va/uk/gov/justice/services/event/sourcing/subscription/manager/EventCatchupProcessor.java b/...va/uk/gov/justice/services/event/sourcing/subscription/manager/EventCatchupProcessor.java
@@ -36,7 +36,7 @@ public void performEventCatchup(final Subscription subscription) {
 
         logger.info("Event catchup started");
         logger.info("Performing catchup of events...");
-        final long eventNumber = subscriptionsRepository.getOrInitialiseCurrentEventNumber(subscription.getName());
+        final long eventNumber = subscriptionsRepository.getOrInitialiseCurrentEventNumber(subscription.getEventSourceName());
 
         final int totalEventsProcessed = eventSource.findEventsSince(eventNumber)
                 .mapToInt(transactionalEventProcessor::processWithEventBuffer)

diff --git a/...k/gov/justice/services/event/sourcing/subscription/manager/EventCatchupProcessorTest.java b/...k/gov/justice/services/event/sourcing/subscription/manager/EventCatchupProcessorTest.java
@@ -20,7 +20,6 @@
 import org.mockito.runners.MockitoJUnitRunner;
 import org.slf4j.Logger;
 
-
 @RunWith(MockitoJUnitRunner.class)
 public class EventCatchupProcessorTest {
 
@@ -43,7 +42,6 @@ public class EventCatchupProcessorTest {
     @Test
     public void shouldFetchAllMissingEventsAndProcess() throws Exception {
 
-        final String subscriptionName = "subscriptionName";
         final String eventSourceName = "event source";
         final long eventNumber = 983745987L;
 
@@ -56,8 +54,7 @@ public void shouldFetchAllMissingEventsAndProcess() throws Exception {
 
         when(subscription.getEventSourceName()).thenReturn(eventSourceName);
         when(eventSourceProvider.getEventSource(eventSourceName)).thenReturn(eventSource);
-        when(subscription.getName()).thenReturn(subscriptionName);
-        when(subscriptionsRepository.getOrInitialiseCurrentEventNumber(subscriptionName)).thenReturn(eventNumber);
+        when(subscriptionsRepository.getOrInitialiseCurrentEventNumber(eventSourceName)).thenReturn(eventNumber);
         when(eventSource.findEventsSince(eventNumber)).thenReturn(Stream.of(event_1, event_2, event_3));
         when(transactionalEventProcessor.processWithEventBuffer(any(JsonEnvelope.class))).thenReturn(1);
 

diff --git a/event-store-bom/pom.xml b/event-store-bom/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>event-store</artifactId>
         <groupId>uk.gov.justice.event-store</groupId>
-        <version>1.1.0-M7</version>
+        <version>1.1.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/event-store-util/pom.xml b/event-store-util/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>event-store</artifactId>
         <groupId>uk.gov.justice.event-store</groupId>
-        <version>1.1.0-M7</version>
+        <version>1.1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/interceptors/command-handler-interceptors/pom.xml b/interceptors/command-handler-interceptors/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>interceptors</artifactId>
         <groupId>uk.gov.justice.event-store</groupId>
-        <version>1.1.0-M7</version>
+        <version>1.1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/interceptors/event-listener-interceptors/pom.xml b/interceptors/event-listener-interceptors/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>interceptors</artifactId>
         <groupId>uk.gov.justice.event-store</groupId>
-        <version>1.1.0-M7</version>
+        <version>1.1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/interceptors/pom.xml b/interceptors/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>event-store</artifactId>
         <groupId>uk.gov.justice.event-store</groupId>
-        <version>1.1.0-M7</version>
+        <version>1.1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/interceptors/subscription-event-interceptors/pom.xml b/interceptors/subscription-event-interceptors/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>interceptors</artifactId>
         <groupId>uk.gov.justice.event-store</groupId>
-        <version>1.1.0-M7</version>
+        <version>1.1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/pom.xml b/pom.xml
@@ -12,7 +12,7 @@
 
     <groupId>uk.gov.justice.event-store</groupId>
     <artifactId>event-store</artifactId>
-    <version>1.1.0-M7</version>
+    <version>1.1.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>Event Store</name>

diff --git a/test-utils-event-store/pom.xml b/test-utils-event-store/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>event-store</artifactId>
         <groupId>uk.gov.justice.event-store</groupId>
-        <version>1.1.0-M7</version>
+        <version>1.1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/test-utils-event-store/test-utils-event/pom.xml b/test-utils-event-store/test-utils-event/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>test-utils-event-store</artifactId>
         <groupId>uk.gov.justice.event-store</groupId>
-        <version>1.1.0-M7</version>
+        <version>1.1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/test-utils-event-store/test-utils-persistence/pom.xml b/test-utils-event-store/test-utils-persistence/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>test-utils-event-store</artifactId>
         <groupId>uk.gov.justice.event-store</groupId>
-        <version>1.1.0-M7</version>
+        <version>1.1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>