summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordglFromAtt <dgl@research.att.com>2018-04-18 17:00:47 -0400
committerdglFromAtt <dgl@research.att.com>2018-04-18 17:00:54 -0400
commit9955fbe954e9808884bc10bfab73a192c1a4df57 (patch)
tree76a49766b6ba901aa52a528cac6bce9ded4d401f
parentbd7b74218a470da6f85f4de9a27b70f09a1f7b3e (diff)
Set ONAP property for non multisite
Change-Id: I68319b9bacc0af3c68fc9e4080474377055276aa Signed-off-by: dglFromAtt <dgl@research.att.com> Issue-ID: DMAAP-295
-rw-r--r--misc/dmaapbc.properties.tmpl4
-rw-r--r--pom.xml4
-rw-r--r--version.properties2
3 files changed, 7 insertions, 3 deletions
diff --git a/misc/dmaapbc.properties.tmpl b/misc/dmaapbc.properties.tmpl
index ce24bb4..d2e879a 100644
--- a/misc/dmaapbc.properties.tmpl
+++ b/misc/dmaapbc.properties.tmpl
@@ -4,6 +4,7 @@ cat <<!EOF
#
# CSIT TESTING
csit: ${DMAAPBC_CSIT:-No}
+
#
# URI to retrieve dynamic DR configuration
#
@@ -86,6 +87,9 @@ Feed.deleteHandling: ${DMAAPBC_FEED_DELETE:-DeleteOnDR}
################################################################################
# MR Related Properties:
#
+# ONAP Beijing is a single site deployment.
+MR.multisite: false
+#
# Value of the CNAME DNS entry which resolves to the primary central MR cluster (when there are more than one central clusters).
# if there is only one MR cluster in an environment, set this to the DNS name for that cluster
#
diff --git a/pom.xml b/pom.xml
index 8e1aefe..d4216bf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -267,7 +267,7 @@
<dependency>
<groupId>org.onap.dmaap.dbcapi</groupId>
<artifactId>dbcapi</artifactId>
- <version>1.0.3-SNAPSHOT</version>
+ <version>1.0.4-SNAPSHOT</version>
</dependency>
</dependencies>
<reporting>
@@ -302,7 +302,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jettyVersion>9.3.7.v20160115</jettyVersion>
<eelf.version>0.0.1</eelf.version>
- <artifact.version>1.0.5</artifact.version>
+ <artifact.version>1.0.6</artifact.version>
<!-- SONAR -->
<jacoco.version>0.7.7.201606060606</jacoco.version>
<sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
diff --git a/version.properties b/version.properties
index 3de14e0..dadd8a9 100644
--- a/version.properties
+++ b/version.properties
@@ -27,7 +27,7 @@
major=1
minor=0
-patch=5
+patch=6
base_version=${major}.${minor}.${patch}
# Release must be completed with git revision # in Jenkins