Upgrade to Framework 3.0.0

CJSCommonPlatform · Jan 19, 2018 · 7757e70 · 7757e70
1 parent a2bdd96
commit 7757e70
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,11 @@ All notable changes to this project will be documented in this file, which follo
 on [Keep a CHANGELOG](http://keepachangelog.com/). This project adheres to
 [Semantic Versioning](http://semver.org/).
 
+## [Unreleased]
+
+## [1.1.0] - 2018-01-18
+
+
 ## [1.0.0] - 2017-08-08
 
 ### Added

diff --git a/metrics-interceptor/pom.xml b/metrics-interceptor/pom.xml
@@ -19,7 +19,7 @@
         <dependency>
             <groupId>uk.gov.justice.framework-api</groupId>
             <artifactId>framework-api-core</artifactId>
-            <version>${cpp.framework.api.version}</version>
+            <version>${framework-api.version}</version>
         </dependency>
         <dependency>
             <groupId>uk.gov.justice.utils</groupId>

diff --git a/...a/uk/gov/justice/services/metrics/interceptor/IndividualActionMetricsInterceptorTest.java b/...a/uk/gov/justice/services/metrics/interceptor/IndividualActionMetricsInterceptorTest.java
@@ -4,9 +4,9 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 import static uk.gov.justice.services.core.interceptor.DefaultInterceptorContext.interceptorContextWithInput;
-import static uk.gov.justice.services.messaging.JsonObjectMetadata.metadataWithDefaults;
-import static uk.gov.justice.services.messaging.JsonObjectMetadata.metadataWithRandomUUID;
 import static uk.gov.justice.services.test.utils.core.messaging.JsonEnvelopeBuilder.envelope;
+import static uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory.metadataWithDefaults;
+import static uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory.metadataWithRandomUUID;
 
 import uk.gov.justice.services.core.interceptor.InterceptorChain;
 import uk.gov.justice.services.core.interceptor.InterceptorContext;

diff --git a/...s-interceptor/src/test/java/uk/gov/justice/services/metrics/interceptor/it/MetricsIT.java b/...s-interceptor/src/test/java/uk/gov/justice/services/metrics/interceptor/it/MetricsIT.java
@@ -7,8 +7,8 @@
 import static org.junit.Assert.assertThat;
 import static uk.gov.justice.services.core.annotation.Component.EVENT_LISTENER;
 import static uk.gov.justice.services.core.interceptor.DefaultInterceptorContext.interceptorContextWithInput;
-import static uk.gov.justice.services.messaging.DefaultJsonEnvelope.envelope;
-import static uk.gov.justice.services.messaging.JsonObjectMetadata.metadataWithRandomUUID;
+import static uk.gov.justice.services.test.utils.core.messaging.JsonEnvelopeBuilder.envelope;
+import static uk.gov.justice.services.test.utils.core.messaging.MetadataBuilderFactory.metadataWithRandomUUID;
 
 import uk.gov.justice.services.common.configuration.GlobalValueProducer;
 import uk.gov.justice.services.common.converter.ObjectToJsonValueConverter;
@@ -40,11 +40,10 @@
 import uk.gov.justice.services.core.json.JsonSchemaLoader;
 import uk.gov.justice.services.core.requester.RequesterProducer;
 import uk.gov.justice.services.core.sender.SenderProducer;
-import uk.gov.justice.services.messaging.DefaultJsonObjectEnvelopeConverter;
 import uk.gov.justice.services.messaging.JsonEnvelope;
 import uk.gov.justice.services.messaging.jms.DefaultEnvelopeConverter;
 import uk.gov.justice.services.messaging.jms.DefaultJmsEnvelopeSender;
-import uk.gov.justice.services.messaging.logging.DefaultTraceLogger;
+import uk.gov.justice.services.messaging.spi.JsonEnvelopeProvider;
 import uk.gov.justice.services.metrics.interceptor.IndividualActionMetricsInterceptor;
 import uk.gov.justice.services.metrics.interceptor.MetricRegistryProducer;
 import uk.gov.justice.services.metrics.interceptor.TotalActionMetricsInterceptor;
@@ -101,7 +100,6 @@ public class MetricsIT {
             DefaultEnvelopeConverter.class,
 
             StringToJsonObjectConverter.class,
-            DefaultJsonObjectEnvelopeConverter.class,
             ObjectToJsonValueConverter.class,
             ObjectMapper.class,
             Enveloper.class,
@@ -123,7 +121,7 @@ public class MetricsIT {
             EnvelopeValidationExceptionHandlerProducer.class,
             GlobalValueProducer.class,
             JsonSchemaLoader.class,
-            DefaultTraceLogger.class
+            JsonEnvelopeProvider.class
     })
     public WebApp war() {
         return new WebApp()

diff --git a/pom.xml b/pom.xml
@@ -21,12 +21,14 @@
     </modules>
 
     <properties>
+        <cpp.repo.name>metrics</cpp.repo.name>
+
         <common-bom.version>1.22.0</common-bom.version>
-        <microservice-framework.version>3.0.0-SNAPSHOT</microservice-framework.version>
-        <cpp.framework.api.version>1.1.0</cpp.framework.api.version>
+        <framework-api.version>1.1.0</framework-api.version>
+        <microservice-framework.version>3.0.0</microservice-framework.version>
+
+        <test-utils.version>1.16.0</test-utils.version>
         <utilities.version>1.11.0</utilities.version>
-        <test-utils.version>1.15.0</test-utils.version>
-        <cpp.repo.name>metrics</cpp.repo.name>
     </properties>
 
     <scm>