From: Tom Pantelis <tompantelis@gmail.com>
Date: Wed, 5 Jul 2017 03:41:06 +0000 (-0400)
Subject: Bug 3401: Remove/cleanup Import-Package in maven-bundle-plugin config
X-Git-Tag: release/nitrogen~33
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=9e76b68bb097dc2b53584cad27e3b940e7c41d35

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 17f1d15253..48ce85ac3e 100644
--- 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 c08bc89226..55bb6b96e5 100644
--- 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 d90f61fdbb..0fcd37ed67 100644
--- 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 1b195e6b14..5979e93a5a 100644
--- 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 80bd141bbe..38a2fc0e34 100644
--- 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 964d35dfb4..b96c3ccb7e 100644
--- 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 abfbb50119..c65cb99ed5 100644
--- 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 0426678f08..e44cfc34a1 100644
--- 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 c28ca396e2..8fe9f20ad7 100644
--- 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 a6ff9f21b3..3e1a58f89f 100644
--- 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 3698aee190..acee6e8ade 100644
--- 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 7bf7ef9992..0bede9048e 100644
--- 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 1d6fabab28..089dd4f09d 100644
--- 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>