Merge 3a99932 into 7c581f2

CJSCommonPlatform · Nov 5, 2018 · 539fd79 · 539fd79
2 parents 7c581f2 + 3a99932
commit 539fd79
Show file tree

Hide file tree

Showing 14 changed files with 22 additions and 22 deletions.
diff --git a/...a/uk/gov/justice/services/eventsourcing/source/core/SnapshotAwareEventSourceProducer.java b/...a/uk/gov/justice/services/eventsourcing/source/core/SnapshotAwareEventSourceProducer.java
@@ -2,7 +2,7 @@
 
 import static java.lang.String.format;
 
-import uk.gov.justice.services.core.cdi.QualifierAnnotationExtractor;
+import uk.gov.justice.services.cdi.QualifierAnnotationExtractor;
 import uk.gov.justice.services.eventsourcing.source.core.annotation.EventSourceName;
 import uk.gov.justice.subscription.domain.eventsource.EventSourceDefinition;
 import uk.gov.justice.subscription.domain.eventsource.Location;

diff --git a/...src/test/java/uk/gov/justice/services/core/aggregate/SnapshotAwareAggregateServiceIT.java b/...src/test/java/uk/gov/justice/services/core/aggregate/SnapshotAwareAggregateServiceIT.java
@@ -21,6 +21,9 @@
 import uk.gov.justice.domain.snapshot.AggregateSnapshot;
 import uk.gov.justice.domain.snapshot.DefaultObjectInputStreamStrategy;
 import uk.gov.justice.domain.snapshot.ObjectInputStreamStrategy;
+import uk.gov.justice.services.cdi.InitialContextProducer;
+import uk.gov.justice.services.cdi.LoggerProducer;
+import uk.gov.justice.services.cdi.QualifierAnnotationExtractor;
 import uk.gov.justice.services.common.configuration.GlobalValueProducer;
 import uk.gov.justice.services.common.configuration.ServiceContextNameProvider;
 import uk.gov.justice.services.common.configuration.ValueProducer;
@@ -31,9 +34,6 @@
 import uk.gov.justice.services.common.converter.jackson.ObjectMapperProducer;
 import uk.gov.justice.services.common.util.Clock;
 import uk.gov.justice.services.common.util.UtcClock;
-import uk.gov.justice.services.core.cdi.InitialContextProducer;
-import uk.gov.justice.services.core.cdi.LoggerProducer;
-import uk.gov.justice.services.core.cdi.QualifierAnnotationExtractor;
 import uk.gov.justice.services.core.enveloper.DefaultEnveloper;
 import uk.gov.justice.services.core.extension.EventFoundEvent;
 import uk.gov.justice.services.eventsource.DefaultEventDestinationResolver;

diff --git a/.../gov/justice/services/eventsourcing/source/core/SnapshotAwareEventSourceProducerTest.java b/.../gov/justice/services/eventsourcing/source/core/SnapshotAwareEventSourceProducerTest.java
@@ -10,7 +10,7 @@
 import static org.mockito.Mockito.when;
 import static uk.gov.justice.subscription.domain.builders.EventSourceDefinitionBuilder.eventSourceDefinition;
 
-import uk.gov.justice.services.core.cdi.QualifierAnnotationExtractor;
+import uk.gov.justice.services.cdi.QualifierAnnotationExtractor;
 import uk.gov.justice.services.eventsourcing.source.core.annotation.EventSourceName;
 import uk.gov.justice.subscription.domain.eventsource.EventSourceDefinition;
 import uk.gov.justice.subscription.domain.eventsource.Location;

diff --git a/...est/src/test/java/uk/gov/justice/services/eventsourcing/source/api/EventStreamPageIT.java b/...est/src/test/java/uk/gov/justice/services/eventsourcing/source/api/EventStreamPageIT.java
@@ -16,6 +16,8 @@
 import static uk.gov.justice.services.eventsourcing.source.api.service.core.Direction.FORWARD;
 import static uk.gov.justice.services.eventsourcing.source.api.util.TestSystemUserProvider.SYSTEM_USER_ID;
 
+import uk.gov.justice.services.cdi.InitialContextProducer;
+import uk.gov.justice.services.cdi.QualifierAnnotationExtractor;
 import uk.gov.justice.services.common.configuration.GlobalValueProducer;
 import uk.gov.justice.services.common.converter.JsonObjectToObjectConverter;
 import uk.gov.justice.services.common.converter.ObjectToJsonObjectConverter;
@@ -25,8 +27,6 @@
 import uk.gov.justice.services.common.rest.BadRequestExceptionMapper;
 import uk.gov.justice.services.common.rest.ForbiddenRequestExceptionMapper;
 import uk.gov.justice.services.common.util.UtcClock;
-import uk.gov.justice.services.core.cdi.InitialContextProducer;
-import uk.gov.justice.services.core.cdi.QualifierAnnotationExtractor;
 import uk.gov.justice.services.core.enveloper.DefaultEnveloper;
 import uk.gov.justice.services.core.json.DefaultJsonValidationLoggerHelper;
 import uk.gov.justice.services.core.json.JsonValidationLoggerHelper;

diff --git a/...ion-test/src/test/java/uk/gov/justice/services/eventsourcing/source/api/EventsPageIT.java b/...ion-test/src/test/java/uk/gov/justice/services/eventsourcing/source/api/EventsPageIT.java
@@ -19,6 +19,8 @@
 import static uk.gov.justice.services.eventsourcing.source.api.service.core.Direction.FORWARD;
 import static uk.gov.justice.services.eventsourcing.source.api.util.TestSystemUserProvider.SYSTEM_USER_ID;
 
+import uk.gov.justice.services.cdi.InitialContextProducer;
+import uk.gov.justice.services.cdi.QualifierAnnotationExtractor;
 import uk.gov.justice.services.common.configuration.GlobalValueProducer;
 import uk.gov.justice.services.common.converter.JsonObjectToObjectConverter;
 import uk.gov.justice.services.common.converter.ObjectToJsonObjectConverter;
@@ -28,8 +30,6 @@
 import uk.gov.justice.services.common.rest.BadRequestExceptionMapper;
 import uk.gov.justice.services.common.rest.ForbiddenRequestExceptionMapper;
 import uk.gov.justice.services.common.util.UtcClock;
-import uk.gov.justice.services.core.cdi.InitialContextProducer;
-import uk.gov.justice.services.core.cdi.QualifierAnnotationExtractor;
 import uk.gov.justice.services.core.enveloper.DefaultEnveloper;
 import uk.gov.justice.services.core.json.DefaultJsonValidationLoggerHelper;
 import uk.gov.justice.services.eventsource.DefaultEventDestinationResolver;

diff --git a/.../src/main/java/uk/gov/justice/services/eventsourcing/source/core/EventSourceProducer.java b/.../src/main/java/uk/gov/justice/services/eventsourcing/source/core/EventSourceProducer.java
@@ -2,7 +2,7 @@
 
 import static java.lang.String.format;
 
-import uk.gov.justice.services.core.cdi.QualifierAnnotationExtractor;
+import uk.gov.justice.services.cdi.QualifierAnnotationExtractor;
 import uk.gov.justice.services.eventsourcing.source.core.annotation.EventSourceName;
 import uk.gov.justice.subscription.domain.eventsource.EventSourceDefinition;
 import uk.gov.justice.subscription.domain.eventsource.Location;

diff --git a/.../test/java/uk/gov/justice/services/eventsourcing/source/core/EventSourceProducerTest.java b/.../test/java/uk/gov/justice/services/eventsourcing/source/core/EventSourceProducerTest.java
@@ -10,7 +10,7 @@
 import static org.mockito.Mockito.when;
 import static uk.gov.justice.subscription.domain.builders.EventSourceDefinitionBuilder.eventSourceDefinition;
 
-import uk.gov.justice.services.core.cdi.QualifierAnnotationExtractor;
+import uk.gov.justice.services.cdi.QualifierAnnotationExtractor;
 import uk.gov.justice.services.eventsourcing.source.core.annotation.EventSourceName;
 import uk.gov.justice.subscription.domain.eventsource.EventSourceDefinition;
 import uk.gov.justice.subscription.domain.eventsource.Location;

diff --git a/...gov/justice/services/event/sourcing/subscription/manager/SubscriptionManagerProducer.java b/...gov/justice/services/event/sourcing/subscription/manager/SubscriptionManagerProducer.java
@@ -2,7 +2,7 @@
 
 import static java.lang.String.format;
 
-import uk.gov.justice.services.core.cdi.QualifierAnnotationExtractor;
+import uk.gov.justice.services.cdi.QualifierAnnotationExtractor;
 import uk.gov.justice.services.core.interceptor.InterceptorChainProcessor;
 import uk.gov.justice.services.core.interceptor.InterceptorChainProcessorProducer;
 import uk.gov.justice.services.eventsourcing.source.core.EventSource;

diff --git a/...justice/services/event/sourcing/subscription/manager/SubscriptionManagerProducerTest.java b/...justice/services/event/sourcing/subscription/manager/SubscriptionManagerProducerTest.java
@@ -12,7 +12,7 @@
 import static uk.gov.justice.services.core.annotation.Component.EVENT_LISTENER;
 import static uk.gov.justice.subscription.domain.builders.SubscriptionBuilder.subscription;
 
-import uk.gov.justice.services.core.cdi.QualifierAnnotationExtractor;
+import uk.gov.justice.services.cdi.QualifierAnnotationExtractor;
 import uk.gov.justice.services.core.interceptor.InterceptorChainProcessor;
 import uk.gov.justice.services.core.interceptor.InterceptorChainProcessorProducer;
 import uk.gov.justice.services.event.buffer.api.EventBufferService;

diff --git a/...ustice/services/event/sourcing/subscription/manager/it/SubscriptionManagerProducerIT.java b/...ustice/services/event/sourcing/subscription/manager/it/SubscriptionManagerProducerIT.java
@@ -7,10 +7,10 @@
 import static uk.gov.justice.services.core.annotation.Component.EVENT_LISTENER;
 import static uk.gov.justice.services.test.utils.core.reflection.ReflectionUtil.fieldValue;
 
+import uk.gov.justice.services.cdi.LoggerProducer;
+import uk.gov.justice.services.cdi.QualifierAnnotationExtractor;
 import uk.gov.justice.services.common.converter.jackson.ObjectMapperProducer;
 import uk.gov.justice.services.core.annotation.ServiceComponent;
-import uk.gov.justice.services.core.cdi.LoggerProducer;
-import uk.gov.justice.services.core.cdi.QualifierAnnotationExtractor;
 import uk.gov.justice.services.core.dispatcher.DispatcherFactory;
 import uk.gov.justice.services.core.dispatcher.EnvelopePayloadTypeConverter;
 import uk.gov.justice.services.core.dispatcher.JsonEnvelopeRepacker;

diff --git a/...stice/services/components/event/listener/interceptors/it/EventBufferAndFilterChainIT.java b/...stice/services/components/event/listener/interceptors/it/EventBufferAndFilterChainIT.java
@@ -14,6 +14,7 @@
 import uk.gov.justice.schema.service.CatalogProducer;
 import uk.gov.justice.schema.service.SchemaCatalogResolverProducer;
 import uk.gov.justice.schema.service.SchemaCatalogService;
+import uk.gov.justice.services.cdi.LoggerProducer;
 import uk.gov.justice.services.common.configuration.GlobalValueProducer;
 import uk.gov.justice.services.common.converter.ObjectToJsonValueConverter;
 import uk.gov.justice.services.common.converter.StringToJsonObjectConverter;
@@ -30,7 +31,6 @@
 import uk.gov.justice.services.core.annotation.Adapter;
 import uk.gov.justice.services.core.annotation.Handles;
 import uk.gov.justice.services.core.annotation.ServiceComponent;
-import uk.gov.justice.services.core.cdi.LoggerProducer;
 import uk.gov.justice.services.core.dispatcher.DispatcherCache;
 import uk.gov.justice.services.core.dispatcher.DispatcherFactory;
 import uk.gov.justice.services.core.dispatcher.EmptySystemUserProvider;

diff --git a/...java/uk/gov/justice/services/components/event/listener/interceptors/it/EventBufferIT.java b/...java/uk/gov/justice/services/components/event/listener/interceptors/it/EventBufferIT.java
@@ -15,6 +15,7 @@
 import uk.gov.justice.schema.service.CatalogProducer;
 import uk.gov.justice.schema.service.SchemaCatalogResolverProducer;
 import uk.gov.justice.schema.service.SchemaCatalogService;
+import uk.gov.justice.services.cdi.LoggerProducer;
 import uk.gov.justice.services.common.configuration.GlobalValueProducer;
 import uk.gov.justice.services.common.converter.ObjectToJsonValueConverter;
 import uk.gov.justice.services.common.converter.StringToJsonObjectConverter;
@@ -28,7 +29,6 @@
 import uk.gov.justice.services.core.annotation.Adapter;
 import uk.gov.justice.services.core.annotation.Handles;
 import uk.gov.justice.services.core.annotation.ServiceComponent;
-import uk.gov.justice.services.core.cdi.LoggerProducer;
 import uk.gov.justice.services.core.dispatcher.DispatcherCache;
 import uk.gov.justice.services.core.dispatcher.DispatcherFactory;
 import uk.gov.justice.services.core.dispatcher.EmptySystemUserProvider;

diff --git a/...java/uk/gov/justice/services/components/event/listener/interceptors/it/EventFilterIT.java b/...java/uk/gov/justice/services/components/event/listener/interceptors/it/EventFilterIT.java
@@ -15,6 +15,7 @@
 import uk.gov.justice.schema.service.CatalogProducer;
 import uk.gov.justice.schema.service.SchemaCatalogResolverProducer;
 import uk.gov.justice.schema.service.SchemaCatalogService;
+import uk.gov.justice.services.cdi.LoggerProducer;
 import uk.gov.justice.services.common.configuration.GlobalValueProducer;
 import uk.gov.justice.services.common.converter.ObjectToJsonValueConverter;
 import uk.gov.justice.services.common.converter.StringToJsonObjectConverter;
@@ -28,7 +29,6 @@
 import uk.gov.justice.services.core.annotation.FrameworkComponent;
 import uk.gov.justice.services.core.annotation.Handles;
 import uk.gov.justice.services.core.annotation.ServiceComponent;
-import uk.gov.justice.services.core.cdi.LoggerProducer;
 import uk.gov.justice.services.core.dispatcher.DispatcherCache;
 import uk.gov.justice.services.core.dispatcher.DispatcherFactory;
 import uk.gov.justice.services.core.dispatcher.EmptySystemUserProvider;

diff --git a/pom.xml b/pom.xml
@@ -36,14 +36,14 @@
     <properties>
         <cpp.repo.name>event-store</cpp.repo.name>
 
-        <framework-domain.version>1.0.0-M3</framework-domain.version>
+        <utilities.version>1.16.0</utilities.version>
+        <test-utils.version>1.18.0</test-utils.version>
+        <framework.version>5.0.0-M3</framework.version>
+        <framework-domain.version>1.0.0-M4</framework-domain.version>
         <catalog-test-utils.version>1.4.1</catalog-test-utils.version>
         <common-bom.version>1.28.0</common-bom.version>
         <file.service.version>1.16.4</file.service.version>
         <framework-api.version>3.0.0-M14</framework-api.version>
-        <framework.version>5.0.0-M2</framework.version>
-        <test-utils.version>1.18.0</test-utils.version>
-        <utilities.version>1.15.1</utilities.version>
     </properties>
 
     <dependencyManagement>