Console Output

[appng] Running shell script
+ git merge --ff appng-1.14.x --strategy-option theirs
Auto-merging pom.xml
Auto-merging appng-xmlapi/pom.xml
Auto-merging appng-tools/pom.xml
Auto-merging appng-tomcat8/pom.xml
Auto-merging appng-tomcat7/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-persistence/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/pom.xml
Auto-merging appng-cli/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/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-bom/pom.xml
Auto-merging appng-application-assembly/pom.xml
Auto-merging appng-api/pom.xml
Auto-merging README.adoc
Merge made by the 'recursive' strategy.
 README.adoc                                        |  4 ++--
 appng-api/pom.xml                                  |  2 +-
 appng-application-assembly/pom.xml                 |  2 +-
 appng-application-bom/pom.xml                      | 28 +++++++++++-----------
 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 +-
 appng-archetype-application/pom.xml                |  2 +-
 appng-archetype-application/readme.txt             |  2 +-
 .../src/main/resources/archetype-resources/pom.xml |  2 +-
 appng-cli/pom.xml                                  |  2 +-
 appng-core/pom.xml                                 |  2 +-
 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-persistence/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-tomcat7/pom.xml                              |  2 +-
 appng-tomcat8/pom.xml                              |  2 +-
 appng-tools/pom.xml                                |  2 +-
 appng-xmlapi/pom.xml                               |  2 +-
 pom.xml                                            |  2 +-
 31 files changed, 49 insertions(+), 49 deletions(-)