Console Output

+ git merge --ff appng-1.26.x --strategy-option theirs
Auto-merging appng-template-parent/pom.xml
Removing appng-core/src/main/java/org/appng/core/controller/messaging/TribesSender.java
Removing appng-core/src/main/java/org/appng/core/controller/messaging/TribesReceiver.java
Auto-merging appng-appngizer-maven-plugin/pom.xml
Auto-merging appng-application-parent/pom.xml
Auto-merging appng-application-bom/pom.xml
Merge made by the 'recursive' strategy.
 README.adoc                                        |   2 +-
 appng-api/pom.xml                                  |   2 +-
 .../src/main/java/org/appng/api/Platform.java      |   2 -
 .../main/java/org/appng/api/messaging/Event.java   |  40 ++++-
 appng-application-assembly/pom.xml                 |   2 +-
 appng-application-bom/pom.xml                      |   2 +-
 appng-application-camunda/pom.xml                  |   2 +-
 appng-application-parent/pom.xml                   |   2 +-
 appng-application/README.adoc                      |   2 +-
 appng-application/pom.xml                          |   2 +-
 .../conf/examples/appNG-example-hsqldb.properties  |   2 +-
 appng-appngizer-jaxb/pom.xml                       |   2 +-
 appng-appngizer-maven-plugin/pom.xml               |   2 +-
 appng-appngizer/pom.xml                            |   2 +-
 .../appng/appngizer/controller/SiteController.java |   4 -
 appng-archetype-application/pom.xml                |   2 +-
 .../src/main/resources/archetype-resources/pom.xml |   2 +-
 appng-camunda/pom.xml                              |   2 +-
 appng-cli/pom.xml                                  |   2 +-
 .../src/main/java/org/appng/cli/CliBootstrap.java  |  17 +-
 appng-core/pom.xml                                 |   2 +-
 .../org/appng/core/controller/HttpHeaders.java     |   6 +-
 .../org/appng/core/controller/PlatformConfig.java  |   4 +-
 .../org/appng/core/controller/PlatformStartup.java |  15 +-
 .../core/controller/filter/EnvironmentFilter.java  |   2 +-
 .../core/controller/filter/PageCacheFilter.java    | 117 ++++++++------
 .../core/controller/messaging/HazelcastBase.java   |   4 +-
 .../controller/messaging/HazelcastReceiver.java    |  11 +-
 .../core/controller/messaging/HazelcastSender.java |   6 +-
 .../core/controller/messaging/JedisReceiver.java   |   2 +-
 .../appng/core/controller/messaging/Messaging.java |  26 +++-
 .../controller/messaging/MulticastReceiver.java    |   2 +-
 .../appng/core/controller/messaging/NodeEvent.java |   2 +-
 .../controller/messaging/RabbitMQReceiver.java     |   2 +-
 .../core/controller/messaging/ReloadSiteEvent.java |  64 ++++----
 .../appng/core/controller/messaging/SiteEvent.java |  10 +-
 .../core/controller/messaging/SiteStateEvent.java  |   3 +-
 .../core/controller/messaging/StopSiteEvent.java   |   4 +-
 .../core/controller/messaging/TribesReceiver.java  | 151 ------------------
 .../core/controller/messaging/TribesSender.java    |  60 -------
 .../controller/rest/openapi/OpenApiAction.java     |   4 +-
 .../controller/rest/openapi/OpenApiDataSource.java |   2 +-
 .../controller/rest/openapi/OpenApiOperation.java  |   2 +-
 .../core/repository/config/DataSourceFactory.java  |   2 +
 .../repository/config/DatasourceConfigurer.java    |   2 +
 .../core/repository/config/HikariCPConfigurer.java |   4 +
 .../repository/config/TomcatJdbcConfigurer.java    |   8 +
 .../appng/core/service/HazelcastConfigurer.java    |  10 +-
 .../java/org/appng/core/service/HsqlStarter.java   |  53 +++++--
 .../org/appng/core/service/InitializerService.java | 172 +++++++++++----------
 .../appng/core/controller/PlatformStartupTest.java |   2 +-
 .../controller/filter/EnvironmentFilterTest.java   |   2 +
 .../controller/filter/PageCacheFilterTest.java     |  77 +++++----
 .../org/appng/core/service/CoreServiceTest.java    |   3 +-
 .../appng/core/service/InitializerServiceTest.java |   7 +-
 .../src/test/resources/appNG-hsql.properties       |   2 +
 appng-documentation/pom.xml                        |   2 +-
 .../src/main/asciidoc/admin/caching.adoc           |  38 +++--
 .../src/main/asciidoc/admin/monitoring.adoc        |  29 +++-
 .../src/main/asciidoc/developerguide.adoc          |   3 +
 .../src/main/asciidoc/parts/openapi.adoc           |  11 ++
 appng-forms/pom.xml                                |   2 +-
 appng-formtags/pom.xml                             |   2 +-
 appng-mail/pom.xml                                 |   2 +-
 appng-maven-plugin/README.adoc                     |   2 +-
 appng-maven-plugin/pom.xml                         |   2 +-
 appng-persistence/pom.xml                          |   2 +-
 appng-rest-api/pom.xml                             |   2 +-
 appng-search/pom.xml                               |   2 +-
 appng-standalone/pom.xml                           |   2 +-
 appng-taglib/pom.xml                               |   2 +-
 appng-template-assembly/pom.xml                    |   2 +-
 appng-template-parent/pom.xml                      |   4 +-
 appng-testsupport/pom.xml                          |   2 +-
 appng-tools/pom.xml                                |   2 +-
 appng-upngizr/README.adoc                          |   2 +-
 appng-upngizr/pom.xml                              |   2 +-
 appng-xmlapi/pom.xml                               |   2 +-
 pom.xml                                            |   2 +-
 79 files changed, 503 insertions(+), 558 deletions(-)
 delete mode 100644 appng-core/src/main/java/org/appng/core/controller/messaging/TribesReceiver.java
 delete mode 100644 appng-core/src/main/java/org/appng/core/controller/messaging/TribesSender.java
 create mode 100644 appng-documentation/src/main/asciidoc/parts/openapi.adoc