Code Review
/
aaf
/
authz.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Update error codes for AAF API" into beijing
[aaf/authz.git]
/
cadi
/
pom.xml
diff --git
a/cadi/pom.xml
b/cadi/pom.xml
index
b6f1262
..
4393f08
100644
(file)
--- a/
cadi/pom.xml
+++ b/
cadi/pom.xml
@@
-21,27
+21,23
@@
-->
<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>
- <groupId>org.onap.aaf.authz.cadi</groupId>
- <artifactId>parent</artifactId>
+ <parent>
+ <groupId>org.onap.aaf.authz</groupId>
+ <artifactId>parent</artifactId>
+ <version>2.1.1-SNAPSHOT</version>
+ </parent>
+ <artifactId>cadiparent</artifactId>
<name>AAF CADI Parent (Code, Access, Data, Identity)</name>
<name>AAF CADI Parent (Code, Access, Data, Identity)</name>
- <version>2.1.0-SNAPSHOT</version>
<inceptionYear>2015-07-20</inceptionYear>
<organization>
<name>ONAP</name>
</organization>
<packaging>pom</packaging>
<inceptionYear>2015-07-20</inceptionYear>
<organization>
<name>ONAP</name>
</organization>
<packaging>pom</packaging>
- <parent>
- <groupId>org.onap.oparent</groupId>
- <artifactId>oparent</artifactId>
- <version>1.1.0</version>
- </parent>
-
+
<properties>
<properties>
- <
skipSigning>true</skipSigning
>
+ <
!-- <sonar.skip>true</sonar.skip> --
>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.miscVersion>2.1.0-SNAPSHOT</project.miscVersion>
- <project.authClientVersion>2.10-SNAPSHOT</project.authClientVersion>
<project.jettyVersion>9.3.9.v20160517</project.jettyVersion>
<powermock.version>1.5.1</powermock.version>
<!-- SONAR -->
<project.jettyVersion>9.3.9.v20160517</project.jettyVersion>
<powermock.version>1.5.1</powermock.version>
<!-- SONAR -->
@@
-136,9
+132,9
@@
<module>core</module>
<module>client</module>
<module>aaf</module>
<module>core</module>
<module>client</module>
<module>aaf</module>
- <module>cass</module>
<module>oauth-enduser</module>
<module>shiro</module>
<module>oauth-enduser</module>
<module>shiro</module>
+ <module>shiro-osgi-bundle</module>
</modules>
<!-- ============================================================== -->
</modules>
<!-- ============================================================== -->
@@
-147,19
+143,19
@@
<dependencyManagement>
<dependencies>
<dependency>
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>org.onap.aaf.authz
.auth
</groupId>
+ <groupId>org.onap.aaf.authz</groupId>
<artifactId>aaf-auth-client</artifactId>
<artifactId>aaf-auth-client</artifactId>
- <version>${project.
authClientV
ersion}</version>
+ <version>${project.
v
ersion}</version>
</dependency>
<dependency>
</dependency>
<dependency>
- <groupId>org.onap.aaf.authz
.cadi
</groupId>
+ <groupId>org.onap.aaf.authz</groupId>
<artifactId>aaf-cadi-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<artifactId>aaf-cadi-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.onap.aaf.authz
.cadi
</groupId>
+ <groupId>org.onap.aaf.authz</groupId>
<artifactId>aaf-cadi-oauth</artifactId>
<version>${project.version}</version>
</dependency>
<artifactId>aaf-cadi-oauth</artifactId>
<version>${project.version}</version>
</dependency>
@@
-167,59
+163,59
@@
<!-- Prevent Cycles in Testing -->
<dependency>
<!-- Prevent Cycles in Testing -->
<dependency>
- <groupId>org.onap.aaf.authz
.cadi
</groupId>
+ <groupId>org.onap.aaf.authz</groupId>
<artifactId>aaf-cadi-core</artifactId>
<version>${project.version}</version>
<classifier>tests</classifier>
</dependency>
<dependency>
<artifactId>aaf-cadi-core</artifactId>
<version>${project.version}</version>
<classifier>tests</classifier>
</dependency>
<dependency>
- <groupId>org.onap.aaf.authz
.cadi
</groupId>
+ <groupId>org.onap.aaf.authz</groupId>
<artifactId>aaf-cadi-jetty</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<artifactId>aaf-cadi-jetty</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.onap.aaf.authz
.cadi
</groupId>
+ <groupId>org.onap.aaf.authz</groupId>
<artifactId>aaf-cadi-cass</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<artifactId>aaf-cadi-cass</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.onap.aaf.authz
.cadi
</groupId>
+ <groupId>org.onap.aaf.authz</groupId>
<artifactId>aaf-cadi-aaf</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<artifactId>aaf-cadi-aaf</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.onap.aaf.authz
.cadi
</groupId>
+ <groupId>org.onap.aaf.authz</groupId>
<artifactId>aaf-cadi-aaf</artifactId>
<version>${project.version}</version>
<classifier>full</classifier>
</dependency>
<dependency>
<artifactId>aaf-cadi-aaf</artifactId>
<version>${project.version}</version>
<classifier>full</classifier>
</dependency>
<dependency>
- <groupId>org.onap.aaf.authz
.cadi
</groupId>
+ <groupId>org.onap.aaf.authz</groupId>
<artifactId>aaf-cadi-client</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<artifactId>aaf-cadi-client</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.onap.aaf.authz
.misc
</groupId>
+ <groupId>org.onap.aaf.authz</groupId>
<artifactId>aaf-misc-env</artifactId>
<artifactId>aaf-misc-env</artifactId>
- <version>${project.
miscV
ersion}</version>
+ <version>${project.
v
ersion}</version>
</dependency>
<dependency>
</dependency>
<dependency>
- <groupId>org.onap.aaf.authz
.misc
</groupId>
+ <groupId>org.onap.aaf.authz</groupId>
<artifactId>aaf-misc-rosetta</artifactId>
<artifactId>aaf-misc-rosetta</artifactId>
- <version>${project.
miscV
ersion}</version>
+ <version>${project.
v
ersion}</version>
</dependency>
<dependency>
</dependency>
<dependency>
- <groupId>org.onap.aaf.authz
.misc
</groupId>
+ <groupId>org.onap.aaf.authz</groupId>
<artifactId>aaf-misc-log4j</artifactId>
<artifactId>aaf-misc-log4j</artifactId>
- <version>${project.
miscV
ersion}</version>
+ <version>${project.
v
ersion}</version>
</dependency>
<dependency>
</dependency>
<dependency>
@@
-260,8
+256,8
@@
<dependency>
<groupId>javax.servlet</groupId>
<dependency>
<groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>
2.5
</version>
+ <artifactId>
javax.
servlet-api</artifactId>
+ <version>
3.0.1
</version>
</dependency>
<dependency>
</dependency>
<dependency>