See
<https://ci-builds.apache.org/job/Tomee/job/pull-request/259/display/redirect>
Changes:
------------------------------------------
[...truncated 44.74 KB...]
CONFLICT (content): Merge conflict in examples/projectstage-demo/pom.xml
Auto-merging examples/polling-parent/polling-client/pom.xml
CONFLICT (content): Merge conflict in
examples/polling-parent/polling-client/pom.xml
Auto-merging examples/pojo-webservice/pom.xml
CONFLICT (content): Merge conflict in examples/pojo-webservice/pom.xml
Auto-merging examples/persistence-fragment/pom.xml
CONFLICT (content): Merge conflict in examples/persistence-fragment/pom.xml
Auto-merging examples/myfaces-codi-demo/pom.xml
CONFLICT (content): Merge conflict in examples/myfaces-codi-demo/pom.xml
Auto-merging examples/mvc-resteasy/pom.xml
CONFLICT (content): Merge conflict in examples/mvc-resteasy/pom.xml
Auto-merging examples/mvc-cxf/pom.xml
CONFLICT (content): Merge conflict in examples/mvc-cxf/pom.xml
Auto-merging examples/mvc-cxf-hibernate/pom.xml
CONFLICT (content): Merge conflict in examples/mvc-cxf-hibernate/pom.xml
Auto-merging examples/multiple-tomee-arquillian/pom.xml
CONFLICT (content): Merge conflict in examples/multiple-tomee-arquillian/pom.xml
Auto-merging examples/multiple-arquillian-adapters/pom.xml
CONFLICT (content): Merge conflict in
examples/multiple-arquillian-adapters/pom.xml
Auto-merging examples/multi-jpa-provider-testing/pom.xml
CONFLICT (content): Merge conflict in
examples/multi-jpa-provider-testing/pom.xml
Auto-merging examples/movies-complete/pom.xml
CONFLICT (content): Merge conflict in examples/movies-complete/pom.xml
Removing examples/movies-complete/build.xml
Auto-merging examples/movies-complete-meta/pom.xml
CONFLICT (content): Merge conflict in examples/movies-complete-meta/pom.xml
Removing examples/movies-complete-meta/build.xml
Auto-merging examples/moviefun/pom.xml
CONFLICT (content): Merge conflict in examples/moviefun/pom.xml
Auto-merging examples/moviefun-rest/pom.xml
CONFLICT (content): Merge conflict in examples/moviefun-rest/pom.xml
Auto-merging examples/mbean-auto-registration/pom.xml
CONFLICT (content): Merge conflict in examples/mbean-auto-registration/pom.xml
Auto-merging examples/lookup-of-ejbs/pom.xml
CONFLICT (content): Merge conflict in examples/lookup-of-ejbs/pom.xml
Removing examples/lookup-of-ejbs/build.xml
Auto-merging examples/lookup-of-ejbs-with-descriptor/pom.xml
CONFLICT (content): Merge conflict in
examples/lookup-of-ejbs-with-descriptor/pom.xml
Removing examples/lookup-of-ejbs-with-descriptor/build.xml
Auto-merging examples/junit5-arquillian-simple-websockets/pom.xml
CONFLICT (content): Merge conflict in
examples/junit5-arquillian-simple-websockets/pom.xml
Auto-merging examples/junit5-arquillian-multiple-tomee/pom.xml
CONFLICT (content): Merge conflict in
examples/junit5-arquillian-multiple-tomee/pom.xml
Auto-merging examples/junit5-application-composer/pom.xml
CONFLICT (content): Merge conflict in
examples/junit5-application-composer/pom.xml
Auto-merging examples/jsf-managedBean-and-ejb/pom.xml
CONFLICT (content): Merge conflict in examples/jsf-managedBean-and-ejb/pom.xml
Auto-merging examples/jsf-cdi-and-ejb/pom.xml
CONFLICT (content): Merge conflict in examples/jsf-cdi-and-ejb/pom.xml
Auto-merging examples/jpa-hibernate/pom.xml
CONFLICT (content): Merge conflict in examples/jpa-hibernate/pom.xml
Auto-merging examples/jpa-hibernate-arquillian/pom.xml
CONFLICT (content): Merge conflict in examples/jpa-hibernate-arquillian/pom.xml
Auto-merging examples/jpa-enumerated/pom.xml
CONFLICT (content): Merge conflict in examples/jpa-enumerated/pom.xml
Removing examples/jpa-enumerated/build.xml
Auto-merging examples/jpa-eclipselink/pom.xml
CONFLICT (content): Merge conflict in examples/jpa-eclipselink/pom.xml
Auto-merging examples/jaxrs-filter/pom.xml
CONFLICT (content): Merge conflict in examples/jaxrs-filter/pom.xml
Auto-merging examples/javamail/pom.xml
CONFLICT (content): Merge conflict in examples/javamail/pom.xml
Auto-merging examples/java-modules/pom.xml
CONFLICT (content): Merge conflict in examples/java-modules/pom.xml
Auto-merging examples/interceptors/pom.xml
CONFLICT (content): Merge conflict in examples/interceptors/pom.xml
Removing examples/interceptors/build.xml
Auto-merging examples/injection-of-env-entry/pom.xml
CONFLICT (content): Merge conflict in examples/injection-of-env-entry/pom.xml
Removing examples/injection-of-env-entry/build.xml
Auto-merging examples/injection-of-entitymanager/pom.xml
CONFLICT (content): Merge conflict in
examples/injection-of-entitymanager/pom.xml
Removing examples/injection-of-entitymanager/build.xml
Auto-merging examples/injection-of-ejbs/pom.xml
CONFLICT (content): Merge conflict in examples/injection-of-ejbs/pom.xml
Removing examples/injection-of-ejbs/build.xml
Auto-merging examples/injection-of-datasource/pom.xml
CONFLICT (content): Merge conflict in examples/injection-of-datasource/pom.xml
Removing examples/injection-of-datasource/build.xml
Removing examples/injection-of-connectionfactory/build.xml
Auto-merging examples/helloworld-weblogic/pom.xml
CONFLICT (content): Merge conflict in examples/helloworld-weblogic/pom.xml
Removing examples/helloworld-weblogic/build.xml
Auto-merging examples/groovy-spock/pom.xml
CONFLICT (content): Merge conflict in examples/groovy-spock/pom.xml
Auto-merging examples/groovy-jpa/pom.xml
CONFLICT (content): Merge conflict in examples/groovy-jpa/pom.xml
Auto-merging examples/groovy-cdi/pom.xml
CONFLICT (content): Merge conflict in examples/groovy-cdi/pom.xml
Auto-merging examples/ejb-webservice/pom.xml
CONFLICT (content): Merge conflict in examples/ejb-webservice/pom.xml
Auto-merging examples/ejb-remote-call/pom.xml
CONFLICT (content): Merge conflict in examples/ejb-remote-call/pom.xml
Auto-merging examples/ejb-remote-call-2/pom.xml
CONFLICT (content): Merge conflict in examples/ejb-remote-call-2/pom.xml
Auto-merging examples/ejb-examples/pom.xml
CONFLICT (content): Merge conflict in examples/ejb-examples/pom.xml
Auto-merging examples/ear-testing/pom.xml
CONFLICT (content): Merge conflict in examples/ear-testing/pom.xml
Auto-merging examples/ear-testing/business-logic/pom.xml
CONFLICT (content): Merge conflict in
examples/ear-testing/business-logic/pom.xml
Auto-merging examples/dynamic-proxy-to-access-mbean/pom.xml
CONFLICT (content): Merge conflict in
examples/dynamic-proxy-to-access-mbean/pom.xml
Auto-merging examples/dynamic-implementation/pom.xml
CONFLICT (content): Merge conflict in examples/dynamic-implementation/pom.xml
Auto-merging examples/dynamic-datasource-routing/pom.xml
CONFLICT (content): Merge conflict in
examples/dynamic-datasource-routing/pom.xml
Auto-merging examples/dynamic-dao-implementation/pom.xml
CONFLICT (content): Merge conflict in
examples/dynamic-dao-implementation/pom.xml
Auto-merging examples/deltaspike-i18n/pom.xml
CONFLICT (content): Merge conflict in examples/deltaspike-i18n/pom.xml
Auto-merging examples/deltaspike-fullstack/pom.xml
CONFLICT (content): Merge conflict in examples/deltaspike-fullstack/pom.xml
Auto-merging examples/deltaspike-exception-handling/pom.xml
CONFLICT (content): Merge conflict in
examples/deltaspike-exception-handling/pom.xml
Auto-merging examples/deltaspike-configproperty/pom.xml
CONFLICT (content): Merge conflict in examples/deltaspike-configproperty/pom.xml
Auto-merging examples/decorators/pom.xml
CONFLICT (content): Merge conflict in examples/decorators/pom.xml
Auto-merging examples/datasource-versioning/pom.xml
CONFLICT (content): Merge conflict in examples/datasource-versioning/pom.xml
Auto-merging examples/datasource-definition/pom.xml
CONFLICT (content): Merge conflict in examples/datasource-definition/pom.xml
Auto-merging examples/datasource-ciphered-password/pom.xml
CONFLICT (content): Merge conflict in
examples/datasource-ciphered-password/pom.xml
Auto-merging examples/custom-injection/pom.xml
CONFLICT (content): Merge conflict in examples/custom-injection/pom.xml
Removing examples/custom-injection/build.xml
Auto-merging examples/cucumber-jvm/pom.xml
CONFLICT (content): Merge conflict in examples/cucumber-jvm/pom.xml
Auto-merging examples/component-interfaces/pom.xml
CONFLICT (content): Merge conflict in examples/component-interfaces/pom.xml
Removing examples/component-interfaces/build.xml
Auto-merging examples/client-resource-lookup-preview/pom.xml
CONFLICT (content): Merge conflict in
examples/client-resource-lookup-preview/pom.xml
Auto-merging examples/cdi-session-scope/pom.xml
CONFLICT (content): Merge conflict in examples/cdi-session-scope/pom.xml
Auto-merging examples/cdi-request-scope/pom.xml
CONFLICT (content): Merge conflict in examples/cdi-request-scope/pom.xml
Auto-merging examples/cdi-realm/pom.xml
CONFLICT (content): Merge conflict in examples/cdi-realm/pom.xml
Auto-merging examples/cdi-qualifier/pom.xml
CONFLICT (content): Merge conflict in examples/cdi-qualifier/pom.xml
Auto-merging examples/cdi-produces-field/pom.xml
CONFLICT (content): Merge conflict in examples/cdi-produces-field/pom.xml
Auto-merging examples/cdi-produces-disposes/pom.xml
CONFLICT (content): Merge conflict in examples/cdi-produces-disposes/pom.xml
Auto-merging examples/cdi-interceptors/pom.xml
CONFLICT (content): Merge conflict in examples/cdi-interceptors/pom.xml
Auto-merging examples/cdi-events/pom.xml
CONFLICT (content): Merge conflict in examples/cdi-events/pom.xml
Auto-merging examples/cdi-ejbcontext-jaas/pom.xml
CONFLICT (content): Merge conflict in examples/cdi-ejbcontext-jaas/pom.xml
Auto-merging examples/cdi-dynamic-inject/pom.xml
CONFLICT (content): Merge conflict in examples/cdi-dynamic-inject/pom.xml
Auto-merging examples/cdi-basic/pom.xml
CONFLICT (content): Merge conflict in examples/cdi-basic/pom.xml
Auto-merging examples/cdi-application-scope/pom.xml
CONFLICT (content): Merge conflict in examples/cdi-application-scope/pom.xml
Auto-merging examples/cdi-alternative-and-stereotypes/pom.xml
CONFLICT (content): Merge conflict in
examples/cdi-alternative-and-stereotypes/pom.xml
Auto-merging examples/bean-validation-design-by-contract/pom.xml
CONFLICT (content): Merge conflict in
examples/bean-validation-design-by-contract/pom.xml
Auto-merging examples/async-servlet/pom.xml
CONFLICT (content): Merge conflict in examples/async-servlet/pom.xml
Auto-merging examples/async-postconstruct/pom.xml
CONFLICT (content): Merge conflict in examples/async-postconstruct/pom.xml
Removing examples/async-postconstruct/build.xml
Auto-merging examples/async-methods/pom.xml
CONFLICT (content): Merge conflict in examples/async-methods/pom.xml
Removing examples/async-methods/build.xml
Auto-merging examples/arquillian-jpa/pom.xml
CONFLICT (content): Merge conflict in examples/arquillian-jpa/pom.xml
Auto-merging examples/applicationexception/pom.xml
CONFLICT (content): Merge conflict in examples/applicationexception/pom.xml
Removing examples/applicationexception/build.xml
Auto-merging examples/application-composer/pom.xml
CONFLICT (content): Merge conflict in examples/application-composer/pom.xml
Removing examples/application-composer/build.xml
Auto-merging examples/applet/pom.xml
CONFLICT (content): Merge conflict in examples/applet/pom.xml
Auto-merging examples/alternate-descriptors/pom.xml
CONFLICT (content): Merge conflict in examples/alternate-descriptors/pom.xml
Removing examples/alternate-descriptors/build.xml
Removing examples/access-timeout/build.xml
Auto-merging examples/access-timeout-meta/pom.xml
CONFLICT (content): Merge conflict in examples/access-timeout-meta/pom.xml
Removing examples/access-timeout-meta/build.xml
Removing docs/refcard/.DS_Store
Removing docs/developer/.DS_Store
Removing docs/contrib/.DS_Store
Removing docs/advanced/.DS_Store
Removing docs/admin/.DS_Store
Removing docs/.DS_Store
Removing
container/openejb-core/src/test/java/org/apache/openejb/core/stateless/JaxRpcInvocationTest.java
Removing
container/openejb-core/src/main/java/org/apache/openejb/mgmt/MEJBBean.java
Removing
container/openejb-core/src/main/java/org/apache/openejb/core/interceptor/JaxRpcInvocationContext.java
Auto-merging boms/tomee-webprofile/src/main/resources/tomee/conf/server.xml
CONFLICT (content): Merge conflict in
boms/tomee-webprofile/src/main/resources/tomee/conf/server.xml
Auto-merging
boms/tomee-webprofile/src/main/resources/tomee/conf/catalina.properties
Auto-merging boms/tomee-webprofile/pom.xml
CONFLICT (content): Merge conflict in boms/tomee-webprofile/pom.xml
Auto-merging boms/tomee-plus/src/main/resources/tomee/conf/server.xml
CONFLICT (content): Merge conflict in
boms/tomee-plus/src/main/resources/tomee/conf/server.xml
Auto-merging boms/tomee-plus/src/main/resources/tomee/conf/catalina.properties
Auto-merging boms/tomee-plus/pom.xml
CONFLICT (content): Merge conflict in boms/tomee-plus/pom.xml
Auto-merging boms/tomee-plume/src/main/resources/tomee/conf/server.xml
CONFLICT (content): Merge conflict in
boms/tomee-plume/src/main/resources/tomee/conf/server.xml
Auto-merging boms/tomee-plume/src/main/resources/tomee/conf/catalina.properties
Auto-merging boms/tomee-plume/pom.xml
CONFLICT (content): Merge conflict in boms/tomee-plume/pom.xml
Auto-merging boms/tomee-microprofile/src/main/resources/tomee/conf/server.xml
CONFLICT (content): Merge conflict in
boms/tomee-microprofile/src/main/resources/tomee/conf/server.xml
Auto-merging
boms/tomee-microprofile/src/main/resources/tomee/conf/catalina.properties
Auto-merging boms/tomee-microprofile/pom.xml
CONFLICT (content): Merge conflict in boms/tomee-microprofile/pom.xml
Removing assembly/test/build.xml
Automatic merge failed; fix conflicts and then commit the result.
stderr:
at
org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandIn(CliGitAPIImpl.java:2671)
at
org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandWithCredentials(CliGitAPIImpl.java:2096)
at
org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandWithCredentials(CliGitAPIImpl.java:1996)
at
org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandWithCredentials(CliGitAPIImpl.java:1987)
at
org.jenkinsci.plugins.gitclient.CliGitAPIImpl.access$600(CliGitAPIImpl.java:84)
at
org.jenkinsci.plugins.gitclient.CliGitAPIImpl$3.execute(CliGitAPIImpl.java:955)
at
org.jenkinsci.plugins.gitclient.AbstractGitAPIImpl.merge(AbstractGitAPIImpl.java:88)
at
org.jenkinsci.plugins.gitclient.CliGitAPIImpl.merge(CliGitAPIImpl.java:84)
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:929)
at
hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:902)
at
hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:854)
at hudson.remoting.UserRequest.perform(UserRequest.java:211)
at hudson.remoting.UserRequest.perform(UserRequest.java:54)
at hudson.remoting.Request$2.run(Request.java:376)
at
hudson.remoting.InterceptingExecutorService.lambda$wrap$0(InterceptingExecutorService.java:78)
at java.util.concurrent.FutureTask.run(FutureTask.java:266)
at
java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1149)
at
java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:624)
at java.lang.Thread.run(Thread.java:748)
INFO: Processing JUnit
ERROR: Step ?Publish xUnit test result report? failed: [JUnit] - No test report
file(s) were found with the pattern '**/target/surefire-reports/TEST-*.xml'
relative to '<https://ci-builds.apache.org/job/Tomee/job/pull-request/ws/'> for
the testing framework 'JUnit'.
Did you enter a pattern relative to (and within) the workspace directory?
Did you generate the result report(s) for 'JUnit'?"
Putting comment on the pull request
