See <https://builds.apache.org/job/Struts-JDK7-pull-request/163/>
------------------------------------------
[...truncated 1619 lines...]
CONFLICT (content): Merge conflict in
archetypes/struts2-archetype-convention/pom.xml
Auto-merging archetypes/struts2-archetype-blank/pom.xml
CONFLICT (content): Merge conflict in archetypes/struts2-archetype-blank/pom.xml
Removing
archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/test/java/actions/HelloActionTest.java
Removing
archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/services.js
Removing
archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/directives.js
Auto-merging
archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/controllers/HomeController.js
Auto-merging
archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/controllers/AppController.js
Auto-merging
archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/controllers/ApacheProjectsController.js
Removing
archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/controllers.js
Auto-merging
archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/config.js
Removing
archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/bootstrap.js
Auto-merging
archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/js/app.js
Removing
archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/content/hello.jsp
Auto-merging
archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/java/actions/data/package-info.java
Removing
archetypes/struts2-archetype-angularjs/src/main/resources/archetype-resources/src/main/java/actions/HelloAction.java
Auto-merging archetypes/struts2-archetype-angularjs/pom.xml
CONFLICT (content): Merge conflict in
archetypes/struts2-archetype-angularjs/pom.xml
Auto-merging archetypes/pom.xml
CONFLICT (content): Merge conflict in archetypes/pom.xml
Removing apps/showcase/src/main/webapp/styles/bootstrap-responsive.min.css
Removing apps/showcase/src/main/webapp/styles/bootstrap-responsive.css
Removing apps/showcase/src/main/webapp/js/jquery-1.8.2.min.js
Removing apps/showcase/src/main/webapp/ajax/index.html
Removing apps/showcase/src/main/webapp/ajax/JSONList.js
Removing apps/showcase/src/main/webapp/WEB-INF/validation/quiz-ajax.jsp
CONFLICT (modify/delete):
apps/showcase/src/main/webapp/WEB-INF/validation/index.jsp deleted in
66327a1c3277821ae59bba6f93a7aaa3a4c7b55a and modified in HEAD. Version HEAD of
apps/showcase/src/main/webapp/WEB-INF/validation/index.jsp left in tree.
Removing apps/showcase/src/main/webapp/WEB-INF/validation/footer.jsp
Auto-merging apps/showcase/src/main/webapp/WEB-INF/tiles/body.jsp
Auto-merging apps/showcase/src/main/webapp/WEB-INF/tiles.xml
Removing apps/showcase/src/main/webapp/WEB-INF/tags/ui/treeExampleStatic.jsp
Removing apps/showcase/src/main/webapp/WEB-INF/tags/ui/treeExampleDynamic.jsp
Removing
apps/showcase/src/main/webapp/WEB-INF/tags/ui/treeExampleAjaxDynamic.jsp
Removing
apps/showcase/src/main/webapp/WEB-INF/tags/ui/treeExampleAjaxDynamic.ftl
Removing apps/showcase/src/main/webapp/WEB-INF/tags/ui/timepicker/index.jsp
Removing apps/showcase/src/main/webapp/WEB-INF/tags/ui/staticTreeSelect.jsp
Removing apps/showcase/src/main/webapp/WEB-INF/tags/ui/datepicker/index.jsp
Removing apps/showcase/src/main/webapp/WEB-INF/jsf/index.jsp
Removing apps/showcase/src/main/webapp/WEB-INF/jsf/employee/list.jsp
Removing apps/showcase/src/main/webapp/WEB-INF/jsf/employee/edit.jsp
Removing apps/showcase/src/main/webapp/WEB-INF/interactive/ognl_8.jsp
Removing apps/showcase/src/main/webapp/WEB-INF/interactive/ognl_7.jsp
Removing apps/showcase/src/main/webapp/WEB-INF/interactive/ognl_6.jsp
Removing apps/showcase/src/main/webapp/WEB-INF/interactive/ognl_5.jsp
Removing apps/showcase/src/main/webapp/WEB-INF/interactive/ognl_4.jsp
Removing apps/showcase/src/main/webapp/WEB-INF/interactive/ognl_3.jsp
Removing apps/showcase/src/main/webapp/WEB-INF/interactive/ognl_2.jsp
Removing apps/showcase/src/main/webapp/WEB-INF/interactive/ognl_1.jsp
Removing apps/showcase/src/main/webapp/WEB-INF/interactive/ognl_0.jsp
Removing apps/showcase/src/main/webapp/WEB-INF/interactive/jsp_4.jsp
Removing apps/showcase/src/main/webapp/WEB-INF/interactive/jsp_3.jsp
Removing apps/showcase/src/main/webapp/WEB-INF/interactive/jsp_2.jsp
Removing apps/showcase/src/main/webapp/WEB-INF/interactive/jsp_1.jsp
Removing apps/showcase/src/main/webapp/WEB-INF/interactive/jsp_0.jsp
Removing apps/showcase/src/main/webapp/WEB-INF/interactive/index.jsp
Removing apps/showcase/src/main/webapp/WEB-INF/interactive/example-action.jsp
Removing apps/showcase/src/main/webapp/WEB-INF/interactive/demo.jsp
Removing apps/showcase/src/main/webapp/WEB-INF/integration/modelDrivenResult.jsp
Removing apps/showcase/src/main/webapp/WEB-INF/integration/modelDriven.jsp
Removing apps/showcase/src/main/webapp/WEB-INF/hangman/hangmanAjax.ftl
Auto-merging apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp
CONFLICT (content): Merge conflict in
apps/showcase/src/main/webapp/WEB-INF/decorators/main.jsp
Removing apps/showcase/src/main/webapp/WEB-INF/chat/usersAvailableInRoom.ftl
Removing apps/showcase/src/main/webapp/WEB-INF/chat/usersAvailable.ftl
Removing apps/showcase/src/main/webapp/WEB-INF/chat/showRoom.ftl
Removing apps/showcase/src/main/webapp/WEB-INF/chat/sendMessageToRoomResult.ftl
Removing apps/showcase/src/main/webapp/WEB-INF/chat/roomsAvailable.ftl
Removing apps/showcase/src/main/webapp/WEB-INF/chat/roomSelection.ftl
Removing apps/showcase/src/main/webapp/WEB-INF/chat/messagesAvailableInRoom.ftl
Removing apps/showcase/src/main/webapp/WEB-INF/chat/index.jsp
Removing apps/showcase/src/main/webapp/WEB-INF/chat/createRoom.ftl
Removing apps/showcase/src/main/webapp/WEB-INF/chat/chatLogin.ftl
Removing apps/showcase/src/main/webapp/WEB-INF/ajax/widgets/index.jsp
Removing apps/showcase/src/main/webapp/WEB-INF/ajax/tree/tree.jsp
Removing apps/showcase/src/main/webapp/WEB-INF/ajax/tree/toggle.jsp
Removing apps/showcase/src/main/webapp/WEB-INF/ajax/tree/partialChunkHeader.jsp
Removing apps/showcase/src/main/webapp/WEB-INF/ajax/tree/getCategory.jsp
Removing apps/showcase/src/main/webapp/WEB-INF/ajax/testjs.jsp
Removing
apps/showcase/src/main/webapp/WEB-INF/ajax/tabbedpanel/nodecorate/panel3Submit.ftl
Removing
apps/showcase/src/main/webapp/WEB-INF/ajax/tabbedpanel/nodecorate/panel3.ftl
Removing
apps/showcase/src/main/webapp/WEB-INF/ajax/tabbedpanel/nodecorate/panel2Submit.ftl
Removing
apps/showcase/src/main/webapp/WEB-INF/ajax/tabbedpanel/nodecorate/panel2.ftl
Removing
apps/showcase/src/main/webapp/WEB-INF/ajax/tabbedpanel/nodecorate/panel1.ftl
Removing apps/showcase/src/main/webapp/WEB-INF/ajax/tabbedpanel/index.jsp
Removing apps/showcase/src/main/webapp/WEB-INF/ajax/tabbedpanel/example6.jsp
Removing apps/showcase/src/main/webapp/WEB-INF/ajax/tabbedpanel/example5Ok.jsp
Removing apps/showcase/src/main/webapp/WEB-INF/ajax/tabbedpanel/example5.jsp
Removing apps/showcase/src/main/webapp/WEB-INF/ajax/tabbedpanel/example4.jsp
Removing apps/showcase/src/main/webapp/WEB-INF/ajax/tabbedpanel/example3.jsp
Removing apps/showcase/src/main/webapp/WEB-INF/ajax/tabbedpanel/example2.jsp
Removing apps/showcase/src/main/webapp/WEB-INF/ajax/tabbedpanel/example1.jsp
Removing apps/showcase/src/main/webapp/WEB-INF/ajax/remotelink/index.jsp
Removing apps/showcase/src/main/webapp/WEB-INF/ajax/remoteforms/index.jsp
Removing apps/showcase/src/main/webapp/WEB-INF/ajax/remotediv/index.jsp
Removing apps/showcase/src/main/webapp/WEB-INF/ajax/remotediv/example9.jsp
Removing apps/showcase/src/main/webapp/WEB-INF/ajax/remotediv/example8.jsp
Removing apps/showcase/src/main/webapp/WEB-INF/ajax/remotediv/example7.jsp
Removing apps/showcase/src/main/webapp/WEB-INF/ajax/remotediv/example6.jsp
Removing apps/showcase/src/main/webapp/WEB-INF/ajax/remotediv/example5.jsp
Removing apps/showcase/src/main/webapp/WEB-INF/ajax/remotediv/example4.jsp
Removing apps/showcase/src/main/webapp/WEB-INF/ajax/remotediv/example3.jsp
Removing apps/showcase/src/main/webapp/WEB-INF/ajax/remotediv/example2.jsp
Removing apps/showcase/src/main/webapp/WEB-INF/ajax/remotediv/example10.jsp
Removing apps/showcase/src/main/webapp/WEB-INF/ajax/remotediv/example1.jsp
Removing apps/showcase/src/main/webapp/WEB-INF/ajax/remotebutton/index.jsp
Removing apps/showcase/src/main/webapp/WEB-INF/ajax/options.ftl
Removing apps/showcase/src/main/webapp/WEB-INF/ajax/footer.jsp
Removing apps/showcase/src/main/webapp/WEB-INF/ajax/commonInclude.jsp
Removing apps/showcase/src/main/webapp/WEB-INF/ajax/bind/index.jsp
Removing apps/showcase/src/main/webapp/WEB-INF/ajax/autocompleter/index.jsp
Removing apps/showcase/src/main/webapp/WEB-INF/ajax/AjaxResult3.jsp
Removing apps/showcase/src/main/webapp/WEB-INF/ajax/AjaxResult2.js
Removing apps/showcase/src/main/webapp/WEB-INF/ajax/AjaxResult.jsp
Auto-merging apps/showcase/src/main/resources/struts-validation.xml
Removing apps/showcase/src/main/resources/struts-jsf.xml
Removing apps/showcase/src/main/resources/struts-integration.xml
Removing apps/showcase/src/main/resources/struts-chat.xml
Removing apps/showcase/src/main/resources/struts-ajax.xml
Removing
apps/showcase/src/main/resources/org/apache/struts2/showcase/chat/SendMessageToRoomAction-sendMessageToRoom-validation.xml
Removing
apps/showcase/src/main/resources/org/apache/struts2/showcase/chat/Room-conversion.properties
Removing
apps/showcase/src/main/resources/org/apache/struts2/showcase/chat/CrudRoomAction-createRoom-validation.xml
Removing
apps/showcase/src/main/resources/org/apache/struts2/showcase/chat/ChatMessage-conversion.properties
Removing
apps/showcase/src/main/resources/org/apache/struts2/showcase/chat/ChatLoginAction-chatLogin-validation.xml
Removing
apps/showcase/src/main/resources/org/apache/struts2/showcase/ajax/Example5Action-validation.xml
Removing apps/showcase/src/main/resources/log4j.properties
Removing
apps/showcase/src/main/java/org/apache/struts2/showcase/jsf/JsfEmployeeAction.java
Removing
apps/showcase/src/main/java/org/apache/struts2/showcase/integration/SaveGangsterAction.java
Removing
apps/showcase/src/main/java/org/apache/struts2/showcase/integration/GangsterForm.java
Removing
apps/showcase/src/main/java/org/apache/struts2/showcase/integration/EditGangsterAction.java
Auto-merging apps/showcase/pom.xml
CONFLICT (content): Merge conflict in apps/showcase/pom.xml
Auto-merging apps/rest-showcase/pom.xml
CONFLICT (content): Merge conflict in apps/rest-showcase/pom.xml
Auto-merging apps/portlet/src/main/resources/log4j2.xml
Removing apps/portlet/src/main/resources/log4j.xml
Auto-merging apps/portlet/pom.xml
CONFLICT (content): Merge conflict in apps/portlet/pom.xml
Auto-merging apps/pom.xml
CONFLICT (content): Merge conflict in apps/pom.xml
Removing apps/mailreader/src/main/webapp/tour.html
Removing apps/mailreader/src/main/webapp/struts-power.gif
Removing apps/mailreader/src/main/webapp/index.html
Removing apps/mailreader/src/main/webapp/css/mailreader.css
Removing apps/mailreader/src/main/webapp/WEB-INF/web.xml
Removing apps/mailreader/src/main/webapp/WEB-INF/jsp/Welcome.jsp
Removing apps/mailreader/src/main/webapp/WEB-INF/jsp/Subscription.jsp
Removing apps/mailreader/src/main/webapp/WEB-INF/jsp/Registration.jsp
Removing apps/mailreader/src/main/webapp/WEB-INF/jsp/MainMenu.jsp
Removing apps/mailreader/src/main/webapp/WEB-INF/jsp/Login.jsp
Removing apps/mailreader/src/main/webapp/WEB-INF/jsp/Footer.jsp
Removing apps/mailreader/src/main/webapp/WEB-INF/jsp/Error.jsp
Removing apps/mailreader/src/main/webapp/WEB-INF/jsp/ChangePassword.jsp
Removing apps/mailreader/src/main/webapp/WEB-INF/database.xml
Removing apps/mailreader/src/main/webapp/META-INF/context.xml
Removing apps/mailreader/src/main/resources/velocity.properties
Removing apps/mailreader/src/main/resources/log4j.properties
Removing apps/mailreader/src/main/resources/NOTICE.txt
Removing apps/mailreader/src/main/resources/LICENSE.txt
Removing apps/mailreader/src/main/java/struts.xml
Removing apps/mailreader/src/main/java/mailreader2/Subscription.java
Removing apps/mailreader/src/main/java/mailreader2/Subscription-validation.xml
Removing
apps/mailreader/src/main/java/mailreader2/Subscription-Subscription_save-validation.xml
Removing apps/mailreader/src/main/java/mailreader2/Registration.java
Removing apps/mailreader/src/main/java/mailreader2/Registration-validation.xml
Removing
apps/mailreader/src/main/java/mailreader2/Registration-Registration_save-validation.xml
Removing
apps/mailreader/src/main/java/mailreader2/MailreaderSupport_ru.properties
Removing
apps/mailreader/src/main/java/mailreader2/MailreaderSupport_ja.properties
Removing apps/mailreader/src/main/java/mailreader2/MailreaderSupport.properties
Removing apps/mailreader/src/main/java/mailreader2/MailreaderSupport.java
Removing apps/mailreader/src/main/java/mailreader2/Login-validation.xml
Removing apps/mailreader/src/main/java/mailreader2/Constants.java
Removing
apps/mailreader/src/main/java/mailreader2/AuthenticationInterceptor.java
Removing apps/mailreader/src/main/java/mailreader2/ApplicationListener.java
Removing apps/mailreader/src/main/java/mailreader-support.xml
Removing apps/mailreader/src/main/java/mailreader-default.xml
Removing apps/mailreader/src/main/java/alternate_ja.properties
Removing apps/mailreader/src/main/java/alternate.properties
CONFLICT (modify/delete): apps/mailreader/pom.xml deleted in
66327a1c3277821ae59bba6f93a7aaa3a4c7b55a and modified in HEAD. Version HEAD of
apps/mailreader/pom.xml left in tree.
Removing apps/mailreader/README.txt
Removing apps/jboss-blank/src/test/java/example/LoginTest.java
Removing apps/jboss-blank/src/test/java/example/ConfigTest.java
Removing apps/jboss-blank/src/main/webapp/index.html
Removing apps/jboss-blank/src/main/webapp/WEB-INF/web.xml
Removing apps/jboss-blank/src/main/webapp/WEB-INF/jsp/example/Welcome.jsp
Removing apps/jboss-blank/src/main/webapp/WEB-INF/jsp/example/Register.jsp
Removing apps/jboss-blank/src/main/webapp/WEB-INF/jsp/example/Missing.jsp
Removing apps/jboss-blank/src/main/webapp/WEB-INF/jsp/example/Menu.jsp
Removing apps/jboss-blank/src/main/webapp/WEB-INF/jsp/example/Login.jsp
Removing apps/jboss-blank/src/main/webapp/WEB-INF/jsp/example/HelloWorld.jsp
Removing apps/jboss-blank/src/main/resources/velocity.properties
Removing apps/jboss-blank/src/main/resources/struts.xml
Removing apps/jboss-blank/src/main/resources/example/package_es.properties
Removing apps/jboss-blank/src/main/resources/example/package.properties
Removing apps/jboss-blank/src/main/resources/example/Login-validation.xml
Removing apps/jboss-blank/src/main/resources/example.xml
Removing apps/jboss-blank/src/main/resources/NOTICE.txt
Removing apps/jboss-blank/src/main/resources/LICENSE.txt
Removing apps/jboss-blank/src/main/java/example/Login.java
Removing apps/jboss-blank/src/main/java/example/HelloWorld.java
CONFLICT (modify/delete): apps/jboss-blank/pom.xml deleted in
66327a1c3277821ae59bba6f93a7aaa3a4c7b55a and modified in HEAD. Version HEAD of
apps/jboss-blank/pom.xml left in tree.
Removing apps/jboss-blank/README.txt
Removing apps/blank/src/test/java/example/LoginTest.java
Removing apps/blank/src/test/java/example/ConfigTest.java
Removing apps/blank/src/main/webapp/index.html
Removing apps/blank/src/main/webapp/WEB-INF/web.xml
Removing apps/blank/src/main/webapp/WEB-INF/jsp/example/Welcome.jsp
Removing apps/blank/src/main/webapp/WEB-INF/jsp/example/Register.jsp
Removing apps/blank/src/main/webapp/WEB-INF/jsp/example/Missing.jsp
Removing apps/blank/src/main/webapp/WEB-INF/jsp/example/Menu.jsp
Removing apps/blank/src/main/webapp/WEB-INF/jsp/example/Login.jsp
Removing apps/blank/src/main/webapp/WEB-INF/jsp/example/HelloWorld.jsp
Removing apps/blank/src/main/webapp/WEB-INF/jsp/error.jsp
Removing apps/blank/src/main/resources/velocity.properties
Removing apps/blank/src/main/resources/struts.xml
Removing apps/blank/src/main/resources/example/package_es.properties
Removing apps/blank/src/main/resources/example/package.properties
Removing apps/blank/src/main/resources/example/Login-validation.xml
Removing apps/blank/src/main/resources/example.xml
Removing apps/blank/src/main/resources/NOTICE.txt
Removing apps/blank/src/main/java/example/YesNo.java
Removing apps/blank/src/main/java/example/HelloWorld.java
CONFLICT (modify/delete): apps/blank/pom.xml deleted in
66327a1c3277821ae59bba6f93a7aaa3a4c7b55a and modified in HEAD. Version HEAD of
apps/blank/pom.xml left in tree.
Removing apps/blank/README.txt
Automatic merge failed; fix conflicts and then commit the result.
stderr:
at
org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1693)
at
org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1669)
at
org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1665)
at
org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1307)
at
org.jenkinsci.plugins.gitclient.CliGitAPIImpl$3.execute(CliGitAPIImpl.java:587)
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:120)
at hudson.remoting.UserRequest.perform(UserRequest.java:48)
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
