diff options
| author |   Dan Timoney <dt5972@att.com> | 2018-09-11 20:57:17 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-09-11 20:57:17 +0000 |
| commit | 4490a4c1f86702cc55203c634d0914003eca6ea5 (patch) | |
| tree | e51a4919a070db8c9a579c1274b7967c512b18ee /blueprints-processor/plugin | |
| parent | 5dfa696b46c79c64c429c66d2af911bd54a653d7 (diff) | |
| parent | 78fc81bf6a35077b8ad80cf29b218477baa15a47 (diff) | |
Merge "Migrate features to Oxygen"
Diffstat (limited to 'blueprints-processor/plugin')
4 files changed, 1 insertions, 28 deletions
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 @@ -37,11 +37,6 @@ <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>
<version>${project.version}</version>
@@ -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 @@ -37,11 +37,6 @@ <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>
<version>${project.version}</version>
@@ -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 @@ -37,11 +37,6 @@ <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>
<version>${project.version}</version>
@@ -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>
|