From 78fc81bf6a35077b8ad80cf29b218477baa15a47 Mon Sep 17 00:00:00 2001
From: Alexis de Talhouët <adetalhouet89@gmail.com>
Date: Tue, 11 Sep 2018 14:38:13 -0400
Subject: Migrate features to Oxygen
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: Ic9db80e71070093209b8eda1cdd12e053a18aded
Issue-ID: CCSDK-505
Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
---
 blueprints-processor/plugin/assignment-provider/pom.xml        |  7 -------
 .../resources/org/opendaylight/blueprint/impl-blueprint.xml    |  5 -----
 blueprints-processor/plugin/generator-provider/pom.xml         |  7 -------
 blueprints-processor/plugin/model-provider/pom.xml             | 10 +---------
 4 files changed, 1 insertion(+), 28 deletions(-)

(limited to 'blueprints-processor/plugin')

diff --git a/blueprints-processor/plugin/assignment-provider/pom.xml b/blueprints-processor/plugin/assignment-provider/pom.xml
index 073f9af9e..6eeac1044 100644
--- a/blueprints-processor/plugin/assignment-provider/pom.xml
+++ b/blueprints-processor/plugin/assignment-provider/pom.xml
@@ -36,11 +36,6 @@
     <url>http://maven.apache.org</url>
 
     <dependencies>
-        <dependency>
-            <groupId>equinoxSDK381</groupId>
-            <artifactId>org.eclipse.osgi</artifactId>
-            <version>${equinox.osgi.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.config</groupId>
             <artifactId>blueprints-generator-provider</artifactId>
@@ -95,8 +90,6 @@
                             org.onap.ccsdk.config.assignment.processor,
                             org.onap.ccsdk.config.assignment.processor.custom
                         </Export-Package>
-                        <Import-Package>*</Import-Package>
-                        <Embed-Transitive>true</Embed-Transitive>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/blueprints-processor/plugin/assignment-provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml b/blueprints-processor/plugin/assignment-provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
index c880c8d4f..baa6bdbc5 100644
--- a/blueprints-processor/plugin/assignment-provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
+++ b/blueprints-processor/plugin/assignment-provider/src/main/resources/org/opendaylight/blueprint/impl-blueprint.xml
@@ -35,9 +35,6 @@
 	<reference id="configGeneratorService"
 		interface="org.onap.ccsdk.config.generator.service.ConfigGeneratorService" />
 
-	<reference id="configProvDataStore"
-		interface="org.onap.ccsdk.config.provdata.service.ConfigProvDataStore" />
-
 	<!-- Expose the Common Component Bean -->
 	<bean id="configAssignmentNode"
 		class="org.onap.ccsdk.config.assignment.service.ConfigAssignmentNode">
@@ -46,7 +43,6 @@
 		<argument ref="configModelService" />
 		<argument ref="componentNodeService" />
 		<argument ref="configGeneratorService" />
-		<argument ref="configProvDataStore" />
 	</bean>
 
 	<service ref="configAssignmentNode"
@@ -59,7 +55,6 @@
 		<argument ref="configModelService" />
 		<argument ref="componentNodeService" />
 		<argument ref="configGeneratorService" />
-		<argument ref="configProvDataStore" />
 	</bean>
 
 	<service ref="configAssignmentService"
diff --git a/blueprints-processor/plugin/generator-provider/pom.xml b/blueprints-processor/plugin/generator-provider/pom.xml
index f18170a6a..82ddd118e 100644
--- a/blueprints-processor/plugin/generator-provider/pom.xml
+++ b/blueprints-processor/plugin/generator-provider/pom.xml
@@ -36,11 +36,6 @@
     <url>http://maven.apache.org</url>
 
     <dependencies>
-        <dependency>
-            <artifactId>org.eclipse.osgi</artifactId>
-            <groupId>equinoxSDK381</groupId>
-            <version>${equinox.osgi.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.config</groupId>
             <artifactId>blueprints-model-provider</artifactId>
@@ -92,8 +87,6 @@
                             org.onap.ccsdk.config.generator.service,
                             org.onap.ccsdk.config.generator.tool
                         </Export-Package>
-                        <Import-Package>*</Import-Package>
-                        <Embed-Transitive>true</Embed-Transitive>
                     </instructions>
                 </configuration>
             </plugin>
diff --git a/blueprints-processor/plugin/model-provider/pom.xml b/blueprints-processor/plugin/model-provider/pom.xml
index 7710fbbed..f14ec3afa 100644
--- a/blueprints-processor/plugin/model-provider/pom.xml
+++ b/blueprints-processor/plugin/model-provider/pom.xml
@@ -36,11 +36,6 @@
     <url>http://maven.apache.org</url>
 
     <dependencies>
-        <dependency>
-            <groupId>equinoxSDK381</groupId>
-            <artifactId>org.eclipse.osgi</artifactId>
-            <version>${equinox.osgi.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.config</groupId>
             <artifactId>blueprints-rest-adaptor-provider</artifactId>
@@ -97,15 +92,12 @@
                         <Export-Package>org.onap.ccsdk.config.model,
                             org.onap.ccsdk.config.model.data,
                             org.onap.ccsdk.config.model.data.api,
-                            org.onap.ccsdk.config.model.data.custom,
-                            org.onap.ccsdk.config.model.data.custom.dict,
+                            org.onap.ccsdk.config.model.data.dict,
                             org.onap.ccsdk.config.model.domain,
                             org.onap.ccsdk.config.model.service,
                             org.onap.ccsdk.config.model.utils,
                             org.onap.ccsdk.config.model.validator
                         </Export-Package>
-                        <Import-Package>*</Import-Package>
-                        <Embed-Transitive>true</Embed-Transitive>
                     </instructions>
                 </configuration>
             </plugin>
-- 
cgit 1.2.3-korg