| commit | c7d0075d223eab9f89fd28853c4b138792059be9 | [log] [tgz] |
|---|---|---|
| author | Patrick Brady <pb071s@att.com> | Thu Jun 01 10:45:37 2017 -0700 |
| committer | Patrick Brady <pb071s@att.com> | Fri Jun 02 13:05:15 2017 -0700 |
| tree | 40aa3e41e598ea7a59bcf6899a2004c1abab11c2 | |
| parent | 8aac2df744820304ee29354333661699e9695939 [diff] |
Merge of new rebased code Change-Id: I9b8d1f69eb3e0af1935ed8304fea4bf54c1aac47 Signed-off-by: Patrick Brady <pb071s@att.com>
diff --git a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-features/pom.xml b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-features/pom.xml index 2181888..8f5b55c 100644 --- a/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-features/pom.xml +++ b/appc-adapters/appc-dmaap-adapter/appc-dmaap-adapter-features/pom.xml
@@ -19,6 +19,12 @@ </dependency> <dependency> + <groupId>org.openecomp.appc</groupId> + <artifactId>appc-message-adapter-factory</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> <groupId>commons-lang</groupId> <artifactId>commons-lang</artifactId> <scope>compile</scope>
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 90a3162..baf04dd 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
@@ -34,6 +34,8 @@ <feature version="${broker-mdsal.version}">odl-mdsal-broker</feature> <!-- <feature version="${sdnctl.sli.version}">sdnc-sli</feature> --> <bundle>mvn:org.openecomp.appc/appc-dmaap-adapter-bundle/${project.version}</bundle> + <bundle>mvn:org.openecomp.appc/appc-message-adapter-factory/${project.version}</bundle> + <bundle>mvn:org.openecomp.appc/appc-message-adapter-api/${project.version}</bundle> </feature>