diff options
author | Jim Hahn <jrh3@att.com> | 2019-02-08 10:15:45 -0500 |
---|---|---|
committer | Jim Hahn <jrh3@att.com> | 2019-02-08 10:21:40 -0500 |
commit | 9f778302220d8acec8d75b18108054b32b4358c6 (patch) | |
tree | 6eeddecc66fcceb861494231b65f9090da189110 | |
parent | 0c1084282ae62cbe9d5b054057aed1b759dc82cd (diff) |
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 <jrh3@att.com>
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 @@ -193,20 +193,6 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>com.att.research.xacml</groupId> - <artifactId>xacml-pdp</artifactId> - <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. - --> - <exclusion> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> <groupId>org.onap.policy.drools-pdp</groupId> <artifactId>policy-management</artifactId> <version>${version.policy.drools-pdp}</version> 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 @@ -42,25 +42,6 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>com.att.research.xacml</groupId> - <artifactId>xacml</artifactId> - <version>1.0.2</version> - <scope>provided</scope> - <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. - --> - <exclusion> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - </exclusion> - <exclusion> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-databind</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> <groupId>org.onap.policy.drools-applications.controlloop.common.actors</groupId> <artifactId>actorServiceProvider</artifactId> <version>${project.version}</version> 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 @@ -248,41 +248,6 @@ </exclusions> </dependency> <dependency> - <groupId>com.att.research.xacml</groupId> - <artifactId>xacml-pdp</artifactId> - <version>1.0.2</version> - <exclusions> - <exclusion> - <artifactId>commons-codec</artifactId> - <groupId>commons-codec</groupId> - </exclusion> - <exclusion> - <artifactId>commons-logging</artifactId> - <groupId>commons-logging</groupId> - </exclusion> - <exclusion> - <artifactId>guava</artifactId> - <groupId>com.google.guava</groupId> - </exclusion> - <exclusion> - <artifactId>commons-lang3</artifactId> - <groupId>org.apache.commons</groupId> - </exclusion> - <exclusion> - <artifactId>jackson-databind</artifactId> - <groupId>com.fasterxml.jackson.core</groupId> - </exclusion> - <exclusion> - <artifactId>commons-collections</artifactId> - <groupId>commons-collections</groupId> - </exclusion> - <exclusion> - <artifactId>commons-lang</artifactId> - <groupId>commons-lang</groupId> - </exclusion> - </exclusions> - </dependency> - <dependency> <groupId>org.onap.policy.drools-pdp</groupId> <artifactId>policy-management</artifactId> <version>${version.policy.drools-pdp}</version> 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 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>com.att.research.xacml</groupId> - <artifactId>xacml-pdp</artifactId> - <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. - --> - <exclusion> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - </exclusion> - </exclusions> + <groupId>com.att.research.xacml</groupId> + <artifactId>xacml-pdp</artifactId> + <version>1.0.2</version> + <exclusions> + <!-- + Exclude jars with an older version or that are insecure and not needed. + --> + <exclusion> + <artifactId>commons-codec</artifactId> + <groupId>commons-codec</groupId> + </exclusion> + <exclusion> + <artifactId>commons-logging</artifactId> + <groupId>commons-logging</groupId> + </exclusion> + <exclusion> + <artifactId>guava</artifactId> + <groupId>com.google.guava</groupId> + </exclusion> + <exclusion> + <artifactId>commons-lang3</artifactId> + <groupId>org.apache.commons</groupId> + </exclusion> + <exclusion> + <artifactId>jackson-databind</artifactId> + <groupId>com.fasterxml.jackson.core</groupId> + </exclusion> + <exclusion> + <artifactId>commons-collections</artifactId> + <groupId>commons-collections</groupId> + </exclusion> + <exclusion> + <artifactId>commons-lang</artifactId> + <groupId>commons-lang</groupId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>junit</groupId> 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. @@ -149,11 +149,6 @@ <version>${dependenciesVersion}</version> </dependency> <dependency> - <groupId>com.att.research.xacml</groupId> - <artifactId>xacml-pdp</artifactId> - <version>1.0.1</version> - </dependency> - <dependency> <groupId>org.onap.policy.drools-pdp</groupId> <artifactId>policy-management</artifactId> <version>${dependenciesVersion}</version> 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. @@ -149,11 +149,6 @@ <version>${dependenciesVersion}</version> </dependency> <dependency> - <groupId>com.att.research.xacml</groupId> - <artifactId>xacml-pdp</artifactId> - <version>1.0.2</version> - </dependency> - <dependency> <groupId>org.onap.policy.drools-pdp</groupId> <artifactId>policy-management</artifactId> <version>${dependenciesVersion}</version> 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 @@ -137,29 +137,6 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>com.att.research.xacml</groupId> - <artifactId>xacml</artifactId> - <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. - --> - <exclusion> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - </exclusion> - <exclusion> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-databind</artifactId> - </exclusion> - </exclusions> - <version>1.0.2</version> - </dependency> - <dependency> - <groupId>com.att.research.xacml</groupId> - <artifactId>xacml-pdp</artifactId> - <version>1.0.2</version> - </dependency> - <dependency> <groupId>org.eclipse.persistence</groupId> <artifactId>javax.persistence</artifactId> <scope>provided</scope> 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 @@ -137,31 +137,6 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>com.att.research.xacml</groupId> - <artifactId>xacml</artifactId> - <version>1.0.2</version> - <scope>test</scope> - <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. - --> - <exclusion> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - </exclusion> - <exclusion> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-databind</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>com.att.research.xacml</groupId> - <artifactId>xacml-pdp</artifactId> - <version>1.0.2</version> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.eclipse.persistence</groupId> <artifactId>javax.persistence</artifactId> <scope>provided</scope> |