From 6950b473ff100653cf726ce2c3f8fe54a8076cfa Mon Sep 17 00:00:00 2001
From: Michael DÜrre <michael.duerre@highstreet-technologies.com>
Date: Thu, 1 Jul 2021 09:11:48 +0200
Subject: fix more sdnr startup problems
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

cleaned up devmgr and odlux bundles

Issue-ID: CCSDK-3362
Signed-off-by: Michael DÜrre <michael.duerre@highstreet-technologies.com>
Change-Id: Ic27852a7a66cef7fb6c5790a6f523240efe24a46
Signed-off-by: Michael DÜrre <michael.duerre@highstreet-technologies.com>
---
 sdnr/wt/odlux/core/features/pom.xml |  5 +++++
 sdnr/wt/odlux/core/model/pom.xml    | 17 -----------------
 sdnr/wt/odlux/core/provider/pom.xml |  2 +-
 3 files changed, 6 insertions(+), 18 deletions(-)

(limited to 'sdnr/wt/odlux/core')

diff --git a/sdnr/wt/odlux/core/features/pom.xml b/sdnr/wt/odlux/core/features/pom.xml
index 5d81f954c..051de3d0a 100644
--- a/sdnr/wt/odlux/core/features/pom.xml
+++ b/sdnr/wt/odlux/core/features/pom.xml
@@ -48,6 +48,11 @@
 
     <dependencies>
 
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>sdnr-wt-odlux-core-model</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>sdnr-wt-odlux-core-provider</artifactId>
diff --git a/sdnr/wt/odlux/core/model/pom.xml b/sdnr/wt/odlux/core/model/pom.xml
index 5577db8c8..9ac9d270e 100644
--- a/sdnr/wt/odlux/core/model/pom.xml
+++ b/sdnr/wt/odlux/core/model/pom.xml
@@ -60,22 +60,5 @@
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
         </dependency>
-
     </dependencies>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Import-Package>*</Import-Package>
-                        <Export-Package>org.onap.ccsdk.features.sdnr.wt.odlux.*,com.opensymphony.*</Export-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 </project>
diff --git a/sdnr/wt/odlux/core/provider/pom.xml b/sdnr/wt/odlux/core/provider/pom.xml
index fc803df96..3ad6488ea 100644
--- a/sdnr/wt/odlux/core/provider/pom.xml
+++ b/sdnr/wt/odlux/core/provider/pom.xml
@@ -58,6 +58,7 @@
             <groupId>org.onap.ccsdk.features.sdnr.wt</groupId>
             <artifactId>sdnr-wt-odlux-core-model</artifactId>
             <version>${project.version}</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
@@ -126,7 +127,6 @@
                         </Import-Package>
                         <Embed-Dependency>sdnr-wt-odlux-framework;inline=true</Embed-Dependency>
                         <Embed-Transitive>true</Embed-Transitive>
-                        <Export-Package>${project.groupId}.*</Export-Package>
                     </instructions>
                 </configuration>
             </plugin>
-- 
cgit 1.2.3-korg