-->
<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.0-SNAPSHOT</version>
+ </parent>
+ <groupId>org.onap.aaf.authz</groupId>
+ <artifactId>cadiparent</artifactId>
<name>AAF CADI Parent (Code, Access, Data, Identity)</name>
- <version>1.5.0-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
<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>
- <skipSigning>true</skipSigning>
+ <!-- <sonar.skip>true</sonar.skip> -->
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.miscVersion>1.3.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 -->
<module>core</module>
<module>client</module>
<module>aaf</module>
- <module>cass</module>
<module>oauth-enduser</module>
<module>shiro</module>
</modules>
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>org.onap.aaf.authz.auth</groupId>
+ <groupId>org.onap.aaf.authz</groupId>
<artifactId>aaf-auth-client</artifactId>
- <version>${project.authClientVersion}</version>
+ <version>${project.version}</version>
</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>
- <groupId>org.onap.aaf.authz.cadi</groupId>
+ <groupId>org.onap.aaf.authz</groupId>
<artifactId>aaf-cadi-oauth</artifactId>
<version>${project.version}</version>
</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>
- <groupId>org.onap.aaf.authz.cadi</groupId>
+ <groupId>org.onap.aaf.authz</groupId>
<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>
- <groupId>org.onap.aaf.authz.cadi</groupId>
+ <groupId>org.onap.aaf.authz</groupId>
<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>
- <groupId>org.onap.aaf.authz.cadi</groupId>
+ <groupId>org.onap.aaf.authz</groupId>
<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>
- <version>${project.miscVersion}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.onap.aaf.authz.misc</groupId>
+ <groupId>org.onap.aaf.authz</groupId>
<artifactId>aaf-misc-rosetta</artifactId>
- <version>${project.miscVersion}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.onap.aaf.authz.misc</groupId>
+ <groupId>org.onap.aaf.authz</groupId>
<artifactId>aaf-misc-log4j</artifactId>
- <version>${project.miscVersion}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<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>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.17</version>
<configuration>
+ <skipTests>false</skipTests>
+ <includes>
+ <include>**/JU*.java</include>
+ </includes>
+ <excludes>
+ </excludes>
</configuration>
</plugin>