Bug 3401: Remove/cleanup Import-Package in maven-bundle-plugin config

Some of the pom files don't need to explicitly specify Import-Package
in the maven-bundle-plugin configuration. Others were cleaned up to remove
unnecessary entries.

Change-Id: I6b9a741d1a110f17d371497e04e2ab2187aff6b6
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>

diff --git a/opendaylight/md-sal/mdsal-trace/binding-impl/pom.xml b/opendaylight/md-sal/mdsal-trace/binding-impl/pom.xml
index 17f1d15253299cfa37fd14bf018147b2ac9576ee..48ce85ac3ed0d0d5a33fdf6bb6c0bcfd1bc6bb7c 100644 (file)
--- a/opendaylight/md-sal/mdsal-trace/binding-impl/pom.xml
+++ b/opendaylight/md-sal/mdsal-trace/binding-impl/pom.xml
@@ -64,16 +64,17 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
             <artifactId>maven-bundle-plugin</artifactId>
             <extensions>true</extensions>
             <configuration>
-            <instructions>
-                <Import-Package>
-                org.opendaylight.controller.md.sal.trace.api,org.opendaylight.mdsal.binding.generator.api,
-                org.opendaylight.controller.md.sal.trace.dom.impl,org.opendaylight.controller.md.sal.dom.api,
-                org.opendaylight.controller.md.sal.binding.api,
-                org.opendaylight.controller.md.sal.dom.broker.impl,org.opendaylight.controller.md.sal.binding.impl,
-                org.opendaylight.controller.sal.core.api.model,*
-                </Import-Package>
-                <Embed-Transitive>true</Embed-Transitive>
-            </instructions>
+                <instructions>
+                    <Import-Package>
+                      org.opendaylight.controller.md.sal.trace.api,
+                      org.opendaylight.mdsal.binding.generator.api,
+                      org.opendaylight.controller.md.sal.dom.api,
+                      org.opendaylight.controller.md.sal.binding.api,
+                      org.opendaylight.controller.md.sal.binding.impl,
+                      org.opendaylight.controller.sal.core.api.model,
+                      *
+                    </Import-Package>
+                </instructions>
             </configuration>
         </plugin>
         <plugin>

diff --git a/opendaylight/md-sal/mdsal-trace/dom-impl/pom.xml b/opendaylight/md-sal/mdsal-trace/dom-impl/pom.xml
index c08bc89226307b798ab39bc8a757ae264480825d..55bb6b96e544d042095d6233e4cab7b34d468e8d 100644 (file)
--- a/opendaylight/md-sal/mdsal-trace/dom-impl/pom.xml
+++ b/opendaylight/md-sal/mdsal-trace/dom-impl/pom.xml
@@ -83,16 +83,13 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
             <artifactId>maven-bundle-plugin</artifactId>
             <extensions>true</extensions>
             <configuration>
-            <instructions>
-                <!--<Embed-Dependency>sal-broker-impl;type=!pom;inline=false</Embed-Dependency>-->
-                <Import-Package>
-                org.opendaylight.controller.md.sal.binding.api,
-                org.opendaylight.controller.md.sal.dom.broker.impl,org.opendaylight.controller.md.sal.binding.impl,
-                org.opendaylight.controller.sal.core.api.model,*
-                </Import-Package>
-                <Export-Package>org.opendaylight.controller.md.sal.trace.dom.impl</Export-Package>
-                <Embed-Transitive>true</Embed-Transitive>
-            </instructions>
+                <instructions>
+                    <Import-Package>
+                      org.opendaylight.controller.md.sal.dom.broker.impl,
+                      *
+                    </Import-Package>
+                    <Export-Package>org.opendaylight.controller.md.sal.trace.dom.impl</Export-Package>
+                </instructions>
             </configuration>
         </plugin>
         <plugin>

diff --git a/opendaylight/md-sal/sal-akka-raft-example/pom.xml b/opendaylight/md-sal/sal-akka-raft-example/pom.xml
index d90f61fdbb286d5c7b58c65d756cc0ed2ed64758..0fcd37ed676a23404ae0154e14fc4a6dcb6e6a84 100644 (file)
--- a/opendaylight/md-sal/sal-akka-raft-example/pom.xml
+++ b/opendaylight/md-sal/sal-akka-raft-example/pom.xml
@@ -51,9 +51,6 @@
         <configuration>
           <instructions>
             <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
-            <Export-package>org.opendaylight.controller.cluster.example</Export-package>
-            <Import-Package>*</Import-Package>
-            <DynamicImport-Package>*</DynamicImport-Package>
           </instructions>
         </configuration>
       </plugin>

diff --git a/opendaylight/md-sal/sal-akka-raft/pom.xml b/opendaylight/md-sal/sal-akka-raft/pom.xml
index 1b195e6b14964d7a32be52e20c654568c18ee78b..5979e93a5aae9f17e4a604963a86a4e758b4a73b 100644 (file)
--- a/opendaylight/md-sal/sal-akka-raft/pom.xml
+++ b/opendaylight/md-sal/sal-akka-raft/pom.xml
@@ -117,7 +117,6 @@
           <instructions>
             <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
             <Export-package>org.opendaylight.cluster.raft</Export-package>
-            <Import-Package>*</Import-Package>
             <DynamicImport-Package>*</DynamicImport-Package>
           </instructions>
         </configuration>

diff --git a/opendaylight/md-sal/sal-cluster-admin-impl/pom.xml b/opendaylight/md-sal/sal-cluster-admin-impl/pom.xml
index 80bd141bbeca66dfed113491a7b501bc2eceeb99..38a2fc0e345358e3f89760e2d32d80cbff4bbd40 100644 (file)
--- a/opendaylight/md-sal/sal-cluster-admin-impl/pom.xml
+++ b/opendaylight/md-sal/sal-cluster-admin-impl/pom.xml
@@ -131,14 +131,6 @@
           <instructions>
             <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
             <Export-Package></Export-Package>
-            <Import-Package>
-                !*snappy;
-                !org.jboss.*;
-                !com.jcraft.*;
-                !*jetty*;
-                !sun.security.*;
-                *;
-            </Import-Package>
           </instructions>
         </configuration>
       </plugin>

diff --git a/opendaylight/md-sal/sal-distributed-datastore/pom.xml b/opendaylight/md-sal/sal-distributed-datastore/pom.xml
index 964d35dfb46b7b9ecc0c81180cb6d893bfb8ade6..b96c3ccb7e4c8ac8e8a63dff2edb5e1a0ab7b806 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/pom.xml
+++ b/opendaylight/md-sal/sal-distributed-datastore/pom.xml
@@ -247,11 +247,6 @@
                 org.opendaylight.controller.cluster.databroker.actors.dds;
             </Export-Package>
             <Import-Package>
-                !*snappy;
-                !org.jboss.*;
-                !com.jcraft.*;
-                !*jetty*;
-                !sun.security.*;
                 *;
                 org.opendaylight.controller.md.sal.dom.broker.impl.jmx
             </Import-Package>

diff --git a/opendaylight/md-sal/sal-dom-broker/pom.xml b/opendaylight/md-sal/sal-dom-broker/pom.xml
index abfbb50119025f1be394e07d227280a452d10788..c65cb99ed57d4e94de5b6e7b6503a14f149f9aa7 100644 (file)
--- a/opendaylight/md-sal/sal-dom-broker/pom.xml
+++ b/opendaylight/md-sal/sal-dom-broker/pom.xml
@@ -139,7 +139,6 @@
                             org.opendaylight.controller.md.sal.dom.broker.impl.*,
                             org.opendaylight.controller.md.sal.dom.clustering.impl,
             </Export-Package>
-            <Import-Package>*</Import-Package>
           </instructions>
         </configuration>
       </plugin>

diff --git a/opendaylight/md-sal/sal-dom-config/pom.xml b/opendaylight/md-sal/sal-dom-config/pom.xml
index 0426678f08333db8e81696c98482eebce84c8b02..e44cfc34a18c695d60613a5f39f9d9540a58c21d 100644 (file)
--- a/opendaylight/md-sal/sal-dom-config/pom.xml
+++ b/opendaylight/md-sal/sal-dom-config/pom.xml
@@ -59,17 +59,6 @@
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
         <extensions>true</extensions>
-        <configuration>
-          <instructions>
-            <Import-Package>
-              com.google.common.base,
-              org.opendaylight.mdsal.eos.common.api,
-              org.opendaylight.mdsal.eos.dom.api,
-              org.opendaylight.mdsal.singleton.common.api,
-              *
-            </Import-Package>
-          </instructions>
-        </configuration>
       </plugin>
     </plugins>
   </build>

diff --git a/opendaylight/md-sal/sal-dummy-distributed-datastore/pom.xml b/opendaylight/md-sal/sal-dummy-distributed-datastore/pom.xml
index c28ca396e28e264b8ba38075467688bdfa4455d7..8fe9f20ad7c8a83f28696a10cf5f4fe570999f38 100644 (file)
--- a/opendaylight/md-sal/sal-dummy-distributed-datastore/pom.xml
+++ b/opendaylight/md-sal/sal-dummy-distributed-datastore/pom.xml
@@ -118,9 +118,6 @@
         <configuration>
           <instructions>
             <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
-            <Export-package></Export-package>
-            <Private-Package></Private-Package>
-            <Import-Package>!*snappy;!org.jboss.*;!com.jcraft.*;!*jetty*;!sun.security.*;*</Import-Package>
           </instructions>
         </configuration>
       </plugin>

diff --git a/opendaylight/md-sal/sal-inmemory-datastore/pom.xml b/opendaylight/md-sal/sal-inmemory-datastore/pom.xml
index a6ff9f21b3ccc1263d1085fb1a967d6285c8e5e2..3e1a58f89f21b639d939c0e377d092992279e21d 100644 (file)
--- a/opendaylight/md-sal/sal-inmemory-datastore/pom.xml
+++ b/opendaylight/md-sal/sal-inmemory-datastore/pom.xml
@@ -150,10 +150,7 @@
         <configuration>
           <instructions>
             <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
-
             <Export-Package>org.opendaylight.controller.md.sal.dom.store.impl.*</Export-Package>
-
-            <Import-Package>*</Import-Package>
           </instructions>
         </configuration>
       </plugin>

diff --git a/opendaylight/md-sal/sal-remoterpc-connector/pom.xml b/opendaylight/md-sal/sal-remoterpc-connector/pom.xml
index 3698aee190cb628ca2511b0dc8d99092b04075ee..acee6e8ade7ff01b4545dea4e28ab73bdd8c12cf 100644 (file)
--- a/opendaylight/md-sal/sal-remoterpc-connector/pom.xml
+++ b/opendaylight/md-sal/sal-remoterpc-connector/pom.xml
@@ -173,35 +173,10 @@
                     <instructions>
                         <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
                         <Export-package></Export-package>
-                        <Private-Package></Private-Package>
                         <Import-Package>
-                            !org.iq80.*;
-                            !*snappy;
-                            !org.jboss.*;
-                            !com.jcraft.*;
-                            !org.fusesource.*;
-                            !*jetty*;
-                            !sun.security.*;
                             org.opendaylight.controller.cluster;
                             *
                         </Import-Package>
-                        <!--
-                        <Embed-Dependency>
-                            sal-clustering-commons;
-                            sal-akka-raft;
-                            *metrics*;
-                            !sal*;
-                            !*config-api*;
-                            !*testkit*;
-                            *protobuf*;
-                            akka*;
-                            *scala*;
-                            *config*;
-                            *netty*;
-                            *uncommons*;
-                        </Embed-Dependency>
-                        <Embed-Transitive>true</Embed-Transitive>
-                      -->
                     </instructions>
                 </configuration>
             </plugin>

diff --git a/opendaylight/md-sal/samples/clustering-test-app/model/pom.xml b/opendaylight/md-sal/samples/clustering-test-app/model/pom.xml
index 7bf7ef9992ea31d9a9d4d90afe3bdac60d8b690a..0bede9048ed1294e8cffeaf77c5b86e57e32dbbc 100644 (file)
--- a/opendaylight/md-sal/samples/clustering-test-app/model/pom.xml
+++ b/opendaylight/md-sal/samples/clustering-test-app/model/pom.xml
@@ -25,7 +25,6 @@
                     <configuration>
                         <instructions>
                             <Bundle-Name>org.opendaylight.controller.sal-clustering-it-model</Bundle-Name>
-                            <Import-Package>*</Import-Package>
                         </instructions>
                     </configuration>
                 </plugin>

diff --git a/opendaylight/model/pom.xml b/opendaylight/model/pom.xml
index 1d6fabab287df6c2ab06925f0851574f22e2f867..089dd4f09db069b238b61e038255686f3609d631 100644 (file)
--- a/opendaylight/model/pom.xml
+++ b/opendaylight/model/pom.xml
@@ -80,7 +80,6 @@
         <configuration>
           <instructions>
             <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
-            <Import-Package>org.opendaylight.yangtools.yang.binding.annotations, *</Import-Package>
           </instructions>
         </configuration>
       </plugin>