Build failed in Jenkins: Cayenne pull requests #321

[Apache Jenkins Server <je...@builds.apache.org>]

See <https://builds.apache.org/job/Cayenne%20pull%20requests/321/display/redirect>

------------------------------------------
GitHub pull request #227 to apache/cayenne
[EnvInject] - Loading node environment variables.
Building remotely on H15 (ubuntu xenial) in workspace <https://builds.apache.org/job/Cayenne%20pull%20requests/ws/>
 > git rev-parse --is-inside-work-tree # timeout=10
Fetching changes from the remote Git repository
 > git config remote.origin.url git://github.com/apache/cayenne.git # timeout=10
Fetching upstream changes from git://github.com/apache/cayenne.git
 > git --version # timeout=10
 > git fetch --tags --progress git://github.com/apache/cayenne.git +refs/heads/*:refs/remotes/origin/*
 > git config core.sparsecheckout # timeout=10
 > git checkout -f origin/master
 > git branch -a -v --no-abbrev # timeout=10
 > git branch -D master # timeout=10
 > git checkout -b master origin/master
  Opening connection
    Done: 0
  Counting objects
    Done: 54
  Finding sources
    Done: 54
  Getting sizes
    Done: 51
  Compressing objects
    Done: 32574
  Writing objects
    Done: 54
  remote: Resolving deltas
  remote: Updating references
Merging refs/tags/changes/321
 > git rev-parse refs/tags/changes/321^{commit} # timeout=10
 > git merge 347e504ca40e07fceb466cc87bb2e01c04ac4d1d # timeout=10
FATAL: Command "git merge 347e504ca40e07fceb466cc87bb2e01c04ac4d1d" returned status code 1:
stdout: Auto-merging tutorials/tutorial/pom.xml
CONFLICT (content): Merge conflict in tutorials/tutorial/pom.xml
Auto-merging tutorials/tutorial-rop-server/pom.xml
Auto-merging tutorials/tutorial-rop-client/pom.xml
Automatic merge failed; fix conflicts and then commit the result.

stderr: 
hudson.plugins.git.GitException: Command "git merge 347e504ca40e07fceb466cc87bb2e01c04ac4d1d" returned status code 1:
stdout: Auto-merging tutorials/tutorial/pom.xml
CONFLICT (content): Merge conflict in tutorials/tutorial/pom.xml
Auto-merging tutorials/tutorial-rop-server/pom.xml
Auto-merging tutorials/tutorial-rop-client/pom.xml
Automatic merge failed; fix conflicts and then commit the result.

stderr: 
	at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1877)
	at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1845)
	at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1841)
	at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1486)
	at org.jenkinsci.plugins.gitclient.CliGitAPIImpl$3.execute(CliGitAPIImpl.java:621)
	at org.jenkinsci.plugins.gitclient.AbstractGitAPIImpl.merge(AbstractGitAPIImpl.java:86)
	at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.merge(CliGitAPIImpl.java:71)
	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
	at java.lang.reflect.Method.invoke(Method.java:606)
	at hudson.remoting.RemoteInvocationHandler$RPCRequest.perform(RemoteInvocationHandler.java:895)
	at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:870)
	at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:829)
	at hudson.remoting.UserRequest.perform(UserRequest.java:153)
	at hudson.remoting.UserRequest.perform(UserRequest.java:50)
	at hudson.remoting.Request$2.run(Request.java:336)
	at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:68)
	at java.util.concurrent.FutureTask.run(FutureTask.java:262)
	at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145)
	at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615)
	at java.lang.Thread.run(Thread.java:745)
	at ......remote call to H15(Native Method)
	at hudson.remoting.Channel.attachCallSiteStackTrace(Channel.java:1545)
	at hudson.remoting.UserResponse.retrieve(UserRequest.java:253)
	at hudson.remoting.Channel.call(Channel.java:830)
	at hudson.remoting.RemoteInvocationHandler.invoke(RemoteInvocationHandler.java:257)
	at com.sun.proxy.$Proxy102.merge(Unknown Source)
	at org.jenkinsci.plugins.gitclient.RemoteGitImpl.merge(RemoteGitImpl.java:435)
	at com.cloudbees.jenkins.plugins.git.vmerge.BuildChooserImpl.getCandidateRevisions(BuildChooserImpl.java:107)
	at hudson.plugins.git.GitSCM.determineRevisionToBuild(GitSCM.java:1001)
	at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1108)
	at hudson.scm.SCM.checkout(SCM.java:496)
	at hudson.model.AbstractProject.checkout(AbstractProject.java:1281)
	at hudson.model.AbstractBuild$AbstractBuildExecution.defaultCheckout(AbstractBuild.java:604)
	at jenkins.scm.SCMCheckoutStrategy.checkout(SCMCheckoutStrategy.java:86)
	at hudson.model.AbstractBuild$AbstractBuildExecution.run(AbstractBuild.java:529)
	at hudson.model.Run.execute(Run.java:1728)
	at hudson.maven.MavenModuleSetBuild.run(MavenModuleSetBuild.java:544)
	at hudson.model.ResourceController.execute(ResourceController.java:98)
	at hudson.model.Executor.run(Executor.java:405)
Putting comment on the pull request

Jenkins build is back to normal : Cayenne pull requests #322

[Apache Jenkins Server <je...@builds.apache.org>]

See <https://builds.apache.org/job/Cayenne%20pull%20requests/322/display/redirect?page=changes>