Merge "Added move of branding jar to assembly"
[controller.git] / opendaylight / md-sal / sal-remoterpc-connector / integrationtest / test-nb / pom.xml
index dc2fdbf9a05382d19307d6cccb20c918c6c1aafc..b041cb430a6eff183ff7ab5a29e4cd0a42bbe838 100644 (file)
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>sal-remoterpc-connector-test-parent</artifactId>
     <groupId>org.opendaylight.controller.tests</groupId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.1-SNAPSHOT</version>
   </parent>
 
   <artifactId>sal-remoterpc-connector-test-nb</artifactId>
             </Export-Package>
             <Import-Package>
               com.sun.jersey.spi.container.servlet,
-              org.codehaus.jackson.annotate,
+              !org.codehaus.jackson.annotate,
               javax.ws.rs,
               javax.ws.rs.core,
               javax.xml.bind,
               javax.xml.bind.annotation,
               org.slf4j,
               org.apache.catalina.filters,
-              org.codehaus.jackson.jaxrs,
+              !org.codehaus.jackson.jaxrs,
               org.opendaylight.controller.sample.zeromq.provider,
               org.opendaylight.controller.sample.zeromq.consumer,
               org.opendaylight.controller.sal.utils,