Merge "Fix resource-assignment dependencies"

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 d3362fba2..f4191293d 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 8915b8d6a..8367b03ff 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 1b98c628a..89134284c 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 7fe544378..be22d8766 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>