summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsu622b <sunil.unnava@att.com>2018-04-23 16:34:35 -0400
committersunil unnava <su622b@att.com>2018-04-24 15:20:34 +0000
commit9a9d6f6650f0623f806179fc832141be32e6652a (patch)
tree23d82e62011dbb152f85f73b9b2c055a3d7f5d3f
parentf5b6899dafee9f9473ee1d7405ede512ce1dc577 (diff)
Changes for AAF integration
Issue-ID: DMAAP-245 Change-Id: Iea092ccd79d5a01add76dcf0489a742124d775a8 Signed-off-by: su622b <sunil.unnava@att.com>
-rw-r--r--bundleconfig-local/etc/appprops/MsgRtrApi.properties8
-rw-r--r--pom.xml2
-rw-r--r--src/main/resources/docker-compose/docker-compose.yml2
3 files changed, 6 insertions, 6 deletions
diff --git a/bundleconfig-local/etc/appprops/MsgRtrApi.properties b/bundleconfig-local/etc/appprops/MsgRtrApi.properties
index 583178a..1ccd9f0 100644
--- a/bundleconfig-local/etc/appprops/MsgRtrApi.properties
+++ b/bundleconfig-local/etc/appprops/MsgRtrApi.properties
@@ -139,12 +139,12 @@ maxcontentlength=10000
##############################################################################
#AAF Properties
-msgRtr.namespace.aaf=com.onap.dmaap.mr.topic
-msgRtr.topicfactory.aaf=org.openecomp.dmaapBC.topicFactory|:org.openecomp.dmaapBC.topic:
-enforced.topic.name.AAF=com.onap
+msgRtr.namespace.aaf=org.onap.dmaap.mr.topic
+msgRtr.topicfactory.aaf=org.onap.dmaap.mr.topicFactory|:org.onap.dmaap.mr.topic:
+enforced.topic.name.AAF=org.onap
forceAAF=false
transidUEBtopicreqd=false
-defaultNSforUEB=com.onap.dmaap.mr.ueb
+defaultNSforUEB=org.onap.dmaap.mr.ueb
##############################################################################
#Mirror Maker Agent
msgRtr.mirrormakeradmin.aaf=com.onap.dmaap.mr.dev.mirrormaker|*|admin
diff --git a/pom.xml b/pom.xml
index e1f685f..e9b0458 100644
--- a/pom.xml
+++ b/pom.xml
@@ -335,7 +335,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-expression</artifactId>
- <version>3.1.0.RELEASE</version>
+ <version>4.3.16.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
diff --git a/src/main/resources/docker-compose/docker-compose.yml b/src/main/resources/docker-compose/docker-compose.yml
index 40f6bea..44d5ce4 100644
--- a/src/main/resources/docker-compose/docker-compose.yml
+++ b/src/main/resources/docker-compose/docker-compose.yml
@@ -18,7 +18,7 @@ services:
- zookeeper
dmaap:
- image: nexus3.onap.org:10001/onap/dmaap/dmaap-mr
+ image: nexus3.onap.org:10001/onap/dmaap/dmaap-mr:1.1.4
ports:
- "3904:3904"
- "3905:3905"