Console Output

+ git merge --ff appng-1.24.x --strategy-option theirs
Updating 3d5ba6bf..4fab7f50
Fast-forward
 README.adoc                                        |   4 +-
 appng-api/pom.xml                                  |   2 +-
 .../src/main/java/org/appng/api/RequestUtil.java   |  28 +++--
 .../main/java/org/appng/api/SiteProperties.java    |   2 +
 .../main/java/org/appng/api/config/RestConfig.java | 120 +++++++++++++++------
 .../main/java/org/appng/api/support/XSSHelper.java |  10 +-
 .../contraints/RichtextSizeValidator.java          |   4 +-
 appng-application-assembly/pom.xml                 |   2 +-
 appng-application-bom/pom.xml                      |  22 +++-
 appng-application-camunda/README.adoc              |   6 +-
 appng-application-camunda/pom.xml                  |   2 +-
 appng-application-parent/pom.xml                   |   2 +-
 appng-application/README.adoc                      |   4 +-
 appng-application/pom.xml                          |   2 +-
 appng-appngizer-jaxb/pom.xml                       |   2 +-
 appng-appngizer-maven-plugin/pom.xml               |   2 +-
 appng-appngizer/pom.xml                            |   2 +-
 appng-archetype-application/pom.xml                |   2 +-
 appng-camunda/pom.xml                              |   2 +-
 appng-cli/pom.xml                                  |   2 +-
 appng-core/pom.xml                                 |  16 ++-
 .../java/org/appng/core/controller/Controller.java |  15 ++-
 .../core/controller/filter/PageCacheFilter.java    |  20 ++--
 .../appng/core/controller/filter/XSSFilter.java    |   2 +-
 .../appng/core/controller/handler/RestService.java |  34 ++++--
 .../org/appng/core/controller/ControllerTest.java  |  20 ++++
 .../controller/filter/PageCacheFilterTest.java     |  40 ++++---
 .../handler/ServiceRequestHandlerTest.java         |   4 +-
 .../appng/core/service/DatabaseServiceTest.java    |  68 ++++++------
 .../resources/container-license-acceptance.txt     |   3 +-
 appng-documentation/pom.xml                        |   2 +-
 appng-forms/pom.xml                                |   2 +-
 .../src/main/java/org/appng/forms/XSSUtil.java     |  14 +--
 .../src/test/java/org/appng/forms/XSSUtilTest.java |   4 +-
 appng-formtags/pom.xml                             |   2 +-
 appng-mail/pom.xml                                 |   2 +-
 appng-maven-plugin/README.adoc                     |   6 +-
 appng-maven-plugin/pom.xml                         |   2 +-
 appng-persistence/pom.xml                          |   2 +-
 appng-rest-api/pom.xml                             |   2 +-
 appng-search/pom.xml                               |   2 +-
 .../org/appng/search/indexer/SimpleDocument.java   |   4 +-
 appng-standalone/pom.xml                           |   2 +-
 appng-taglib/pom.xml                               |   2 +-
 .../main/java/org/appng/taglib/search/Search.java  |   6 +-
 appng-template-assembly/pom.xml                    |   2 +-
 appng-template-parent/pom.xml                      |   4 +-
 appng-testsupport/pom.xml                          |   2 +-
 .../testsupport/config/ApplicationTestConfig.java  |  33 +++++-
 appng-tools/pom.xml                                |   2 +-
 appng-upngizr/README.adoc                          |   4 +-
 appng-xmlapi/pom.xml                               |   2 +-
 pom.xml                                            |  21 +++-
 53 files changed, 380 insertions(+), 188 deletions(-)