Merge "Remove import-package declaration"

[netconf.git] / restconf / sal-rest-docgen / pom.xml

diff --git a/restconf/sal-rest-docgen/pom.xml b/restconf/sal-rest-docgen/pom.xml
index f9f334c9e0403b5bfef8c6638010f60772ee99a8..155351e36b62298d6afce6f0df7fc4a4a8b5e0da 100644 (file)
--- a/restconf/sal-rest-docgen/pom.xml
+++ b/restconf/sal-rest-docgen/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
-    <version>1.9.0-SNAPSHOT</version>
+    <version>1.9.0</version>
     <relativePath/>
   </parent>
 
@@ -46,10 +46,6 @@
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
     </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.datatype</groupId>
-      <artifactId>jackson-datatype-json-org</artifactId>
-    </dependency>
 
     <dependency>
       <groupId>com.google.guava</groupId>
@@ -62,11 +58,6 @@
       <artifactId>jaxrs-api</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>org.json</groupId>
-      <artifactId>json</artifactId>
-    </dependency>
-
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal-core-api</artifactId>
@@ -133,9 +124,8 @@
           <instructions>
             <Bundle-Name>MD SAL Rest Api Doc Generator</Bundle-Name>
             <Embed-Dependency>generex, automaton</Embed-Dependency>
-            <Import-Package>!org.apache.maven.plugin.logging,
-              !org.apache.maven.project,
-              !org.opendaylight.yangtools.yang2sources.spi,
+            <!-- needed for web.xml. Remove once we have Jersey 2 -->
+            <Import-Package>
               *,
               com.sun.jersey.spi.container.servlet,
               org.eclipse.jetty.servlets,
@@ -145,8 +135,7 @@
               org.apache.shiro.web.env
             </Import-Package>
             <Export-Package>
-              com.fasterxml.jackson.datatype.*,
-              org.json
+              com.fasterxml.jackson.datatype.*
             </Export-Package>
             <Bundle-Activator>org.opendaylight.netconf.sal.rest.doc.DocProvider</Bundle-Activator>
             <Web-ContextPath>/apidoc</Web-ContextPath>
@@ -163,4 +152,4 @@
       </plugin>
     </plugins>
   </build>
-</project>
\ No newline at end of file
+</project>