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>
- <groupId>org.onap.aaf.authz</groupId>
- <artifactId>super-pom</artifactId>
- <version>2.1.0-SNAPSHOT</version>
- </parent> -->
- <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.2-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.interfaceVersion>2.1.1-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>
<snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
<releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
<stagingNexusPath>/content/repositories/staging/</stagingNexusPath>
- <sitePath>/content/sites/site/org/onap/aaf/authz/auth/${project.artifactId}/${project.version}</sitePath>
+ <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>
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>org.onap.aaf.authz.misc</groupId>
+ <groupId>org.onap.aaf.authz</groupId>
<artifactId>aaf-misc-env</artifactId>
<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.version}</version>
</dependency>
<dependency>
- <groupId>org.onap.aaf.authz.misc</groupId>
+ <groupId>org.onap.aaf.authz</groupId>
<artifactId>aaf-misc-rosetta</artifactId>
<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.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-client</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>
<exclusions>
</dependency>
<dependency>
- <groupId>org.onap.aaf.authz.auth</groupId>
+ <groupId>org.onap.aaf.authz</groupId>
<artifactId>aaf-auth-client</artifactId>
<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>com.datastax.cassandra</groupId>
<artifactId>cassandra-all</artifactId>
- <version>3.3.0</version>
+ <version>${project.cassVersion}</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<dependency>
<groupId>com.datastax.cassandra</groupId>
<artifactId>cassandra-driver-core</artifactId>
- <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>