Merge "Update cadi to 2.1.10 and updated keystore"

diff --combined pom.xml
index e03aead,71c9f29..911ffc6
--- 1/pom.xml
--- 2/pom.xml
+++ b/pom.xml
@@@ -64,8 -64,8 +64,8 @@@
                                <java.version>1.8</java.version>
  
                                <eelf.core.version>1.0.0</eelf.core.version>
 -                              <camel.version>2.22.1</camel.version>
 -                              <springboot.version>2.0.6.RELEASE</springboot.version>
 +                              <camel.version>2.23.1</camel.version>
 +                              <springboot.version>2.1.4.RELEASE</springboot.version>
  
                                <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
                                <sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
@@@ -284,10 -284,6 +284,10 @@@
                                                <version>${tomcat.version}</version>
                                </dependency>
                                <!-- For CAMEL -->
 +                              <dependency>
 +                                      <groupId>org.apache.camel</groupId>
 +                                      <artifactId>camel-http4</artifactId>
 +                              </dependency>
                                <dependency>
                                                <groupId>org.apache.camel</groupId>
                                                <artifactId>camel-spring-boot-starter</artifactId>
@@@ -378,7 -374,7 +378,7 @@@
                                <dependency>
                                        <groupId>org.onap.aaf.authz</groupId>
                                        <artifactId>aaf-cadi-aaf</artifactId>
-                                       <version>2.1.1</version>
+                                       <version>2.1.10</version>
                                        <exclusions>
                                                <exclusion>
                                                        <groupId>javax.servlet</groupId>
@@@ -409,7 -405,6 +409,7 @@@
                                <dependency>
                                                <groupId>com.googlecode.json-simple</groupId>
                                                <artifactId>json-simple</artifactId>
 +                                              <version>1.1.1</version>
                                </dependency>
                                <dependency>
                                                <groupId>org.apache.commons</groupId>

diff --combined src/main/resources/application.properties
index 4792d05,02acf18..b1077d3
--- 1/src/main/resources/application.properties
--- 2/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@@ -58,8 -58,8 +58,8 @@@ server.port=844
  ## Config part for Server certificates
  # Can be a classpath parameter instead of file:/
  server.ssl.key-store=classpath:/clds/aaf/org.onap.clamp.p12
- server.ssl.key-store-password=34xqGdj]VnHothQ]5qCykV3X
- server.ssl.key-password=34xqGdj]VnHothQ]5qCykV3X
+ server.ssl.key-store-password=China in the Spring
+ server.ssl.key-password=China in the Spring
  server.ssl.key-store-type=PKCS12
  server.ssl.key-alias=clamp@clamp.onap.org
  
@@@ -150,7 -150,7 +150,7 @@@ clamp.config.dcae.deployment.template=c
  #
  #
  # Configuration Settings for Policy Engine Components
 -clamp.config.policy.url=http://policy.api.simpledemo.onap.org:8081/pdp/
 +clamp.config.policy.url=http://policy.api.simpledemo.onap.org:8081/policy/api/v1
  clamp.config.policy.userName=test
  clamp.config.policy.password=test
  clamp.config.policy.pdpUrl1=http://policy.api.simpledemo.onap.org:8081/pdp/ , testpdp, alpha123
@@@ -236,8 -236,8 +236,8 @@@ clamp.config.security.authentication.cl
  #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
@@@ -245,4 -245,4 +245,4 @@@
  #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:CN=intermediateCA_1, OU=OSAAF, O=ONAP, C=US