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 "Sonar Major"
[policy/engine.git]
/
PolicyEngineAPI
/
pom.xml
diff --git
a/PolicyEngineAPI/pom.xml
b/PolicyEngineAPI/pom.xml
index
f0bffb5
..
be3700e
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.
@@
-24,9
+24,9
@@
<modelVersion>4.0.0</modelVersion>
<parent>
<modelVersion>4.0.0</modelVersion>
<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>
<artifactId>PolicyEngineAPI</artifactId>
</parent>
<artifactId>PolicyEngineAPI</artifactId>
@@
-34,7
+34,7
@@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>
2.8.5
</version>
+ <version>
${jackson.version}
</version>
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
@@
-44,7
+44,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,7
+59,7
@@
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
<dependency>
<groupId>commons-fileupload</groupId>
<artifactId>commons-fileupload</artifactId>
- <version>
1.3.1
</version>
+ <version>
${commons.fileupload.version}
</version>
</dependency>
<dependency>
<groupId>junit</groupId>
</dependency>
<dependency>
<groupId>junit</groupId>
@@
-109,22
+109,14
@@
</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>
<exclusions>
<exclusion>
<groupId>org.powermock</groupId>
<artifactId>powermock-api-mockito</artifactId>
</exclusion>
<version>${project.version}</version>
<exclusions>
<exclusion>
<groupId>org.powermock</groupId>
<artifactId>powermock-api-mockito</artifactId>
</exclusion>
- <exclusion>
- <groupId>com.att.aft</groupId>
- <artifactId>dme2</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.att.cadi</groupId>
- <artifactId>cadi-aaf</artifactId>
- </exclusion>
</exclusions>
</dependency>
<!-- https://mvnrepository.com/artifact/org.mockito/mockito-all -->
</exclusions>
</dependency>
<!-- https://mvnrepository.com/artifact/org.mockito/mockito-all -->