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
ONAP log files consolidation
[policy/engine.git]
/
PolicyEngineAPI
/
pom.xml
diff --git
a/PolicyEngineAPI/pom.xml
b/PolicyEngineAPI/pom.xml
index
c8ee4c1
..
d43dd4b
100644
(file)
--- a/
PolicyEngineAPI/pom.xml
+++ b/
PolicyEngineAPI/pom.xml
@@
-1,9
+1,9
@@
<?xml version="1.0" encoding="UTF-8"?>
<!--
============LICENSE_START=======================================================
<?xml version="1.0" encoding="UTF-8"?>
<!--
============LICENSE_START=======================================================
-
ECOM
P Policy Engine
+
ONA
P 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.
@@
-22,20
+22,13
@@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
-
<parent>
<parent>
- <groupId>org.o
penecom
p.policy.engine</groupId>
+ <groupId>org.o
na
p.policy.engine</groupId>
<artifactId>PolicyEngineSuite</artifactId>
<artifactId>PolicyEngineSuite</artifactId>
- <version>1.
1
.0-SNAPSHOT</version>
+ <version>1.
2
.0-SNAPSHOT</version>
</parent>
</parent>
-
<artifactId>PolicyEngineAPI</artifactId>
<dependencies>
<artifactId>PolicyEngineAPI</artifactId>
<dependencies>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- <version>2.8.5</version>
- </dependency>
<dependency>
<groupId>org.glassfish</groupId>
<artifactId>javax.json</artifactId>
<dependency>
<groupId>org.glassfish</groupId>
<artifactId>javax.json</artifactId>
@@
-44,7
+37,7
@@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>
4.3.1
</version>
+ <version>
${httpclient.version}
</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
</dependency>
<dependency>
<groupId>commons-io</groupId>
@@
-59,13
+52,7
@@
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
- <version>1.3.1</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.11</version>
- <scope>test</scope>
+ <version>${commons.fileupload.version}</version>
</dependency>
<dependency>
<groupId>javax.websocket</groupId>
</dependency>
<dependency>
<groupId>javax.websocket</groupId>
@@
-87,6
+74,11
@@
<artifactId>spring-webmvc</artifactId>
<version>4.3.3.RELEASE</version>
</dependency>
<artifactId>spring-webmvc</artifactId>
<version>4.3.3.RELEASE</version>
</dependency>
+ <dependency>
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
+ <version>2.8.0</version>
+ </dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
@@
-104,8
+96,8
@@
</exclusions>
</dependency>
<dependency>
</exclusions>
</dependency>
<dependency>
- <groupId>org.o
penecom
p.policy.engine</groupId>
- <artifactId>
ECOM
P-XACML</artifactId>
+ <groupId>org.o
na
p.policy.engine</groupId>
+ <artifactId>
ONA
P-XACML</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
<version>${project.version}</version>
</dependency>
</dependencies>