Console Output

+ git merge --ff appng-manager-1.16.x --strategy-option theirs
Auto-merging src/main/java/org/appng/application/manager/service/Service.java
Auto-merging src/main/java/org/appng/application/manager/business/Cache.java
Auto-merging pom.xml
Merge made by the 'recursive' strategy.
 application-home/application.xml                   |   2 +-
 pom.xml                                            |   8 +-
 .../appng/application/manager/business/Cache.java  | 106 ++++--
 .../appng/application/manager/service/Service.java |   2 +
 .../application/manager/business/CacheTest.java    |  69 ++++
 .../resources/xml/CacheTest-testCacheElements.xml  | 370 +++++++++++++++++++++
 6 files changed, 527 insertions(+), 30 deletions(-)
 create mode 100644 src/test/java/org/appng/application/manager/business/CacheTest.java
 create mode 100644 src/test/resources/xml/CacheTest-testCacheElements.xml