Build failed in Jenkins: Cayenne pull requests #409

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

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

------------------------------------------
GitHub pull request #275 to apache/cayenne
[EnvInject] - Loading node environment variables.
Building remotely on H15 (Hadoop 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: 118
  Finding sources
    Done: 118
  Getting sizes
    Done: 94
  Compressing objects
    Done: 156044
  Writing objects
    Done: 118
  remote: Resolving deltas
  remote: Updating references
Merging refs/tags/changes/409
 > git rev-parse refs/tags/changes/409^{commit} # timeout=10
 > git merge b3e513c47efb75e1da726b21dba3b73be2bbdd91 # timeout=10
FATAL: Command "git merge b3e513c47efb75e1da726b21dba3b73be2bbdd91" returned status code 1:
stdout: Auto-merging cayenne-server/src/main/java/org/apache/cayenne/query/SQLTemplate.java
Auto-merging RELEASE-NOTES.txt
CONFLICT (content): Merge conflict in RELEASE-NOTES.txt
Automatic merge failed; fix conflicts and then commit the result.

stderr: 
Also:   hudson.remoting.Channel$CallSiteStackTrace: Remote call to H15
		at hudson.remoting.Channel.attachCallSiteStackTrace(Channel.java:1693)
		at hudson.remoting.UserResponse.retrieve(UserRequest.java:310)
		at hudson.remoting.Channel.call(Channel.java:908)
		at hudson.remoting.RemoteInvocationHandler.invoke(RemoteInvocationHandler.java:281)
		at com.sun.proxy.$Proxy110.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:1054)
		at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1161)
		at hudson.scm.SCM.checkout(SCM.java:495)
		at hudson.model.AbstractProject.checkout(AbstractProject.java:1202)
		at hudson.model.AbstractBuild$AbstractBuildExecution.defaultCheckout(AbstractBuild.java:574)
		at jenkins.scm.SCMCheckoutStrategy.checkout(SCMCheckoutStrategy.java:86)
		at hudson.model.AbstractBuild$AbstractBuildExecution.run(AbstractBuild.java:499)
		at hudson.model.Run.execute(Run.java:1724)
		at hudson.maven.MavenModuleSetBuild.run(MavenModuleSetBuild.java:543)
		at hudson.model.ResourceController.execute(ResourceController.java:97)
		at hudson.model.Executor.run(Executor.java:429)
hudson.plugins.git.GitException: Command "git merge b3e513c47efb75e1da726b21dba3b73be2bbdd91" returned status code 1:
stdout: Auto-merging cayenne-server/src/main/java/org/apache/cayenne/query/SQLTemplate.java
Auto-merging RELEASE-NOTES.txt
CONFLICT (content): Merge conflict in RELEASE-NOTES.txt
Automatic merge failed; fix conflicts and then commit the result.

stderr: 
	at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1996)
	at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1964)
	at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1960)
	at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1597)
	at org.jenkinsci.plugins.gitclient.CliGitAPIImpl$3.execute(CliGitAPIImpl.java:697)
	at org.jenkinsci.plugins.gitclient.AbstractGitAPIImpl.merge(AbstractGitAPIImpl.java:86)
	at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.merge(CliGitAPIImpl.java:72)
	at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
	at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
	at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
	at java.lang.reflect.Method.invoke(Method.java:498)
	at hudson.remoting.RemoteInvocationHandler$RPCRequest.perform(RemoteInvocationHandler.java:922)
	at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:896)
	at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:853)
	at hudson.remoting.UserRequest.perform(UserRequest.java:207)
	at hudson.remoting.UserRequest.perform(UserRequest.java:53)
	at hudson.remoting.Request$2.run(Request.java:358)
	at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72)
	at java.util.concurrent.FutureTask.run(FutureTask.java:266)
	at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1142)
	at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:617)
	at java.lang.Thread.run(Thread.java:748)
Putting comment on the pull request

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

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

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