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 "Increased auth batch coverage"
[aaf/authz.git]
/
auth
/
pom.xml
diff --git
a/auth/pom.xml
b/auth/pom.xml
index
410e88b
..
777480e
100644
(file)
--- a/
auth/pom.xml
+++ b/
auth/pom.xml
@@
-24,20
+24,18
@@
<modelVersion>4.0.0</modelVersion>
<parent>
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.onap.aaf.authz</groupId>
-
<artifactId>super-pom
</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+
<groupId>org.onap.aaf.authz</groupId>
+
<artifactId>parent
</artifactId>
+
<version>2.1.0-SNAPSHOT</version>
</parent>
</parent>
- <groupId>org.onap.aaf.authz.auth</groupId>
- <artifactId>parent</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <artifactId>authparent</artifactId>
<name>AAF Auth Parent</name>
<packaging>pom</packaging>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<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
.
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.jettyVersion>9.3.22.v20171030</project.jettyVersion -->
<project.jettyVersion>9.4.8.v20171121</project.jettyVersion>
<powermock.version>1.5.1</powermock.version>
@@
-55,7
+53,7
@@
<snapshotNexusPath>/content/repositories/snapshots/</snapshotNexusPath>
<releaseNexusPath>/content/repositories/releases/</releaseNexusPath>
<stagingNexusPath>/content/repositories/staging/</stagingNexusPath>
<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>
</properties>
<developers>
</properties>
<developers>
@@
-382,43
+380,43
@@
<dependencyManagement>
<dependencies>
<dependency>
<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>
<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>
<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>
<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>
<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>
<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>
<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>
<artifactId>aaf-cadi-aaf</artifactId>
<version>${project.version}</version>
<exclusions>
@@
-430,37
+428,37
@@
</dependency>
<dependency>
</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>
<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>
<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>
<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>
<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>
<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>
<artifactId>aaf-auth-deforg</artifactId>
<version>${project.version}</version>
</dependency>
@@
-502,7
+500,7
@@
<dependency>
<groupId>com.datastax.cassandra</groupId>
<artifactId>cassandra-driver-core</artifactId>
<dependency>
<groupId>com.datastax.cassandra</groupId>
<artifactId>cassandra-driver-core</artifactId>
- <version>3.
3
.0</version>
+ <version>3.
4
.0</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
@@
-514,6
+512,15
@@
</exclusion>
</exclusions>
</dependency>
</exclusion>
</exclusions>
</dependency>
+
+ <!-- Note: Ensure DataStax uses more up-to-date netty handler -->
+ <dependency>
+ <groupId>io.netty</groupId>
+ <artifactId>netty-handler</artifactId>
+ <version>4.1.22.Final</version>
+ </dependency>
+
+
<dependency>
<groupId>org.slf4j</groupId>
<dependency>
<groupId>org.slf4j</groupId>