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 <christophe.closset@intl.att.com>

diff --git a/pom.xml b/pom.xml
index d2f4521..dca319a 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -347,7 +347,7 @@
                                <dependency>
                                        <groupId>org.onap.aaf.authz</groupId>
                                        <artifactId>aaf-cadi-aaf</artifactId>
-                                       <version>2.1.1</version>
+                                       <version>2.1.8</version>
                                        <exclusions>
                                                <exclusion>
                                                        <groupId>javax.servlet</groupId>

diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 66ea64f..7284763 100644 (file)
--- 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 2da1dcc..ff844b1 100644 (file)
Binary files a/src/main/resources/clds/aaf/truststoreONAPall.jks and b/src/main/resources/clds/aaf/truststoreONAPall.jks differ