This is an automated email from the ASF dual-hosted git repository. ffang pushed a commit to branch 3.2.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 00d9eb9f3ba9b4b6985aa75f5e55ed3b3fafba15 Author: Freeman Fang <[email protected]> AuthorDate: Wed Aug 7 20:47:30 2019 -0400 fix compilation failure --- .../cxf/jaxrs/blueprint/JAXRSServerFactoryBeanDefinitionParser.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/blueprint/JAXRSServerFactoryBeanDefinitionParser.java b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/blueprint/JAXRSServerFactoryBeanDefinitionParser.java index bc08e0f..7ea4a79 100644 --- a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/blueprint/JAXRSServerFactoryBeanDefinitionParser.java +++ b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/blueprint/JAXRSServerFactoryBeanDefinitionParser.java @@ -30,11 +30,8 @@ import org.apache.aries.blueprint.ParserContext; import org.apache.aries.blueprint.mutable.MutableBeanMetadata; import org.apache.aries.blueprint.mutable.MutableCollectionMetadata; import org.apache.aries.blueprint.mutable.MutablePassThroughMetadata; -<<<<<<< HEAD -import org.apache.cxf.common.util.StringUtils; -======= import org.apache.cxf.common.injection.NoJSR250Annotations; ->>>>>>> c453a20... [CXF-8088]ensure jaxrs endpoint can work correctly when using a shared bus exposed from another bundle +import org.apache.cxf.common.util.StringUtils; import org.apache.cxf.configuration.blueprint.SimpleBPBeanDefinitionParser; import org.apache.cxf.endpoint.Server; import org.apache.cxf.helpers.DOMUtils;
