From 9e76b68bb097dc2b53584cad27e3b940e7c41d35 Mon Sep 17 00:00:00 2001 From: Tom Pantelis Date: Tue, 4 Jul 2017 23:41:06 -0400 Subject: [PATCH] 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 --- .../md-sal/mdsal-trace/binding-impl/pom.xml | 21 ++++++++-------- .../md-sal/mdsal-trace/dom-impl/pom.xml | 17 ++++++------- .../md-sal/sal-akka-raft-example/pom.xml | 3 --- opendaylight/md-sal/sal-akka-raft/pom.xml | 1 - .../md-sal/sal-cluster-admin-impl/pom.xml | 8 ------ .../md-sal/sal-distributed-datastore/pom.xml | 5 ---- opendaylight/md-sal/sal-dom-broker/pom.xml | 1 - opendaylight/md-sal/sal-dom-config/pom.xml | 11 -------- .../sal-dummy-distributed-datastore/pom.xml | 3 --- .../md-sal/sal-inmemory-datastore/pom.xml | 3 --- .../md-sal/sal-remoterpc-connector/pom.xml | 25 ------------------- .../samples/clustering-test-app/model/pom.xml | 1 - opendaylight/model/pom.xml | 1 - 13 files changed, 18 insertions(+), 82 deletions(-) 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 maven-bundle-plugin true - - - 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,* - - true - + + + 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, + * + + 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 maven-bundle-plugin true - - - - 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,* - - org.opendaylight.controller.md.sal.trace.dom.impl - true - + + + org.opendaylight.controller.md.sal.dom.broker.impl, + * + + org.opendaylight.controller.md.sal.trace.dom.impl + 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 @@ ${project.groupId}.${project.artifactId} - org.opendaylight.controller.cluster.example - * - * 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 @@ ${project.groupId}.${project.artifactId} org.opendaylight.cluster.raft - * * 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 @@ ${project.groupId}.${project.artifactId} - - !*snappy; - !org.jboss.*; - !com.jcraft.*; - !*jetty*; - !sun.security.*; - *; - 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; - !*snappy; - !org.jboss.*; - !com.jcraft.*; - !*jetty*; - !sun.security.*; *; org.opendaylight.controller.md.sal.dom.broker.impl.jmx 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, - * 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 @@ org.apache.felix maven-bundle-plugin true - - - - com.google.common.base, - org.opendaylight.mdsal.eos.common.api, - org.opendaylight.mdsal.eos.dom.api, - org.opendaylight.mdsal.singleton.common.api, - * - - - 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 @@ ${project.groupId}.${project.artifactId} - - - !*snappy;!org.jboss.*;!com.jcraft.*;!*jetty*;!sun.security.*;* 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 @@ ${project.groupId}.${project.artifactId} - org.opendaylight.controller.md.sal.dom.store.impl.* - - * 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 @@ ${project.groupId}.${project.artifactId} - - !org.iq80.*; - !*snappy; - !org.jboss.*; - !com.jcraft.*; - !org.fusesource.*; - !*jetty*; - !sun.security.*; org.opendaylight.controller.cluster; * - 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 @@ org.opendaylight.controller.sal-clustering-it-model - * 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 @@ ${project.groupId}.${project.artifactId} - org.opendaylight.yangtools.yang.binding.annotations, * -- 2.36.6