Simplifying Import-Package line in maven-bundle-plugin for REST bundles
Change-Id: Ic29e3f205e18b7b63e33a8c65cbb30a8b56d2e74
diff --git a/web/api/pom.xml b/web/api/pom.xml
index bf4959e..6f40f76 100644
--- a/web/api/pom.xml
+++ b/web/api/pom.xml
@@ -87,23 +87,7 @@
${project.groupId}.${project.artifactId}
</Bundle-SymbolicName>
<Import-Package>
- org.slf4j,
- org.osgi.framework,
- javax.ws.rs,javax.ws.rs.core,javax.ws.rs.ext,
- org.glassfish.jersey,
- org.glassfish.jersey.servlet,
- com.fasterxml.jackson.databind,
- com.fasterxml.jackson.databind.node,
- com.google.common.base.*,
- com.google.common.collect.*,
- com.google.common.io.*,
- org.onlab.util.*,
- org.onlab.osgi.*,
- org.onlab.packet.*,
- org.onlab.rest.*,
- org.onosproject.*,
- org.onlab.metrics.*,
- com.codahale.metrics.*
+ *,org.glassfish.jersey.servlet
</Import-Package>
<Web-ContextPath>${web.context}</Web-ContextPath>
</instructions>
diff --git a/web/gui/pom.xml b/web/gui/pom.xml
index 08d1872..19efd98 100644
--- a/web/gui/pom.xml
+++ b/web/gui/pom.xml
@@ -91,38 +91,14 @@
${project.groupId}.${project.artifactId}
</Bundle-SymbolicName>
<Import-Package>
- org.slf4j,
- org.osgi.framework,
- javax.imageio.*,
- javax.ws.rs,javax.ws.rs.core,javax.ws.rs.ext,
- javax.servlet.*,
- org.glassfish.jersey,
+ *,
org.glassfish.jersey.servlet,
- org.glassfish.jersey.media.multipart,
- org.jvnet.mimepull,
- com.fasterxml.jackson.databind,
- com.fasterxml.jackson.databind.node,
- com.google.common.base.*,
- com.google.common.collect.*,
- com.google.common.io.*,
- org.eclipse.jetty.websocket.*,
- org.onlab.util.*,
- org.onlab.osgi.*,
- org.onlab.packet.*,
- org.onlab.rest.*,
- org.onosproject.*,
- org.joda.time.*,
- org.apache.commons.*
+ org.jvnet.mimepull
</Import-Package>
<Web-ContextPath>${web.context}</Web-ContextPath>
</instructions>
</configuration>
</plugin>
-
</plugins>
</build>
- <!--
-
--->
-
</project>
diff --git a/web/pom.xml b/web/pom.xml
index 98ae7aa..9d4523c 100644
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -75,6 +75,11 @@
<scope>test</scope>
</dependency>
+ <!-- TODO jersey-container-servlet and core may not be needed as dependencies
+
+ They are definitely not needed at compile time, but need to be added
+ as a bundle import for runtime; references are specified in web.xml
+ -->
<dependency>
<groupId>org.glassfish.jersey.containers</groupId>
<artifactId>jersey-container-servlet</artifactId>