You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by Apache Jenkins Server <je...@builds.apache.org> on 2015/11/25 19:04:09 UTC
Build failed in Jenkins: Struts-JDK7-pull-request #81
See <https://builds.apache.org/job/Struts-JDK7-pull-request/81/>
------------------------------------------
GitHub pull request #53 to apache/struts
[EnvInject] - Loading node environment variables.
Building remotely on ubuntu3 (Ubuntu ubuntu legacy-ubuntu) in workspace <https://builds.apache.org/job/Struts-JDK7-pull-request/ws/>
Cloning the remote Git repository
Cloning repository git://github.com/apache/struts.git
> git init <https://builds.apache.org/job/Struts-JDK7-pull-request/ws/> # timeout=10
Fetching upstream changes from git://github.com/apache/struts.git
> git --version # timeout=10
> git -c core.askpass=true fetch --tags --progress git://github.com/apache/struts.git +refs/heads/*:refs/remotes/origin/*
> git config remote.origin.url git://github.com/apache/struts.git # timeout=10
> git config --add remote.origin.fetch +refs/heads/*:refs/remotes/origin/* # timeout=10
> git config remote.origin.url git://github.com/apache/struts.git # timeout=10
Pruning obsolete local branches
Fetching upstream changes from git://github.com/apache/struts.git
> git -c core.askpass=true fetch --tags --progress git://github.com/apache/struts.git +refs/heads/*:refs/remotes/origin/* --prune
> git config core.sparsecheckout # timeout=10
> git checkout -f origin/master # timeout=10
> git branch -a # timeout=10
> git rev-parse remotes/origin/master^{commit} # timeout=10
> git rev-parse remotes/origin/support-2-3^{commit} # timeout=10
> git checkout -b master origin/master
Opening connection
Done: 0
Counting objects
Done: 631
Finding sources
Done: 631
Getting sizes
Done: 428
Compressing objects
Done: 105439
Writing objects
Done: 631
remote: Resolving deltas
remote: Updating references
Merging refs/tags/changes/81
> git rev-parse refs/tags/changes/81^{commit} # timeout=10
> git merge 20f00c67a663bcbfc49a977577b34e6422d72e11 # timeout=10
FATAL: Could not merge AnyObjectId[20f00c67a663bcbfc49a977577b34e6422d72e11]
hudson.plugins.git.GitException: Could not merge AnyObjectId[20f00c67a663bcbfc49a977577b34e6422d72e11]
at org.jenkinsci.plugins.gitclient.CliGitAPIImpl$3.execute(CliGitAPIImpl.java:568)
at org.jenkinsci.plugins.gitclient.AbstractGitAPIImpl.merge(AbstractGitAPIImpl.java:87)
at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.merge(CliGitAPIImpl.java:62)
at sun.reflect.GeneratedMethodAccessor2400.invoke(Unknown Source)
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:608)
at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:583)
at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:542)
at hudson.remoting.UserRequest.perform(UserRequest.java:121)
at hudson.remoting.UserRequest.perform(UserRequest.java:49)
at hudson.remoting.Request$2.run(Request.java:326)
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 ubuntu3(Native Method)
at hudson.remoting.Channel.attachCallSiteStackTrace(Channel.java:1413)
at hudson.remoting.UserResponse.retrieve(UserRequest.java:221)
at hudson.remoting.Channel.call(Channel.java:778)
at hudson.remoting.RemoteInvocationHandler.invoke(RemoteInvocationHandler.java:250)
at com.sun.proxy.$Proxy116.merge(Unknown Source)
at org.jenkinsci.plugins.gitclient.RemoteGitImpl.merge(RemoteGitImpl.java:429)
at com.cloudbees.jenkins.plugins.git.vmerge.BuildChooserImpl.getCandidateRevisions(BuildChooserImpl.java:107)
at hudson.plugins.git.GitSCM.determineRevisionToBuild(GitSCM.java:941)
at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1044)
at hudson.scm.SCM.checkout(SCM.java:484)
at hudson.model.AbstractProject.checkout(AbstractProject.java:1274)
at hudson.model.AbstractBuild$AbstractBuildExecution.defaultCheckout(AbstractBuild.java:609)
at jenkins.scm.SCMCheckoutStrategy.checkout(SCMCheckoutStrategy.java:86)
at hudson.model.AbstractBuild$AbstractBuildExecution.run(AbstractBuild.java:531)
at hudson.model.Run.execute(Run.java:1738)
at hudson.maven.MavenModuleSetBuild.run(MavenModuleSetBuild.java:531)
at hudson.model.ResourceController.execute(ResourceController.java:98)
at hudson.model.Executor.run(Executor.java:381)
Caused by: hudson.plugins.git.GitException: Command "git merge 20f00c67a663bcbfc49a977577b34e6422d72e11" returned status code 1:
stdout: Auto-merging core/src/test/java/org/apache/struts2/views/jsp/URLTagTest.java
Auto-merging core/src/test/java/org/apache/struts2/views/jsp/ActionTagTest.java
Auto-merging core/src/test/java/org/apache/struts2/interceptor/MessageStoreInterceptorTest.java
Auto-merging core/src/test/java/com/opensymphony/xwork2/interceptor/annotations/AnnotationParameterFilterInterceptorTest.java
Auto-merging core/src/main/java/org/apache/struts2/interceptor/MessageStoreInterceptor.java
CONFLICT (content): Merge conflict in core/src/main/java/org/apache/struts2/interceptor/MessageStoreInterceptor.java
Auto-merging core/src/main/java/com/opensymphony/xwork2/interceptor/annotations/AnnotationParameterFilterInterceptor.java
Automatic merge failed; fix conflicts and then commit the result.
stderr:
at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1640)
at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1616)
at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1612)
at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1254)
at org.jenkinsci.plugins.gitclient.CliGitAPIImpl$3.execute(CliGitAPIImpl.java:566)
at org.jenkinsci.plugins.gitclient.AbstractGitAPIImpl.merge(AbstractGitAPIImpl.java:87)
at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.merge(CliGitAPIImpl.java:62)
at sun.reflect.GeneratedMethodAccessor2400.invoke(Unknown Source)
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:608)
at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:583)
at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:542)
at hudson.remoting.UserRequest.perform(UserRequest.java:121)
at hudson.remoting.UserRequest.perform(UserRequest.java:49)
at hudson.remoting.Request$2.run(Request.java:326)
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)
Putting comment on the pull request
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org
Jenkins build is back to normal : Struts-JDK7-pull-request #82
Posted by Apache Jenkins Server <je...@builds.apache.org>.
See <https://builds.apache.org/job/Struts-JDK7-pull-request/82/>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org