From fe267425a0597297d8724d57a805fece2b91358d Mon Sep 17 00:00:00 2001
From: Michael Vorburger <vorburger@redhat.com>
Date: Wed, 8 Feb 2017 19:29:20 +0100
Subject: [PATCH] Remove felix.dependencymanager from aaa-h2-store

This makes life easier for my friends working hard on the Karaf 4 mig.

The switch of Import-Package from explicit list to exclusion list is
indirectly related; I may also have been possible to leave that as is
and just remove "org.apache.felix.*" from that list, but flipping this
around like this seems much better, to me.

Change-Id: I0ee3d3765db9d4ec466939b4862a38d957cdb451
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
---
 aaa-h2-store/pom.xml                          | 28 +++++++++++++++----
 .../src/main/features/features.xml            |  3 +-
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/aaa-h2-store/pom.xml b/aaa-h2-store/pom.xml
index a7d80e434..38652d042 100644
--- a/aaa-h2-store/pom.xml
+++ b/aaa-h2-store/pom.xml
@@ -26,11 +26,6 @@
             <groupId>org.opendaylight.aaa</groupId>
             <artifactId>aaa-authn</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.dependencymanager</artifactId>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>org.immutables</groupId>
             <artifactId>value</artifactId>
@@ -71,7 +66,28 @@
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
-                        <Import-Package>net.sf.ehcache.*,com.google.*,org.opendaylight.aaa.api.*,org.apache.felix.*,org.slf4j.*,org.osgi.*,org.apache.commons.lang3</Import-Package>
+                        <!-- The import exclusions (note the ! prefix) are required because H2's MANIFEST has Import-Package for them (but we don't use these) -->
+                        <Import-Package>
+                            !javax.naming,
+                            !javax.naming.spi,
+                            !javax.servlet,
+                            !javax.servlet.http,
+                            !javax.tools,
+                            !javax.transaction.xa,
+                            !org.apache.lucene.analysis,
+                            !org.apache.lucene.analysis.standard,
+                            !org.apache.lucene.document,
+                            !org.apache.lucene.index,
+                            !org.apache.lucene.queryParser,
+                            !org.apache.lucene.search,
+                            !org.apache.lucene.store,
+                            !org.apache.lucene.util,
+                            !com.vividsolutions.jts.geom,
+                            !com.vividsolutions.jts.io,
+                            !org.osgi.service.jdbc,
+                            !javax.annotation,
+                            !javax.naming,
+                            *</Import-Package>
                         <Private-Package>org.h2.*</Private-Package>
                     </instructions>
                 </configuration>
diff --git a/features/authn/features-aaa/src/main/features/features.xml b/features/authn/features-aaa/src/main/features/features.xml
index fc868b974..0e92bd8a1 100644
--- a/features/authn/features-aaa/src/main/features/features.xml
+++ b/features/authn/features-aaa/src/main/features/features.xml
@@ -67,7 +67,6 @@
         <bundle>mvn:org.opendaylight.aaa/aaa-filterchain/{{VERSION}}</bundle>
 
         <!--H2 Store -->
-        <bundle>mvn:org.osgi/org.osgi.enterprise/4.2.0</bundle>
         <bundle>wrap:mvn:com.h2database/h2/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.aaa/aaa-h2-store/{{VERSION}}</bundle>
 
@@ -178,4 +177,4 @@
         <bundle>mvn:net.sf.ehcache/ehcache/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.aaa/aaa-cli/{{VERSION}}</bundle>
     </feature>
-</features>
\ No newline at end of file
+</features>
-- 
2.36.6