diff options
Diffstat (limited to 'appc-config/appc-flow-controller')
3 files changed, 14 insertions, 14 deletions
diff --git a/appc-config/appc-flow-controller/features/src/main/resources/features.xml b/appc-config/appc-flow-controller/features/src/main/resources/features.xml index b1b5391b6..2ab6ba248 100644 --- a/appc-config/appc-flow-controller/features/src/main/resources/features.xml +++ b/appc-config/appc-flow-controller/features/src/main/resources/features.xml @@ -3,7 +3,7 @@ ============LICENSE_START======================================================= ONAP : APP-C ================================================================================ - Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -24,20 +24,17 @@ xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0"> - <repository>mvn:org.opendaylight.mdsal/features-mdsal/${odl.mdsal.features.version}/xml/features</repository> + <!--<repository>mvn:org.opendaylight.mdsal/features-mdsal/${odl.mdsal.features.version}/xml/features</repository>--> <feature name='appc-config-flow-controller' description="Application Controller Flow Executor" version='${project.version}'> <!-- Most applications will have a dependency on the ODL MD-SAL Broker --> - <feature version="${odl.mdsal.version}">odl-mdsal-broker</feature> - <feature>sdnc-sli</feature> + <feature >odl-mdsal-broker</feature> + <feature>ccsdk-sli</feature> <bundle>mvn:commons-lang/commons-lang/2.6</bundle> <bundle>mvn:commons-collections/commons-collections/${common.collections.version}</bundle> - - <bundle>wrap:mvn:com.att.eelf/eelf-core/${eelf.version}</bundle> - <bundle>mvn:ch.qos.logback/logback-core/${logback.version}</bundle> - <bundle>mvn:ch.qos.logback/logback-classic/${logback.version}</bundle> + <bundle>mvn:org.onap.appc/appc-config-flow-controller-provider/${project.version}</bundle> </feature> </features> diff --git a/appc-config/appc-flow-controller/installer/src/main/resources/scripts/install-feature.sh b/appc-config/appc-flow-controller/installer/src/main/resources/scripts/install-feature.sh index d3d2ea6e7..69ca19451 100644 --- a/appc-config/appc-flow-controller/installer/src/main/resources/scripts/install-feature.sh +++ b/appc-config/appc-flow-controller/installer/src/main/resources/scripts/install-feature.sh @@ -2,7 +2,7 @@ # ============LICENSE_START======================================================= # ONAP : APP-C # ================================================================================ -# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -16,14 +16,13 @@ # See the License for the specific language governing permissions and # limitations under the License. # ============LICENSE_END========================================================= -# ECOMP is a trademark and service mark of AT&T Intellectual Property. ### #!/bin/bash ODL_HOME=${ODL_HOME:-/opt/opendaylight/current} ODL_KARAF_CLIENT=${ODL_KARAF_CLIENT:-${ODL_HOME}/bin/client} -ODL_KARAF_CLIENT_OPTS=${ODL_KARAF_CLIENT_OPTS:-"-u karaf"} +ODL_KARAF_CLIENT_OPTS=${ODL_KARAF_CLIENT_OPTS:-""} INSTALLERDIR=$(dirname $0) REPOZIP=${INSTALLERDIR}/${features.boot}-${project.version}.zip @@ -37,4 +36,4 @@ else fi ${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories} -${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:install ${features.boot} + diff --git a/appc-config/appc-flow-controller/provider/pom.xml b/appc-config/appc-flow-controller/provider/pom.xml index 807b52b5b..876fe0cf0 100644 --- a/appc-config/appc-flow-controller/provider/pom.xml +++ b/appc-config/appc-flow-controller/provider/pom.xml @@ -3,7 +3,7 @@ ============LICENSE_START======================================================= ONAP : APPC ================================================================================ - Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. Copyright (C) 2017 Amdocs ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); @@ -18,7 +18,6 @@ See the License for the specific language governing permissions and limitations under the License. ============LICENSE_END========================================================= - ECOMP is a trademark and service mark of AT&T Intellectual Property. --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> @@ -56,6 +55,10 @@ <artifactId>jackson-annotations</artifactId> </dependency> <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + </dependency> + <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-core</artifactId> </dependency> @@ -137,6 +140,7 @@ <Bundle-Activator>org.onap.appc.flow.controller.FlowControllerActivator</Bundle-Activator> <Export-Package>org.onap.appc.flow.controller</Export-Package> <Import-Package>*</Import-Package> + <Embed-Dependency>eelf-core,logback-core,logback-classic</Embed-Dependency> <DynamicImport-Package>*</DynamicImport-Package> </instructions> <manifestLocation>${project.basedir}/src/main/resources/META-INF</manifestLocation> |