Merge "Remove import-package declaration"

diff --combined restconf/sal-rest-docgen/pom.xml
index 262448a461b9d6757c2b78096830f063e71563eb,c1f9c9336a0c164e36e6419d60ecfee550e5b950..155351e36b62298d6afce6f0df7fc4a4a8b5e0da
--- 1/restconf/sal-rest-docgen/pom.xml
--- 2/restconf/sal-rest-docgen/pom.xml
+++ b/restconf/sal-rest-docgen/pom.xml
@@@ -46,6 -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>
@@@ -58,6 -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>
@@@ -124,9 -133,8 +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,
@@@ -136,7 -144,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>
@@@ -153,4 -162,4 +152,4 @@@
        </plugin>
      </plugins>
    </build>
- </project>
+ </project>