Merge 5dc7c0b into ae7a47e

CJSCommonPlatform · May 13, 2019 · be85b3b · be85b3b
2 parents ae7a47e + 5dc7c0b
commit be85b3b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,12 @@ on [Keep a CHANGELOG](http://keepachangelog.com/). This project adheres to
 
 ## Unreleased
 
+## [2.1.5] - 2019-05-13
+### Changed
+- microservice-framework -> 6.0.0-M23
+- framework-api -> 4.0.0-M19
+
+
 ## [2.1.4] - 2019-05-07
 ### Changed
 - microservice-framework -> 6.0.0-M22

diff --git a/pom.xml b/pom.xml
@@ -23,9 +23,9 @@
     <properties>
         <cpp.repo.name>metrics</cpp.repo.name>
 
-        <microservice-framework.version>6.0.0-M22</microservice-framework.version>
+        <microservice-framework.version>6.0.0-M23</microservice-framework.version>
         <common-bom.version>2.0.2</common-bom.version>
-        <framework-api.version>4.0.0-M18</framework-api.version>
+        <framework-api.version>4.0.0-M19</framework-api.version>
         <test-utils.version>1.23.0</test-utils.version>
         <utilities.version>1.18.0</utilities.version>
     </properties>