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.auth</groupId>
- <artifactId>parent</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <parent>
+ <groupId>org.onap.aaf.authz</groupId>
+ <artifactId>parent</artifactId>
+ <version>2.1.0-SNAPSHOT</version>
+ </parent>
+ <artifactId>authparent</artifactId>
<name>AAF Auth Parent</name>
<packaging>pom</packaging>
+
+
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.interfaceVersion>2.10-SNAPSHOT</project.interfaceVersion>
- <project.miscVersion>1.3.0-SNAPSHOT</project.miscVersion>
- <project.cadiVersion>1.5.0-SNAPSHOT</project.cadiVersion>
+ <project.interfaceVersion>2.1.0-SNAPSHOT</project.interfaceVersion>
<!-- >project.jettyVersion>9.3.22.v20171030</project.jettyVersion -->
<project.jettyVersion>9.4.8.v20171121</project.jettyVersion>
<powermock.version>1.5.1</powermock.version>
- <project.conf_dir>/opt/app/osaaf/etc</project.conf_dir>
+ <project.ext_root_dir>/opt/app/osaaf</project.ext_root_dir>
<!-- SONAR -->
<jacoco.version>0.7.7.201606060606</jacoco.version>
<sonar-jacoco-listeners.version>3.2</sonar-jacoco-listeners.version>
<sonar.core.codeCoveragePlugin>jacoco</sonar.core.codeCoveragePlugin>
<!-- Default Sonar configuration -->
- <sonar.jacoco.reportPath>target/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPath>
- <sonar.jacoco.itReportPath>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPath>
+ <sonar.jacoco.reportPaths>target/code-coverage/jacoco-ut.exec</sonar.jacoco.reportPaths>
+ <sonar.jacoco.itReportPaths>target/code-coverage/jacoco-it.exec</sonar.jacoco.itReportPaths>
<!-- Note: This list should match jacoco-maven-plugin's exclusion list below -->
<sonar.exclusions>**/gen/**,**/generated-sources/**,**/yang-gen**,**/pax/**</sonar.exclusions>
<nexusproxy>https://nexus.onap.org</nexusproxy>
<releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
<stagingNexusPath>/content/repositories/staging/</stagingNexusPath>
<sitePath>/content/sites/site/org/onap/aaf/authz/${project.artifactId}/${project.version}</sitePath>
+ <!-- We have to up these versions from the original to avoid Security Errors -->
+ <project.cassVersion>3.4.0</project.cassVersion>
+ <project.nettyVersion>4.1.22.Final</project.nettyVersion>
+ <!--
+ <project.cassVersion>3.3.0</project.cassVersion>
+ <project.nettyVersion>4.0.47.Final</project.nettyVersion> -->
</properties>
<developers>
<artifactId>maven-deploy-plugin</artifactId>
<version>2.6</version>
<configuration>
- <skip>true</skip>
+ <skip>false</skip>
</configuration>
</plugin>
<artifactId>maven-failsafe-plugin</artifactId>
<version>2.17</version>
<configuration>
- <skipTests>flase</skipTests>
+ <skipTests>false</skipTests>
</configuration>
<executions>
<execution>
<configuration>
<programs/> <!-- this set in projects that have programs -->
<assembleDirectory>../aaf_${project.version}</assembleDirectory>
- <copyConfigurationDirectory>false</copyConfigurationDirectory>
+ <copyConfigurationDirectory>true</copyConfigurationDirectory>
<configurationDirectory>etc</configurationDirectory>
<repositoryName>lib</repositoryName>
+ <includeConfigurationDirectoryInClasspath>false</includeConfigurationDirectoryInClasspath>
<repositoryLayout>flat</repositoryLayout>
</configuration>
</plugin>
<dependencyManagement>
<dependencies>
<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-log4j</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-xgen</artifactId>
- <version>${project.miscVersion}</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.cadiVersion}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.onap.aaf.authz.cadi</groupId>
+ <groupId>org.onap.aaf.authz</groupId>
<artifactId>aaf-cadi-client</artifactId>
- <version>${project.cadiVersion}</version>
+ <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.cadiVersion}</version>
+ <version>${project.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.cassandra</groupId>
</dependency>
<dependency>
- <groupId>org.onap.aaf.authz.auth</groupId>
+ <groupId>org.onap.aaf.authz</groupId>
<artifactId>aaf-auth-client</artifactId>
- <version>${project.interfaceVersion}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.onap.aaf.authz.auth</groupId>
+ <groupId>org.onap.aaf.authz</groupId>
<artifactId>aaf-auth-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.onap.aaf.authz.auth</groupId>
+ <groupId>org.onap.aaf.authz</groupId>
<artifactId>aaf-auth-cass</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.onap.aaf.authz.auth</groupId>
+ <groupId>org.onap.aaf.authz</groupId>
<artifactId>aaf-auth-cmd</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.onap.aaf.authz.auth</groupId>
+ <groupId>org.onap.aaf.authz</groupId>
<artifactId>aaf-auth-oauth</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.onap.aaf.authz.auth</groupId>
+ <groupId>org.onap.aaf.authz</groupId>
<artifactId>aaf-auth-deforg</artifactId>
<version>${project.version}</version>
</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>
<version>${project.jettyVersion}</version>
</dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-jmx</artifactId>
- <version>${project.jettyVersion}</version>
- </dependency>
-
<dependency>
<groupId>com.datastax.cassandra</groupId>
<artifactId>cassandra-all</artifactId>
- <version>3.3.0</version>
+ <version>${project.cassVersion}</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
</exclusion>
</exclusions>
</dependency>
+
<dependency>
<groupId>com.datastax.cassandra</groupId>
<artifactId>cassandra-driver-core</artifactId>
- <!-- version>1.0.3</version -->
- <!-- version>1.0.5</version -->
- <version>3.3.0</version>
+ <version>${project.cassVersion}</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
</exclusion>
</exclusions>
</dependency>
+
+ <!-- Note: Ensure DataStax uses more up-to-date netty handler -->
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-handler</artifactId>
+ <version>${project.nettyVersion}</version>
+ </dependency>
+
+
<dependency>
<groupId>org.slf4j</groupId>