Merge "Change guard pdp rest to new api"

diff --git a/controlloop/common/database/pom.xml b/controlloop/common/database/pom.xml
index b2b07da..e078de9 100644 (file)
--- a/controlloop/common/database/pom.xml
+++ b/controlloop/common/database/pom.xml
@@ -33,10 +33,12 @@
       <groupId>com.att.research.xacml</groupId>
       <artifactId>xacml-pdp</artifactId>
       <version>2.0.1</version>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.projectlombok</groupId>
       <artifactId>lombok</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>junit</groupId>

diff --git a/controlloop/common/eventmanager/pom.xml b/controlloop/common/eventmanager/pom.xml
index fb18945..ab62bf7 100644 (file)
--- a/controlloop/common/eventmanager/pom.xml
+++ b/controlloop/common/eventmanager/pom.xml
@@ -88,7 +88,6 @@
       <groupId>org.onap.policy.drools-applications.controlloop.common</groupId>
       <artifactId>database</artifactId>
       <version>${project.version}</version>
-      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.onap.policy.drools-applications.controlloop.common</groupId>

diff --git a/controlloop/common/feature-controlloop-management/src/main/feature/config/controlloop.properties.environment b/controlloop/common/feature-controlloop-management/src/main/feature/config/controlloop.properties.environment
index 1ff627f..dba0d20 100644 (file)
--- a/controlloop/common/feature-controlloop-management/src/main/feature/config/controlloop.properties.environment
+++ b/controlloop/common/feature-controlloop-management/src/main/feature/config/controlloop.properties.environment
@@ -45,8 +45,8 @@ pdpx.environment=${env:PDP_ENVIRONMENT}
 pdpx.client.username=${env:PDP_CLIENT_USERNAME}
 pdpx.client.password=${env:PDP_CLIENT_PASSWORD}
 
-guard.url=https://${env:PDP_HOST}:8081/pdp/api/getDecision
-guard.jdbc.url=jdbc:mariadb://${env:SQL_HOST}:3306/onap_sdk
+guard.url=https://${env:PDP_HOST}:6969/policy/pdpx/v1/decision
+guard.jdbc.url=jdbc:mariadb://${env:SQL_HOST}:3306/operationshistory
 guard.disabled=false
 
 sdnc.url=${env:SDNC_URL}