Merge 6415471 into 89c3313

CJSCommonPlatform · Oct 30, 2018 · 2f591d3 · 2f591d3
2 parents 89c3313 + 6415471
commit 2f591d3
Show file tree

Hide file tree

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

diff --git a/pom.xml b/pom.xml
@@ -23,9 +23,9 @@
     <properties>
         <cpp.repo.name>metrics</cpp.repo.name>
 
-        <microservice-framework.version>4.4.0</microservice-framework.version>
+        <microservice-framework.version>5.0.0-M1</microservice-framework.version>
         <common-bom.version>1.28.0</common-bom.version>
-        <framework-api.version>2.2.0</framework-api.version>
+        <framework-api.version>3.0.0-M14</framework-api.version>
         <test-utils.version>1.17.3</test-utils.version>
         <utilities.version>1.15.1</utilities.version>
     </properties>