From 45bea5f11e5db90f54525425099d649fe939e1df Mon Sep 17 00:00:00 2001 From: ChrisC Date: Fri, 29 Mar 2019 10:50:49 +0100 Subject: Update cadi for Casablanca Updated cadi params and uplift aaf to casablanca release official Issue-ID: CLAMP-335 Change-Id: Ib83fdf9f6f1a8d4dee6f5a0996c170ee63f5ab58 Signed-off-by: ChrisC --- pom.xml | 2 +- src/main/resources/application.properties | 6 +++--- src/main/resources/clds/aaf/truststoreONAPall.jks | Bin 114865 -> 117990 bytes 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index d2f45218..dca319ad 100644 --- a/pom.xml +++ b/pom.xml @@ -347,7 +347,7 @@ org.onap.aaf.authz aaf-cadi-aaf - 2.1.1 + 2.1.8 javax.servlet diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 66ea64fa..72847635 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -235,8 +235,8 @@ clamp.config.security.permission.instance=dev #AAF related parameters clamp.config.cadi.keyFile=classpath:/clds/aaf/org.onap.clamp.keyfile clamp.config.cadi.cadiLoglevel=DEBUG -clamp.config.cadi.cadiLatitude=37.78187 -clamp.config.cadi.cadiLongitude=-122.26147 +clamp.config.cadi.cadiLatitude=10 +clamp.config.cadi.cadiLongitude=10 clamp.config.cadi.aafLocateUrl=https://aaf.api.simpledemo.onap.org:8095 clamp.config.cadi.cadiKeystorePassword=enc:V_kq_EwDNb4itWp_lYfDGXIWJzemHGkhkZOxAQI9IHs clamp.config.cadi.cadiTruststorePassword=enc:Mj0YQqNCUKbKq2lPp1kTFQWeqLxaBXKNwd5F1yB1ukf @@ -244,4 +244,4 @@ clamp.config.cadi.cadiTruststorePassword=enc:Mj0YQqNCUKbKq2lPp1kTFQWeqLxaBXKNwd5 #clamp.config.cadi.oauthIntrospectUrll=https://AAF_LOCATE_URL/AAF_NS.introspect:2.0/introspect clamp.config.cadi.aafEnv=DEV clamp.config.cadi.aafUrl=https://AAF_LOCATE_URL/AAF_NS.service:2.0 -clamp.config.cadi.cadiX509Issuers=CN=intermediateCA_1, OU=OSAAF, O=ONAP, C=US +clamp.config.cadi.cadiX509Issuers=CN=intermediateCA_9, OU=OSAAF, O=ONAP, C=US diff --git a/src/main/resources/clds/aaf/truststoreONAPall.jks b/src/main/resources/clds/aaf/truststoreONAPall.jks index 2da1dcc4..ff844b10 100644 Binary files a/src/main/resources/clds/aaf/truststoreONAPall.jks and b/src/main/resources/clds/aaf/truststoreONAPall.jks differ -- cgit 1.2.3-korg