From: Pamela Dragosh <pdragosh@research.att.com>
Date: Thu, 21 Mar 2019 23:45:45 +0000 (-0400)
Subject: Reorder xacml 2.0.0 loading
X-Git-Tag: 3.0.2-ONAP~23
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=d5c3b36247605392b4f75b2e44296922559baac6;p=policy%2Fxacml-pdp.git

Reorder xacml 2.0.0 loading

This dependency should only be in the applications area.
Reordering may help ensure that the correct jackson is loaded
for glassfish.

Issue-ID: POLICY-1609
Change-Id: I727a5266204e8e2e5c35b7a326baff854b55e523
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
---

diff --git a/applications/common/pom.xml b/applications/common/pom.xml
index 9d83f3d5..30017302 100644
--- a/applications/common/pom.xml
+++ b/applications/common/pom.xml
@@ -42,5 +42,10 @@
             <artifactId>utils-test</artifactId>
             <version>${policy.common.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.att.research.xacml</groupId>
+            <artifactId>xacml-pdp</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
 </project>
diff --git a/pom.xml b/pom.xml
index 03f171bc..77838654 100644
--- a/pom.xml
+++ b/pom.xml
@@ -104,17 +104,6 @@
             <artifactId>json</artifactId>
             <version>20180813</version>
         </dependency>
-        <dependency>
-            <groupId>com.att.research.xacml</groupId>
-            <artifactId>xacml-pdp</artifactId>
-            <version>2.0.0</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.fasterxml.jackson.core</groupId>
-                    <artifactId>jackson-annotations</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
         <dependency>
             <groupId>org.onap.policy.models</groupId>
             <artifactId>models-decisions</artifactId>