See
<https://ci-builds.apache.org/job/Tomee/job/master-pull-request/51/display/redirect>
Changes:
------------------------------------------
[...truncated 127.63 KB...]
CONFLICT (modify/delete):
deps/cxf-shade/src/patch/java/org/apache/cxf/jaxrs/provider/DataSourceProvider.java
deleted in dd2eb4ac5afba150f680bf55db0b41866463f364 and modified in HEAD.
Version HEAD of
deps/cxf-shade/src/patch/java/org/apache/cxf/jaxrs/provider/DataSourceProvider.java
left in tree.
CONFLICT (modify/delete):
deps/cxf-shade/src/patch/java/org/apache/cxf/jaxrs/provider/CachingMessageBodyWriter.java
deleted in dd2eb4ac5afba150f680bf55db0b41866463f364 and modified in HEAD.
Version HEAD of
deps/cxf-shade/src/patch/java/org/apache/cxf/jaxrs/provider/CachingMessageBodyWriter.java
left in tree.
CONFLICT (modify/delete):
deps/cxf-shade/src/patch/java/org/apache/cxf/jaxrs/provider/CachingMessageBodyReader.java
deleted in dd2eb4ac5afba150f680bf55db0b41866463f364 and modified in HEAD.
Version HEAD of
deps/cxf-shade/src/patch/java/org/apache/cxf/jaxrs/provider/CachingMessageBodyReader.java
left in tree.
CONFLICT (modify/delete):
deps/cxf-shade/src/patch/java/org/apache/cxf/jaxrs/model/URITemplate.java
deleted in dd2eb4ac5afba150f680bf55db0b41866463f364 and modified in HEAD.
Version HEAD of
deps/cxf-shade/src/patch/java/org/apache/cxf/jaxrs/model/URITemplate.java left
in tree.
CONFLICT (modify/delete):
deps/cxf-shade/src/patch/java/org/apache/cxf/jaxrs/model/ClassResourceInfo.java
deleted in dd2eb4ac5afba150f680bf55db0b41866463f364 and modified in HEAD.
Version HEAD of
deps/cxf-shade/src/patch/java/org/apache/cxf/jaxrs/model/ClassResourceInfo.java
left in tree.
CONFLICT (modify/delete):
deps/cxf-shade/src/patch/java/org/apache/cxf/jaxrs/model/AbstractResourceInfo.java
deleted in dd2eb4ac5afba150f680bf55db0b41866463f364 and modified in HEAD.
Version HEAD of
deps/cxf-shade/src/patch/java/org/apache/cxf/jaxrs/model/AbstractResourceInfo.java
left in tree.
CONFLICT (modify/delete):
deps/cxf-shade/src/patch/java/org/apache/cxf/jaxrs/interceptor/JAXRSOutInterceptor.java
deleted in dd2eb4ac5afba150f680bf55db0b41866463f364 and modified in HEAD.
Version HEAD of
deps/cxf-shade/src/patch/java/org/apache/cxf/jaxrs/interceptor/JAXRSOutInterceptor.java
left in tree.
CONFLICT (modify/delete):
deps/cxf-shade/src/patch/java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java
deleted in dd2eb4ac5afba150f680bf55db0b41866463f364 and modified in HEAD.
Version HEAD of
deps/cxf-shade/src/patch/java/org/apache/cxf/jaxrs/interceptor/JAXRSInInterceptor.java
left in tree.
Removing
deps/cxf-shade/src/patch/java/org/apache/cxf/jaxrs/impl/tl/ThreadLocalInvocationHandler.java
CONFLICT (modify/delete):
deps/cxf-shade/src/patch/java/org/apache/cxf/jaxrs/impl/ResponseImpl.java
deleted in dd2eb4ac5afba150f680bf55db0b41866463f364 and modified in HEAD.
Version HEAD of
deps/cxf-shade/src/patch/java/org/apache/cxf/jaxrs/impl/ResponseImpl.java left
in tree.
CONFLICT (modify/delete):
deps/cxf-shade/src/patch/java/org/apache/cxf/jaxrs/impl/ResourceContextImpl.java
deleted in dd2eb4ac5afba150f680bf55db0b41866463f364 and modified in HEAD.
Version HEAD of
deps/cxf-shade/src/patch/java/org/apache/cxf/jaxrs/impl/ResourceContextImpl.java
left in tree.
CONFLICT (modify/delete):
deps/cxf-shade/src/patch/java/org/apache/cxf/jaxrs/impl/RequestImpl.java
deleted in dd2eb4ac5afba150f680bf55db0b41866463f364 and modified in HEAD.
Version HEAD of
deps/cxf-shade/src/patch/java/org/apache/cxf/jaxrs/impl/RequestImpl.java left
in tree.
CONFLICT (modify/delete):
deps/cxf-shade/src/patch/java/org/apache/cxf/jaxrs/impl/MediaTypeHeaderProvider.java
deleted in dd2eb4ac5afba150f680bf55db0b41866463f364 and modified in HEAD.
Version HEAD of
deps/cxf-shade/src/patch/java/org/apache/cxf/jaxrs/impl/MediaTypeHeaderProvider.java
left in tree.
CONFLICT (modify/delete):
deps/cxf-shade/src/patch/java/org/apache/cxf/jaxrs/impl/EntityTagHeaderProvider.java
deleted in dd2eb4ac5afba150f680bf55db0b41866463f364 and modified in HEAD.
Version HEAD of
deps/cxf-shade/src/patch/java/org/apache/cxf/jaxrs/impl/EntityTagHeaderProvider.java
left in tree.
CONFLICT (modify/delete):
deps/cxf-shade/src/patch/java/org/apache/cxf/jaxrs/client/spring/JAXRSClientFactoryBeanDefinitionParser.java
deleted in dd2eb4ac5afba150f680bf55db0b41866463f364 and modified in HEAD.
Version HEAD of
deps/cxf-shade/src/patch/java/org/apache/cxf/jaxrs/client/spring/JAXRSClientFactoryBeanDefinitionParser.java
left in tree.
CONFLICT (modify/delete):
deps/cxf-shade/src/patch/java/org/apache/cxf/jaxrs/client/spec/ClientRequestContextImpl.java
deleted in dd2eb4ac5afba150f680bf55db0b41866463f364 and modified in HEAD.
Version HEAD of
deps/cxf-shade/src/patch/java/org/apache/cxf/jaxrs/client/spec/ClientRequestContextImpl.java
left in tree.
CONFLICT (modify/delete):
deps/cxf-shade/src/patch/java/org/apache/cxf/jaxrs/client/WebClient.java
deleted in dd2eb4ac5afba150f680bf55db0b41866463f364 and modified in HEAD.
Version HEAD of
deps/cxf-shade/src/patch/java/org/apache/cxf/jaxrs/client/WebClient.java left
in tree.
CONFLICT (modify/delete):
deps/cxf-shade/src/patch/java/org/apache/cxf/jaxrs/client/LocalClientState.java
deleted in dd2eb4ac5afba150f680bf55db0b41866463f364 and modified in HEAD.
Version HEAD of
deps/cxf-shade/src/patch/java/org/apache/cxf/jaxrs/client/LocalClientState.java
left in tree.
CONFLICT (modify/delete):
deps/cxf-shade/src/patch/java/org/apache/cxf/jaxrs/client/JAXRSClientFactory.java
deleted in dd2eb4ac5afba150f680bf55db0b41866463f364 and modified in HEAD.
Version HEAD of
deps/cxf-shade/src/patch/java/org/apache/cxf/jaxrs/client/JAXRSClientFactory.java
left in tree.
CONFLICT (modify/delete):
deps/cxf-shade/src/patch/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java
deleted in dd2eb4ac5afba150f680bf55db0b41866463f364 and modified in HEAD.
Version HEAD of
deps/cxf-shade/src/patch/java/org/apache/cxf/jaxrs/client/ClientProxyImpl.java
left in tree.
CONFLICT (modify/delete):
deps/cxf-shade/src/patch/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBean.java
deleted in dd2eb4ac5afba150f680bf55db0b41866463f364 and modified in HEAD.
Version HEAD of
deps/cxf-shade/src/patch/java/org/apache/cxf/jaxrs/JAXRSServerFactoryBean.java
left in tree.
CONFLICT (modify/delete):
deps/cxf-shade/src/patch/java/org/apache/cxf/jaxrs/JAXRSInvoker.java deleted in
dd2eb4ac5afba150f680bf55db0b41866463f364 and modified in HEAD. Version HEAD of
deps/cxf-shade/src/patch/java/org/apache/cxf/jaxrs/JAXRSInvoker.java left in
tree.
CONFLICT (modify/delete):
deps/cxf-shade/src/patch/java/org/apache/cxf/jaxb/io/DataReaderImpl.java
deleted in dd2eb4ac5afba150f680bf55db0b41866463f364 and modified in HEAD.
Version HEAD of
deps/cxf-shade/src/patch/java/org/apache/cxf/jaxb/io/DataReaderImpl.java left
in tree.
CONFLICT (modify/delete):
deps/cxf-shade/src/patch/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java
deleted in dd2eb4ac5afba150f680bf55db0b41866463f364 and modified in HEAD.
Version HEAD of
deps/cxf-shade/src/patch/java/org/apache/cxf/jaxb/JAXBSchemaInitializer.java
left in tree.
CONFLICT (modify/delete):
deps/cxf-shade/src/patch/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java
deleted in dd2eb4ac5afba150f680bf55db0b41866463f364 and modified in HEAD.
Version HEAD of
deps/cxf-shade/src/patch/java/org/apache/cxf/jaxb/JAXBEncoderDecoder.java left
in tree.
CONFLICT (modify/delete):
deps/cxf-shade/src/patch/java/org/apache/cxf/jaxb/JAXBDataBinding.java deleted
in dd2eb4ac5afba150f680bf55db0b41866463f364 and modified in HEAD. Version HEAD
of deps/cxf-shade/src/patch/java/org/apache/cxf/jaxb/JAXBDataBinding.java left
in tree.
CONFLICT (modify/delete):
deps/cxf-shade/src/patch/java/org/apache/cxf/jaxb/JAXBDataBase.java deleted in
dd2eb4ac5afba150f680bf55db0b41866463f364 and modified in HEAD. Version HEAD of
deps/cxf-shade/src/patch/java/org/apache/cxf/jaxb/JAXBDataBase.java left in
tree.
Removing
deps/cxf-shade/src/patch/java/org/apache/cxf/jaxb/FactoryClassGenerator.java
Removing
deps/cxf-shade/src/patch/java/org/apache/cxf/io/WriteOnCloseOutputStream.java
CONFLICT (modify/delete):
deps/cxf-shade/src/patch/java/org/apache/cxf/io/ReaderInputStream.java deleted
in dd2eb4ac5afba150f680bf55db0b41866463f364 and modified in HEAD. Version HEAD
of deps/cxf-shade/src/patch/java/org/apache/cxf/io/ReaderInputStream.java left
in tree.
Removing deps/cxf-shade/src/patch/java/org/apache/cxf/io/CachedWriter.java
Removing
deps/cxf-shade/src/patch/java/org/apache/cxf/io/CacheAndWriteOutputStream.java
Removing
deps/cxf-shade/src/patch/java/org/apache/cxf/internal/CXFAPINamespaceHandler.java
Removing
deps/cxf-shade/src/patch/java/org/apache/cxf/interceptor/security/JAASLoginInterceptor.java
Removing
deps/cxf-shade/src/patch/java/org/apache/cxf/interceptor/security/DefaultSecurityContext.java
Removing
deps/cxf-shade/src/patch/java/org/apache/cxf/interceptor/OutFaultChainInitiatorObserver.java
Removing
deps/cxf-shade/src/patch/java/org/apache/cxf/interceptor/OneWayProcessorInterceptor.java
Removing
deps/cxf-shade/src/patch/java/org/apache/cxf/interceptor/LoggingMessage.java
Removing
deps/cxf-shade/src/patch/java/org/apache/cxf/interceptor/InterceptorChain.java
Removing
deps/cxf-shade/src/patch/java/org/apache/cxf/interceptor/InFaultChainInitiatorObserver.java
Removing
deps/cxf-shade/src/patch/java/org/apache/cxf/interceptor/ClientOutFaultObserver.java
Removing
deps/cxf-shade/src/patch/java/org/apache/cxf/interceptor/AttachmentInInterceptor.java
Removing
deps/cxf-shade/src/patch/java/org/apache/cxf/interceptor/AnnotationInterceptors.java
Removing
deps/cxf-shade/src/patch/java/org/apache/cxf/interceptor/AbstractLoggingInterceptor.java
CONFLICT (modify/delete):
deps/cxf-shade/src/patch/java/org/apache/cxf/interceptor/AbstractFaultChainInitiatorObserver.java
deleted in dd2eb4ac5afba150f680bf55db0b41866463f364 and modified in HEAD.
Version HEAD of
deps/cxf-shade/src/patch/java/org/apache/cxf/interceptor/AbstractFaultChainInitiatorObserver.java
left in tree.
Removing deps/cxf-shade/src/patch/java/org/apache/cxf/helpers/ServiceUtils.java
Removing deps/cxf-shade/src/patch/java/org/apache/cxf/helpers/IOUtils.java
Removing deps/cxf-shade/src/patch/java/org/apache/cxf/helpers/DOMUtils.java
Removing deps/cxf-shade/src/patch/java/org/apache/cxf/headers/Header.java
Removing
deps/cxf-shade/src/patch/java/org/apache/cxf/feature/transform/XSLTOutInterceptor.java
Removing
deps/cxf-shade/src/patch/java/org/apache/cxf/feature/WrappedFeature.java
Removing
deps/cxf-shade/src/patch/java/org/apache/cxf/feature/FastInfosetFeature.java
Removing deps/cxf-shade/src/patch/java/org/apache/cxf/endpoint/ServerImpl.java
Removing deps/cxf-shade/src/patch/java/org/apache/cxf/endpoint/EndpointImpl.java
CONFLICT (modify/delete):
deps/cxf-shade/src/patch/java/org/apache/cxf/endpoint/ClientImpl.java deleted
in dd2eb4ac5afba150f680bf55db0b41866463f364 and modified in HEAD. Version HEAD
of deps/cxf-shade/src/patch/java/org/apache/cxf/endpoint/ClientImpl.java left
in tree.
Removing
deps/cxf-shade/src/patch/java/org/apache/cxf/endpoint/ClientCallback.java
Removing
deps/cxf-shade/src/patch/java/org/apache/cxf/endpoint/AbstractConduitSelector.java
Removing
deps/cxf-shade/src/patch/java/org/apache/cxf/databinding/stax/StaxDataBinding.java
Removing
deps/cxf-shade/src/patch/java/org/apache/cxf/databinding/source/SourceDataBinding.java
Removing
deps/cxf-shade/src/patch/java/org/apache/cxf/configuration/spring/ConfigurerImpl.java
Removing
deps/cxf-shade/src/patch/java/org/apache/cxf/configuration/jsse/TLSParameterJaxBUtils.java
Removing
deps/cxf-shade/src/patch/java/org/apache/cxf/configuration/jsse/TLSClientParameters.java
Removing
deps/cxf-shade/src/patch/java/org/apache/cxf/configuration/jsse/MultiKeyPasswordKeyManager.java
Removing
deps/cxf-shade/src/patch/java/org/apache/cxf/common/xmlschema/SchemaCollection.java
Removing
deps/cxf-shade/src/patch/java/org/apache/cxf/common/util/URIParserUtil.java
Removing
deps/cxf-shade/src/patch/java/org/apache/cxf/common/util/StreamPrinter.java
Removing
deps/cxf-shade/src/patch/java/org/apache/cxf/common/util/SpringClasspathScanner.java
Removing
deps/cxf-shade/src/patch/java/org/apache/cxf/common/util/SpringClassUnwrapper.java
Removing
deps/cxf-shade/src/patch/java/org/apache/cxf/common/util/SortedArraySet.java
Removing
deps/cxf-shade/src/patch/java/org/apache/cxf/common/util/ReflectionInvokationHandler.java
Removing
deps/cxf-shade/src/patch/java/org/apache/cxf/common/util/ProxyHelper.java
Removing
deps/cxf-shade/src/patch/java/org/apache/cxf/common/util/ProxyClassLoader.java
Removing
deps/cxf-shade/src/patch/java/org/apache/cxf/common/util/PackageUtils.java
Removing
deps/cxf-shade/src/patch/java/org/apache/cxf/common/util/ModCountCopyOnWriteArrayList.java
Removing deps/cxf-shade/src/patch/java/org/apache/cxf/common/util/Compiler.java
Removing
deps/cxf-shade/src/patch/java/org/apache/cxf/common/util/CollectionUtils.java
Removing
deps/cxf-shade/src/patch/java/org/apache/cxf/common/util/ClassHelper.java
Removing
deps/cxf-shade/src/patch/java/org/apache/cxf/common/util/CachedClass.java
Removing
deps/cxf-shade/src/patch/java/org/apache/cxf/common/util/Base64Utility.java
Removing
deps/cxf-shade/src/patch/java/org/apache/cxf/common/util/ASMHelperImpl.java
Removing
deps/cxf-shade/src/patch/java/org/apache/cxf/common/spi/NamespaceClassGenerator.java
Removing
deps/cxf-shade/src/patch/java/org/apache/cxf/common/spi/ClassGeneratorClassLoader.java
Removing
deps/cxf-shade/src/patch/java/org/apache/cxf/common/logging/RegexLoggingFilter.java
Removing
deps/cxf-shade/src/patch/java/org/apache/cxf/common/logging/LogUtils.java
Removing
deps/cxf-shade/src/patch/java/org/apache/cxf/common/logging/AbstractDelegatingLogger.java
CONFLICT (modify/delete):
deps/cxf-shade/src/patch/java/org/apache/cxf/common/jaxb/JAXBUtils.java deleted
in dd2eb4ac5afba150f680bf55db0b41866463f364 and modified in HEAD. Version HEAD
of deps/cxf-shade/src/patch/java/org/apache/cxf/common/jaxb/JAXBUtils.java left
in tree.
CONFLICT (modify/delete):
deps/cxf-shade/src/patch/java/org/apache/cxf/common/injection/ResourceInjector.java
deleted in dd2eb4ac5afba150f680bf55db0b41866463f364 and modified in HEAD.
Version HEAD of
deps/cxf-shade/src/patch/java/org/apache/cxf/common/injection/ResourceInjector.java
left in tree.
Removing
deps/cxf-shade/src/patch/java/org/apache/cxf/common/i18n/UncheckedException.java
Removing deps/cxf-shade/src/patch/java/org/apache/cxf/common/i18n/Message.java
Removing deps/cxf-shade/src/patch/java/org/apache/cxf/common/i18n/Exception.java
Removing
deps/cxf-shade/src/patch/java/org/apache/cxf/catalog/CatalogXmlSchemaURIResolver.java
Removing deps/cxf-shade/src/patch/java/org/apache/cxf/bus/spring/SpringBus.java
Removing
deps/cxf-shade/src/patch/java/org/apache/cxf/bus/spring/NamespaceHandler.java
Removing
deps/cxf-shade/src/patch/java/org/apache/cxf/bus/spring/Jsr250BeanPostProcessor.java
Removing
deps/cxf-shade/src/patch/java/org/apache/cxf/bus/spring/BusExtensionPostProcessor.java
Removing
deps/cxf-shade/src/patch/java/org/apache/cxf/bus/spring/BusEntityResolver.java
Removing
deps/cxf-shade/src/patch/java/org/apache/cxf/bus/spring/BusDefinitionParser.java
CONFLICT (modify/delete):
deps/cxf-shade/src/patch/java/org/apache/cxf/bus/resource/ResourceManagerImpl.java
deleted in dd2eb4ac5afba150f680bf55db0b41866463f364 and modified in HEAD.
Version HEAD of
deps/cxf-shade/src/patch/java/org/apache/cxf/bus/resource/ResourceManagerImpl.java
left in tree.
Removing
deps/cxf-shade/src/patch/java/org/apache/cxf/bus/osgi/OSGIBusListener.java
Removing
deps/cxf-shade/src/patch/java/org/apache/cxf/bus/osgi/CXFExtensionBundleListener.java
Removing deps/cxf-shade/src/patch/java/org/apache/cxf/bus/osgi/CXFActivator.java
Removing
deps/cxf-shade/src/patch/java/org/apache/cxf/bus/managers/ServiceContractResolverRegistryImpl.java
Removing
deps/cxf-shade/src/patch/java/org/apache/cxf/bus/extension/ExtensionManagerImpl.java
Removing
deps/cxf-shade/src/patch/java/org/apache/cxf/bus/extension/Extension.java
Removing
deps/cxf-shade/src/patch/java/org/apache/cxf/bus/blueprint/ConfigurerImpl.java
Removing
deps/cxf-shade/src/patch/java/org/apache/cxf/bus/blueprint/BusDefinitionParser.java
Removing
deps/cxf-shade/src/patch/java/org/apache/cxf/bus/blueprint/BundleDelegatingClassLoader.java
Removing deps/cxf-shade/src/patch/java/org/apache/cxf/bus/CXFBusFactory.java
Removing
deps/cxf-shade/src/patch/java/org/apache/cxf/attachment/MimeBodyPartInputStream.java
CONFLICT (modify/delete):
deps/cxf-shade/src/patch/java/org/apache/cxf/attachment/LazyAttachmentCollection.java
deleted in dd2eb4ac5afba150f680bf55db0b41866463f364 and modified in HEAD.
Version HEAD of
deps/cxf-shade/src/patch/java/org/apache/cxf/attachment/LazyAttachmentCollection.java
left in tree.
Removing
deps/cxf-shade/src/patch/java/org/apache/cxf/attachment/ContentDisposition.java
Removing
deps/cxf-shade/src/patch/java/org/apache/cxf/attachment/Base64DecoderStream.java
CONFLICT (modify/delete):
deps/cxf-shade/src/patch/java/org/apache/cxf/attachment/AttachmentUtil.java
deleted in dd2eb4ac5afba150f680bf55db0b41866463f364 and modified in HEAD.
Version HEAD of
deps/cxf-shade/src/patch/java/org/apache/cxf/attachment/AttachmentUtil.java
left in tree.
CONFLICT (modify/delete):
deps/cxf-shade/src/patch/java/org/apache/cxf/attachment/AttachmentSerializer.java
deleted in dd2eb4ac5afba150f680bf55db0b41866463f364 and modified in HEAD.
Version HEAD of
deps/cxf-shade/src/patch/java/org/apache/cxf/attachment/AttachmentSerializer.java
left in tree.
CONFLICT (modify/delete):
deps/cxf-shade/src/patch/java/org/apache/cxf/attachment/AttachmentDeserializer.java
deleted in dd2eb4ac5afba150f680bf55db0b41866463f364 and modified in HEAD.
Version HEAD of
deps/cxf-shade/src/patch/java/org/apache/cxf/attachment/AttachmentDeserializer.java
left in tree.
CONFLICT (modify/delete):
deps/cxf-shade/src/patch/java/org/apache/cxf/attachment/AttachmentDataSource.java
deleted in dd2eb4ac5afba150f680bf55db0b41866463f364 and modified in HEAD.
Version HEAD of
deps/cxf-shade/src/patch/java/org/apache/cxf/attachment/AttachmentDataSource.java
left in tree.
Removing
deps/cxf-shade/src/patch/java/org/apache/cxf/annotations/WSDLDocumentation.java
Removing deps/cxf-shade/src/patch/java/org/apache/cxf/annotations/Policy.java
Auto-merging deps/cxf-shade/pom.xml
CONFLICT (content): Merge conflict in deps/cxf-shade/pom.xml
Auto-merging container/pom.xml
CONFLICT (content): Merge conflict in container/pom.xml
Auto-merging container/openejb-loader/pom.xml
CONFLICT (content): Merge conflict in container/openejb-loader/pom.xml
Auto-merging container/openejb-junit5/pom.xml
CONFLICT (content): Merge conflict in container/openejb-junit5/pom.xml
Auto-merging container/openejb-junit5-backward/pom.xml
CONFLICT (content): Merge conflict in container/openejb-junit5-backward/pom.xml
Auto-merging container/openejb-junit/pom.xml
CONFLICT (content): Merge conflict in container/openejb-junit/pom.xml
Auto-merging container/openejb-jpa-integration/pom.xml
CONFLICT (content): Merge conflict in container/openejb-jpa-integration/pom.xml
Auto-merging container/openejb-jee/pom.xml
CONFLICT (content): Merge conflict in container/openejb-jee/pom.xml
Auto-merging container/openejb-jee-accessors/pom.xml
CONFLICT (content): Merge conflict in container/openejb-jee-accessors/pom.xml
Auto-merging container/openejb-javaagent/pom.xml
CONFLICT (content): Merge conflict in container/openejb-javaagent/pom.xml
Auto-merging
container/openejb-core/src/main/java/org/apache/openejb/util/proxy/LocalBeanProxyFactory.java
CONFLICT (content): Merge conflict in
container/openejb-core/src/main/java/org/apache/openejb/util/proxy/LocalBeanProxyFactory.java
Auto-merging
container/openejb-core/src/main/java/org/apache/openejb/util/classloader/URLClassLoaderFirst.java
CONFLICT (content): Merge conflict in
container/openejb-core/src/main/java/org/apache/openejb/util/classloader/URLClassLoaderFirst.java
Auto-merging
container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/dbcp/DbcpTransactionRegistry.java
CONFLICT (add/add): Merge conflict in
container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/dbcp/DbcpTransactionRegistry.java
Auto-merging
container/openejb-core/src/main/java/org/apache/openejb/core/mdb/MdbContainer.java
Auto-merging
container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
Auto-merging container/openejb-core/pom.xml
CONFLICT (content): Merge conflict in container/openejb-core/pom.xml
Auto-merging container/openejb-api/pom.xml
CONFLICT (content): Merge conflict in container/openejb-api/pom.xml
Auto-merging container/mbean-annotation-api/pom.xml
CONFLICT (content): Merge conflict in container/mbean-annotation-api/pom.xml
Auto-merging boms/tomee-webprofile/pom.xml
CONFLICT (content): Merge conflict in boms/tomee-webprofile/pom.xml
Auto-merging boms/tomee-webprofile-api/pom.xml
CONFLICT (content): Merge conflict in boms/tomee-webprofile-api/pom.xml
Auto-merging boms/tomee-plus/pom.xml
CONFLICT (content): Merge conflict in boms/tomee-plus/pom.xml
Auto-merging boms/tomee-plus-api/pom.xml
CONFLICT (content): Merge conflict in boms/tomee-plus-api/pom.xml
Auto-merging boms/tomee-plume/pom.xml
CONFLICT (content): Merge conflict in boms/tomee-plume/pom.xml
Auto-merging boms/tomee-plume-api/pom.xml
CONFLICT (content): Merge conflict in boms/tomee-plume-api/pom.xml
Auto-merging boms/tomee-microprofile/pom.xml
CONFLICT (content): Merge conflict in boms/tomee-microprofile/pom.xml
Auto-merging boms/tomee-microprofile-api/pom.xml
CONFLICT (content): Merge conflict in boms/tomee-microprofile-api/pom.xml
Auto-merging boms/pom.xml
CONFLICT (content): Merge conflict in boms/pom.xml
Auto-merging boms/jaxb-runtime/pom.xml
CONFLICT (content): Merge conflict in boms/jaxb-runtime/pom.xml
Auto-merging assembly/pom.xml
CONFLICT (content): Merge conflict in assembly/pom.xml
Auto-merging assembly/openejb-standalone/pom.xml
CONFLICT (content): Merge conflict in assembly/openejb-standalone/pom.xml
Auto-merging assembly/openejb-lite/pom.xml
CONFLICT (content): Merge conflict in assembly/openejb-lite/pom.xml
Auto-merging arquillian/ziplock/pom.xml
CONFLICT (content): Merge conflict in arquillian/ziplock/pom.xml
Auto-merging arquillian/pom.xml
CONFLICT (content): Merge conflict in arquillian/pom.xml
Auto-merging arquillian/arquillian-tomee-webapp-remote/pom.xml
CONFLICT (content): Merge conflict in
arquillian/arquillian-tomee-webapp-remote/pom.xml
Auto-merging arquillian/arquillian-tomee-tests/pom.xml
CONFLICT (content): Merge conflict in arquillian/arquillian-tomee-tests/pom.xml
Auto-merging
arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/org/apache/openejb/arquillian/tests/cmp/sample/persistence-hibernate.xml
CONFLICT (content): Merge conflict in
arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/org/apache/openejb/arquillian/tests/cmp/sample/persistence-hibernate.xml
Auto-merging
arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/sample/CustomOrmXmlHibernateEarTest.java
CONFLICT (content): Merge conflict in
arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/cmp/sample/CustomOrmXmlHibernateEarTest.java
Auto-merging
arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/pom.xml
CONFLICT (content): Merge conflict in
arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/pom.xml
Auto-merging
arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/src/test/java/org/apache/openejb/arquillian/tests/jms/MDBWithWildcardTest.java
CONFLICT (add/add): Merge conflict in
arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/src/test/java/org/apache/openejb/arquillian/tests/jms/MDBWithWildcardTest.java
Auto-merging
arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/pom.xml
CONFLICT (content): Merge conflict in
arquillian/arquillian-tomee-tests/arquillian-tomee-jms-tests/pom.xml
Auto-merging
arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/pom.xml
CONFLICT (content): Merge conflict in
arquillian/arquillian-tomee-tests/arquillian-tomee-jaxws-tests/pom.xml
Auto-merging
arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/pom.xml
CONFLICT (content): Merge conflict in
arquillian/arquillian-tomee-tests/arquillian-tomee-jaxrs-tests/pom.xml
Auto-merging
arquillian/arquillian-tomee-tests/arquillian-tomee-config-tests/pom.xml
CONFLICT (content): Merge conflict in
arquillian/arquillian-tomee-tests/arquillian-tomee-config-tests/pom.xml
Auto-merging arquillian/arquillian-tomee-remote/pom.xml
CONFLICT (content): Merge conflict in arquillian/arquillian-tomee-remote/pom.xml
Auto-merging arquillian/arquillian-tomee-moviefun-example/pom.xml
CONFLICT (content): Merge conflict in
arquillian/arquillian-tomee-moviefun-example/pom.xml
Auto-merging arquillian/arquillian-tomee-embedded/pom.xml
CONFLICT (content): Merge conflict in
arquillian/arquillian-tomee-embedded/pom.xml
Auto-merging arquillian/arquillian-tomee-common/pom.xml
CONFLICT (content): Merge conflict in arquillian/arquillian-tomee-common/pom.xml
Auto-merging arquillian/arquillian-tck/pom.xml
CONFLICT (content): Merge conflict in arquillian/arquillian-tck/pom.xml
Auto-merging arquillian/arquillian-openejb-transaction-provider/pom.xml
CONFLICT (content): Merge conflict in
arquillian/arquillian-openejb-transaction-provider/pom.xml
Auto-merging arquillian/arquillian-openejb-embedded/pom.xml
CONFLICT (content): Merge conflict in
arquillian/arquillian-openejb-embedded/pom.xml
Auto-merging arquillian/arquillian-common/pom.xml
CONFLICT (content): Merge conflict in arquillian/arquillian-common/pom.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
java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at
java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
at
java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.base/java.lang.reflect.Method.invoke(Method.java:566)
at
hudson.remoting.RemoteInvocationHandler$RPCRequest.perform(RemoteInvocationHandler.java:924)
at
hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:902)
at
hudson.remoting.RemoteInvocationHandler$RPCRequest.call(RemoteInvocationHandler.java:853)
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.base/java.util.concurrent.FutureTask.run(FutureTask.java:264)
at
java.base/java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1128)
at
java.base/java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:628)
at java.base/java.lang.Thread.run(Thread.java:829)
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/master-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
