BUG-99: cleanup packages

Change-Id: I6cd59418164caa103d6b1c52e5951ed76addec98
Signed-off-by: Robert Varga <rovarga@cisco.com>

diff --git a/bgp/concepts/pom.xml b/bgp/concepts/pom.xml
index 2c16b360d2294360940cad01c07209f166622298..9b6905cde8c48d0dab8200a39c702c4282d656cd 100644 (file)
--- a/bgp/concepts/pom.xml
+++ b/bgp/concepts/pom.xml
@@ -107,8 +107,6 @@
                                                <Import-Package>
                                                        com.google.common.base,
                                                        org.opendaylight.protocol.concepts,
-                                                       com.google.guava,
-                                                       org.opendaylight.protocol.util
                                                </Import-Package>
                                        </instructions>
                                </configuration>

diff --git a/bgp/parser-api/pom.xml b/bgp/parser-api/pom.xml
index 447518d66a558bad18c63cfc67553b5c31cdd67f..91acbea2136b43649213af077d9dc799a611cf09 100644 (file)
--- a/bgp/parser-api/pom.xml
+++ b/bgp/parser-api/pom.xml
@@ -106,20 +106,20 @@
                                        <instructions>
                                                <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
                                                <Import-Package>
-                                                       org.opendaylight.protocol.bgp.concepts, 
+                                                       com.google.common.base,
+                                                       com.google.common.collect,
+                                                       com.google.common.primitives,
+                                                       org.opendaylight.protocol.bgp.concepts,
+                                                       org.opendaylight.protocol.bgp.linkstate,
+                                                       org.opendaylight.protocol.concepts,
                                                        org.opendaylight.protocol.concepts,
                                                        org.opendaylight.protocol.framework,
-                                                       org.opendaylight.protocol.concepts, 
                                                        org.opendaylight.protocol.util,
-                                                       com.google.common.primitives, 
-                                                       com.google.common.collect, 
-                                                       org.opendaylight.protocol.bgp.linkstate,
-                                                       com.google.common.base,
-                                                       com.google.guava,
                                                        org.slf4j,
                                                </Import-Package>
                                                <Export-Package>
-                                                       org.opendaylight.protocol.bgp.parser,
+                            org.opendaylight.protocol.bgp.parser,
+                            org.opendaylight.protocol.bgp.parser.message,
                                                </Export-Package>
                                        </instructions>
                                </configuration>

diff --git a/concepts/pom.xml b/concepts/pom.xml
index 21b6948bfd8e84b280480f7f31e079fa2d5da027..5a3f647254b6c5c819f2059564b15975aaabaaee 100644 (file)
--- a/concepts/pom.xml
+++ b/concepts/pom.xml
@@ -106,7 +106,6 @@
                                        <instructions>
                                                <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
                                                <Import-Package>
-                                                       org.opendaylight.protocol.concepts,
                             org.opendaylight.protocol.util,
                             com.google.common.base,
                             com.google.common.collect,

diff --git a/util/pom.xml b/util/pom.xml
index c3d7d1cbbca0570c21fc3b8b6255a84fdc177926..bb7db8e542009f8727202c662ed722f7ddcce2dd 100644 (file)
--- a/util/pom.xml
+++ b/util/pom.xml
@@ -44,7 +44,6 @@
                                                <Import-Package>
                             com.google.common.*, 
                             javax.net.ssl,
-                            org.apache.commons.codec.binary,
                                                </Import-Package>
                                                <Export-Package>
                                                        org.opendaylight.protocol.util