diff options
author | jhh <jorge.hernandez-herrero@att.com> | 2019-04-14 21:41:14 -0500 |
---|---|---|
committer | jhh <jorge.hernandez-herrero@att.com> | 2019-04-14 21:41:14 -0500 |
commit | 50be587b3604c958faa438cd587364da8f49d9a7 (patch) | |
tree | 59b60775d725e841bc0a08d2ea6cf2d4f2e72e42 /controlloop/common | |
parent | 84286faf575e4311720829c1df101614a769a240 (diff) |
Modify dependencies to avoid enabled features fail
The drl change is only partial just to recognize Tosca
policies.
Change-Id: I5d3b8071394a9ea14638170e04d74e4c6b4ad028
Issue-ID: POLICY-1642
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
Diffstat (limited to 'controlloop/common')
-rw-r--r-- | controlloop/common/feature-controlloop-management/pom.xml | 16 | ||||
-rw-r--r-- | controlloop/common/feature-controlloop-trans/pom.xml | 2 |
2 files changed, 17 insertions, 1 deletions
diff --git a/controlloop/common/feature-controlloop-management/pom.xml b/controlloop/common/feature-controlloop-management/pom.xml index 40e37beff..84fbe485e 100644 --- a/controlloop/common/feature-controlloop-management/pom.xml +++ b/controlloop/common/feature-controlloop-management/pom.xml @@ -87,7 +87,9 @@ <addParentPoms>false</addParentPoms> <copyPom>false</copyPom> <includeScope>runtime</includeScope> + <excludeScope>provided</excludeScope> <excludeTransitive>false</excludeTransitive> + <excludeGroupIds>org.glassfish.hk2.external,org.glassfish.hk2</excludeGroupIds> </configuration> </execution> </executions> @@ -135,6 +137,16 @@ <groupId>org.onap.policy.models.policy-models-interactions.model-impl</groupId> <artifactId>aai</artifactId> <version>${policy.models.version}</version> + <exclusions> + <exclusion> + <artifactId>commons-lang3</artifactId> + <groupId>org.apache.commons</groupId> + </exclusion> + <exclusion> + <artifactId>jcl-over-slf4j</artifactId> + <groupId>org.slf4j</groupId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.onap.policy.models.policy-models-interactions.model-impl</groupId> @@ -187,6 +199,10 @@ <artifactId>guava</artifactId> <groupId>com.google.guava</groupId> </exclusion> + <exclusion> + <artifactId>commons-lang3</artifactId> + <groupId>org.apache.commons</groupId> + </exclusion> </exclusions> </dependency> <dependency> diff --git a/controlloop/common/feature-controlloop-trans/pom.xml b/controlloop/common/feature-controlloop-trans/pom.xml index 4d9080616..915636e6b 100644 --- a/controlloop/common/feature-controlloop-trans/pom.xml +++ b/controlloop/common/feature-controlloop-trans/pom.xml @@ -106,7 +106,6 @@ <excludes> </excludes> <consoleOutput>true</consoleOutput> - <failsOnViolation>true</failsOnViolation> <violationSeverity>warning</violationSeverity> </configuration> </execution> @@ -128,6 +127,7 @@ <groupId>org.onap.policy.models.policy-models-interactions.model-impl</groupId> <artifactId>events</artifactId> <version>${policy.models.version}</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.onap.policy.common</groupId> |