From 9f778302220d8acec8d75b18108054b32b4358c6 Mon Sep 17 00:00:00 2001 From: Jim Hahn Date: Fri, 8 Feb 2019 10:15:45 -0500 Subject: Consolidate xacml dependencies The xacml dependency appeared in multiple drools-applications pom files, with different exclusion lists. The dependencies have been consolidated into a single pom, with a combined exclusion list. Added comment to the exclusion list. Change-Id: I2a5a66619b376879b44c5e0ce064d7e52c4482bf Issue-ID: POLICY-1429 Signed-off-by: Jim Hahn --- controlloop/common/controller-casablanca/pom.xml | 14 ------- controlloop/common/eventmanager/pom.xml | 19 --------- .../common/feature-controlloop-management/pom.xml | 35 ---------------- controlloop/common/guard/pom.xml | 48 ++++++++++++++++------ .../src/main/resources/archetype-resources/pom.xml | 7 +--- .../src/main/resources/archetype-resources/pom.xml | 7 +--- controlloop/templates/template.demo.clc/pom.xml | 23 ----------- controlloop/templates/template.demo/pom.xml | 25 ----------- 8 files changed, 38 insertions(+), 140 deletions(-) diff --git a/controlloop/common/controller-casablanca/pom.xml b/controlloop/common/controller-casablanca/pom.xml index 076938616..bd724ba4d 100644 --- a/controlloop/common/controller-casablanca/pom.xml +++ b/controlloop/common/controller-casablanca/pom.xml @@ -192,20 +192,6 @@ ${project.version} provided - - com.att.research.xacml - xacml-pdp - 1.0.2 - - - - commons-collections - commons-collections - - - org.onap.policy.drools-pdp policy-management diff --git a/controlloop/common/eventmanager/pom.xml b/controlloop/common/eventmanager/pom.xml index 94f9689dc..32cda44d4 100644 --- a/controlloop/common/eventmanager/pom.xml +++ b/controlloop/common/eventmanager/pom.xml @@ -41,25 +41,6 @@ 2.5 provided - - com.att.research.xacml - xacml - 1.0.2 - provided - - - - commons-collections - commons-collections - - - com.fasterxml.jackson.core - jackson-databind - - - org.onap.policy.drools-applications.controlloop.common.actors actorServiceProvider diff --git a/controlloop/common/feature-controlloop-management/pom.xml b/controlloop/common/feature-controlloop-management/pom.xml index ed145ac6a..e4c2d3504 100644 --- a/controlloop/common/feature-controlloop-management/pom.xml +++ b/controlloop/common/feature-controlloop-management/pom.xml @@ -247,41 +247,6 @@ - - com.att.research.xacml - xacml-pdp - 1.0.2 - - - commons-codec - commons-codec - - - commons-logging - commons-logging - - - guava - com.google.guava - - - commons-lang3 - org.apache.commons - - - jackson-databind - com.fasterxml.jackson.core - - - commons-collections - commons-collections - - - commons-lang - commons-lang - - - org.onap.policy.drools-pdp policy-management diff --git a/controlloop/common/guard/pom.xml b/controlloop/common/guard/pom.xml index 7dc85d778..d1beed58d 100644 --- a/controlloop/common/guard/pom.xml +++ b/controlloop/common/guard/pom.xml @@ -36,18 +36,42 @@ provided - com.att.research.xacml - xacml-pdp - 1.0.2 - - - - commons-collections - commons-collections - - + com.att.research.xacml + xacml-pdp + 1.0.2 + + + + commons-codec + commons-codec + + + commons-logging + commons-logging + + + guava + com.google.guava + + + commons-lang3 + org.apache.commons + + + jackson-databind + com.fasterxml.jackson.core + + + commons-collections + commons-collections + + + commons-lang + commons-lang + + junit diff --git a/controlloop/templates/archetype-cl-amsterdam/src/main/resources/archetype-resources/pom.xml b/controlloop/templates/archetype-cl-amsterdam/src/main/resources/archetype-resources/pom.xml index f39acc1fe..2197a8e39 100644 --- a/controlloop/templates/archetype-cl-amsterdam/src/main/resources/archetype-resources/pom.xml +++ b/controlloop/templates/archetype-cl-amsterdam/src/main/resources/archetype-resources/pom.xml @@ -3,7 +3,7 @@ ============LICENSE_START======================================================= ONAP ================================================================================ - Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + Copyright (C) 2017, 2019 AT&T Intellectual Property. All rights reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -148,11 +148,6 @@ policy-yaml ${dependenciesVersion} - - com.att.research.xacml - xacml-pdp - 1.0.1 - org.onap.policy.drools-pdp policy-management diff --git a/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/pom.xml b/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/pom.xml index 6e4048895..9126edb98 100644 --- a/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/pom.xml +++ b/controlloop/templates/archetype-cl-casablanca/src/main/resources/archetype-resources/pom.xml @@ -3,7 +3,7 @@ ============LICENSE_START======================================================= ONAP ================================================================================ - Copyright (C) 2018 AT&T Intellectual Property. All rights reserved. + Copyright (C) 2018-2019 AT&T Intellectual Property. All rights reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -148,11 +148,6 @@ policy-yaml ${dependenciesVersion} - - com.att.research.xacml - xacml-pdp - 1.0.2 - org.onap.policy.drools-pdp policy-management diff --git a/controlloop/templates/template.demo.clc/pom.xml b/controlloop/templates/template.demo.clc/pom.xml index f43550071..5e80ad225 100644 --- a/controlloop/templates/template.demo.clc/pom.xml +++ b/controlloop/templates/template.demo.clc/pom.xml @@ -136,29 +136,6 @@ ${project.version} provided - - com.att.research.xacml - xacml - - - - commons-collections - commons-collections - - - com.fasterxml.jackson.core - jackson-databind - - - 1.0.2 - - - com.att.research.xacml - xacml-pdp - 1.0.2 - org.eclipse.persistence javax.persistence diff --git a/controlloop/templates/template.demo/pom.xml b/controlloop/templates/template.demo/pom.xml index 33ab4175c..7ec0cd561 100644 --- a/controlloop/templates/template.demo/pom.xml +++ b/controlloop/templates/template.demo/pom.xml @@ -136,31 +136,6 @@ ${project.version} provided - - com.att.research.xacml - xacml - 1.0.2 - test - - - - commons-collections - commons-collections - - - com.fasterxml.jackson.core - jackson-databind - - - - - com.att.research.xacml - xacml-pdp - 1.0.2 - test - org.eclipse.persistence javax.persistence -- cgit 1.2.3-korg