See
<https://builds.apache.org/job/Struts-JDK7-pull-request/259/display/redirect>
------------------------------------------
[...truncated 36.34 KB...]
CONFLICT (modify/delete):
xwork-core/src/main/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManager.java
deleted in HEAD and modified in 9e8627ca669ec566bbedd638fc6010e8ae364160.
Version 9e8627ca669ec566bbedd638fc6010e8ae364160 of
xwork-core/src/main/java/com/opensymphony/xwork2/validator/AnnotationActionValidatorManager.java
left in tree.
CONFLICT (modify/delete):
xwork-core/src/main/java/com/opensymphony/xwork2/util/LocalizedTextUtil.java
deleted in HEAD and modified in 9e8627ca669ec566bbedd638fc6010e8ae364160.
Version 9e8627ca669ec566bbedd638fc6010e8ae364160 of
xwork-core/src/main/java/com/opensymphony/xwork2/util/LocalizedTextUtil.java
left in tree.
CONFLICT (modify/delete):
xwork-core/src/main/java/com/opensymphony/xwork2/util/CompoundRoot.java deleted
in HEAD and modified in 9e8627ca669ec566bbedd638fc6010e8ae364160. Version
9e8627ca669ec566bbedd638fc6010e8ae364160 of
xwork-core/src/main/java/com/opensymphony/xwork2/util/CompoundRoot.java left in
tree.
CONFLICT (modify/delete):
xwork-core/src/main/java/com/opensymphony/xwork2/spring/SpringObjectFactory.java
deleted in HEAD and modified in 9e8627ca669ec566bbedd638fc6010e8ae364160.
Version 9e8627ca669ec566bbedd638fc6010e8ae364160 of
xwork-core/src/main/java/com/opensymphony/xwork2/spring/SpringObjectFactory.java
left in tree.
CONFLICT (modify/delete):
xwork-core/src/main/java/com/opensymphony/xwork2/security/DefaultExcludedPatternsChecker.java
deleted in HEAD and modified in 9e8627ca669ec566bbedd638fc6010e8ae364160.
Version 9e8627ca669ec566bbedd638fc6010e8ae364160 of
xwork-core/src/main/java/com/opensymphony/xwork2/security/DefaultExcludedPatternsChecker.java
left in tree.
CONFLICT (modify/delete):
xwork-core/src/main/java/com/opensymphony/xwork2/ognl/SecurityMemberAccess.java
deleted in HEAD and modified in 9e8627ca669ec566bbedd638fc6010e8ae364160.
Version 9e8627ca669ec566bbedd638fc6010e8ae364160 of
xwork-core/src/main/java/com/opensymphony/xwork2/ognl/SecurityMemberAccess.java
left in tree.
CONFLICT (modify/delete):
xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlValueStack.java
deleted in HEAD and modified in 9e8627ca669ec566bbedd638fc6010e8ae364160.
Version 9e8627ca669ec566bbedd638fc6010e8ae364160 of
xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlValueStack.java left
in tree.
CONFLICT (modify/delete):
xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java deleted in
HEAD and modified in 9e8627ca669ec566bbedd638fc6010e8ae364160. Version
9e8627ca669ec566bbedd638fc6010e8ae364160 of
xwork-core/src/main/java/com/opensymphony/xwork2/ognl/OgnlUtil.java left in
tree.
CONFLICT (modify/delete):
xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
deleted in HEAD and modified in 9e8627ca669ec566bbedd638fc6010e8ae364160.
Version 9e8627ca669ec566bbedd638fc6010e8ae364160 of
xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/ParametersInterceptor.java
left in tree.
CONFLICT (modify/delete):
xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/I18nInterceptor.java
deleted in HEAD and modified in 9e8627ca669ec566bbedd638fc6010e8ae364160.
Version 9e8627ca669ec566bbedd638fc6010e8ae364160 of
xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/I18nInterceptor.java
left in tree.
CONFLICT (modify/delete):
xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/DefaultWorkflowInterceptor.java
deleted in HEAD and modified in 9e8627ca669ec566bbedd638fc6010e8ae364160.
Version 9e8627ca669ec566bbedd638fc6010e8ae364160 of
xwork-core/src/main/java/com/opensymphony/xwork2/interceptor/DefaultWorkflowInterceptor.java
left in tree.
CONFLICT (modify/delete):
xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/DateConverter.java
deleted in HEAD and modified in 9e8627ca669ec566bbedd638fc6010e8ae364160.
Version 9e8627ca669ec566bbedd638fc6010e8ae364160 of
xwork-core/src/main/java/com/opensymphony/xwork2/conversion/impl/DateConverter.java
left in tree.
CONFLICT (modify/delete):
xwork-core/src/main/java/com/opensymphony/xwork2/config/providers/InterceptorBuilder.java
deleted in HEAD and modified in 9e8627ca669ec566bbedd638fc6010e8ae364160.
Version 9e8627ca669ec566bbedd638fc6010e8ae364160 of
xwork-core/src/main/java/com/opensymphony/xwork2/config/providers/InterceptorBuilder.java
left in tree.
CONFLICT (modify/delete):
xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/ResultTypeConfig.java
deleted in HEAD and modified in 9e8627ca669ec566bbedd638fc6010e8ae364160.
Version 9e8627ca669ec566bbedd638fc6010e8ae364160 of
xwork-core/src/main/java/com/opensymphony/xwork2/config/entities/ResultTypeConfig.java
left in tree.
CONFLICT (modify/delete):
xwork-core/src/main/java/com/opensymphony/xwork2/XWorkConstants.java deleted in
HEAD and modified in 9e8627ca669ec566bbedd638fc6010e8ae364160. Version
9e8627ca669ec566bbedd638fc6010e8ae364160 of
xwork-core/src/main/java/com/opensymphony/xwork2/XWorkConstants.java left in
tree.
CONFLICT (modify/delete):
xwork-core/src/main/java/com/opensymphony/xwork2/DefaultActionProxyFactory.java
deleted in HEAD and modified in 9e8627ca669ec566bbedd638fc6010e8ae364160.
Version 9e8627ca669ec566bbedd638fc6010e8ae364160 of
xwork-core/src/main/java/com/opensymphony/xwork2/DefaultActionProxyFactory.java
left in tree.
CONFLICT (modify/delete):
xwork-core/src/main/java/com/opensymphony/xwork2/DefaultActionInvocation.java
deleted in HEAD and modified in 9e8627ca669ec566bbedd638fc6010e8ae364160.
Version 9e8627ca669ec566bbedd638fc6010e8ae364160 of
xwork-core/src/main/java/com/opensymphony/xwork2/DefaultActionInvocation.java
left in tree.
CONFLICT (modify/delete):
xwork-core/src/main/java/com/opensymphony/xwork2/ActionSupport.java deleted in
HEAD and modified in 9e8627ca669ec566bbedd638fc6010e8ae364160. Version
9e8627ca669ec566bbedd638fc6010e8ae364160 of
xwork-core/src/main/java/com/opensymphony/xwork2/ActionSupport.java left in
tree.
CONFLICT (modify/delete): xwork-core/pom.xml deleted in HEAD and modified in
9e8627ca669ec566bbedd638fc6010e8ae364160. Version
9e8627ca669ec566bbedd638fc6010e8ae364160 of xwork-core/pom.xml left in tree.
Auto-merging pom.xml
CONFLICT (content): Merge conflict in pom.xml
CONFLICT (modify/delete): plugins/tiles3/pom.xml deleted in HEAD and modified
in 9e8627ca669ec566bbedd638fc6010e8ae364160. Version
9e8627ca669ec566bbedd638fc6010e8ae364160 of plugins/tiles3/pom.xml left in tree.
Auto-merging
plugins/tiles/src/main/java/org/apache/struts2/views/tiles/TilesResult.java
CONFLICT (content): Merge conflict in
plugins/tiles/src/main/java/org/apache/struts2/views/tiles/TilesResult.java
Auto-merging
plugins/tiles/src/main/java/org/apache/struts2/tiles/annotation/TilesDefinition.java
CONFLICT (add/add): Merge conflict in
plugins/tiles/src/main/java/org/apache/struts2/tiles/annotation/TilesDefinition.java
Auto-merging
plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesListener.java
CONFLICT (content): Merge conflict in
plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesListener.java
Auto-merging
plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesInitializer.java
CONFLICT (add/add): Merge conflict in
plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesInitializer.java
Auto-merging
plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesContainerFactory.java
CONFLICT (content): Merge conflict in
plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsTilesContainerFactory.java
Auto-merging
plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsFreeMarkerAttributeRenderer.java
CONFLICT (add/add): Merge conflict in
plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsFreeMarkerAttributeRenderer.java
Auto-merging
plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsAttributeEvaluator.java
CONFLICT (add/add): Merge conflict in
plugins/tiles/src/main/java/org/apache/struts2/tiles/StrutsAttributeEvaluator.java
Auto-merging
plugins/tiles/src/main/java/org/apache/struts2/tiles/I18NAttributeEvaluator.java
CONFLICT (add/add): Merge conflict in
plugins/tiles/src/main/java/org/apache/struts2/tiles/I18NAttributeEvaluator.java
Auto-merging plugins/tiles/pom.xml
CONFLICT (content): Merge conflict in plugins/tiles/pom.xml
Auto-merging plugins/testng/pom.xml
CONFLICT (content): Merge conflict in plugins/testng/pom.xml
CONFLICT (modify/delete): plugins/struts1/pom.xml deleted in HEAD and modified
in 9e8627ca669ec566bbedd638fc6010e8ae364160. Version
9e8627ca669ec566bbedd638fc6010e8ae364160 of plugins/struts1/pom.xml left in
tree.
Auto-merging plugins/spring/pom.xml
CONFLICT (content): Merge conflict in plugins/spring/pom.xml
Auto-merging plugins/sitemesh/pom.xml
CONFLICT (content): Merge conflict in plugins/sitemesh/pom.xml
Auto-merging plugins/sitegraph/pom.xml
CONFLICT (content): Merge conflict in plugins/sitegraph/pom.xml
Auto-merging
plugins/rest/src/test/java/org/apache/struts2/rest/RestActionMapperTest.java
CONFLICT (content): Merge conflict in
plugins/rest/src/test/java/org/apache/struts2/rest/RestActionMapperTest.java
Auto-merging plugins/rest/pom.xml
CONFLICT (content): Merge conflict in plugins/rest/pom.xml
Auto-merging plugins/portlet/pom.xml
CONFLICT (content): Merge conflict in plugins/portlet/pom.xml
Auto-merging
plugins/portlet-tiles/src/main/java/org/apache/struts2/views/tiles/PortletTilesResult.java
CONFLICT (content): Merge conflict in
plugins/portlet-tiles/src/main/java/org/apache/struts2/views/tiles/PortletTilesResult.java
Auto-merging plugins/portlet-tiles/pom.xml
CONFLICT (content): Merge conflict in plugins/portlet-tiles/pom.xml
Auto-merging plugins/pom.xml
CONFLICT (content): Merge conflict in plugins/pom.xml
Auto-merging plugins/plexus/pom.xml
CONFLICT (content): Merge conflict in plugins/plexus/pom.xml
Auto-merging plugins/pell-multipart/pom.xml
CONFLICT (content): Merge conflict in plugins/pell-multipart/pom.xml
Auto-merging plugins/oval/pom.xml
CONFLICT (content): Merge conflict in plugins/oval/pom.xml
Auto-merging plugins/osgi/pom.xml
CONFLICT (content): Merge conflict in plugins/osgi/pom.xml
Auto-merging plugins/junit/pom.xml
CONFLICT (content): Merge conflict in plugins/junit/pom.xml
Auto-merging
plugins/json/src/test/java/org/apache/struts2/json/JSONActionRedirectResultTest.java
CONFLICT (add/add): Merge conflict in
plugins/json/src/test/java/org/apache/struts2/json/JSONActionRedirectResultTest.java
Auto-merging
plugins/json/src/main/java/org/apache/struts2/json/JSONValidationInterceptor.java
CONFLICT (content): Merge conflict in
plugins/json/src/main/java/org/apache/struts2/json/JSONValidationInterceptor.java
Auto-merging
plugins/json/src/main/java/org/apache/struts2/json/JSONActionRedirectResult.java
CONFLICT (add/add): Merge conflict in
plugins/json/src/main/java/org/apache/struts2/json/JSONActionRedirectResult.java
Auto-merging plugins/json/pom.xml
CONFLICT (content): Merge conflict in plugins/json/pom.xml
CONFLICT (modify/delete): plugins/jsf/pom.xml deleted in HEAD and modified in
9e8627ca669ec566bbedd638fc6010e8ae364160. Version
9e8627ca669ec566bbedd638fc6010e8ae364160 of plugins/jsf/pom.xml left in tree.
Auto-merging plugins/jfreechart/pom.xml
CONFLICT (content): Merge conflict in plugins/jfreechart/pom.xml
Auto-merging plugins/javatemplates/pom.xml
CONFLICT (content): Merge conflict in plugins/javatemplates/pom.xml
CONFLICT (modify/delete): plugins/java8-support/pom.xml deleted in HEAD and
modified in 9e8627ca669ec566bbedd638fc6010e8ae364160. Version
9e8627ca669ec566bbedd638fc6010e8ae364160 of plugins/java8-support/pom.xml left
in tree.
Auto-merging plugins/jasperreports/pom.xml
CONFLICT (content): Merge conflict in plugins/jasperreports/pom.xml
Auto-merging plugins/gxp/pom.xml
CONFLICT (content): Merge conflict in plugins/gxp/pom.xml
Auto-merging plugins/embeddedjsp/pom.xml
CONFLICT (content): Merge conflict in plugins/embeddedjsp/pom.xml
Auto-merging plugins/dwr/pom.xml
CONFLICT (content): Merge conflict in plugins/dwr/pom.xml
CONFLICT (modify/delete):
plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts_dojo.js.uncompressed.js
deleted in HEAD and modified in 9e8627ca669ec566bbedd638fc6010e8ae364160.
Version 9e8627ca669ec566bbedd638fc6010e8ae364160 of
plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/struts_dojo.js.uncompressed.js
left in tree.
CONFLICT (modify/delete):
plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/dojo.js.uncompressed.js
deleted in HEAD and modified in 9e8627ca669ec566bbedd638fc6010e8ae364160.
Version 9e8627ca669ec566bbedd638fc6010e8ae364160 of
plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/dojo.js.uncompressed.js
left in tree.
CONFLICT (modify/delete):
plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/dojo.js deleted
in HEAD and modified in 9e8627ca669ec566bbedd638fc6010e8ae364160. Version
9e8627ca669ec566bbedd638fc6010e8ae364160 of
plugins/dojo/src/main/resources/org/apache/struts2/static/dojo/dojo.js left in
tree.
CONFLICT (modify/delete): plugins/dojo/pom.xml deleted in HEAD and modified in
9e8627ca669ec566bbedd638fc6010e8ae364160. Version
9e8627ca669ec566bbedd638fc6010e8ae364160 of plugins/dojo/pom.xml left in tree.
Auto-merging
plugins/convention/src/main/java/org/apache/struts2/convention/ConventionsServiceImpl.java
CONFLICT (content): Merge conflict in
plugins/convention/src/main/java/org/apache/struts2/convention/ConventionsServiceImpl.java
Auto-merging
plugins/convention/src/main/java/org/apache/struts2/convention/ConventionUnknownHandler.java
CONFLICT (content): Merge conflict in
plugins/convention/src/main/java/org/apache/struts2/convention/ConventionUnknownHandler.java
Auto-merging plugins/convention/pom.xml
CONFLICT (content): Merge conflict in plugins/convention/pom.xml
Auto-merging plugins/config-browser/pom.xml
CONFLICT (content): Merge conflict in plugins/config-browser/pom.xml
CONFLICT (modify/delete): plugins/codebehind/pom.xml deleted in HEAD and
modified in 9e8627ca669ec566bbedd638fc6010e8ae364160. Version
9e8627ca669ec566bbedd638fc6010e8ae364160 of plugins/codebehind/pom.xml left in
tree.
Auto-merging plugins/cdi/pom.xml
CONFLICT (content): Merge conflict in plugins/cdi/pom.xml
Auto-merging
core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-12.txt
CONFLICT (add/add): Merge conflict in
core/src/test/resources/org/apache/struts2/views/jsp/ui/Textfield-12.txt
Auto-merging
core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-6.txt
CONFLICT (content): Merge conflict in
core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-6.txt
Auto-merging
core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-5.txt
CONFLICT (content): Merge conflict in
core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-5.txt
Auto-merging
core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-2.txt
CONFLICT (content): Merge conflict in
core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-2.txt
Auto-merging
core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-1.txt
CONFLICT (content): Merge conflict in
core/src/test/resources/org/apache/struts2/views/jsp/ui/Submit-1.txt
Auto-merging
core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-4.txt
CONFLICT (content): Merge conflict in
core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-4.txt
Auto-merging
core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-3.txt
CONFLICT (content): Merge conflict in
core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-3.txt
Auto-merging
core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-2.txt
CONFLICT (content): Merge conflict in
core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-2.txt
Auto-merging
core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-1.txt
CONFLICT (content): Merge conflict in
core/src/test/resources/org/apache/struts2/views/jsp/ui/DoubleSelect-1.txt
Auto-merging
core/src/test/java/org/apache/struts2/views/jsp/ui/TextfieldTest.java
CONFLICT (content): Merge conflict in
core/src/test/java/org/apache/struts2/views/jsp/ui/TextfieldTest.java
Auto-merging
core/src/test/java/org/apache/struts2/interceptor/MessageStorePreResultListenerTest.java
CONFLICT (add/add): Merge conflict in
core/src/test/java/org/apache/struts2/interceptor/MessageStorePreResultListenerTest.java
Auto-merging
core/src/test/java/org/apache/struts2/interceptor/MessageStoreInterceptorTest.java
CONFLICT (content): Merge conflict in
core/src/test/java/org/apache/struts2/interceptor/MessageStoreInterceptorTest.java
Auto-merging
core/src/test/java/org/apache/struts2/interceptor/I18nInterceptorTest.java
CONFLICT (content): Merge conflict in
core/src/test/java/org/apache/struts2/interceptor/I18nInterceptorTest.java
Auto-merging core/src/main/resources/template/simple/form-close-tooltips.ftl
CONFLICT (add/add): Merge conflict in
core/src/main/resources/template/simple/form-close-tooltips.ftl
Auto-merging core/src/main/resources/template/simple/doubleselect.ftl
CONFLICT (content): Merge conflict in
core/src/main/resources/template/simple/doubleselect.ftl
Auto-merging core/src/main/resources/struts-default.xml
CONFLICT (content): Merge conflict in core/src/main/resources/struts-default.xml
Auto-merging
core/src/main/java/org/apache/struts2/views/util/DefaultUrlHelper.java
CONFLICT (content): Merge conflict in
core/src/main/java/org/apache/struts2/views/util/DefaultUrlHelper.java
Auto-merging core/src/main/java/org/apache/struts2/util/tomcat/buf/UDecoder.java
CONFLICT (add/add): Merge conflict in
core/src/main/java/org/apache/struts2/util/tomcat/buf/UDecoder.java
Auto-merging
core/src/main/java/org/apache/struts2/util/tomcat/buf/StringCache.java
CONFLICT (add/add): Merge conflict in
core/src/main/java/org/apache/struts2/util/tomcat/buf/StringCache.java
Auto-merging
core/src/main/java/org/apache/struts2/interceptor/MessageStorePreResultListener.java
CONFLICT (add/add): Merge conflict in
core/src/main/java/org/apache/struts2/interceptor/MessageStorePreResultListener.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
CONFLICT (modify/delete):
core/src/main/java/org/apache/struts2/dispatcher/ng/PrepareOperations.java
deleted in HEAD and modified in 9e8627ca669ec566bbedd638fc6010e8ae364160.
Version 9e8627ca669ec566bbedd638fc6010e8ae364160 of
core/src/main/java/org/apache/struts2/dispatcher/ng/PrepareOperations.java left
in tree.
Auto-merging
core/src/main/java/org/apache/struts2/dispatcher/multipart/MultiPartRequestWrapper.java
CONFLICT (content): Merge conflict in
core/src/main/java/org/apache/struts2/dispatcher/multipart/MultiPartRequestWrapper.java
Auto-merging
core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaStreamMultiPartRequest.java
CONFLICT (content): Merge conflict in
core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaStreamMultiPartRequest.java
Auto-merging
core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaMultiPartRequest.java
CONFLICT (content): Merge conflict in
core/src/main/java/org/apache/struts2/dispatcher/multipart/JakartaMultiPartRequest.java
Auto-merging
core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
CONFLICT (content): Merge conflict in
core/src/main/java/org/apache/struts2/dispatcher/mapper/DefaultActionMapper.java
Auto-merging
core/src/main/java/org/apache/struts2/dispatcher/DefaultStaticContentLoader.java
CONFLICT (content): Merge conflict in
core/src/main/java/org/apache/struts2/dispatcher/DefaultStaticContentLoader.java
Auto-merging core/src/main/java/org/apache/struts2/components/I18n.java
CONFLICT (content): Merge conflict in
core/src/main/java/org/apache/struts2/components/I18n.java
Auto-merging core/pom.xml
CONFLICT (content): Merge conflict in core/pom.xml
Auto-merging bundles/pom.xml
CONFLICT (content): Merge conflict in bundles/pom.xml
Auto-merging bundles/demo/pom.xml
CONFLICT (content): Merge conflict in bundles/demo/pom.xml
Auto-merging bundles/admin/pom.xml
CONFLICT (content): Merge conflict in bundles/admin/pom.xml
Auto-merging bom/pom.xml
CONFLICT (content): Merge conflict in bom/pom.xml
Auto-merging assembly/src/main/assembly/min-lib.xml
CONFLICT (add/add): Merge conflict in assembly/src/main/assembly/min-lib.xml
Auto-merging assembly/pom.xml
CONFLICT (content): Merge conflict in assembly/pom.xml
CONFLICT (modify/delete): archetypes/struts2-archetype-starter/pom.xml deleted
in HEAD and modified in 9e8627ca669ec566bbedd638fc6010e8ae364160. Version
9e8627ca669ec566bbedd638fc6010e8ae364160 of
archetypes/struts2-archetype-starter/pom.xml left in tree.
CONFLICT (modify/delete): archetypes/struts2-archetype-portlet/pom.xml deleted
in HEAD and modified in 9e8627ca669ec566bbedd638fc6010e8ae364160. Version
9e8627ca669ec566bbedd638fc6010e8ae364160 of
archetypes/struts2-archetype-portlet/pom.xml left in tree.
CONFLICT (modify/delete): archetypes/struts2-archetype-plugin/pom.xml deleted
in HEAD and modified in 9e8627ca669ec566bbedd638fc6010e8ae364160. Version
9e8627ca669ec566bbedd638fc6010e8ae364160 of
archetypes/struts2-archetype-plugin/pom.xml left in tree.
CONFLICT (modify/delete): archetypes/struts2-archetype-dbportlet/pom.xml
deleted in HEAD and modified in 9e8627ca669ec566bbedd638fc6010e8ae364160.
Version 9e8627ca669ec566bbedd638fc6010e8ae364160 of
archetypes/struts2-archetype-dbportlet/pom.xml left in tree.
CONFLICT (modify/delete): archetypes/struts2-archetype-convention/pom.xml
deleted in HEAD and modified in 9e8627ca669ec566bbedd638fc6010e8ae364160.
Version 9e8627ca669ec566bbedd638fc6010e8ae364160 of
archetypes/struts2-archetype-convention/pom.xml left in tree.
CONFLICT (modify/delete): archetypes/struts2-archetype-blank/pom.xml deleted in
HEAD and modified in 9e8627ca669ec566bbedd638fc6010e8ae364160. Version
9e8627ca669ec566bbedd638fc6010e8ae364160 of
archetypes/struts2-archetype-blank/pom.xml left in tree.
CONFLICT (modify/delete): archetypes/struts2-archetype-angularjs/pom.xml
deleted in HEAD and modified in 9e8627ca669ec566bbedd638fc6010e8ae364160.
Version 9e8627ca669ec566bbedd638fc6010e8ae364160 of
archetypes/struts2-archetype-angularjs/pom.xml left in tree.
CONFLICT (modify/delete): archetypes/pom.xml deleted in HEAD and modified in
9e8627ca669ec566bbedd638fc6010e8ae364160. Version
9e8627ca669ec566bbedd638fc6010e8ae364160 of archetypes/pom.xml left in tree.
CONFLICT (modify/delete):
apps/showcase/src/main/webapp/WEB-INF/validation/index.jsp deleted in HEAD and
modified in 9e8627ca669ec566bbedd638fc6010e8ae364160. Version
9e8627ca669ec566bbedd638fc6010e8ae364160 of
apps/showcase/src/main/webapp/WEB-INF/validation/index.jsp left in tree.
Auto-merging apps/showcase/src/main/webapp/WEB-INF/validation/ajaxFormSubmit.jsp
CONFLICT (add/add): Merge conflict in
apps/showcase/src/main/webapp/WEB-INF/validation/ajaxFormSubmit.jsp
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
Auto-merging apps/showcase/src/main/resources/struts-tiles.xml
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
CONFLICT (modify/delete): apps/portlet/src/main/webapp/WEB-INF/view/index.jsp
deleted in HEAD and modified in 9e8627ca669ec566bbedd638fc6010e8ae364160.
Version 9e8627ca669ec566bbedd638fc6010e8ae364160 of
apps/portlet/src/main/webapp/WEB-INF/view/index.jsp left in tree.
CONFLICT (modify/delete): apps/portlet/pom.xml deleted in HEAD and modified in
9e8627ca669ec566bbedd638fc6010e8ae364160. Version
9e8627ca669ec566bbedd638fc6010e8ae364160 of apps/portlet/pom.xml left in tree.
Auto-merging apps/pom.xml
CONFLICT (content): Merge conflict in apps/pom.xml
CONFLICT (modify/delete): apps/mailreader/pom.xml deleted in HEAD and modified
in 9e8627ca669ec566bbedd638fc6010e8ae364160. Version
9e8627ca669ec566bbedd638fc6010e8ae364160 of apps/mailreader/pom.xml left in
tree.
CONFLICT (modify/delete): apps/jboss-blank/pom.xml deleted in HEAD and modified
in 9e8627ca669ec566bbedd638fc6010e8ae364160. Version
9e8627ca669ec566bbedd638fc6010e8ae364160 of apps/jboss-blank/pom.xml left in
tree.
CONFLICT (modify/delete): apps/blank/pom.xml deleted in HEAD and modified in
9e8627ca669ec566bbedd638fc6010e8ae364160. Version
9e8627ca669ec566bbedd638fc6010e8ae364160 of apps/blank/pom.xml left in tree.
Automatic merge failed; fix conflicts and then commit the result.
stderr: warning: inexact rename detection was skipped due to too many files.
warning: you may want to set your merge.renamelimit variable to at least 3000
and retry the command.
at
org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1793)
at
org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1766)
at
org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:1762)
at
org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommand(CliGitAPIImpl.java:1409)
at
org.jenkinsci.plugins.gitclient.CliGitAPIImpl$3.execute(CliGitAPIImpl.java:588)
at
org.jenkinsci.plugins.gitclient.AbstractGitAPIImpl.merge(AbstractGitAPIImpl.java:86)
at
org.jenkinsci.plugins.gitclient.CliGitAPIImpl.merge(CliGitAPIImpl.java:64)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at
sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
at
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:498)
at
hudson.remoting.RemoteInvocationHandler$RPCRequest.perform(RemoteInvocationHandler.java:894)
at
hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:869)
at
hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:828)
at hudson.remoting.UserRequest.perform(UserRequest.java:153)
at hudson.remoting.UserRequest.perform(UserRequest.java:50)
at hudson.remoting.Request$2.run(Request.java:336)
at
hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:68)
at java.util.concurrent.FutureTask.run(FutureTask.java:266)
at
java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1142)
at
java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:617)
at java.lang.Thread.run(Thread.java:745)
at ......remote call to H21(Native Method)
at hudson.remoting.Channel.attachCallSiteStackTrace(Channel.java:1537)
at hudson.remoting.UserResponse.retrieve(UserRequest.java:253)
at hudson.remoting.Channel.call(Channel.java:822)
at
hudson.remoting.RemoteInvocationHandler.invoke(RemoteInvocationHandler.java:256)
at com.sun.proxy.$Proxy96.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:995)
at hudson.plugins.git.GitSCM.checkout(GitSCM.java:1102)
at hudson.scm.SCM.checkout(SCM.java:495)
at hudson.model.AbstractProject.checkout(AbstractProject.java:1278)
at
hudson.model.AbstractBuild$AbstractBuildExecution.defaultCheckout(AbstractBuild.java:604)
at jenkins.scm.SCMCheckoutStrategy.checkout(SCMCheckoutStrategy.java:86)
at
hudson.model.AbstractBuild$AbstractBuildExecution.run(AbstractBuild.java:529)
at hudson.model.Run.execute(Run.java:1728)
at hudson.maven.MavenModuleSetBuild.run(MavenModuleSetBuild.java:544)
at hudson.model.ResourceController.execute(ResourceController.java:98)
at hudson.model.Executor.run(Executor.java:404)
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
