struts-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Apache Jenkins Server <jenk...@builds.apache.org>
Subject Build failed in Jenkins: Struts-JDK7-pull-request #27
Date Fri, 22 May 2015 08:24:15 GMT
See <https://builds.apache.org/job/Struts-JDK7-pull-request/27/>

------------------------------------------
GitHub pull request #38 to apache/struts
Building remotely on jenkins-ubuntu-1404-4gb-5da (jenkins-cloud-4GB cloud-slave Ubuntu ubuntu)
in workspace <https://builds.apache.org/job/Struts-JDK7-pull-request/ws/>
Unpacking http://archive.apache.org/dist/maven/binaries/apache-maven-3.2.1-bin.zip to /jenkins/tools/hudson.tasks.Maven_MavenInstallation/maven-3.2.1
on jenkins-ubuntu-1404-4gb-5da
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 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 remote.origin.fetch +refs/heads/*:refs/remotes/origin/* # timeout=10
 > git config remote.origin.url git://github.com/apache/struts.git # timeout=10
Fetching upstream changes from git://github.com/apache/struts.git
 > git fetch --tags --progress git://github.com/apache/struts.git +refs/heads/*:refs/remotes/origin/*
 > 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 checkout -b master origin/master
  Opening connection
    Done: 0
  Counting objects
    Done: 216
  Finding sources
    Done: 216
  Getting sizes
    Done: 94
  Compressing objects
    Done: 0
  Writing objects
    Done: 216
  remote: Resolving deltas
  remote: Updating references
Merging refs/tags/changes/27
 > git rev-parse refs/tags/changes/27^{commit} # timeout=10
 > git merge 94f8be90a81d54ec40748d6a02e292a5d46a3293 # timeout=10
FATAL: Could not merge AnyObjectId[94f8be90a81d54ec40748d6a02e292a5d46a3293]
hudson.plugins.git.GitException: Could not merge AnyObjectId[94f8be90a81d54ec40748d6a02e292a5d46a3293]
	at org.jenkinsci.plugins.gitclient.CliGitAPIImpl$3.execute(CliGitAPIImpl.java:469)
	at org.jenkinsci.plugins.gitclient.AbstractGitAPIImpl.merge(AbstractGitAPIImpl.java:76)
	at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.merge(CliGitAPIImpl.java:85)
	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:310)
	at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:290)
	at hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:249)
	at hudson.remoting.UserRequest.perform(UserRequest.java:118)
	at hudson.remoting.UserRequest.perform(UserRequest.java:48)
	at hudson.remoting.Request$2.run(Request.java:328)
	at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72)
	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)
Caused by: hudson.plugins.git.GitException: Command "git merge 94f8be90a81d54ec40748d6a02e292a5d46a3293"
returned status code 1:
stdout: Auto-merging core/src/site/resources/tags/submit.html
CONFLICT (content): Merge conflict in core/src/site/resources/tags/submit.html
Auto-merging core/src/site/resources/tags/reset.html
CONFLICT (content): Merge conflict in core/src/site/resources/tags/reset.html
Auto-merging core/src/main/resources/template/simple/inputtransferselect.ftl
CONFLICT (content): Merge conflict in core/src/main/resources/template/simple/inputtransferselect.ftl
Automatic merge failed; fix conflicts and then commit the result.

stderr: 
	at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1435)
	at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1411)
	at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1407)
	at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1110)
	at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1120)
	at org.jenkinsci.plugins.gitclient.CliGitAPIImpl$3.execute(CliGitAPIImpl.java:467)
	... 17 more

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org


Mime
View raw message