summaryrefslogtreecommitdiffstats
path: root/appc-inbound
diff options
context:
space:
mode:
authorPatrick Brady <pb071s@att.com>2017-10-26 09:12:23 -0700
committerPatrick Brady <pb071s@att.com>2017-10-26 11:27:33 -0700
commitb7d8b97e10c62ef446b28fc071bb7536a248a304 (patch)
treef7fcff57512caf0bf7ddc6e3638e39f8a59a2809 /appc-inbound
parent172e0a20ac4557716ec780843253383772557aee (diff)
Fixing problems with features files
In progress. Change-Id: Idb0d3f13eaa89d9241f4c543f1222c14ea288f2f Signed-off-by: Patrick Brady <pb071s@att.com> Issue-id: APPC-296
Diffstat (limited to 'appc-inbound')
-rw-r--r--appc-inbound/appc-artifact-handler/features/src/main/resources/features.xml6
-rwxr-xr-xappc-inbound/appc-artifact-handler/installer/pom.xml8
-rwxr-xr-xappc-inbound/appc-artifact-handler/provider/pom.xml2
-rw-r--r--appc-inbound/appc-artifact-handler/provider/src/main/resources/initial/appc-artifact-handler-provider.xml (renamed from appc-inbound/appc-artifact-handler/provider/src/main/resources/initial/artifact-handler-provider.xml)0
-rw-r--r--appc-inbound/appc-design-services/features/src/main/resources/features.xml6
5 files changed, 15 insertions, 7 deletions
diff --git a/appc-inbound/appc-artifact-handler/features/src/main/resources/features.xml b/appc-inbound/appc-artifact-handler/features/src/main/resources/features.xml
index 676049150..6b6906e9d 100644
--- a/appc-inbound/appc-artifact-handler/features/src/main/resources/features.xml
+++ b/appc-inbound/appc-artifact-handler/features/src/main/resources/features.xml
@@ -31,11 +31,11 @@
<repository>mvn:org.opendaylight.mdsal/features-mdsal/${odl.mdsal.features.version}/xml/features</repository>
- <feature name='app-cntrl-artifact-handler' description="Application Controller Artifact Handler"
+ <feature name='appc-artifact-handler' description="Application Controller Artifact Handler"
version='${project.version}'>
<!-- Most applications will have a dependency on the ODL MD-SAL Broker -->
- <feature version="${broker-mdsal.version}">odl-mdsal-broker</feature>
- <feature version='${sdnctl.sli.version}'>sdnc-sli</feature>
+ <feature version="${odl.mdsal.version}">odl-mdsal-broker</feature>
+ <feature>sdnc-sli</feature>
<bundle>wrap:mvn:com.att.eelf/eelf-core/${eelf.version}</bundle>
<bundle>wrap:mvn:com.fasterxml.jackson.core/jackson-databind/${jackson.version}</bundle>
<bundle>wrap:mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson.version}</bundle>
diff --git a/appc-inbound/appc-artifact-handler/installer/pom.xml b/appc-inbound/appc-artifact-handler/installer/pom.xml
index 9af28bf6a..1a1a9800e 100755
--- a/appc-inbound/appc-artifact-handler/installer/pom.xml
+++ b/appc-inbound/appc-artifact-handler/installer/pom.xml
@@ -36,6 +36,14 @@
<groupId>org.openecomp.appc</groupId>
<artifactId>appc-artifact-handler-provider</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>org.openecomp.appc</groupId>
+ <artifactId>appc-artifact-handler-provider</artifactId>
+ <version>${project.version}</version>
+ <classifier>config</classifier>
+ <type>xml</type>
+ </dependency>
</dependencies>
diff --git a/appc-inbound/appc-artifact-handler/provider/pom.xml b/appc-inbound/appc-artifact-handler/provider/pom.xml
index 35aea7e85..3452e4f18 100755
--- a/appc-inbound/appc-artifact-handler/provider/pom.xml
+++ b/appc-inbound/appc-artifact-handler/provider/pom.xml
@@ -105,7 +105,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
<configuration>
<artifacts>
<artifact>
- <file>${project.build.directory}/classes/initial/artifact-handler-provider.xml</file>
+ <file>${project.build.directory}/classes/initial/appc-artifact-handler-provider.xml</file>
<type>xml</type>
<classifier>config</classifier>
</artifact>
diff --git a/appc-inbound/appc-artifact-handler/provider/src/main/resources/initial/artifact-handler-provider.xml b/appc-inbound/appc-artifact-handler/provider/src/main/resources/initial/appc-artifact-handler-provider.xml
index 658cb3fd6..658cb3fd6 100644
--- a/appc-inbound/appc-artifact-handler/provider/src/main/resources/initial/artifact-handler-provider.xml
+++ b/appc-inbound/appc-artifact-handler/provider/src/main/resources/initial/appc-artifact-handler-provider.xml
diff --git a/appc-inbound/appc-design-services/features/src/main/resources/features.xml b/appc-inbound/appc-design-services/features/src/main/resources/features.xml
index 315becfdb..5aa32be50 100644
--- a/appc-inbound/appc-design-services/features/src/main/resources/features.xml
+++ b/appc-inbound/appc-design-services/features/src/main/resources/features.xml
@@ -40,12 +40,12 @@
<bundle>mvn:org.openecomp.appc/appc-design-services-model/${project.version}</bundle>
<!-- Most applications will have a dependency on the ODL MD-SAL Broker -->
- <feature version='${broker-mdsal.version}'>odl-mdsal-broker</feature>
- <feature version='${sdnctl.sli.version}'>sdnc-sli</feature>
+ <feature version='${odl.mdsal.version}'>odl-mdsal-broker</feature>
+ <feature>sdnc-sli</feature>
<bundle>mvn:org.openecomp.appc/appc-design-services-provider/${project.version}</bundle>
<bundle>wrap:mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/2.3.0</bundle>
- <feature version='${broker-mdsal.version}'>odl-restconf</feature>
+ <feature version='${odl.mdsal.version}'>odl-restconf</feature>
</feature>