summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--datarouter-node/aaf_certs/org.onap.dmaap-dr.jksbin3647 -> 3666 bytes
-rw-r--r--datarouter-node/aaf_certs/org.onap.dmaap-dr.keyfile54
-rw-r--r--datarouter-node/aaf_certs/org.onap.dmaap-dr.trust.jksbin1413 -> 1413 bytes
-rw-r--r--datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/NodeUtils.java20
-rw-r--r--datarouter-node/src/main/resources/drNodeCadi.properties6
-rw-r--r--datarouter-node/src/main/resources/node.properties6
-rw-r--r--datarouter-node/src/test/java/org/onap/dmaap/datarouter/node/NodeUtilsTest.java2
-rw-r--r--datarouter-node/src/test/resources/node_test.properties6
-rw-r--r--datarouter-node/src/test/resources/org.onap.dmaap-dr-test-cert.jksbin3647 -> 0 bytes
-rw-r--r--datarouter-node/src/test/resources/org.onap.dmaap-dr.jksbin0 -> 3666 bytes
-rw-r--r--datarouter-prov/aaf_certs/org.onap.dmaap-dr.jksbin3647 -> 3668 bytes
-rw-r--r--datarouter-prov/aaf_certs/org.onap.dmaap-dr.keyfile54
-rw-r--r--datarouter-prov/aaf_certs/org.onap.dmaap-dr.trust.jksbin1413 -> 1413 bytes
-rw-r--r--datarouter-prov/src/main/resources/drProvCadi.properties6
-rwxr-xr-xdatarouter-prov/src/main/resources/provserver.properties6
-rw-r--r--datarouter-prov/src/test/resources/integration_test.properties4
-rwxr-xr-xpom.xml2
-rw-r--r--version.properties4
18 files changed, 87 insertions, 83 deletions
diff --git a/datarouter-node/aaf_certs/org.onap.dmaap-dr.jks b/datarouter-node/aaf_certs/org.onap.dmaap-dr.jks
index 2320dc9f..bcbbe999 100644
--- a/datarouter-node/aaf_certs/org.onap.dmaap-dr.jks
+++ b/datarouter-node/aaf_certs/org.onap.dmaap-dr.jks
Binary files differ
diff --git a/datarouter-node/aaf_certs/org.onap.dmaap-dr.keyfile b/datarouter-node/aaf_certs/org.onap.dmaap-dr.keyfile
index 0d187ccf..fc9bdf31 100644
--- a/datarouter-node/aaf_certs/org.onap.dmaap-dr.keyfile
+++ b/datarouter-node/aaf_certs/org.onap.dmaap-dr.keyfile
@@ -1,27 +1,27 @@
-6-tNRI8kimOFIXwcTbENGrkJzim1NFAcA4iRrbWVSteGmgX0-RzgwYEy4wnNju7jlOUfRVKqJSYL
-0qcHP1Z9AbX_K5zqJ2CATFO_0tlvNbocvoh6IecTlvL6V00hlVzP1JjCedUN0cO13TSnc4_NpWWj
-nVZ9EaFQTmFL0NiYj-TPqRolhnQCIMDruBI6ImOIrnWxIcOEpH_6zmivzHhzRVbKVRNFEDq_F5J9
-fp2P3PXrYWU7rglKQtWcJpo3kMyC65zoPNVc-gMr4pfnpTTqzim5vVQyv-9w0QSwzvpKaydWPkm8
-E-kTotAQJ7r843U67U16-JTVb4n-7NummoNwshHo60BUb2xZd418VnIURD79QWt1zzOVFIs5f_LB
-pebds0dtdL_cPGzuY23Z4SBWU2LTihziJDzYCIo-6PIL5-XeWqkwBrLRcy9-JffHYbaNVCf9g0Ml
-cbnteUjuET-ea2-M-d1PwOIIr_ziU3UpMClQJ1GRZEuy4Aco9qJgMUqoJVJfEI_4CdLNVMTRwg1-
-T81PoIf0nN_cje8pQlu3LX_B0oozdJd5yfGqsM021jsXPs0uJ5KuLPHP8NvY_uDqaqANXRUEG2ke
-d57X6nF2CXcXXFKO0cf8-L35UrzbYgaZt5XsPP_sDl4WkKqJxKjREvrzjE4DXHfwrGqCMg7E767O
-y9-uPF5SpfgUer8jtQcFlREAl050CwMzv90TBb2UqM3Ydi6qq80miKBqXVbKMgqdBs7qIVxXLm43
-TR-krMmMnimWBI6SVxEFREXnzHePItLazefHwZTqn7_0Tu_WPqZltLIKo_waKV57nrnH3EJtd7lu
-GI5vIp46XQ6k-5LHOkfibKmImEKl19pFUvJehEjgVE6C3_2RnEmpG3T779_KJZKEy1sMqrud2QPX
-2rZPnfEJEaEkYW8jibKwZtNQ0HpRarg1sc0p4mrl6dGGqLbdPBSsxLdAkm9gLRKkMPsS_gtfjjWZ
-oPmUydEHu2fhUOjqsADpa76QSlPsun2-aL1CEiUAwzow9e68gxmnMQz02rc_cXElhskH2dDPod2w
-h2c6PfVkji5rvk-nDFJQ0MwMbpl1ctSI4_gZU4j_OD6nSh4RbXgC4wwzfqAGe_A-9UNq2bkmC1BA
-CDzjZXZRtZTCjgyaAH9yt6bsGTNxCfqD_OiRv7rQrO0yy-o4kGTidlW9Xwk_THgVn9-hF76JiDc-
-bw9DxTzJwQxHxrg7JNicFbpXP071rdaXRrXWxUQ7X7ZRWrZuCJ87qhOqfd3iE2VylI3vwEaqrDGD
-AULLczDd50X594-_pN8bCW_Nya5vjvRWNZmv1Uh0_YtbmotCj4Fz9vlTs5bIbfnyUp5sCk7jZZrv
-RGGFTU3mwa7jq-0uzY-jYdosDyU2PXMI0WZsSiSF08g_K7y0nnoSEa9kPtOWPTcotEXsTeZ5cgpj
-Bufi_U1SoW-kKG5-eyNDbputpvEFy00zrcSj3U8A6m2YkCxRQ7m_s9wnISiwVdVKuSCQ08MvyOrs
-10a3HHPB7T1BDA6sPVpDrGBjq7piVDQZvEgA9CGIrcyHrRR8_96DGKbMboUaY9vNG2NBJc7zcBRw
-AHs6cc-LKxB1mMUPNJZHxDNQOCk_nnbzGSG2AWppZHEmTpmB0tg0ZM03aqDrGgOK07xREZSZaAMY
-TmVNJSgEIOA2mEDoP2qOHdT5eQmn7xK34HSWJBKR6l1N30K626oomF70DVgqRSqkSZ0rhDBZzNzy
-VlZ4hG_ZZCJOcm_AUShWOsS6JJ11s23uJKkZQeaTZCWc0KVqhtWbKTE8CVyRzm1XcyRONdJVnvXN
-P4ANxGMzsaRZDC31gJYbSirZoTobLQ5OZxgNaNY9cBsEuK6r3sznPORG98d9y33x4Xa5HUedrHju
-HxAAADMCZwK0ITdWPPsk9lsag-tNor16nfLXj20y2JdLaZfx2PnluQjCitwskuZhTcWmHRZ0Ry7t
-ZxfxCSh5IOnAowFu1G2t0RiooKh4v26wOLTCzFiV0ZSmw1VSflkabxsIY9K2rh4-24QwQaAt \ No newline at end of file
+6_5dED7IASSWN0rg5BJESs9Gt1hnaAmDl-6zKnCSARoF1nqf8yblyPHB739Iyq_gc_8z7wOHM730
+fhFaXVKNpqQBghl-wC-gRmtFBQYZA30qvz0tk2Z13bBXa5w7yrjFC4m3sAYi2x6INZ_K3PVhDALY
+Uzh3t3WwHd-_reZJvQaYlwhlTZ9A6KB6Emryj2AJzu-FcZl-qQkXZ2Yc3yVjkKspYLUfjl7g6odn
+XGrfrlXFxhv_b3cq7KQOKFf7UedTsVVMZAEdXRc5TlV5Zahy_j7Ra6TyTQJSIAhhAS2hQAfBUt0V
+aJTlNkx9U7XNOSZVo4-rlHgmkKyyGJi-out1mSZZSstCK4zroY523GOI_B_FDVUnFuLNuQgMRiob
+lw3X8NF4KDERbv1RGtsBWj94GeP2t9Qm9n8sBa0jprD48kz0e2wfUIH9AcDxbYhaMiYdu5VNRNLQ
+090Sd0VNZ4-R73-CnQHaCVHtIFbLA5rs-1fVpwK3Bk947o4pVdZyqkO2pyiFDZksUzrrq9E6TkeT
+Oyn_5QRGtjlZ7r-324WYhSrvYXO-p9_LdujC-L4c-FRK7B_xAoiEN95gq6XbCRzEOjov1hl09VIO
+rnFaXZs0BBhfieDyYMCthe4pbmm1ri_c7JUrxUo7f3lYSKjMaytGJRFx704Mb0D4eF0-TP07czuj
+N3G6UxFcHlLA_5RTLCiiwvktruy9q9hl2Aqe_Bf-0NT7LBX5WDvbsb0A-4ZSBp-iiQbCSZ0WfATF
+nrosqjLGM76AsPIi7eG6X9CapI9hjJpE5ZX9B3drpXXslXaNDZBwdwiirkm1M3TyTb1vt9xbXLlD
+Ubz5fKBWSsW3-4GvDiDKZNAiBijaou5vvZ0CV-dVcAPtD_U8csL3K8DmrIrjckgjgI8bToO1okiS
+Sjz61qa3EZtH8WYC9CIZgxmnw0Z6ruY7728hxRpFI4an5fupQJpEBfp3qeZHn9VgWmFoBR4-B18a
+cp0xD0SkMVJnTv31Qgm1HbMmKU7FtolZ1Lcc5CBJMByqlVR30OWL0NYwFgb_WN-szoPll-DwgZNk
+POeMUOW5hORHiSmYUfqZfZ57IIdDabi5uOECozX9NU3S327QxHnc5IMYgYDkCMLnvghatRUlPgBQ
+Wnj2mZUwE2g6UIuNiFM1c-t_LemRFD9s5JV3rcNI9GNP_CsxWSCh2tIm7Y-3YOuFB8l7QUnK4n8r
+AlCcwJWxuSXljbQxv3NqjvWm_t9ADE_OMSKSX_5NetNX-sQtz7IvX2scJ6yL3Wzm1FvYGOb7cL8b
+qTPQ5bbovMMxGXYl6zKyZuQV0xGk6c3loX_7CLB8o89mtO50Vs0bPbps07dt9OIMcuPBxPPnSc01
+7lMa0kf_kiW0sCjRCJK9685ZJWK1YVdXuHAbiWtkpmNK81Ks0G1-H25wCgBSJUlqq1-8F1aazs3s
+lcOzAj1qXLfpbp0QZ916pzUU6P2USt7oF1vrUuNEslCk5oMymYMLX-miz0MNG3gUboCMAXKvBJPF
+FIg29T9v_tPsvoyGy_Tsqhg0CXq7BVvh-AQ-UFxbmZw78EWLwC7y0cUlaVjKo7Ubog3cKmS7K7O6
+OJs6ZdJGjOHcqZNxtoi08ZiP8y21pOyROhcgYtWi4zOA1ZgYKKNBO8xa2DSXSH0p-zxlS1uuEBLj
+G1Y1CxHYmuTXIE45ZEse7waa8SOA8rbUkeFFAvNy1_xYFYLfNjiF5t_sEOMVkSeushDmK39X3nGN
+YJr-_SkLAq7NdRKxGQhQqjy9QkdbLLm8go_8wcpH4kQEAhKF99mciEAnKht8a_paF1gVGxMetK4_
+3zJZ6roaflVDLrCs8BqbS5_4l3WxR02mVjT2seQjDoxIYeF8Lfg0IVoThCPryRphc0jMidXzx-40
+QhryIOMNx569-5BSFAQz2xdNtuqKI_PnGN-S23YRfDM-3vcpjhOyfShKK3nk68PNEzIgjrYBWqrj
+x8cLP7_BxbIq27iQXzavpB2bRMYETZ8ZTucEYWLAGZLX3roaxz8xLiHFf_TO6lEhCE7_ISs4 \ No newline at end of file
diff --git a/datarouter-node/aaf_certs/org.onap.dmaap-dr.trust.jks b/datarouter-node/aaf_certs/org.onap.dmaap-dr.trust.jks
index 808c1b92..0e384957 100644
--- a/datarouter-node/aaf_certs/org.onap.dmaap-dr.trust.jks
+++ b/datarouter-node/aaf_certs/org.onap.dmaap-dr.trust.jks
Binary files differ
diff --git a/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/NodeUtils.java b/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/NodeUtils.java
index d4fc7dbe..37e5db60 100644
--- a/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/NodeUtils.java
+++ b/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/NodeUtils.java
@@ -47,6 +47,9 @@ import java.util.Enumeration;
import java.util.TimeZone;
import java.util.UUID;
import java.util.zip.GZIPInputStream;
+import javax.naming.InvalidNameException;
+import javax.naming.ldap.LdapName;
+import javax.naming.ldap.Rdn;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.codec.binary.Base64;
@@ -315,15 +318,16 @@ public class NodeUtils {
X509Certificate cert = (X509Certificate) ks.getCertificate(alias);
if (cert != null) {
String subject = cert.getSubjectX500Principal().getName();
- String[] parts = subject.split(",");
- if (parts.length < 1) {
- return null;
+ try {
+ LdapName ln = new LdapName(subject);
+ for (Rdn rdn : ln.getRdns()) {
+ if (rdn.getType().equalsIgnoreCase("CN")) {
+ return rdn.getValue().toString();
+ }
+ }
+ } catch (InvalidNameException e) {
+ eelfLogger.error("No valid CN not found for dr-node cert", e);
}
- subject = parts[5].trim();
- if (!subject.startsWith("CN=")) {
- return null;
- }
- return subject.substring(3);
}
}
return null;
diff --git a/datarouter-node/src/main/resources/drNodeCadi.properties b/datarouter-node/src/main/resources/drNodeCadi.properties
index 8dfcab1c..b94f6cfa 100644
--- a/datarouter-node/src/main/resources/drNodeCadi.properties
+++ b/datarouter-node/src/main/resources/drNodeCadi.properties
@@ -1,11 +1,11 @@
cadi_x509_issuers=CN=intermediateCA_1, OU=OSAAF, O=ONAP, C=US:CN=intermediateCA_7, OU=OSAAF, O=ONAP, C=US:CN=intermediateCA_9, OU=OSAAF, O=ONAP, C=US
cadi_keyfile=/opt/app/datartr/aaf_certs/org.onap.dmaap-dr.keyfile
cadi_keystore=/opt/app/datartr/aaf_certs/org.onap.dmaap-dr.jks
-cadi_keystore_password=]3V)($O&.Mv]W{f8^]6SxGNL
-cadi_key_password=]3V)($O&.Mv]W{f8^]6SxGNL
+cadi_keystore_password=[V7pj(U*?Jzpsl0aZP?3hS;?
+cadi_key_password=[V7pj(U*?Jzpsl0aZP?3hS;?
cadi_alias=dmaap-dr-node@dmaap-dr.onap.org
cadi_truststore=/opt/app/datartr/aaf_certs/org.onap.dmaap-dr.trust.jks
-cadi_truststore_password=(Rd,&{]%ePdp}4JZjqoJ2G+g
+cadi_truststore_password=jH+{FIhNOX+tl:I7:dnJT($3
aaf_env=DEV
aaf_locate_url=https://aaf-onap-test.osaaf.org:8095
diff --git a/datarouter-node/src/main/resources/node.properties b/datarouter-node/src/main/resources/node.properties
index 7c076359..5a669eca 100644
--- a/datarouter-node/src/main/resources/node.properties
+++ b/datarouter-node/src/main/resources/node.properties
@@ -63,10 +63,10 @@ KeyStoreType = jks
KeyStoreFile = /opt/app/datartr/aaf_certs/org.onap.dmaap-dr.jks
#
# The password for the https keystore
-KeyStorePassword=WGxd2P6MDo*Bi4+UdzWs{?$8
+KeyStorePassword=[V7pj(U*?Jzpsl0aZP?3hS;?
#
# The password for the private key in the https keystore
-KeyPassword=WGxd2P6MDo*Bi4+UdzWs{?$8
+KeyPassword=[V7pj(U*?Jzpsl0aZP?3hS;?
#
# The type of truststore for https
TrustStoreType = jks
@@ -75,7 +75,7 @@ TrustStoreType = jks
TrustStoreFile = /opt/app/datartr/aaf_certs/org.onap.dmaap-dr.trust.jks
#
# The password for the https truststore
-TrustStorePassword=)OBvCd{e{aWq.^mJJdX:S:1&
+TrustStorePassword=jH+{FIhNOX+tl:I7:dnJT($3
#
# The path to the file used to trigger an orderly shutdown
QuiesceFile = etc/SHUTDOWN
diff --git a/datarouter-node/src/test/java/org/onap/dmaap/datarouter/node/NodeUtilsTest.java b/datarouter-node/src/test/java/org/onap/dmaap/datarouter/node/NodeUtilsTest.java
index 2d87b8b9..2b64c013 100644
--- a/datarouter-node/src/test/java/org/onap/dmaap/datarouter/node/NodeUtilsTest.java
+++ b/datarouter-node/src/test/java/org/onap/dmaap/datarouter/node/NodeUtilsTest.java
@@ -79,7 +79,7 @@ public class NodeUtilsTest {
@Test
public void Given_Get_CanonicalName_Called_Valid_CN_Returned() {
- String canonicalName = NodeUtils.getCanonicalName("jks", "src/test/resources/org.onap.dmaap-dr-test-cert.jks", "WGxd2P6MDo*Bi4+UdzWs{?$8");
+ String canonicalName = NodeUtils.getCanonicalName("jks", "src/test/resources/org.onap.dmaap-dr.jks", "[V7pj(U*?Jzpsl0aZP?3hS;?");
Assert.assertEquals("dmaap-dr-node", canonicalName);
}
}
diff --git a/datarouter-node/src/test/resources/node_test.properties b/datarouter-node/src/test/resources/node_test.properties
index 9e0cd994..a4f1cbd2 100644
--- a/datarouter-node/src/test/resources/node_test.properties
+++ b/datarouter-node/src/test/resources/node_test.properties
@@ -63,10 +63,10 @@ KeyStoreType = jks
KeyStoreFile = aaf_certs/org.onap.dmaap-dr.jks
#
# The password for the https keystore
-KeyStorePassword=WGxd2P6MDo*Bi4+UdzWs{?$8
+KeyStorePassword=[V7pj(U*?Jzpsl0aZP?3hS;?
#
# The password for the private key in the https keystore
-KeyPassword=WGxd2P6MDo*Bi4+UdzWs{?$8
+KeyPassword=[V7pj(U*?Jzpsl0aZP?3hS;?
#
# The type of truststore for https
TrustStoreType = jks
@@ -75,7 +75,7 @@ TrustStoreType = jks
TrustStoreFile = aaf_certs/org.onap.dmaap-dr.trust.jks
#
# The password for the https truststore
-TrustStorePassword=)OBvCd{e{aWq.^mJJdX:S:1&
+TrustStorePassword=jH+{FIhNOX+tl:I7:dnJT($3
#
# The path to the file used to trigger an orderly shutdown
QuiesceFile = etc/SHUTDOWN
diff --git a/datarouter-node/src/test/resources/org.onap.dmaap-dr-test-cert.jks b/datarouter-node/src/test/resources/org.onap.dmaap-dr-test-cert.jks
deleted file mode 100644
index 2320dc9f..00000000
--- a/datarouter-node/src/test/resources/org.onap.dmaap-dr-test-cert.jks
+++ /dev/null
Binary files differ
diff --git a/datarouter-node/src/test/resources/org.onap.dmaap-dr.jks b/datarouter-node/src/test/resources/org.onap.dmaap-dr.jks
new file mode 100644
index 00000000..bcbbe999
--- /dev/null
+++ b/datarouter-node/src/test/resources/org.onap.dmaap-dr.jks
Binary files differ
diff --git a/datarouter-prov/aaf_certs/org.onap.dmaap-dr.jks b/datarouter-prov/aaf_certs/org.onap.dmaap-dr.jks
index 17027970..a3c2fa3a 100644
--- a/datarouter-prov/aaf_certs/org.onap.dmaap-dr.jks
+++ b/datarouter-prov/aaf_certs/org.onap.dmaap-dr.jks
Binary files differ
diff --git a/datarouter-prov/aaf_certs/org.onap.dmaap-dr.keyfile b/datarouter-prov/aaf_certs/org.onap.dmaap-dr.keyfile
index 59f161f9..d46a8757 100644
--- a/datarouter-prov/aaf_certs/org.onap.dmaap-dr.keyfile
+++ b/datarouter-prov/aaf_certs/org.onap.dmaap-dr.keyfile
@@ -1,27 +1,27 @@
-XzAbZ4lSt3j0vgqonk1lGgt_2IvBzet-MDbt7nlxdj5vrQbUBET9eqIfjRBMlen0E815nYm6nRBi
-RR2fUKzqO8JIn2s19e3fmYrp9wTbIkY9GXOzsnuSeyRxVxxW-82VrAD-gSBmqUEJvPjqjVWinadL
-LVy1h9lE35EErQkBpK_GmqVp2RajjXv8N_5LcKkkc4vYJQ8WclOHwN_BnQpNS1NLBWJVXSPeVwjM
-zIkQ10Q6GGEGCurBPLef9UiXD73oVnQsVyZY3E87X7RbDfCiVbfmHN1hyVkR3DX6gDfrfjTnqkqE
-Hv7kw43qXx9-aRCHrqnmaGYBTscU5JgxTNpqe5hvxLJHnDwLTtHDx-vES0PljekcofQVT5pWJvRK
-ltZtPQwuGlapONa_rDuMq3sSDx8gXKE01rjK0bNDurIPvFzyef0RoDYIc3m4M-KdsBMlnE7oyBAz
-OXCPt42HLJX55F9boRIWwSy-8o3AsPXwQTwEKoD7ZUL4pZ2Zf45npfQLlhhs5x_ERcPTrOXrF7Uu
-40HxQnMbwO_Ofz7CrlKe78UImSJbsQp0heyBbr6irHrMq6_E1DqbjWafs_a4kKNbtfN4fHHvxkA0
-9J_plrqVOoBqFaeUc9MJt_6WBYq2vDFbHSvBf9QZKnaVZ3aKU2MzV2Y5xjw7V6rgDQHwmXXeAmfV
--Z3JT5ocQhyG4SqyKhSrzh4nGOMt51yy68hPPHMrYnpW8VF99qTLqSmQfLAeNqog413Efj75oQDW
-JLw1BR56ABvCPdcR5wZruo2Egwak1UyiRL0Mjd8txrjc4uojiiqddqalEQrORvn4BgP0OKQOOdUx
-dArQ4HqjBGwvurQUM0XjBvyqki1h1pxhSNeuyOY3mofVB2NNi-ZvSHHUpwqIgQ4kVLombpsKw2W9
-AW-3h4cLYl3LgP_LRH5mS8Mo_BEKZqivM9v9YYVZCgB2Djqyn3MQXpcFSxaB1AK9wG4TmMneFP7W
-_dHqJnx26njAtff1y2ud8cmW_UGgzMb33QGIjIrYo3AVX8_G8iEQ-838fDpGE7BdqLSam-BMoeo3
-WPht7-O8gx7utuYx1ceCetunKRmh3Tfga_0srBNDWMyzuiPvbLX3oUJO_F5p5734Qwm5CeqCAaJv
-sU_yfzTgUPqS6jC9cuKi54h3HrzV-k7DcSdGrpsAgzYZdHwi7XFfAzFOhkpBeNUNzDCX8B7yTHjU
-dKdGDezdgs7lMWbJwnSNFDyTwbZdk4XTnSrtdhmOZp4oVizEQgha0Un0ISKQ519kajTFj1rZV6ue
-h8SzN4QXOw6BHYB5rsy8YEvWbkfyneQ74HeyeWRRq3p4UdBTTUn2JbGM0neErRrxnYvmKIdFlSsU
-NlEgNf7dh_kqdWUBkXfud32ftazttjmiO4zkqBupsJTlxj9Tjam9aZqNhunPNI9znf4luKAiRa3v
-26giSwRUX8mjlK5FvBNUbLeFM-G3Pk2jQej13q1lZ3PZMesLjUwvvMIdlu9qmDx_TCYSy72-6O2A
-qmPlUeYCKgI8eVaZV79aM6YtomaopHiPCcyJGWl114Ke4j8H3-Lg3EkjfVROwQw_fKn2z4Eci7io
-LetFQnibRw2ow-Z0F-Db3kuEuRTgmb6U0pMUO3njou6Sq7oa_gaND0XYHy6MKGu1uJ9aKVLZ9uy4
-m9KRxZvq71LRJkD84y9bMv14lxzUsosuzbXV7Q_uz8kceWSq_1BLXQXam9j5rxN6SKEk_Rn0jgnX
-h4A4e7q6loMXUq4nPSVII9K6pHAqfi1sDLhVZ239XcLBwKY9R5f0jgYy76AI1dN-_oEMdXJf_L6w
-KuRJ4jy0XSfyV_QvS6at77san2UIOkdY_tuI03Ps3fTzSaztsy5yX22t-6TnkFSoYxGkuMw9R-Rn
-ZwJIanS3v_wQbgNdUB6JIlE_9kkHYCokheldHkKndV8eEc6Z6bgasNWKB3PreI1m6UrfZI3agd-n
-zhsQppGFk8j7Tkq4S_9SP1OFVCgCT3-mU0UhPhDhCFPM1bladfj8RptCbPKO66evW1c_ooU2 \ No newline at end of file
+bxVb25V71S7Mc0br6UCv__tc5dIqGYSVJ3ocHHFBu55M2zVnOa53_9jWS-CHpVT1BRZx8EbShdtq
+rfCwuzEoHb95jxrLVBZ6jAyYUtL2-rYE301pGrw9QiTfy9kyBYUkl02VIJX5vNj6aak19AbbwMvN
+CK_rc0w0v99Ladt3DeSRZyEF6O3-GsXAMlSJireBJc_u8fcUCVeHmqhlHr2PbqkJ8-xFUdgxKAGF
+wggbb89k9tnIWuom_XrNAuDx6s6W2L3Ftc_Klag2d7qR7oMmtGZ1vPiohCLgn6SN2r6pbNOT8ytb
+uidOlZtiwleV-FJxPCoNBaAhtH9_bXqR-sNstVkJSfpyUTApUCUuz8nZa0YDO04XeRGm8nODQplu
+ePrp6mMnXWYAw7yoMoi8FI9q4xHtFUAWfAbpc9tmyRWkSOvU930qermoypRHKultHjBXQguH5pP7
+p4V83Qffmp-32LW_pTdwb_0YgcnVBsBcCK40xQi1rYz2MSOzJ3Eh9zn-cenM8FkIpPueupcQZRhr
+iIISIDfr7C3n6vsQO7Sfcprcrl6m5eKuX_2M9-dHlwbxiL_UR4Ywy6ybDTXKRb1pRUirYAfiKMP9
+LBmng-HgP_0o5ZUFA5pJynyWPsWXwkxBH3mIhyik-ZamN8MvYTNzC89aOS3K8DRaUXaM0avL-Sh3
+izSjbNSD7CIJnGu2yEQc1oeROB57fngJiCNX5UT3s3Imep07Zn3hcCLnO73pP3G8bECiDpiWMnRU
+gx0Tpnz-GaZNiIRBolD7X0lsrwWePuwyeEQ30K6qwFlJ0aJf1n7I8lQJOhpNLoV09tyrage5dw5r
+GuTfaUHkcmNKxWSCTddWKtV3oXtHRMcx--FY-VsnpP8CE4rXHP-XYWNgRd6EkWYlJRQlgY5gBwHc
+pFdmWbsMNJK7Ucn6-8gl-SBbC-nKTcmClDoN-Fyf-kKDzPySkh1gLrgvXCoZV7yWeFsVIMWpVxg8
+_Gt1TJ3WQJ4Z89-5aiCC6IPThUC0Q9X54ez4YoaIk80YlR-R2d4f8igpdZxaDmdrwxmF1a1VELKu
+IMSuyulmWXR01_9cxPM65SKG_ye6PL1LUoG8bJ8Wes5fu3kkmpt6_4b-NzbhJ3MRQGU1iIfwNiha
+zJ0uXQdfreek61i2OUKoh7zPcr7hYkSK0ViHirHXb9TCbnAI363oaieIvOhvBxnbFmyVcMzxYdBM
+PszMntzpwd0Xcc8s3o3_zmnHOSP_B2fvXI511C7I4ixHec0y_3I8magBXQJO42hH9FsfEHKtJ1ip
+hs8mZr0XNu3uEzqQ1M4ryurvMaFaXj6nYvJWxmMoHMVp1QbsITrqzwD0qHDaNEVz_enHLoDB9X9G
+1dXAF455EATw23nQ9LXybNnjxsPG2Iowrhpf1xQhTQaDrUtm95XHtxFEAcNEerOP93dV0i7PRkL8
+_703_pQPrRBmJUS_N8JkepGjxmXYXUujqAw6x5S5AZV9NhIhSOzynFOMPZvjx6kKy4biLfoNeB9y
+vcy2nAhLaV1ULYEAlNdMuYb4Mqd0QkVHOo-nyB6yChqybWIaDIjLUH0C-tH0DQIE_V7fncOiSnn-
+lRKZRiCgMLGSXPOQy9UYoPMl6uWFPVe5FRSadC8ufIWDJeo_rPrAMdqygO_Dkf53fUzL89ZWI3oA
+zq-adA5w2MilymddeS3TVURyk_-50L5JqbaYJknkAbVQksFtrpweN3yRV30581h5B7QTAYD7jUKN
+-oiZzLpKhKLSuBvZI6Edost16ZrKv0viSXBrCGHgzUd5bPz8N4Y31Epy_aNhSWax2ZeQUYrEdtCi
+uxEm_UIt41RmrkBKO5AMbpUb3GOIPid0fO1tlswBobIadi-a1m50V8G1Wpg2or2YGGA1EmF_uep8
+dI2e78-VCYnN2T9e_F0Cq2SxhrHq4nuA3i7HH_4e5cjEubpgMa_KbsDGFIFmsgJiDbfNKQ7LfFex
+fFqLknleEHpOQpC15yvqVmm9SzjNq05DAn1cVf-4XBTe8W85Bt3aCrDVeXjzmmOpA4CIwmw6 \ No newline at end of file
diff --git a/datarouter-prov/aaf_certs/org.onap.dmaap-dr.trust.jks b/datarouter-prov/aaf_certs/org.onap.dmaap-dr.trust.jks
index 2fe06cd2..d814490f 100644
--- a/datarouter-prov/aaf_certs/org.onap.dmaap-dr.trust.jks
+++ b/datarouter-prov/aaf_certs/org.onap.dmaap-dr.trust.jks
Binary files differ
diff --git a/datarouter-prov/src/main/resources/drProvCadi.properties b/datarouter-prov/src/main/resources/drProvCadi.properties
index 56f2e5c0..f2de9218 100644
--- a/datarouter-prov/src/main/resources/drProvCadi.properties
+++ b/datarouter-prov/src/main/resources/drProvCadi.properties
@@ -1,11 +1,11 @@
cadi_x509_issuers=CN=intermediateCA_1, OU=OSAAF, O=ONAP, C=US:CN=intermediateCA_7, OU=OSAAF, O=ONAP, C=US:CN=intermediateCA_9, OU=OSAAF, O=ONAP, C=US
cadi_keyfile=/opt/app/datartr/aaf_certs/org.onap.dmaap-dr.keyfile
cadi_keystore=/opt/app/datartr/aaf_certs/org.onap.dmaap-dr.jks
-cadi_keystore_password=AT{];bvaDiytVD&oWhMZj0N5
-cadi_key_password=AT{];bvaDiytVD&oWhMZj0N5
+cadi_keystore_password=)OC(*mtYL!1ZJk{sLl3bk?@h
+cadi_key_password=)OC(*mtYL!1ZJk{sLl3bk?@h
cadi_alias=dmaap-dr-prov@dmaap-dr.onap.org
cadi_truststore=/opt/app/datartr/aaf_certs/org.onap.dmaap-dr.trust.jks
-cadi_truststore_password=ljlS@Y}0]{UO(TnwvEWkgJ%]
+cadi_truststore_password=vn$sH1Y8X$so:&9u0zYsz{7c
aaf_env=DEV
aaf_locate_url=https://aaf-onap-test.osaaf.org:8095
diff --git a/datarouter-prov/src/main/resources/provserver.properties b/datarouter-prov/src/main/resources/provserver.properties
index 59b791dc..75857a8f 100755
--- a/datarouter-prov/src/main/resources/provserver.properties
+++ b/datarouter-prov/src/main/resources/provserver.properties
@@ -27,11 +27,11 @@ org.onap.dmaap.datarouter.provserver.https.port = 8443
org.onap.dmaap.datarouter.provserver.https.relaxation = true
org.onap.dmaap.datarouter.provserver.keystore.type = jks
-org.onap.dmaap.datarouter.provserver.keymanager.password = FZNkU,B%NJzcT1v7;^v]M#ZX
+org.onap.dmaap.datarouter.provserver.keymanager.password = )OC(*mtYL!1ZJk{sLl3bk?@h
org.onap.dmaap.datarouter.provserver.keystore.path = /opt/app/datartr/aaf_certs/org.onap.dmaap-dr.jks
-org.onap.dmaap.datarouter.provserver.keystore.password = FZNkU,B%NJzcT1v7;^v]M#ZX
+org.onap.dmaap.datarouter.provserver.keystore.password = )OC(*mtYL!1ZJk{sLl3bk?@h
org.onap.dmaap.datarouter.provserver.truststore.path = /opt/app/datartr/aaf_certs/org.onap.dmaap-dr.trust.jks
-org.onap.dmaap.datarouter.provserver.truststore.password = +mzf@J.D^;3!![*Xr.z$c#?b
+org.onap.dmaap.datarouter.provserver.truststore.password = vn$sH1Y8X$so:&9u0zYsz{7c
org.onap.dmaap.datarouter.provserver.accesslog.dir = /opt/app/datartr/logs
org.onap.dmaap.datarouter.provserver.spooldir = /opt/app/datartr/spool
diff --git a/datarouter-prov/src/test/resources/integration_test.properties b/datarouter-prov/src/test/resources/integration_test.properties
index 9ac1850a..98373246 100644
--- a/datarouter-prov/src/test/resources/integration_test.properties
+++ b/datarouter-prov/src/test/resources/integration_test.properties
@@ -1,5 +1,5 @@
test.keystore=aaf_certs/org.onap.dmaap-dr.jks
-test.kspassword=Qgw77oaQcdP*F8Pwa[&.,.Ab
+test.kspassword=)OC(*mtYL!1ZJk{sLl3bk?@h
test.truststore=aaf_certs/org.onap.dmaap-dr.trust.jks
-test.tspassword=9M?)?:KAj1z6gpLhNrVUG@0T
+test.tspassword=vn$sH1Y8X$so:&9u0zYsz{7c
test.host=https://dmaap-dr-prov:8443 \ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 0e24a373..8cc5cf3e 100755
--- a/pom.xml
+++ b/pom.xml
@@ -36,7 +36,7 @@
</parent>
<properties>
<!--revision must also be set in the version.properties file at project root-->
- <revision>2.1.2-SNAPSHOT</revision>
+ <revision>2.2.0-SNAPSHOT</revision>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
diff --git a/version.properties b/version.properties
index 44a1614c..2a39d41b 100644
--- a/version.properties
+++ b/version.properties
@@ -26,8 +26,8 @@
# because they are used in Jenkins, whose plug-in doesn't support
major=2
-minor=1
-patch=2
+minor=2
+patch=0
base_version=${major}.${minor}.${patch}