Console Output

+ git merge --ff appng-1.20.x --strategy-option theirs
Auto-merging pom.xml
Auto-merging appng-xmlapi/pom.xml
Auto-merging appng-upngizr/pom.xml
Auto-merging appng-upngizr/README.adoc
Auto-merging appng-tools/pom.xml
Auto-merging appng-testsupport/pom.xml
Auto-merging appng-template-parent/pom.xml
Auto-merging appng-template-assembly/pom.xml
Auto-merging appng-taglib/pom.xml
Auto-merging appng-standalone/pom.xml
Auto-merging appng-search/pom.xml
Auto-merging appng-rest-api/pom.xml
Auto-merging appng-persistence/pom.xml
Auto-merging appng-maven-plugin/pom.xml
Auto-merging appng-mail/pom.xml
Auto-merging appng-formtags/pom.xml
Auto-merging appng-forms/pom.xml
Auto-merging appng-documentation/src/main/asciidoc/listing/dependencies.txt
Auto-merging appng-documentation/pom.xml
Auto-merging appng-core/src/test/java/org/appng/core/service/DatabaseServiceTest.java
Auto-merging appng-core/src/test/java/org/appng/core/controller/RepositoryWatcherTest.java
Auto-merging appng-core/src/main/resources/org/appng/core/site-config.properties
Auto-merging appng-core/src/main/java/org/appng/core/service/MigrationService.java
Auto-merging appng-core/src/main/java/org/appng/core/repository/config/HikariCPConfigurer.java
Auto-merging appng-core/src/main/java/org/appng/core/domain/DatabaseConnection.java
Auto-merging appng-core/src/main/java/org/appng/core/controller/RepositoryWatcher.java
Auto-merging appng-core/pom.xml
Auto-merging appng-cli/src/test/java/org/appng/cli/commands/property/CommandListPropertiesTest.java
Auto-merging appng-cli/pom.xml
Auto-merging appng-camunda/pom.xml
Auto-merging appng-archetype-application/src/main/resources/archetype-resources/pom.xml
Auto-merging appng-archetype-application/readme.txt
Auto-merging appng-archetype-application/pom.xml
Auto-merging appng-appngizer/src/test/resources/xml/site-property-list.xml
Auto-merging appng-appngizer/pom.xml
Auto-merging appng-appngizer-maven-plugin/pom.xml
Auto-merging appng-appngizer-jaxb/pom.xml
Auto-merging appng-application/pom.xml
Auto-merging appng-application-parent/pom.xml
Auto-merging appng-application-camunda/pom.xml
Auto-merging appng-application-bom/pom.xml
Auto-merging appng-application-assembly/pom.xml
Auto-merging appng-api/pom.xml
Auto-merging README.adoc
Auto-merging .gitignore
Merge made by the 'recursive' strategy.
 .gitignore                                         |  1 -
 README.adoc                                        |  4 +-
 appng-api/pom.xml                                  |  2 +-
 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/pom.xml                          |  2 +-
 appng-appngizer-jaxb/pom.xml                       |  2 +-
 appng-appngizer-maven-plugin/pom.xml               |  2 +-
 appng-appngizer/pom.xml                            |  2 +-
 .../src/test/resources/xml/site-property-list.xml  | 11 +++--
 appng-archetype-application/pom.xml                |  2 +-
 appng-archetype-application/readme.txt             |  2 +-
 .../src/main/resources/archetype-resources/pom.xml |  2 +-
 appng-camunda/pom.xml                              |  2 +-
 appng-cli/pom.xml                                  |  2 +-
 .../property/CommandListPropertiesTest.java        |  6 +--
 appng-core/pom.xml                                 |  2 +-
 .../appng/core/controller/RepositoryWatcher.java   | 50 ++++++++++++----------
 .../org/appng/core/domain/DatabaseConnection.java  | 17 +++-----
 .../core/repository/config/HikariCPConfigurer.java |  1 +
 .../org/appng/core/service/MigrationService.java   |  7 ++-
 .../org/appng/core/site-config.properties          |  2 +-
 .../core/controller/RepositoryWatcherTest.java     | 14 +++++-
 .../appng/core/service/DatabaseServiceTest.java    |  4 ++
 appng-documentation/.gitignore                     |  1 +
 appng-documentation/pom.xml                        |  2 +-
 .../src/main/asciidoc/listing/dependencies.txt     |  8 ++--
 appng-forms/pom.xml                                |  2 +-
 appng-formtags/pom.xml                             |  2 +-
 appng-mail/pom.xml                                 |  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                          |  4 +-
 appng-upngizr/pom.xml                              |  2 +-
 appng-xmlapi/pom.xml                               |  2 +-
 pom.xml                                            |  2 +-
 46 files changed, 108 insertions(+), 88 deletions(-)