summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordglFromAtt <dgl@research.att.com>2019-01-28 17:15:33 +0000
committerdglFromAtt <dgl@research.att.com>2019-01-28 17:15:42 +0000
commit339668d8382568eb043709ea9eb16f4b2ea7d072 (patch)
tree07cfafaec69fc432acf56b66f5228f8575496ed8
parent4ff165d2d626de73cb86a356c5e5156f86933c46 (diff)
Support DR API diverge
Change-Id: Ie4d58731706a4d41202cf42cdaad2d460d73fc2f Signed-off-by: dglFromAtt <dgl@research.att.com> Issue-ID: DMAAP-1000
-rw-r--r--README.md11
-rw-r--r--pom.xml4
-rw-r--r--version.properties2
3 files changed, 13 insertions, 4 deletions
diff --git a/README.md b/README.md
index 85880d5..bd8a327 100644
--- a/README.md
+++ b/README.md
@@ -132,7 +132,7 @@ However, a java argument -DConfigFile can be set to a different path. (Our kub
The table below lists all the settings, default values (if not set), and shows any explicit setting in ONAP oom kubernetes deployment.
|-|-|-|-|
-| Property | Description | Default | Kubernetes Setting |
+| Property | Description | Default | ONAP Kubernetes Setting |
|-|-|-|-|
|UseAAF | Flag for whether AAF authz API is to be used | false | false |
|-|-|-|-|
@@ -188,6 +188,7 @@ The table below lists all the settings, default values (if not set), and shows a
|aaf.AdminPassword | AAF credential of AdminUser | notSet | demo123456! |
|-|-|-|-|
|aaf.NsOwnerIdentity | AAF Identity to be used as topic Namespace owner | notSet | aaf_admin@people.osaaf.org |
+|topicNsRoot | AAF namespace value used to create FQTN | org.onap.dcae.dmaap | org.onap.dcae.dmaap |
|-|-|-|-|
|CredentialCodeKeyfile | location of the codec keyfile used to decrypt passwords | LocalKey | etc/LocalKey |
| | in this properties file before they are passed to AAF | LocalKey | etc/LocalKey |
@@ -206,6 +207,14 @@ The table below lists all the settings, default values (if not set), and shows a
|-|-|-|-|
|MM.AgentRole | AAF Role of client susbcribing to MM command topic | notSet | org.onal.dmaap-bc-mm-prov.agent |
|-|-|-|-|
+|DR.provApi | Version name of DR API (ONAP or AT&T) | ONAP | ONAP |
+|-|-|-|-|
+|DR.onBehalfHeader | String for "On Behalf Of" HTTP Header in DR API | X-DR-ON-BEHALF-OF | X-DR-ON-BEHALF-OF |
+|-|-|-|-|
+|DR.feedContentType | Value for Content-Type Header in DR Feed API | application/vnd.dr.feed | application/vnd.dr.feed |
+|-|-|-|-|
+|DR subContentType | Value for Content-Type Header in DR Subscription API | application/vnd.dr.subscription | application/vnd.dr.subscription |
+|-|-|-|-|
|HttpAllowed | flag indicating whether http is supported | false | true |
|-|-|-|-|
|IntHttpPort | Internal port for http service | 80 | 8080 |
diff --git a/pom.xml b/pom.xml
index ef634bd..d8b6cd6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -326,7 +326,7 @@
<dependency>
<groupId>org.onap.dmaap.dbcapi</groupId>
<artifactId>dbcapi</artifactId>
- <version>1.0.20-SNAPSHOT</version>
+ <version>1.0.21-SNAPSHOT</version>
</dependency>
</dependencies>
<reporting>
@@ -362,7 +362,7 @@
<jettyVersion>9.4.12.RC2</jettyVersion>
<eelf.version>1.0.0</eelf.version>
<swagger.version>1.5.19</swagger.version>
- <artifact.version>1.0.25</artifact.version>
+ <artifact.version>1.0.26</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 19905f9..8db0bb1 100644
--- a/version.properties
+++ b/version.properties
@@ -27,7 +27,7 @@
major=1
minor=0
-patch=25
+patch=26
base_version=${major}.${minor}.${patch}
# Release must be completed with git revision # in Jenkins