+ set -e
+ set -o pipefail
++ dirname /tmp/rultor-4yLc/run.sh
+ cd /tmp/rultor-4yLc
+ echo 4527
+ echo '1.49.2 c0afd56'
1.49.2 c0afd56
+ date
Fri Feb 13 23:50:45 CET 2015
+ uptime
23:50:45 up 11 days, 5:49, 0 users, load average: 12.12, 8.97, 5.31
+ fork=git@github.com:dtretter/jcabi-heroku-maven-plugin.git
+ fork_branch=master
+ head=git@github.com:jcabi/jcabi-heroku-maven-plugin.git
+ head_branch=master
+ vars=('--env=MAVEN_OPTS=-XX:MaxPermSize=256m -Xmx1g' '--env=fork=git@github.com:dtretter/jcabi-heroku-maven-plugin.git' '--env=fork_branch=master' '--env=head=git@github.com:jcabi/jcabi-heroku-maven-plugin.git' '--env=head_branch=master')
+ image=yegor256/rultor
+ directory=
+ scripts=('sudo gem install pdd' ';' 'mvn clean install -Pqulice --errors --settings ../settings.xml' ';' 'mvn clean' ';' 'pdd --source=$(pwd) --verbose --file=/dev/null' ';')
+ container=jcabi_jcabi-heroku-maven-plugin_2
+ as_root=false
+ git clone --branch=master --depth=10 git@github.com:jcabi/jcabi-heroku-maven-plugin.git repo
Initialized empty Git repository in /tmp/rultor-4yLc/repo/.git/
+ cd repo
+ git config user.email me@rultor.com
+ git config user.name rultor
+ '[' -z 'sudo gem install pdd' ']'
+ cd ..
+ cat
+ '[' false = true ']'
+ cat
+ chmod a+x entry.sh
+ cat
+ echo 'sudo gem install pdd' ';' 'mvn clean install -Pqulice --errors --settings ../settings.xml' ';' 'mvn clean' ';' 'pdd --source=$(pwd) --verbose --file=/dev/null' ';'
+ rm -rf .gpg
+ cd repo
+ git remote add fork git@github.com:dtretter/jcabi-heroku-maven-plugin.git
+ git remote update
Fetching origin
Fetching fork
From github.com:dtretter/jcabi-heroku-maven-plugin
* [new branch] master -> fork/master
+ git merge fork/master
Auto-merging .gitignore
CONFLICT (add/add): Merge conflict in .gitignore
Auto-merging LICENSE.txt
CONFLICT (add/add): Merge conflict in LICENSE.txt
Auto-merging README.md
CONFLICT (add/add): Merge conflict in README.md
Auto-merging pom.xml
CONFLICT (add/add): Merge conflict in pom.xml
Auto-merging src/changes/changes.xml
CONFLICT (add/add): Merge conflict in src/changes/changes.xml
Auto-merging src/it/settings.xml
CONFLICT (add/add): Merge conflict in src/it/settings.xml
Auto-merging src/it/skipped-deployment/pom.xml
CONFLICT (add/add): Merge conflict in src/it/skipped-deployment/pom.xml
Auto-merging src/it/skipped-deployment/verify.groovy
CONFLICT (add/add): Merge conflict in src/it/skipped-deployment/verify.groovy
Auto-merging src/main/java/com/jcabi/heroku/maven/plugin/DeployMojo.java
CONFLICT (add/add): Merge conflict in src/main/java/com/jcabi/heroku/maven/plugin/DeployMojo.java
Auto-merging src/main/java/com/jcabi/heroku/maven/plugin/Git.java
CONFLICT (add/add): Merge conflict in src/main/java/com/jcabi/heroku/maven/plugin/Git.java
Auto-merging src/main/java/com/jcabi/heroku/maven/plugin/Heroku.java
CONFLICT (add/add): Merge conflict in src/main/java/com/jcabi/heroku/maven/plugin/Heroku.java
Auto-merging src/main/java/com/jcabi/heroku/maven/plugin/Repo.java
CONFLICT (add/add): Merge conflict in src/main/java/com/jcabi/heroku/maven/plugin/Repo.java
Auto-merging src/main/java/com/jcabi/heroku/maven/plugin/package-info.java
CONFLICT (add/add): Merge conflict in src/main/java/com/jcabi/heroku/maven/plugin/package-info.java
Auto-merging src/main/resources/com/jcabi/heroku/maven/plugin/pom.xml.vm
CONFLICT (add/add): Merge conflict in src/main/resources/com/jcabi/heroku/maven/plugin/pom.xml.vm
Auto-merging src/site/apt/example-start.apt.vm
CONFLICT (add/add): Merge conflict in src/site/apt/example-start.apt.vm
Auto-merging src/site/apt/index.apt.vm
CONFLICT (add/add): Merge conflict in src/site/apt/index.apt.vm
Auto-merging src/site/apt/usage.apt.vm
CONFLICT (add/add): Merge conflict in src/site/apt/usage.apt.vm
Auto-merging src/site/fml/faq.fml
CONFLICT (add/add): Merge conflict in src/site/fml/faq.fml
Auto-merging src/site/site.xml
CONFLICT (add/add): Merge conflict in src/site/site.xml
Auto-merging src/test/java/com/jcabi/heroku/maven/plugin/DeployMojoTest.java
CONFLICT (add/add): Merge conflict in src/test/java/com/jcabi/heroku/maven/plugin/DeployMojoTest.java
Auto-merging src/test/java/com/jcabi/heroku/maven/plugin/GitTest.java
CONFLICT (add/add): Merge conflict in src/test/java/com/jcabi/heroku/maven/plugin/GitTest.java
Auto-merging src/test/java/com/jcabi/heroku/maven/plugin/HerokuTest.java
CONFLICT (add/add): Merge conflict in src/test/java/com/jcabi/heroku/maven/plugin/HerokuTest.java
Auto-merging src/test/java/com/jcabi/heroku/maven/plugin/RepoTest.java
CONFLICT (add/add): Merge conflict in src/test/java/com/jcabi/heroku/maven/plugin/RepoTest.java
Auto-merging src/test/java/com/jcabi/heroku/maven/plugin/package-info.java
CONFLICT (add/add): Merge conflict in src/test/java/com/jcabi/heroku/maven/plugin/package-info.java
Automatic merge failed; fix conflicts and then commit the result.
This build log was produced by
rultor.com
for
jcabi/jcabi-heroku-maven-plugin#2