Merge pull request #238 from CJSCommonPlatform/update-framework-libra…

…ries Update framework-libraries to 7.0.11
CJSCommonPlatform · Sep 10, 2020 · 3eab868 · 3eab868
2 parents c314d7f + cef801e
commit 3eab868
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,12 +5,17 @@ on [Keep a CHANGELOG](http://keepachangelog.com/). This project adheres to
 
 ## [Unreleased]
 
+## [7.0.10] - 2020-09-10
+### Changed
+- Update framework-libraries to 7.0.11
+
 ## [7.0.9] - 2020-08-28
 ### Changed
 - Changed the removal of the event_log trigger to be called by a 
 ServletContextListener to fix call happening after database 
 connections destroyed
 
+
 ## [7.0.8] - 2020-08-14
 ### Changed
 - Updated framework to 7.0.10

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
@@ -27,7 +27,7 @@
 import uk.gov.justice.services.common.configuration.GlobalValueProducer;
 import uk.gov.justice.services.common.configuration.ServiceContextNameProvider;
 import uk.gov.justice.services.common.configuration.ValueProducer;
-import uk.gov.justice.services.common.converter.JsonObjectToObjectConverter;
+import uk.gov.justice.services.common.converter.JsonObjectConvertersProducer;
 import uk.gov.justice.services.common.converter.ObjectToJsonObjectConverter;
 import uk.gov.justice.services.common.converter.ObjectToJsonValueConverter;
 import uk.gov.justice.services.common.converter.StringToJsonObjectConverter;
@@ -164,7 +164,6 @@ public class SnapshotAwareAggregateServiceIT {
             DefaultEnvelopeConverter.class,
             StringToJsonObjectConverter.class,
             DefaultJsonObjectEnvelopeConverter.class,
-            JsonObjectToObjectConverter.class,
             ObjectMapperProducer.class,
 
             JmsEventPublisher.class,
@@ -209,7 +208,8 @@ public class SnapshotAwareAggregateServiceIT {
             EventStreamManager.class,
 
             JndiAppNameProvider.class,
-            DefaultJsonEnvelopeProvider.class
+            DefaultJsonEnvelopeProvider.class,
+            JsonObjectConvertersProducer.class
     })
 
     public WebApp war() {

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
@@ -20,8 +20,7 @@
 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;
+import uk.gov.justice.services.common.converter.JsonObjectConvertersProducer;
 import uk.gov.justice.services.common.converter.ObjectToJsonValueConverter;
 import uk.gov.justice.services.common.converter.StringToJsonObjectConverter;
 import uk.gov.justice.services.common.converter.jackson.ObjectMapperProducer;
@@ -197,11 +196,9 @@ public EventInsertionStrategy eventLogInsertionStrategy() {
             JmsEventPublisher.class,
             DefaultEventDestinationResolver.class,
             DefaultJsonObjectEnvelopeConverter.class,
-            ObjectToJsonObjectConverter.class,
             DummyJmsEnvelopeSender.class,
             TraceLogger.class,
             DefaultTraceLogger.class,
-            JsonObjectToObjectConverter.class,
             EventSourceProducer.class,
             EventSourceDefinitionRegistryProducer.class,
             ParserProducer.class,
@@ -228,7 +225,8 @@ public EventInsertionStrategy eventLogInsertionStrategy() {
             EventStreamManager.class,
 
             JndiAppNameProvider.class,
-            DefaultJsonEnvelopeProvider.class
+            DefaultJsonEnvelopeProvider.class,
+            JsonObjectConvertersProducer.class
     })
 
     public WebApp war() {

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
@@ -23,8 +23,7 @@
 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;
+import uk.gov.justice.services.common.converter.JsonObjectConvertersProducer;
 import uk.gov.justice.services.common.converter.ObjectToJsonValueConverter;
 import uk.gov.justice.services.common.converter.StringToJsonObjectConverter;
 import uk.gov.justice.services.common.converter.jackson.ObjectMapperProducer;
@@ -207,8 +206,6 @@ public EventInsertionStrategy eventLogInsertionStrategy() {
             TraceLogger.class,
             DefaultTraceLogger.class,
             DefaultEnvelopeConverter.class,
-            JsonObjectToObjectConverter.class,
-            ObjectToJsonObjectConverter.class,
             JdbcBasedEventRepository.class,
 
             EventSourceProducer.class,
@@ -235,7 +232,8 @@ public EventInsertionStrategy eventLogInsertionStrategy() {
             EventStreamManager.class,
 
             JndiAppNameProvider.class,
-            DefaultJsonEnvelopeProvider.class
+            DefaultJsonEnvelopeProvider.class,
+            JsonObjectConvertersProducer.class
     })
     public WebApp war() {
         return new WebApp()

diff --git a/pom.xml b/pom.xml
@@ -38,7 +38,7 @@
 
     <properties>
         <cpp.repo.name>event-store</cpp.repo.name>
-        <framework.version>7.0.10</framework.version>
+        <framework.version>7.0.11</framework.version>
     </properties>
 
     <dependencyManagement>