From 3faa8aca6318c00e77282b33c59c90676e4223ec Mon Sep 17 00:00:00 2001 From: Jimmy Forsyth Date: Tue, 9 Oct 2018 09:47:16 -0400 Subject: Update io.netty to latest Issue-ID: AAI-1720 Change-Id: I0b3d1f4fe869f3547f3c62f694db5d59d8689f27 Signed-off-by: Jimmy Forsyth (cherry picked from commit c82cff45945304de3928845f417dc5ea7c0abc71) --- aai-resources/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aai-resources/pom.xml b/aai-resources/pom.xml index 2631a48..a8ed984 100644 --- a/aai-resources/pom.xml +++ b/aai-resources/pom.xml @@ -129,7 +129,7 @@ 4.3.18.RELEASE 4.1.9.Final - 4.0.37.Final + 4.0.56.Final 4.3.6.RELEASE -- cgit 1.2.3-korg From b1653a4d0e8dda23ceae599cd4f185746a0c7161 Mon Sep 17 00:00:00 2001 From: Jimmy Forsyth Date: Fri, 12 Oct 2018 19:32:16 -0400 Subject: Set AAF version to 2.1.4-SNAPSHOT Issue-ID: AAI-1752 Change-Id: I8d647fa4ac2c7d77fcfc9ae8338484d50e2abac7 Signed-off-by: Jimmy Forsyth --- aai-resources/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aai-resources/pom.xml b/aai-resources/pom.xml index a8ed984..4fa5525 100644 --- a/aai-resources/pom.xml +++ b/aai-resources/pom.xml @@ -70,7 +70,7 @@ 1.2.3 2.0.0.0 4.12 - 2.1.2 + 2.1.4-SNAPSHOT 2.7.8 19.0 0.2.0 -- cgit 1.2.3-korg From 615d1f45b5733409d6ba4f630e01376aecb6e944 Mon Sep 17 00:00:00 2001 From: Pavel Paroulek Date: Mon, 15 Oct 2018 20:20:47 +0200 Subject: Adding AAF client legacy credentials Change-Id: I42b414de02a5d4482d8959007715694965b8e8d2 Issue-ID: AAI-32 Signed-off-by: Pavel Paroulek --- .../src/main/resources/aaf/bath_config.csv | 32 ++++++++++++++++++++++ .../src/main/resources/aaf/org.onap.aai.props | 3 +- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 aai-resources/src/main/resources/aaf/bath_config.csv diff --git a/aai-resources/src/main/resources/aaf/bath_config.csv b/aai-resources/src/main/resources/aaf/bath_config.csv new file mode 100644 index 0000000..433b333 --- /dev/null +++ b/aai-resources/src/main/resources/aaf/bath_config.csv @@ -0,0 +1,32 @@ +# AAI -> aai@aai.onap.org +Basic QUFJOkFBSQ==,Basic YWFpQGFhaS5vbmFwLm9yZzpkZW1vMTIzNDU2IQ==,2050-03-03 + +# ModelLoader -> aai@aai.onap.org +Basic TW9kZWxMb2FkZXI6TW9kZWxMb2FkZXI=,Basic YWFpQGFhaS5vbmFwLm9yZzpkZW1vMTIzNDU2IQ==,2050-03-03 + +# AaiUI -> aai@aai.onap.org, +Basic QWFpVUk6QWFpVUk=,Basic YWFpQGFhaS5vbmFwLm9yZzpkZW1vMTIzNDU2IQ==,2050-03-03 + +# MSO -> so@so.onap.org +Basic TVNPOk1TTw==,Basic c29Ac28ub25hcC5vcmc6ZGVtbzEyMzQ1NiE=,2050-03-03 + +# SDNC -> sdnc@sdnc.onap.org +Basic U0ROQzpTRE5D,Basic c2RuY0BzZG5jLm9uYXAub3JnOmRlbW8xMjM0NTYh,2050-03-03 + +# DCAE -> dcae@dcae.onap.org +Basic RENBRTpEQ0FF,Basic ZGNhZUBkY2FlLm9uYXAub3JnOmRlbW8xMjMzNDU2IQ==,2050-03-03 + +# POLICY -> policy@policy.onap.org +Basic UE9MSUNZOlBPTElDWQ==,Basic cG9saWN5QHBvbGljeS5vbmFwLm9yZzpkZW1vMTIzNDU2IQ==,2050-03-03 + +# ASDC -> sdc@sdc.onap.org +Basic QVNEQzpBU0RD,Basic c2RjQHNkYy5vbmFwLm9yZzpkZW1vMTIzNDU2IQ==,2050-03-03 + +# VID -> vid@vid.onap.org +Basic VklEOlZJRA==,Basic dmlkQHZpZC5vbmFwLm9yZzpkZW1vMTIzNDU2IQ==,2050-03-03 + +# APPC -> appc@appc.onap.org +Basic QVBQQzpBUFBD,Basic YXBwY0BhcHBjLm9uYXAub3JnOmRlbW8xMjM0NTYh,2050-03-03 + +# OOF -> oof@oof.onap.org +Basic T09GOk9PRg==,Basic b29mQG9vZi5vbmFwLm9yZzpkZW1vMTIzNDQ2IQ==,2050-03-03 diff --git a/aai-resources/src/main/resources/aaf/org.onap.aai.props b/aai-resources/src/main/resources/aaf/org.onap.aai.props index 70ab2f7..6e683df 100644 --- a/aai-resources/src/main/resources/aaf/org.onap.aai.props +++ b/aai-resources/src/main/resources/aaf/org.onap.aai.props @@ -10,4 +10,5 @@ cadi_keystore_password=enc:383RDJRFA6yQz9AOxUxC1iIg3xTJXityw05MswnpnEtelRQy2D4r5 cadi_alias=aai@aai.onap.org cadi_truststore=aai-resources/src/main/resources/aaf/truststoreONAPall.jks cadi_truststore_password=enc:s77wlnZFoQ08NhnU3OSeWO6uKgRwC6sAK-wTvVubNz2 -cadi_loglevel=INFO \ No newline at end of file +cadi_loglevel=INFO +cadi_bath_convert=aai-resources/src/main/resources/aaf/bath_config.csv -- cgit 1.2.3-korg From 87a727d4266b8217ef319c5b52853355f827ab86 Mon Sep 17 00:00:00 2001 From: Jimmy Forsyth Date: Tue, 16 Oct 2018 09:07:35 -0400 Subject: Set AAF version to 2.1.4 Issue-ID: AAI-1755 Change-Id: I365ea212d04c3745dda4df090acaeacb8eb94488 Signed-off-by: Jimmy Forsyth --- aai-resources/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aai-resources/pom.xml b/aai-resources/pom.xml index 4fa5525..7b8e090 100644 --- a/aai-resources/pom.xml +++ b/aai-resources/pom.xml @@ -70,7 +70,7 @@ 1.2.3 2.0.0.0 4.12 - 2.1.4-SNAPSHOT + 2.1.4 2.7.8 19.0 0.2.0 -- cgit 1.2.3-korg