Code Review
/
policy
/
engine.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "ONAP code change for log files consolidation"
[policy/engine.git]
/
PolicyEngineUtils
/
pom.xml
diff --git
a/PolicyEngineUtils/pom.xml
b/PolicyEngineUtils/pom.xml
index
c083705
..
ac2b2a1
100644
(file)
--- a/
PolicyEngineUtils/pom.xml
+++ b/
PolicyEngineUtils/pom.xml
@@
-2,7
+2,7
@@
============LICENSE_START=======================================================
ONAP Policy Engine
================================================================================
============LICENSE_START=======================================================
ONAP Policy Engine
================================================================================
- Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ Copyright (C) 2017
-2018
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.
================================================================================
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@
-23,24
+23,24
@@
<parent>
<groupId>org.onap.policy.engine</groupId>
<artifactId>PolicyEngineSuite</artifactId>
<parent>
<groupId>org.onap.policy.engine</groupId>
<artifactId>PolicyEngineSuite</artifactId>
- <version>1.
1
.0-SNAPSHOT</version>
+ <version>1.
2
.0-SNAPSHOT</version>
</parent>
<artifactId>PolicyEngineUtils</artifactId>
<dependencies>
<dependency>
<groupId>org.onap.policy.common</groupId>
<artifactId>integrity-monitor</artifactId>
</parent>
<artifactId>PolicyEngineUtils</artifactId>
<dependencies>
<dependency>
<groupId>org.onap.policy.common</groupId>
<artifactId>integrity-monitor</artifactId>
- <version>${
common-modules
.version}</version>
+ <version>${
project
.version}</version>
</dependency>
<dependency>
<groupId>org.onap.policy.common</groupId>
<artifactId>integrity-audit</artifactId>
</dependency>
<dependency>
<groupId>org.onap.policy.common</groupId>
<artifactId>integrity-audit</artifactId>
- <version>${
common-modules
.version}</version>
+ <version>${
project
.version}</version>
</dependency>
<dependency>
<groupId>org.onap.policy.common</groupId>
<artifactId>ONAP-Logging</artifactId>
</dependency>
<dependency>
<groupId>org.onap.policy.common</groupId>
<artifactId>ONAP-Logging</artifactId>
- <version>${
common-modules
.version}</version>
+ <version>${
project
.version}</version>
<exclusions>
<exclusion>
<groupId>org.powermock</groupId>
<exclusions>
<exclusion>
<groupId>org.powermock</groupId>
@@
-63,14
+63,14
@@
<version>2.6.0</version>
</dependency>
<dependency>
<version>2.6.0</version>
</dependency>
<dependency>
- <groupId>
mysql
</groupId>
- <artifactId>m
ysql-connector-java
</artifactId>
- <version>
5.1.30
</version>
+ <groupId>
org.mariadb.jdbc
</groupId>
+ <artifactId>m
ariadb-java-client
</artifactId>
+ <version>
2.1.1
</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>
2.7.5
</version>
+ <version>
${jackson.version}
</version>
</dependency>
<dependency>
<groupId>com.github.fge</groupId>
</dependency>
<dependency>
<groupId>com.github.fge</groupId>
@@
-88,36
+88,54
@@
<version>4.11</version>
<scope>test</scope>
</dependency>
<version>4.11</version>
<scope>test</scope>
</dependency>
+ <!--
+ CLM security fix - force use of xstream
+ Remove this if a new version of drools-verifier is upgraded
+ that upgrades to xstream.
+ -->
<dependency>
<dependency>
-
<groupId>org.mariadb.jdbc
</groupId>
-
<artifactId>mariadb-java-client
</artifactId>
-
<version>1.2.3
</version>
+
<groupId>com.thoughtworks.xstream
</groupId>
+
<artifactId>xstream
</artifactId>
+
<version>1.4.10
</version>
</dependency>
<dependency>
<groupId>org.drools</groupId>
<artifactId>drools-verifier</artifactId>
</dependency>
<dependency>
<groupId>org.drools</groupId>
<artifactId>drools-verifier</artifactId>
- <version>6.
3
.0.Final</version>
+ <version>6.
5
.0.Final</version>
<exclusions>
<exclusion>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</exclusion>
<exclusions>
<exclusion>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>com.lowagie</groupId>
+ <artifactId>itext</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.thoughtworks.xstream</groupId>
+ <artifactId>xstream</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
</exclusions>
</dependency>
<dependency>
- <groupId>
com.att
.cadi</groupId>
- <artifactId>cadi-aaf</artifactId>
- <version>1.
3.0
</version>
+ <groupId>
org.onap.aaf
.cadi</groupId>
+ <artifactId>cadi-aaf</artifactId>
+ <version>1.
0.0-SNAPSHOT
</version>
</dependency>
</dependency>
+ <dependency>
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
+ <version>2.8.1</version>
+ </dependency>
<dependency>
<groupId>com.att.aft</groupId>
<artifactId>dme2</artifactId>
<version>3.1.200</version>
</dependency>
<dependency>
<dependency>
<groupId>com.att.aft</groupId>
<artifactId>dme2</artifactId>
<version>3.1.200</version>
</dependency>
<dependency>
- <groupId>
com.att.nsa
</groupId>
+ <groupId>
org.onap.dmaap.messagerouter.dmaapclient
</groupId>
<artifactId>dmaapClient</artifactId>
<artifactId>dmaapClient</artifactId>
- <version>
0.2.12
</version>
+ <version>
${dmaap.version}
</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>