diff options
| author |   Patrick Brady <pb071s@att.com> | 2017-06-01 10:45:37 -0700 |
|---|---|---|
| committer | Patrick Brady <pb071s@att.com> | 2017-06-02 13:05:15 -0700 |
| commit | c7d0075d223eab9f89fd28853c4b138792059be9 (patch) | |
| tree | 40aa3e41e598ea7a59bcf6899a2004c1abab11c2 /appc-provider/appc-provider-features/src/main | |
| parent | 8aac2df744820304ee29354333661699e9695939 (diff) | |
Merge of new rebased code
Change-Id: I9b8d1f69eb3e0af1935ed8304fea4bf54c1aac47
Signed-off-by: Patrick Brady <pb071s@att.com>
Diffstat (limited to 'appc-provider/appc-provider-features/src/main')
| -rw-r--r-- | appc-provider/appc-provider-features/src/main/resources/features.xml | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/appc-provider/appc-provider-features/src/main/resources/features.xml b/appc-provider/appc-provider-features/src/main/resources/features.xml index f67333648..c9a1bf424 100644 --- a/appc-provider/appc-provider-features/src/main/resources/features.xml +++ b/appc-provider/appc-provider-features/src/main/resources/features.xml @@ -25,13 +25,9 @@ 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.version}/xml/features</repository> --> <repository>mvn:org.opendaylight.mdsal/features-mdsal/${odl.mdsal.features.version}/xml/features</repository> <feature name='appc-provider' description="application controller" version='${project.version}'> - <!--<feature version="${project.version}">appc-aai-adapter</feature>--> - <!-- Most applications will have a dependency on the ODL MD-SAL Broker --> - <!-- <feature version="${broker-mdsal.version}">odl-mdsal-broker</feature> --> <feature version="${broker-mdsal.version}">odl-mdsal-broker</feature> <bundle>mvn:org.openecomp.appc/appc-provider-model/${project.version}</bundle> <bundle>mvn:org.openecomp.appc/appc-provider-bundle/${project.version}</bundle> |