diff options
author | Patrick Brady <pb071s@att.com> | 2018-08-07 11:44:12 -0700 |
---|---|---|
committer | Patrick Brady <pb071s@att.com> | 2018-08-13 14:38:55 -0700 |
commit | b4e7e11ec4cd69495413714fd1eaa09e49fac334 (patch) | |
tree | abff3b478d6159c80405f7cd672d6347b16bd09b /appc-dispatcher/appc-license-manager/appc-license-manager-core | |
parent | 7f383f98c874d5918fa6e55597f30432b13a658d (diff) |
Karaf4 for license and lifecycle
Change-Id: I392affa978507eae64583e0b5d6fd85111b39c97
Signed-off-by: Patrick Brady <pb071s@att.com>
Issue-ID: APPC-1122
Diffstat (limited to 'appc-dispatcher/appc-license-manager/appc-license-manager-core')
2 files changed, 9 insertions, 5 deletions
diff --git a/appc-dispatcher/appc-license-manager/appc-license-manager-core/pom.xml b/appc-dispatcher/appc-license-manager/appc-license-manager-core/pom.xml index 09b699f00..d650a33dc 100644 --- a/appc-dispatcher/appc-license-manager/appc-license-manager-core/pom.xml +++ b/appc-dispatcher/appc-license-manager/appc-license-manager-core/pom.xml @@ -26,12 +26,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.appc</groupId> - <artifactId>appc-license-manager</artifactId> + <groupId>org.onap.appc.parent</groupId> + <artifactId>binding-parent</artifactId> <version>1.4.0-SNAPSHOT</version> + <relativePath /> </parent> <artifactId>appc-license-manager-core</artifactId> + <groupId>org.onap.appc</groupId> + <version>1.4.0-SNAPSHOT</version> <packaging>bundle</packaging> <name>APPC License Manager - Core</name> <description>appc-license-manager-core OSGi bundle project.</description> @@ -43,7 +46,7 @@ <dependencies> <dependency> <groupId>org.onap.appc</groupId> - <artifactId>appc-common</artifactId> + <artifactId>appc-common-bundle</artifactId> <version>${project.version}</version> </dependency> <dependency> @@ -70,6 +73,7 @@ <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> <scope>test</scope> + <version>${assertj.version}</version> </dependency> <dependency> <groupId>org.onap.ccsdk.sli.core</groupId> diff --git a/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml index 6f56ee8c9..ffe865974 100644 --- a/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml +++ b/appc-dispatcher/appc-license-manager/appc-license-manager-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml @@ -29,9 +29,9 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0 http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd"> - <reference id="dbLibServiceRef" availability="mandatory" activation="eager" interface="org.onap.ccsdk.sli.core.dblib.DbLibService" /> + <reference id="dbLibServiceRef" interface="org.onap.ccsdk.sli.core.dblib.DbLibService" /> - <bean id="licenseDataServiceBean" class="org.onap.appc.licmgr.impl.LicenseDataAccessServiceImpl" scope="singleton" activation="eager"> + <bean id="licenseDataServiceBean" class="org.onap.appc.licmgr.impl.LicenseDataAccessServiceImpl" scope="singleton"> <property name="dbLibService" ref="dbLibServiceRef" /> <property name="schema" value="sdnctl" /> </bean> |