Merge "Upgrade xacml 1.0.2"

diff --combined BRMSGateway/dependency.json
index 6d8c4ff,13533ad..aa7ac81
--- 1/BRMSGateway/dependency.json
--- 2/BRMSGateway/dependency.json
+++ b/BRMSGateway/dependency.json
@@@ -3,124 -3,124 +3,124 @@@
          "default": [{
              "groupId": "org.onap.policy.drools-applications.controlloop.templates",
              "artifactId": "template.demo",
 -            "version": "1.3.1-SNAPSHOT"
 +            "version": "1.4.0-SNAPSHOT"
          }, {
              "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
              "artifactId": "events",
 -            "version": "1.3.1-SNAPSHOT"
 +            "version": "1.4.0-SNAPSHOT"
          }, {
              "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
              "artifactId": "rest",
 -            "version": "1.3.1-SNAPSHOT"
 +            "version": "1.4.0-SNAPSHOT"
          }, {
              "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
              "artifactId": "appc",
 -            "version": "1.3.1-SNAPSHOT"
 +            "version": "1.4.0-SNAPSHOT"
          }, {
              "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
              "artifactId": "aai",
 -            "version": "1.3.1-SNAPSHOT"
 +            "version": "1.4.0-SNAPSHOT"
          }, {
              "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
              "artifactId": "so",
 -            "version": "1.3.1-SNAPSHOT"
 +            "version": "1.4.0-SNAPSHOT"
          }, {
              "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
              "artifactId": "sdnc",
 -            "version": "1.3.1-SNAPSHOT"
 +            "version": "1.4.0-SNAPSHOT"
          }, {
              "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
              "artifactId": "sdnr",
 -            "version": "1.3.1-SNAPSHOT"
 +            "version": "1.4.0-SNAPSHOT"
          }, {
              "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
              "artifactId": "trafficgenerator",
 -            "version": "1.3.1-SNAPSHOT"
 +            "version": "1.4.0-SNAPSHOT"
          }],
          "amsterdam": [{
              "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
              "artifactId": "events",
 -            "version": "1.3.1-SNAPSHOT"
 +            "version": "1.4.0-SNAPSHOT"
          }, {
              "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
              "artifactId": "appc",
 -            "version": "1.3.1-SNAPSHOT"
 +            "version": "1.4.0-SNAPSHOT"
          }, {
              "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
              "artifactId": "appclcm",
 -            "version": "1.3.1-SNAPSHOT"
 +            "version": "1.4.0-SNAPSHOT"
          }, {
              "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
              "artifactId": "vfc",
 -            "version": "1.3.1-SNAPSHOT"
 +            "version": "1.4.0-SNAPSHOT"
          }, {
              "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
              "artifactId": "so",
 -            "version": "1.3.1-SNAPSHOT"
 +            "version": "1.4.0-SNAPSHOT"
          }, {
              "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
              "artifactId": "sdnr",
 -            "version": "1.3.1-SNAPSHOT"
 +            "version": "1.4.0-SNAPSHOT"
          }, {
              "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
              "artifactId": "sdnc",
 -            "version": "1.3.1-SNAPSHOT"
 +            "version": "1.4.0-SNAPSHOT"
          }, {
              "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
              "artifactId": "aai",
 -            "version": "1.3.1-SNAPSHOT"
 +            "version": "1.4.0-SNAPSHOT"
          }, {
              "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
              "artifactId": "sdc",
 -            "version": "1.3.1-SNAPSHOT"
 +            "version": "1.4.0-SNAPSHOT"
          }, {
              "groupId": "org.onap.policy.drools-applications.controlloop.common.model-impl",
              "artifactId": "trafficgenerator",
 -            "version": "1.3.1-SNAPSHOT"
 +            "version": "1.4.0-SNAPSHOT"
          }, {
              "groupId": "org.onap.policy.drools-applications.controlloop.common",
              "artifactId": "eventmanager",
 -            "version": "1.3.1-SNAPSHOT"
 +            "version": "1.4.0-SNAPSHOT"
          }, {
              "groupId": "org.onap.policy.drools-applications.controlloop.common",
              "artifactId": "guard",
 -            "version": "1.3.1-SNAPSHOT"
 +            "version": "1.4.0-SNAPSHOT"
          }, {
              "groupId": "org.onap.policy.drools-applications.controlloop.common.actors",
              "artifactId": "actorServiceProvider",
 -            "version": "1.3.1-SNAPSHOT"
 +            "version": "1.4.0-SNAPSHOT"
          }, {
              "groupId": "org.onap.policy.drools-applications.controlloop.common.actors",
              "artifactId": "actor.appc",
 -            "version": "1.3.1-SNAPSHOT"
 +            "version": "1.4.0-SNAPSHOT"
          }, {
              "groupId": "org.onap.policy.drools-applications.controlloop.common.actors",
              "artifactId": "actor.appclcm",
 -            "version": "1.3.1-SNAPSHOT"
 +            "version": "1.4.0-SNAPSHOT"
          }, {
              "groupId": "org.onap.policy.drools-applications.controlloop.common.actors",
              "artifactId": "actor.so",
 -            "version": "1.3.1-SNAPSHOT"
 +            "version": "1.4.0-SNAPSHOT"
          }, {
              "groupId": "org.onap.policy.drools-applications.controlloop.common.actors",
              "artifactId": "actor.sdnc",
 -            "version": "1.3.1-SNAPSHOT"
 +            "version": "1.4.0-SNAPSHOT"
          }, {
              "groupId": "org.onap.policy.drools-applications.controlloop.common.actors",
              "artifactId": "actor.sdnr",
 -            "version": "1.3.1-SNAPSHOT"
 +            "version": "1.4.0-SNAPSHOT"
          }, {
              "groupId": "org.onap.policy.drools-applications.controlloop.common.actors",
              "artifactId": "actor.vfc",
 -            "version": "1.3.1-SNAPSHOT"
 +            "version": "1.4.0-SNAPSHOT"
          }, {
              "groupId": "org.onap.policy.drools-applications.controlloop.common",
              "artifactId": "policy-yaml",
 -            "version": "1.3.1-SNAPSHOT"
 +            "version": "1.4.0-SNAPSHOT"
          }, {
              "groupId": "com.att.research.xacml",
              "artifactId": "xacml-pdp",
-             "version": "1.0.1"
+             "version": "1.0.2"
          }]
      }
  }

diff --combined ONAP-PDP/pom.xml
index 32d26e2,965280d..2bd4548
--- 1/ONAP-PDP/pom.xml
--- 2/ONAP-PDP/pom.xml
+++ b/ONAP-PDP/pom.xml
@@@ -19,7 -19,9 +19,7 @@@
    ============LICENSE_END=========================================================
    -->
  
 -<project xmlns="http://maven.apache.org/POM/4.0.0"
 -    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 -    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
      <modelVersion>4.0.0</modelVersion>
      <artifactId>ONAP-PDP</artifactId>
      <description>ONAP-PDP</description>
@@@ -27,7 -29,7 +27,7 @@@
      <parent>
          <groupId>org.onap.policy.engine</groupId>
          <artifactId>PolicyEngineSuite</artifactId>
 -        <version>1.3.1-SNAPSHOT</version>
 +        <version>1.4.0-SNAPSHOT</version>
      </parent>
      <dependencies>
          <dependency>
@@@ -65,7 -67,7 +65,7 @@@
          <dependency>
              <groupId>com.att.research.xacml</groupId>
              <artifactId>xacml-pdp</artifactId>
-             <version>1.0.1</version>
+             <version>1.0.2</version>
              <exclusions>
                  <!-- The LDAP PIP uses velocity which pulls this insecure jar in. We 
                      are not using that PIP and can safely exclude this jar to resolve CLM issue. -->

diff --combined ONAP-XACML/pom.xml
index 4c1da42,5c68413..0577080
--- 1/ONAP-XACML/pom.xml
--- 2/ONAP-XACML/pom.xml
+++ b/ONAP-XACML/pom.xml
@@@ -19,12 -19,14 +19,12 @@@
    ============LICENSE_END=========================================================
    -->
  
 -<project xmlns="http://maven.apache.org/POM/4.0.0"
 -    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 -    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
      <modelVersion>4.0.0</modelVersion>
      <parent>
          <groupId>org.onap.policy.engine</groupId>
          <artifactId>PolicyEngineSuite</artifactId>
 -        <version>1.3.1-SNAPSHOT</version>
 +        <version>1.4.0-SNAPSHOT</version>
      </parent>
      <artifactId>ONAP-XACML</artifactId>
      <packaging>jar</packaging>
@@@ -50,7 -52,7 +50,7 @@@
          <dependency>
              <groupId>com.att.research.xacml</groupId>
              <artifactId>xacml</artifactId>
-             <version>1.0.1</version>
+             <version>1.0.2</version>
              <exclusions>
              <!-- The LDAP PIP uses velocity which pulls this insecure jar in. We
                  are not using that PIP and can safely exclude this jar to resolve CLM issue.