Merge 8ec0d64 into 87e8425

CJSCommonPlatform · Nov 8, 2018 · 73112ed · 73112ed
2 parents 87e8425 + 8ec0d64
commit 73112ed
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,17 +6,21 @@ on [Keep a CHANGELOG](http://keepachangelog.com/). This project adheres to
 ## Unreleased
 ### No changes
 
+## [2.0.0] - 2018-11-08
+### Changed
+- Updated framework to framework 5.0.3 
+
 ## [2.0.0-M2] - 2018-10-31
 ### Changed
-Updated framework to framework 5.0.0-M2 
+- Updated framework to framework 5.0.0-M2 
 
 ## [2.0.0-M1] - 2018-10-30
 ### Changed
-Updated framework to framework 5.0.0-M1 
+- Updated framework to framework 5.0.0-M1 
 
 ## [1.3.2] - 2018-09-10
 ### Changed
--Change MetricRegistryProducer to produce a static instance of MetricRegistry
+- Change MetricRegistryProducer to produce a static instance of MetricRegistry
 
 ## [1.3.1] - 2018-08-14
 

diff --git a/metrics-interceptor/pom.xml b/metrics-interceptor/pom.xml
@@ -61,6 +61,11 @@
             <version>${test-utils.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>uk.gov.justice.utils</groupId>
+            <artifactId>utilities-core</artifactId>
+            <version>${utilities.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.tomee</groupId>
             <artifactId>openejb-core</artifactId>
@@ -73,4 +78,4 @@
         </dependency>
     </dependencies>
 
-</project>
+</project>
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
@@ -10,6 +10,7 @@
 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.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;
@@ -22,7 +23,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.EmptySystemUserProvider;
 import uk.gov.justice.services.core.dispatcher.ServiceComponentObserver;
@@ -208,4 +208,4 @@ public List<Pair<Integer, Class<? extends Interceptor>>> interceptorChainTypes()
             return interceptorChainTypes;
         }
     }
-}
+}
diff --git a/pom.xml b/pom.xml
@@ -23,11 +23,11 @@
     <properties>
         <cpp.repo.name>metrics</cpp.repo.name>
 
-        <microservice-framework.version>5.0.0-M2</microservice-framework.version>
+        <microservice-framework.version>5.0.3</microservice-framework.version>
         <common-bom.version>1.28.0</common-bom.version>
-        <framework-api.version>3.0.0-M14</framework-api.version>
-        <test-utils.version>1.18.0</test-utils.version>
-        <utilities.version>1.15.1</utilities.version>
+        <framework-api.version>3.0.0</framework-api.version>
+        <test-utils.version>1.18.1</test-utils.version>
+        <utilities.version>1.16.1</utilities.version>
     </properties>
 
     <scm>