Merge 02cdcaa into a528c9b

CJSCommonPlatform · Apr 16, 2019 · d023387 · d023387
2 parents a528c9b + 02cdcaa
commit d023387
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -19,8 +19,6 @@ addons:
     organization: cjscommonplatform
     token:
       secure: Lb5gA3NBMFf8VnTNjf2KAcy5S0+cvSSz2qaiN0diHSIi205nT12Foom27bCQnn2+Kxfzljn3hdIA3GUEipwh/UbZQHCdFl3mROMm28psWO7nZvNz82vwYlrpGiXzrkn5YAL9QRFbnzrCZwIZSGinQojaZ72H3/FwmSYlBKE++ito2HPPdD8wrLYVUBKp06u683NQQU4koLSU50pFgkbIcFkeUNwrVT8t69tW2+abEgzfpa5o6ExcPATcxKYJ8fPx/C/x9XjcNVYho5nAJ7KRy0PkS3MEAnjOIBwVHZrXb2qjeoJ5T9AJfuXwaTCyMFA/e+gyGn28CsQkzHohE4VZUovn5MdU9Hkzz9xOwU7JS8837JNAlPy2+U71oemGXwdB8D4LnuxkghBw9JukFq1EqqeLv0CQWU/iBAYYPIHIdjFUTcolPM14VhCQfj0XPIR7oyIDsOivjcK0ULSY6pInGszFgbex0ApVWD6t7l3yoFmbZMfdviAmuzUEtwwwIyffq76at64iH9rz1VbcUesF6ls+/02/Umvx1azReQqQ+/ciRCK6I/NtnfGzDvYlVtQA6+HigRBivRLbjrv9iaGHG+54aP1cne2n1QJUkke58yLjLWvhfcXIIB2nsrTqEyJx1qfMdPUlKFqrHZQJu/pp2cxY8uwkLe2Eur7jRNofIE8=
-    github_token:
-      secure: cEzLKBpESOAsBZTzfnxFW0vGt5cmiys0eLX1VdKWarIBluW4tBsxuCsZAjJq1Gqvhfc+bfYNPr6cB1hueK/sQ6ktpmXjM9NtihPbkLKulBi917449osOlumUeRVVQds8hm46R4/p67s8qocyHNh3oHn9caBFOisFe8OrFL3lgGW7ymkWpGeAFlY1yHMdns2o/ISdOoQ8R7vJX4Qi9XLLi7IaKlY4vSBJB17rThqQxVhAe+z9rE7gZGcXjZhRBMZcUKXJNDUTLvnfjdJBF/uNHrpT3gEJJnnlelxv0ROaWeJX7UXGJ9cjdDgEpKObejuGNCgmHRqT5rgpOQjNCU2vvNJoNFEQUR0UszIq3W2BPX5y+jOYfNw2QkihQRWA+UxkMy48/yfkjEqiRA1YgvrLZBz4oaCeeaxzcAeZjVoQaYfNfK1MUzka0yoZ3tZT7zaiJmcAxW5Mn0HYfL2KgHgz18TT4S9lH5aRG27lvUAwguFS77f4+TtpOk3qhkm3M7rqP8gmYKRW2ioRLd8ZGYcyTg/QSrJSu6RIrloj3KmAb7kIekZHXPZ6fp8jMIYafDZjRFM7mkJpEBBCtkKZL7xeYgUbvhAhWEa9fb3ifUjGTMG4oIDZsveFgfhB8CMB5LzX0WlNuxEChmTcM+dYJzl+WL21Qesb6ULowW1LvsG1CUc=
 before_install:
 - git clone https://github.com/CJSCommonPlatform/travis-settings.git target/travis-settings
 - ln -sfT ${PWD}/target/travis-settings/settings.xml ${HOME}/.m2/settings.xml

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,11 @@ on [Keep a CHANGELOG](http://keepachangelog.com/). This project adheres to
 
 ## [Unreleased]
 
+## [1.1.2-M2] - 2019-04-16
+### Changed
+- Remove deprecated github_token entry from travis.yml
+- Update framework to 6.0.0-M12
+
 ## [1.1.2-M1] - 2019-03-01
 ### Changed
 - Update framework to 5.3.0-M3

diff --git a/pom.xml b/pom.xml
@@ -32,7 +32,7 @@
     <properties>
         <cpp.repo.name>framework-domain</cpp.repo.name>
         <common-bom.version>1.29.0</common-bom.version>
-        <framework.version>5.3.0-M3</framework.version>
+        <framework.version>6.0.0-M12</framework.version>
     </properties>
 
     <dependencyManagement>