summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcus Williams <marcus.williams@intel.com>2017-09-07 16:56:47 +0000
committerGerrit Code Review <gerrit@onap.org>2017-09-07 16:56:47 +0000
commit4e85d4dd2ac2cc0ab65363527b9a0cebf079eb95 (patch)
tree69846230bff14e7a2e87550f8ac3b77e036b1d9c
parentc3861f3219196626e9b6caffdbd0be6a96ffaf8e (diff)
parenta54af3e7b27bc15d051064ba7990121ac7d27eea (diff)
Merge "Fix resource-assignment dependencies"
-rw-r--r--resource-assignment/features/src/main/resources/features.xml5
-rwxr-xr-xresource-assignment/installer/pom.xml2
-rwxr-xr-xresource-assignment/provider/pom.xml4
-rw-r--r--resource-assignment/provider/src/main/resources/META-INF/spring/resource-assignment-osgi-context.xml6
4 files changed, 11 insertions, 6 deletions
diff --git a/resource-assignment/features/src/main/resources/features.xml b/resource-assignment/features/src/main/resources/features.xml
index d3362fba..f4191293 100644
--- a/resource-assignment/features/src/main/resources/features.xml
+++ b/resource-assignment/features/src/main/resources/features.xml
@@ -9,9 +9,9 @@
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -35,6 +35,7 @@
<feature>spring-dm</feature>
<bundle start-level="88">mvn:org.onap.ccsdk.sli.adaptors/resource-assignment-provider/${project.version}</bundle>
<bundle>mvn:mysql/mysql-connector-java/${mysql.connector.version}</bundle>
+ <bundle>mvn:commons-lang/commons-lang/2.6</bundle>
</feature>
</features>
diff --git a/resource-assignment/installer/pom.xml b/resource-assignment/installer/pom.xml
index 8915b8d6..8367b03f 100755
--- a/resource-assignment/installer/pom.xml
+++ b/resource-assignment/installer/pom.xml
@@ -15,6 +15,7 @@
<features.boot>sdnc-resource-assignment</features.boot>
<features.repositories>mvn:org.onap.ccsdk.sli.adaptors/resource-assignment-features/${project.version}/xml/features</features.repositories>
<include.transitive.dependencies>false</include.transitive.dependencies>
+ <commons.lang.version>2.6</commons.lang.version>
</properties>
<dependencies>
@@ -39,6 +40,7 @@
<version>${project.version}</version>
</dependency>
+
</dependencies>
<build>
diff --git a/resource-assignment/provider/pom.xml b/resource-assignment/provider/pom.xml
index 1b98c628..89134284 100755
--- a/resource-assignment/provider/pom.xml
+++ b/resource-assignment/provider/pom.xml
@@ -94,9 +94,11 @@
<instructions>
<Bundle-SymbolicName>org.onap.ccsdk.sli.adaptors.ra</Bundle-SymbolicName>
<Export-Package>org.onap.ccsdk.sli.adaptors.ra</Export-Package>
+ <!--
<Import-Package>*,org.onap.ccsdk.sli.adaptors.resource.dblib,org.onap.ccsdk.sli.adaptors.*,org.osgi.framework.*,org.slf4j.*,com.mysql.jdbc.*</Import-Package>
- <!--Import-Package>*</Import-Package-->
<Embed-Transitive>true</Embed-Transitive>
+ -->
+ <Import-Package>*,org.onap.ccsdk.sli.core.dblib</Import-Package>
</instructions>
</configuration>
</plugin>
diff --git a/resource-assignment/provider/src/main/resources/META-INF/spring/resource-assignment-osgi-context.xml b/resource-assignment/provider/src/main/resources/META-INF/spring/resource-assignment-osgi-context.xml
index 7fe54437..be22d876 100644
--- a/resource-assignment/provider/src/main/resources/META-INF/spring/resource-assignment-osgi-context.xml
+++ b/resource-assignment/provider/src/main/resources/META-INF/spring/resource-assignment-osgi-context.xml
@@ -9,9 +9,9 @@
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -30,7 +30,7 @@
<reference id="dblib.dataSource">
<interfaces>
<beans:value>javax.sql.DataSource</beans:value>
- <beans:value>org.onap.ccsdk.sli.adaptors.resource.dblib.DbLibService</beans:value>
+ <beans:value>org.onap.ccsdk.sli.core.dblib.DbLibService</beans:value>
</interfaces>
</reference>