diff options
| author |   Pamela Dragosh <pdragosh@research.att.com> | 2019-02-11 17:30:26 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-02-11 17:30:26 +0000 |
| commit | b91e46218371ea9a94056aa548ff1704de795b2d (patch) | |
| tree | a9723a303f30fc7e9b2544430a8eb1f3b7d8c8fa /controlloop/templates | |
| parent | c33bfe386e2a94d78939621a84173716ca73748f (diff) | |
| parent | 9f778302220d8acec8d75b18108054b32b4358c6 (diff) | |
Merge "Consolidate xacml dependencies"
Diffstat (limited to 'controlloop/templates')
4 files changed, 2 insertions, 60 deletions
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> |