Merge pull request #459 from CJSCommonPlatform/json-fix-2.2.x

Upgrade utilities and file service libraries

Author: mapingo

CHANGELOG.md

@@ -5,15 +5,27 @@ on [Keep a CHANGELOG](http://keepachangelog.com/). This project adheres to
 
 ## [Unreleased]
 
-## [2.2.0] 2017-08-02
+### Changed
+- Utilities library upgraded to 1.8.1 and file service to 1.11.1 to pick up JSON logging fix
+
+## [2.2.1] - 2017-09-01
+
+### Changed
+- Converted to release to bintray
+- Converted example context to run as a single war by default
+
+### Fixed
+- Class conflicts between generated clients in a single war
+
+## [2.2.0] - 2017-08-02
 
 ### Changed
 - Use maven-framework-parent-pom 1.6.1, which simply changes the wildfly-maven-plugin to 1.2.0.Alpha6 and stops adding it to every build
 - example-it: move the wildfly operations to the pre/post-integration-test phases (where they belong)
 - Switch to bintray for release processes
 - Cleaned up some unnecessary version overrides
 
-## [2.1.0] 2017-07-17
+## [2.1.0] - 2017-07-17
 
 ### Added
 - New test matcher for checking schema properties
@@ -22,7 +34,7 @@ on [Keep a CHANGELOG](http://keepachangelog.com/). This project adheres to
 - Aggregate snapshot repository did not use aggregate class when retrieving snapshots, so services that use multiple aggregate classes
 on the same stream could get class cast exceptions
 
-## [2.0.0] 2017-06-23
+## [2.0.0] - 2017-06-23
 
 ### Changed
 - Refactor all framework components that are not internal so that they are provided as interfaces
@@ -91,15 +103,15 @@ class will need to change the class name of their override to match.
 ### Removed
 - Precondition class marked as deprecated - will be removed in 3.0.0 unless a differen tuse case is found for it
 
-## [2.0.0-rc2] 2017-06-06
+## [2.0.0-rc2] - 2017-06-06
 
 ### Changed
 - Interceptor chain now adds the component name to the context so it can be used by the access control interceptor or anything else that needs it
 
 ### Removed
 - Access control Provider annotation and annotation scanning; this functionality has moved to the access control library
 
-## [2.0.0-rc1] 2017-05-31
+## [2.0.0-rc1] - 2017-05-31
 
 ### Changed
 - Refactor all framework components that are not internal so that they are provided as interfaces
@@ -121,28 +133,28 @@ be provided, typically by generating one from the destination RAML.
 - Support for generating and discovering direct adapters, if a message destination exists locally 
 a service component in the same application
 
-## [1.7.1] 2017-05-16
+## [1.7.1] - 2017-05-16
 
 ### Added
 - Utility for browsing and deleting DLQ messages, backported from separate test utils library
 - Support for adding additional fields when building metadata
 
-## [1.7.0] 2017-05-16
+## [1.7.0] - 2017-05-16
 
 ### Added
 - Add test event log repository to the test-utils-core module
 
-## [1.6.0] 2017-05-05
+## [1.6.0] - 2017-05-05
 
 ### Added
 - Support for PDF generation in Alfresco interface
 
-## [1.5.2] 2017-04-07
+## [1.5.2] - 2017-04-07
 
 ###
 - Service names with hyphens were also breaking other adapters and clients
 
-## [1.5.1] 2017-04-05
+## [1.5.1] - 2017-04-05
 
 ### Fixed
 - Event listeners for services with a hyphen in the name generated invalid class names
@@ -709,7 +721,10 @@ turned off by default
 
 - Initial release with basic dispatcher, handler and adapter generation
 
-[Unreleased]: https://github.com/CJSCommonPlatform/microservice_framework/compare/release-2.1.0...HEAD
+[Unreleased]: https://github.com/CJSCommonPlatform/microservice_framework/compare/release-2.2.1...HEAD
+[2.2.1]: https://github.com/CJSCommonPlatform/microservice_framework/compare/release-2.2.0...release-2.2.1
+[2.2.0]: https://github.com/CJSCommonPlatform/microservice_framework/compare/release-2.1.0...release-2.2.0
+[2.1.0]: https://github.com/CJSCommonPlatform/microservice_framework/compare/release-2.0.0...release-2.1.0
 [2.1.0]: https://github.com/CJSCommonPlatform/microservice_framework/compare/release-2.0.0...release-2.1.0
 [2.0.0]: https://github.com/CJSCommonPlatform/microservice_framework/compare/release-1.7.0...release-2.0.0
 [2.0.0-rc8]: https://github.com/CJSCommonPlatform/microservice_framework/compare/release-2.0.0-rc7...release-2.0.0-rc8

pom.xml

@@ -49,9 +49,9 @@
         <common-bom.version>1.17.0</common-bom.version>
         <embedded-artemis.version>1.1.0</embedded-artemis.version>
         <raml-maven-plugin.version>1.6.0</raml-maven-plugin.version>
-        <file.service.version>1.9.0</file.service.version>
-        <utilities.version>1.7.0</utilities.version>
-        <test-utils.version>1.5.0</test-utils.version>
+        <file.service.version>1.11.1</file.service.version>
+        <utilities.version>1.8.1</utilities.version>
+        <test-utils.version>1.7.0</test-utils.version>
         <jboss-ejb3-ext-api.version>2.2.0.Final</jboss-ejb3-ext-api.version>
 
         <cpp.repo.name>microservice_framework</cpp.repo.name>