Build failed in Jenkins: Cayenne pull requests #408

2018-02-20 Thread Apache Jenkins Server 
See 


--
GitHub pull request #274 to apache/cayenne
[EnvInject] - Loading node environment variables.
Building remotely on windows-2012-1 (Windows) in workspace 

 > 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: 53
  Finding sources
Done: 53
  Getting sizes
Done: 43
  Compressing objects
Done: 88175
  Writing objects
Done: 53
  remote: Resolving deltas
  remote: Updating references
Merging refs/tags/changes/408
 > git rev-parse "refs/tags/changes/408^{commit}" # timeout=10
 > git merge 193c6aa4f6221efc7ac9d436fca50e865d63c229 # timeout=10
FATAL: Command "git merge 193c6aa4f6221efc7ac9d436fca50e865d63c229" 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 
JNLP4-connect connection from 37.48.69.226/37.48.69.226:54252
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 
193c6aa4f6221efc7ac9d436fca50e865d63c229" 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(Unknown Source)
at sun.reflect.DelegatingMethodAccessorImpl.invoke(Unknown Source)
at java.lang.reflect.Method.invoke(Unknown Source)
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

[GitHub] cayenne pull request #274: Cay-2407

2018-02-20 Thread aarrsseni 
GitHub user aarrsseni opened a pull request:

https://github.com/apache/cayenne/pull/274

Cay-2407

Modeler: add prefetch support for the SQLTemplate query

You can merge this pull request into a Git repository by running:

$ git pull https://github.com/aarrsseni/cayenne CAY-2407

Alternatively you can review and apply these changes as the patch at:

https://github.com/apache/cayenne/pull/274.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

This closes #274


commit 8b48c7c6f327e22877a8ddf9b547dea6179fba8f
Author: Arseni Bulatski 
Date:   2018-02-19T07:48:28Z

CAY-2407

commit 193c6aa4f6221efc7ac9d436fca50e865d63c229
Author: Arseni Bulatski 
Date:   2018-02-20T09:39:14Z

CAY-2407 add prefetch to sqlTemplate in Modeler




---