Simplifying Import-Package line in maven-bundle-plugin for REST bundles
Change-Id: Ic29e3f205e18b7b63e33a8c65cbb30a8b56d2e74
diff --git a/apps/acl/pom.xml b/apps/acl/pom.xml
index a074002..4f859be 100644
--- a/apps/acl/pom.xml
+++ b/apps/acl/pom.xml
@@ -138,17 +138,7 @@
${project.groupId}.${project.artifactId}
</Bundle-SymbolicName>
<Import-Package>
- org.slf4j,
- org.osgi.framework,
- javax.ws.rs,javax.ws.rs.core,
- com.fasterxml.jackson*,
- org.glassfish.jersey,
- org.glassfish.jersey.servlet,
- org.onlab.packet.*,
- org.onlab.rest.*,
- org.onosproject.*,
- org.onlab.util.*,
- com.google.common.*;
+ *,org.glassfish.jersey.servlet
</Import-Package>
<Web-ContextPath>${web.context}</Web-ContextPath>
</instructions>
diff --git a/apps/cordvtn/pom.xml b/apps/cordvtn/pom.xml
index d43360d..797db29 100644
--- a/apps/cordvtn/pom.xml
+++ b/apps/cordvtn/pom.xml
@@ -131,23 +131,7 @@
${project.groupId}.${project.artifactId}
</Bundle-SymbolicName>
<Import-Package>
- org.slf4j,
- org.osgi.framework,
- javax.ws.rs,
- javax.ws.rs.core,
- org.glassfish.jersey,
- org.glassfish.jersey.servlet,
- com.fasterxml.jackson.databind,
- com.fasterxml.jackson.databind.node,
- com.fasterxml.jackson.core,
- com.jcraft.jsch,
- org.apache.karaf.shell.commands,
- org.apache.karaf.shell.console,
- com.google.common.*,
- org.onlab.packet.*,
- org.onlab.rest.*,
- org.onosproject.*,
- org.onlab.util.*,
+ *,org.glassfish.jersey.servlet
</Import-Package>
<Web-ContextPath>${web.context}</Web-ContextPath>
</instructions>
diff --git a/apps/cpman/app/pom.xml b/apps/cpman/app/pom.xml
index 81109c0..8ec1f1f 100644
--- a/apps/cpman/app/pom.xml
+++ b/apps/cpman/app/pom.xml
@@ -173,25 +173,7 @@
${project.groupId}.${project.artifactId}
</Bundle-SymbolicName>
<Import-Package>
- org.slf4j,
- org.osgi.framework,
- javax.ws.rs,
- javax.ws.rs.core,
- org.glassfish.jersey,
- org.glassfish.jersey.servlet,
- com.fasterxml.jackson.databind,
- com.fasterxml.jackson.databind.node,
- com.fasterxml.jackson.core,
- org.apache.karaf.shell.commands,
- org.apache.karaf.shell.console,
- org.apache.karaf.shell.console.completer,
- com.google.common.*,
- org.onlab.packet.*,
- org.onlab.rest.*,
- org.onosproject.*,
- org.onlab.util.*,
- org.jboss.netty.util.*,
- org.rrd4j.*
+ *,org.glassfish.jersey.servlet
</Import-Package>
<Web-ContextPath>${web.context}</Web-ContextPath>
</instructions>
diff --git a/apps/dhcp/app/pom.xml b/apps/dhcp/app/pom.xml
index 1f22e28..7a696bc 100644
--- a/apps/dhcp/app/pom.xml
+++ b/apps/dhcp/app/pom.xml
@@ -136,24 +136,7 @@
${project.groupId}.${project.artifactId}
</Bundle-SymbolicName>
<Import-Package>
- org.slf4j,
- org.osgi.framework,
- javax.ws.rs,
- javax.ws.rs.core,
- org.glassfish.jersey,
- org.glassfish.jersey.servlet,
- com.fasterxml.jackson.databind,
- com.fasterxml.jackson.databind.node,
- com.fasterxml.jackson.core,
- org.apache.karaf.shell.commands,
- org.apache.karaf.shell.console,
- org.apache.karaf.shell.console.completer,
- com.google.common.*,
- org.onlab.packet.*,
- org.onlab.rest.*,
- org.onosproject.*,
- org.onlab.util.*,
- org.jboss.netty.util.*
+ *,org.glassfish.jersey.servlet
</Import-Package>
<Web-ContextPath>${web.context}</Web-ContextPath>
</instructions>
diff --git a/apps/faultmanagement/fmweb/pom.xml b/apps/faultmanagement/fmweb/pom.xml
index 9b65196..3f558b5 100644
--- a/apps/faultmanagement/fmweb/pom.xml
+++ b/apps/faultmanagement/fmweb/pom.xml
@@ -111,24 +111,7 @@
${project.groupId}.${project.artifactId}
</Bundle-SymbolicName>
<Import-Package>
- org.slf4j,
- org.osgi.framework,
- javax.ws.rs,
- javax.ws.rs.core,
- org.glassfish.jersey,
- org.glassfish.jersey.servlet,
- com.fasterxml.jackson.databind,
- com.fasterxml.jackson.databind.node,
- com.fasterxml.jackson.core,
- org.apache.karaf.shell.commands,
- org.apache.commons.lang.math.*,
- org.apache.commons.lang.*,
- com.google.common.*,
- org.onlab.packet.*,
- org.onlab.rest.*,
- org.onosproject.*,
- org.onlab.util.*,
- org.jboss.netty.util.*
+ *,org.glassfish.jersey.servlet
</Import-Package>
<Web-ContextPath>${web.context}</Web-ContextPath>
</instructions>
diff --git a/apps/mfwd/pom.xml b/apps/mfwd/pom.xml
index 9e67eb7..6c9fe2a 100644
--- a/apps/mfwd/pom.xml
+++ b/apps/mfwd/pom.xml
@@ -117,18 +117,7 @@
${project.groupId}.${project.artifactId}
</Bundle-SymbolicName>
<Import-Package>
- org.slf4j,
- org.osgi.framework,
- javax.ws.rs,javax.ws.rs.core,
- org.glassfish.jersey,
- org.glassfish.jersey.servlet,
- com.fasterxml.jackson.databind,
- com.fasterxml.jackson.databind.node,
- org.apache.karaf.shell.commands,
- org.apache.karaf.shell.console,
- com.google.common.*,
- org.onlab.packet.*,
- org.onosproject.*,
+ *,org.glassfish.jersey.servlet
</Import-Package>
<Web-ContextPath>${web.context}</Web-ContextPath>
</instructions>
diff --git a/apps/olt/app/pom.xml b/apps/olt/app/pom.xml
index da16e9e..a27aea4 100644
--- a/apps/olt/app/pom.xml
+++ b/apps/olt/app/pom.xml
@@ -113,20 +113,7 @@
${project.groupId}.${project.artifactId}
</Bundle-SymbolicName>
<Import-Package>
- org.slf4j,
- org.osgi.framework,
- org.osgi.service.*,
- javax.ws.rs,
- javax.ws.rs.core,
- org.glassfish.jersey,
- org.glassfish.jersey.servlet,
- com.fasterxml.jackson.databind,
- com.fasterxml.jackson.databind.node,
- org.apache.karaf.shell.commands,
- com.google.common.*,
- org.onlab.packet.*,
- org.onosproject.*,
- org.onlab.util.*,
+ *,org.glassfish.jersey.servlet
</Import-Package>
<Web-ContextPath>${web.context}</Web-ContextPath>
</instructions>
diff --git a/apps/openstacknetworking/web/pom.xml b/apps/openstacknetworking/web/pom.xml
index fd2f282..09f442a 100644
--- a/apps/openstacknetworking/web/pom.xml
+++ b/apps/openstacknetworking/web/pom.xml
@@ -125,20 +125,7 @@
${project.groupId}.${project.artifactId}
</Bundle-SymbolicName>
<Import-Package>
- org.slf4j,
- org.osgi.framework,
- javax.ws.rs,
- javax.ws.rs.core,
- org.glassfish.jersey,
- org.glassfish.jersey.servlet,
- com.fasterxml.jackson.databind,
- com.fasterxml.jackson.databind.node,
- com.fasterxml.jackson.core,
- org.apache.karaf.shell.commands,
- com.google.common.*,
- org.onlab.packet.*,
- org.onosproject.*,
- org.onlab.util.*
+ *,org.glassfish.jersey.servlet
</Import-Package>
<Web-ContextPath>${web.context}</Web-ContextPath>
</instructions>
diff --git a/apps/routing/pom.xml b/apps/routing/pom.xml
index 1c7d1b5..ccb52cc 100644
--- a/apps/routing/pom.xml
+++ b/apps/routing/pom.xml
@@ -59,9 +59,11 @@
<version>${project.version}</version>
</dependency>
+ <!-- FIXME: not OSGi-ready -->
<dependency>
- <groupId>org.onosproject</groupId>
- <artifactId>onlab-thirdparty</artifactId>
+ <groupId>com.googlecode.concurrent-trees</groupId>
+ <artifactId>concurrent-trees</artifactId>
+ <scope>compile</scope>
</dependency>
<dependency>
diff --git a/apps/segmentrouting/pom.xml b/apps/segmentrouting/pom.xml
index 4053fe3..78b50f6 100644
--- a/apps/segmentrouting/pom.xml
+++ b/apps/segmentrouting/pom.xml
@@ -125,20 +125,7 @@
${project.groupId}.${project.artifactId}
</Bundle-SymbolicName>
<Import-Package>
- org.slf4j,
- org.osgi.framework,
- javax.ws.rs,
- javax.ws.rs.core,
- org.glassfish.jersey,
- org.glassfish.jersey.servlet,
- com.fasterxml.jackson.databind,
- com.fasterxml.jackson.databind.node,
- com.fasterxml.jackson.core,
- org.apache.karaf.shell.commands,
- com.google.common.*,
- org.onlab.packet.*,
- org.onosproject.*,
- org.onlab.util.*,
+ *,org.glassfish.jersey.servlet
</Import-Package>
<Web-ContextPath>${web.context}</Web-ContextPath>
</instructions>
diff --git a/apps/test/demo/pom.xml b/apps/test/demo/pom.xml
index 0ab7e72..0672c3b 100644
--- a/apps/test/demo/pom.xml
+++ b/apps/test/demo/pom.xml
@@ -99,20 +99,7 @@
${project.groupId}.${project.artifactId}
</Bundle-SymbolicName>
<Import-Package>
- org.slf4j,
- org.osgi.framework,
- javax.ws.rs,javax.ws.rs.core,
- org.glassfish.jersey,
- org.glassfish.jersey.servlet,
- com.fasterxml.jackson.databind,
- com.fasterxml.jackson.databind.node,
- org.apache.commons.lang.math.*,
- com.google.common.*,
- org.onlab.packet.*,
- org.onlab.rest.*,
- org.onosproject.*,
- org.onlab.util.*,
- org.jboss.netty.util.*
+ *,org.glassfish.jersey.servlet
</Import-Package>
<Web-ContextPath>${web.context}</Web-ContextPath>
</instructions>
diff --git a/apps/virtualbng/pom.xml b/apps/virtualbng/pom.xml
index 8619328..6b8077c 100644
--- a/apps/virtualbng/pom.xml
+++ b/apps/virtualbng/pom.xml
@@ -89,18 +89,7 @@
${project.groupId}.${project.artifactId}
</Bundle-SymbolicName>
<Import-Package>
- org.slf4j,
- javax.ws.rs,
- javax.ws.rs.core,
- org.glassfish.jersey,
- org.glassfish.jersey.servlet,
- com.sun.jersey.server.impl.container.servlet,
- com.fasterxml.jackson.databind,
- com.fasterxml.jackson.databind.node,
- org.apache.karaf.shell.commands,
- com.google.common.*,
- org.onlab.packet.*,
- org.onosproject.*
+ *,org.glassfish.jersey.servlet
</Import-Package>
<Web-ContextPath>${web.context}</Web-ContextPath>
</instructions>
diff --git a/apps/vtn/vtnweb/pom.xml b/apps/vtn/vtnweb/pom.xml
index 02bd197..ab0e6cf 100644
--- a/apps/vtn/vtnweb/pom.xml
+++ b/apps/vtn/vtnweb/pom.xml
@@ -58,21 +58,7 @@
${project.groupId}.${project.artifactId}
</Bundle-SymbolicName>
<Import-Package>
- org.slf4j,
- org.osgi.framework,
- javax.ws.rs,
- javax.ws.rs.core,
- org.glassfish.jersey,
- org.glassfish.jersey.servlet,
- com.fasterxml.jackson.databind,
- com.fasterxml.jackson.databind.node,
- com.fasterxml.jackson.core,
- org.apache.karaf.shell.commands,
- com.google.common.*,
- org.onlab.packet.*,
- org.onlab.rest.*,
- org.onosproject.*,
- org.onlab.util.*,
+ *,org.glassfish.jersey.servlet
</Import-Package>
<Web-ContextPath>${web.context}</Web-ContextPath>
</instructions>
diff --git a/tools/package/archetypes/rest/src/main/resources/archetype-resources/pom.xml b/tools/package/archetypes/rest/src/main/resources/archetype-resources/pom.xml
index 2dd2f4b..b57dffc 100644
--- a/tools/package/archetypes/rest/src/main/resources/archetype-resources/pom.xml
+++ b/tools/package/archetypes/rest/src/main/resources/archetype-resources/pom.xml
@@ -156,24 +156,7 @@
${project.groupId}.${project.artifactId}
</Bundle-SymbolicName>
<Import-Package>
- org.slf4j,
- org.osgi.framework,
- javax.ws.rs,
- javax.ws.rs.core,
- org.glassfish.jersey,
- org.glassfish.jersey.servlet,
- com.fasterxml.jackson.databind,
- com.fasterxml.jackson.databind.node,
- com.fasterxml.jackson.core,
- org.apache.karaf.shell.commands,
- org.apache.karaf.shell.console,
- com.google.common.*,
- org.onlab.packet.*,
- org.onlab.rest.*,
- org.onlab.osgi.*,
- org.onlab.util.*,
- org.onosproject.*,
- org.jboss.netty.util.*
+ *,org.glassfish.jersey.servlet
</Import-Package>
<Web-ContextPath>${web.context}</Web-ContextPath>
</instructions>
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>