Console Output

[appng] Running shell script
+ git merge --ff appng-1.14.2-release
Auto-merging pom.xml
CONFLICT (content): Merge conflict in pom.xml
Auto-merging appng-xmlapi/pom.xml
CONFLICT (content): Merge conflict in appng-xmlapi/pom.xml
Auto-merging appng-tools/pom.xml
CONFLICT (content): Merge conflict in appng-tools/pom.xml
Auto-merging appng-tomcat8/pom.xml
CONFLICT (content): Merge conflict in appng-tomcat8/pom.xml
Auto-merging appng-tomcat7/pom.xml
CONFLICT (content): Merge conflict in appng-tomcat7/pom.xml
Auto-merging appng-testsupport/pom.xml
CONFLICT (content): Merge conflict in appng-testsupport/pom.xml
Auto-merging appng-template-parent/pom.xml
CONFLICT (content): Merge conflict in appng-template-parent/pom.xml
Auto-merging appng-template-assembly/pom.xml
CONFLICT (content): Merge conflict in appng-template-assembly/pom.xml
Auto-merging appng-taglib/pom.xml
CONFLICT (content): Merge conflict in appng-taglib/pom.xml
Auto-merging appng-standalone/pom.xml
CONFLICT (content): Merge conflict in appng-standalone/pom.xml
Auto-merging appng-search/pom.xml
CONFLICT (content): Merge conflict in appng-search/pom.xml
Auto-merging appng-persistence/pom.xml
CONFLICT (content): Merge conflict in appng-persistence/pom.xml
Auto-merging appng-mail/pom.xml
CONFLICT (content): Merge conflict in appng-mail/pom.xml
Auto-merging appng-formtags/pom.xml
CONFLICT (content): Merge conflict in appng-formtags/pom.xml
Auto-merging appng-forms/pom.xml
CONFLICT (content): Merge conflict in appng-forms/pom.xml
Auto-merging appng-documentation/src/main/asciidoc/listing/dependencies.txt
CONFLICT (content): Merge conflict in appng-documentation/src/main/asciidoc/listing/dependencies.txt
Auto-merging appng-documentation/pom.xml
CONFLICT (content): Merge conflict in appng-documentation/pom.xml
Removing appng-core/src/test/resources/conf/log4j.properties
Auto-merging appng-core/pom.xml
CONFLICT (content): Merge conflict in appng-core/pom.xml
Auto-merging appng-cli/pom.xml
CONFLICT (content): Merge conflict in appng-cli/pom.xml
Auto-merging appng-archetype-application/src/main/resources/archetype-resources/pom.xml
CONFLICT (content): Merge conflict in appng-archetype-application/src/main/resources/archetype-resources/pom.xml
Auto-merging appng-archetype-application/readme.txt
CONFLICT (content): Merge conflict in appng-archetype-application/readme.txt
Auto-merging appng-archetype-application/pom.xml
CONFLICT (content): Merge conflict in appng-archetype-application/pom.xml
Auto-merging appng-appngizer/pom.xml
CONFLICT (content): Merge conflict in appng-appngizer/pom.xml
Auto-merging appng-appngizer-maven-plugin/pom.xml
CONFLICT (content): Merge conflict in appng-appngizer-maven-plugin/pom.xml
Auto-merging appng-appngizer-jaxb/pom.xml
CONFLICT (content): Merge conflict in appng-appngizer-jaxb/pom.xml
Auto-merging appng-application/pom.xml
CONFLICT (content): Merge conflict in appng-application/pom.xml
Auto-merging appng-application-parent/pom.xml
CONFLICT (content): Merge conflict in appng-application-parent/pom.xml
Auto-merging appng-application-assembly/pom.xml
CONFLICT (content): Merge conflict in appng-application-assembly/pom.xml
Auto-merging appng-api/pom.xml
CONFLICT (content): Merge conflict in appng-api/pom.xml
Auto-merging README.adoc
CONFLICT (content): Merge conflict in README.adoc
Automatic merge failed; fix conflicts and then commit the result.