summaryrefslogtreecommitdiffstats
path: root/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-features
diff options
context:
space:
mode:
authorPatrick Brady <pb071s@att.com>2018-03-22 15:12:48 -0700
committerPatrick Brady <pb071s@att.com>2018-04-11 17:42:20 +0000
commit5b81764739425ccb4a418947e1565a7f691f4204 (patch)
tree245b7d69f2bc2c093c88bc9fb3c2c3757468e9c1 /appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-features
parentabd3c649e4e50d9e1e995f81cb080e470eb02b48 (diff)
ODL Upgrade Method 2
Changes necessary to support upgrade to ODL Nitrogen, while continuing to use Karaf 3 style features Change-Id: I2edf619e0b889420c32793b958c0926b0311e71d Signed-off-by: Patrick Brady <pb071s@att.com> Issue-ID: APPC-403
Diffstat (limited to 'appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-features')
-rw-r--r--appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-features/src/main/resources/features.xml11
1 files changed, 5 insertions, 6 deletions
diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-features/src/main/resources/features.xml b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-features/src/main/resources/features.xml
index 576214089..e23713930 100644
--- a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-features/src/main/resources/features.xml
+++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-features/src/main/resources/features.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
=============================================================================
@@ -19,7 +19,6 @@
See the License for the specific language governing permissions and
limitations under the License.
- ECOMP is a trademark and service mark of AT&T Intellectual Property.
============LICENSE_END=========================================================
-->
@@ -29,13 +28,13 @@
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.version}/xml/features</repository> -->
- <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-dmaap-adapter' description="appc-dmaap-adapter" 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 version="${odl.mdsal.version}">odl-mdsal-broker</feature>
-<!-- <feature version="${sdnctl.sli.version}">sdnc-sli</feature> -->
+<!-- <feature >odl-mdsal-broker</feature> -->
+ <feature >odl-mdsal-broker</feature>
+<!-- <feature version="${sdnctl.sli.version}">ccsdk-sli</feature> -->
<bundle>mvn:org.onap.appc/appc-dmaap-adapter-bundle/${project.version}</bundle>
<bundle>mvn:org.onap.appc/appc-message-adapter-factory/${project.version}</bundle>
<bundle>mvn:org.onap.appc/appc-message-adapter-api/${project.version}</bundle>