Console Output

+ git merge --ff appng-1.26.x --strategy-option theirs
Auto-merging appng-template-parent/pom.xml
Auto-merging appng-appngizer-maven-plugin/pom.xml
Auto-merging appng-application-parent/pom.xml
Auto-merging appng-application-bom/pom.xml
Removing appng-api/src/main/java/org/appng/api/support/environment/EnvironmentFactoryBean.java
Merge made by the 'recursive' strategy.
 README.adoc                                        |  2 +-
 appng-api/pom.xml                                  |  2 +-
 .../environment/EnvironmentFactoryBean.java        | 46 ----------------------
 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 +-
 appng-appngizer-jaxb/pom.xml                       |  2 +-
 appng-appngizer-maven-plugin/pom.xml               |  2 +-
 appng-appngizer/pom.xml                            |  2 +-
 appng-archetype-application/pom.xml                |  2 +-
 .../src/main/resources/archetype-resources/pom.xml |  2 +-
 appng-camunda/pom.xml                              |  2 +-
 appng-cli/pom.xml                                  |  2 +-
 appng-core/pom.xml                                 |  2 +-
 .../core/controller/messaging/ReloadSiteEvent.java |  6 +--
 .../main/java/org/appng/core/domain/SiteImpl.java  | 19 +++++++--
 .../org/appng/core/service/InitializerService.java |  2 +-
 .../java/org/appng/core/domain/SiteImplTest.java   |  4 ++
 .../org/appng/core/service/PlatformTestConfig.java |  8 ++--
 appng-documentation/pom.xml                        |  2 +-
 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 +-
 changelog.txt                                      | 18 +++++++++
 pom.xml                                            |  2 +-
 42 files changed, 82 insertions(+), 93 deletions(-)
 delete mode 100644 appng-api/src/main/java/org/appng/api/support/environment/EnvironmentFactoryBean.java