See <https://builds.apache.org/job/Struts-JDK7-pull-request/84/>
------------------------------------------ [...truncated 2091 lines...] jdk1.7.0_80/man/man1/apt.1 jdk1.7.0_80/man/man1/javah.1 jdk1.7.0_80/man/man1/wsgen.1 jdk1.7.0_80/man/man1/jvisualvm.1 jdk1.7.0_80/man/man1/appletviewer.1 jdk1.7.0_80/man/man1/jsadebugd.1 jdk1.7.0_80/man/man1/orbd.1 jdk1.7.0_80/man/man1/javaws.1 jdk1.7.0_80/man/man1/jdb.1 jdk1.7.0_80/man/man1/jstatd.1 jdk1.7.0_80/man/man1/javap.1 jdk1.7.0_80/man/man1/jhat.1 jdk1.7.0_80/man/man1/xjc.1 jdk1.7.0_80/man/man1/jar.1 jdk1.7.0_80/man/man1/policytool.1 jdk1.7.0_80/man/man1/rmiregistry.1 jdk1.7.0_80/man/man1/idlj.1 jdk1.7.0_80/man/man1/jps.1 jdk1.7.0_80/man/man1/unpack200.1 jdk1.7.0_80/man/man1/tnameserv.1 jdk1.7.0_80/man/man1/jrunscript.1 jdk1.7.0_80/man/man1/jmap.1 jdk1.7.0_80/man/man1/jstack.1 jdk1.7.0_80/man/man1/servertool.1 jdk1.7.0_80/man/man1/javafxpackager.1 jdk1.7.0_80/man/man1/jstat.1 jdk1.7.0_80/man/man1/jmc.1 jdk1.7.0_80/man/man1/javac.1 jdk1.7.0_80/man/ja jdk1.7.0_80/man/ja_JP.UTF-8/ jdk1.7.0_80/man/ja_JP.UTF-8/man1/ jdk1.7.0_80/man/ja_JP.UTF-8/man1/jinfo.1 jdk1.7.0_80/man/ja_JP.UTF-8/man1/rmid.1 jdk1.7.0_80/man/ja_JP.UTF-8/man1/native2ascii.1 jdk1.7.0_80/man/ja_JP.UTF-8/man1/jcmd.1 jdk1.7.0_80/man/ja_JP.UTF-8/man1/java.1 jdk1.7.0_80/man/ja_JP.UTF-8/man1/jarsigner.1 jdk1.7.0_80/man/ja_JP.UTF-8/man1/keytool.1 jdk1.7.0_80/man/ja_JP.UTF-8/man1/jconsole.1 jdk1.7.0_80/man/ja_JP.UTF-8/man1/extcheck.1 jdk1.7.0_80/man/ja_JP.UTF-8/man1/wsimport.1 jdk1.7.0_80/man/ja_JP.UTF-8/man1/pack200.1 jdk1.7.0_80/man/ja_JP.UTF-8/man1/schemagen.1 jdk1.7.0_80/man/ja_JP.UTF-8/man1/javadoc.1 jdk1.7.0_80/man/ja_JP.UTF-8/man1/rmic.1 jdk1.7.0_80/man/ja_JP.UTF-8/man1/serialver.1 jdk1.7.0_80/man/ja_JP.UTF-8/man1/apt.1 jdk1.7.0_80/man/ja_JP.UTF-8/man1/javah.1 jdk1.7.0_80/man/ja_JP.UTF-8/man1/wsgen.1 jdk1.7.0_80/man/ja_JP.UTF-8/man1/jvisualvm.1 jdk1.7.0_80/man/ja_JP.UTF-8/man1/appletviewer.1 jdk1.7.0_80/man/ja_JP.UTF-8/man1/jsadebugd.1 jdk1.7.0_80/man/ja_JP.UTF-8/man1/orbd.1 jdk1.7.0_80/man/ja_JP.UTF-8/man1/javaws.1 jdk1.7.0_80/man/ja_JP.UTF-8/man1/jdb.1 jdk1.7.0_80/man/ja_JP.UTF-8/man1/jstatd.1 jdk1.7.0_80/man/ja_JP.UTF-8/man1/javap.1 jdk1.7.0_80/man/ja_JP.UTF-8/man1/jhat.1 jdk1.7.0_80/man/ja_JP.UTF-8/man1/xjc.1 jdk1.7.0_80/man/ja_JP.UTF-8/man1/jar.1 jdk1.7.0_80/man/ja_JP.UTF-8/man1/policytool.1 jdk1.7.0_80/man/ja_JP.UTF-8/man1/rmiregistry.1 jdk1.7.0_80/man/ja_JP.UTF-8/man1/idlj.1 jdk1.7.0_80/man/ja_JP.UTF-8/man1/jps.1 jdk1.7.0_80/man/ja_JP.UTF-8/man1/unpack200.1 jdk1.7.0_80/man/ja_JP.UTF-8/man1/tnameserv.1 jdk1.7.0_80/man/ja_JP.UTF-8/man1/jrunscript.1 jdk1.7.0_80/man/ja_JP.UTF-8/man1/jmap.1 jdk1.7.0_80/man/ja_JP.UTF-8/man1/jstack.1 jdk1.7.0_80/man/ja_JP.UTF-8/man1/servertool.1 jdk1.7.0_80/man/ja_JP.UTF-8/man1/javafxpackager.1 jdk1.7.0_80/man/ja_JP.UTF-8/man1/jstat.1 jdk1.7.0_80/man/ja_JP.UTF-8/man1/jmc.1 jdk1.7.0_80/man/ja_JP.UTF-8/man1/javac.1 jdk1.7.0_80/include/ jdk1.7.0_80/include/jvmti.h jdk1.7.0_80/include/classfile_constants.h jdk1.7.0_80/include/jdwpTransport.h jdk1.7.0_80/include/jvmticmlr.h jdk1.7.0_80/include/jni.h jdk1.7.0_80/include/linux/ jdk1.7.0_80/include/linux/jni_md.h jdk1.7.0_80/include/linux/jawt_md.h jdk1.7.0_80/include/jawt.h jdk1.7.0_80/src.zip jdk1.7.0_80/THIRDPARTYLICENSEREADME-JAVAFX.txt jdk1.7.0_80/COPYRIGHT jdk1.7.0_80/db/ jdk1.7.0_80/db/LICENSE jdk1.7.0_80/db/RELEASE-NOTES.html jdk1.7.0_80/db/lib/ jdk1.7.0_80/db/lib/derbyLocale_zh_CN.jar jdk1.7.0_80/db/lib/derbynet.jar jdk1.7.0_80/db/lib/derbyLocale_ja_JP.jar jdk1.7.0_80/db/lib/derbyLocale_ru.jar jdk1.7.0_80/db/lib/derbyLocale_es.jar jdk1.7.0_80/db/lib/derbyLocale_it.jar jdk1.7.0_80/db/lib/derby.jar jdk1.7.0_80/db/lib/derbytools.jar jdk1.7.0_80/db/lib/derbyLocale_hu.jar jdk1.7.0_80/db/lib/derby.war jdk1.7.0_80/db/lib/derbyrun.jar jdk1.7.0_80/db/lib/derbyLocale_zh_TW.jar jdk1.7.0_80/db/lib/derbyLocale_fr.jar jdk1.7.0_80/db/lib/derbyclient.jar jdk1.7.0_80/db/lib/derbyLocale_cs.jar jdk1.7.0_80/db/lib/derbyLocale_pl.jar jdk1.7.0_80/db/lib/derbyLocale_de_DE.jar jdk1.7.0_80/db/lib/derbyLocale_ko_KR.jar jdk1.7.0_80/db/lib/derbyLocale_pt_BR.jar jdk1.7.0_80/db/3RDPARTY jdk1.7.0_80/db/bin/ jdk1.7.0_80/db/bin/setNetworkClientCP.bat jdk1.7.0_80/db/bin/dblook jdk1.7.0_80/db/bin/NetworkServerControl jdk1.7.0_80/db/bin/setEmbeddedCP jdk1.7.0_80/db/bin/stopNetworkServer.bat jdk1.7.0_80/db/bin/NetworkServerControl.bat jdk1.7.0_80/db/bin/sysinfo jdk1.7.0_80/db/bin/ij jdk1.7.0_80/db/bin/setNetworkServerCP jdk1.7.0_80/db/bin/setEmbeddedCP.bat jdk1.7.0_80/db/bin/ij.bat jdk1.7.0_80/db/bin/dblook.bat jdk1.7.0_80/db/bin/sysinfo.bat jdk1.7.0_80/db/bin/setNetworkClientCP jdk1.7.0_80/db/bin/derby_common.bat jdk1.7.0_80/db/bin/startNetworkServer.bat jdk1.7.0_80/db/bin/startNetworkServer jdk1.7.0_80/db/bin/setNetworkServerCP.bat jdk1.7.0_80/db/bin/stopNetworkServer jdk1.7.0_80/db/README-JDK.html jdk1.7.0_80/db/NOTICE jdk1.7.0_80/README.html jdk1.7.0_80/THIRDPARTYLICENSEREADME.txt Building remotely on jenkins-ubuntu-1404-4gb-b39 (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-b39 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 Cleaning workspace > git rev-parse --verify HEAD # timeout=10 No valid HEAD. Skipping the resetting > git clean -fdx # 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: 1007 Finding sources Done: 1007 Getting sizes Done: 702 Compressing objects Done: 617493 Writing objects Done: 1007 remote: Resolving deltas remote: Updating references Merging refs/tags/changes/84 > git rev-parse refs/tags/changes/84^{commit} # timeout=10 > git merge 8d1a1b1ce1ec598471d441f4fb8fbe4ac0a2407d # timeout=10 FATAL: Could not merge AnyObjectId[8d1a1b1ce1ec598471d441f4fb8fbe4ac0a2407d] hudson.plugins.git.GitException: Could not merge AnyObjectId[8d1a1b1ce1ec598471d441f4fb8fbe4ac0a2407d] 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.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: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 jenkins-ubuntu-1404-4gb-b39(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 8d1a1b1ce1ec598471d441f4fb8fbe4ac0a2407d" 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.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: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-unsubscr...@struts.apache.org For additional commands, e-mail: dev-h...@struts.apache.org
