summaryrefslogtreecommitdiffstats
path: root/cadi
diff options
context:
space:
mode:
Diffstat (limited to 'cadi')
-rw-r--r--cadi/aaf/pom.xml6
-rw-r--r--cadi/client/pom.xml4
-rw-r--r--cadi/core/pom.xml2
-rw-r--r--cadi/oauth-enduser/pom.xml12
-rw-r--r--cadi/pom.xml10
-rw-r--r--cadi/shiro/pom.xml3
6 files changed, 24 insertions, 13 deletions
diff --git a/cadi/aaf/pom.xml b/cadi/aaf/pom.xml
index ab4b284b..f6fb1fdf 100644
--- a/cadi/aaf/pom.xml
+++ b/cadi/aaf/pom.xml
@@ -25,7 +25,7 @@
<groupId>org.onap.aaf.authz.cadi</groupId>
<artifactId>parent</artifactId>
<version>2.1.0-SNAPSHOT</version>
- <relativePath>..</relativePath>
+ <relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -91,21 +91,25 @@
<dependency>
<groupId>org.onap.aaf.authz.auth</groupId>
<artifactId>aaf-auth-client</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.onap.aaf.authz.cadi</groupId>
<artifactId>aaf-cadi-client</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.onap.aaf.authz.misc</groupId>
<artifactId>aaf-misc-env</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.onap.aaf.authz.cadi</groupId>
<artifactId>aaf-cadi-core</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
diff --git a/cadi/client/pom.xml b/cadi/client/pom.xml
index 026b5098..9c96cf34 100644
--- a/cadi/client/pom.xml
+++ b/cadi/client/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.onap.aaf.authz.cadi</groupId>
<artifactId>parent</artifactId>
<version>2.1.0-SNAPSHOT</version>
- <relativePath>..</relativePath>
+ <relativePath>../pom.xml</relativePath>
</parent>
<artifactId>aaf-cadi-client</artifactId>
@@ -90,11 +90,13 @@
<dependency>
<groupId>org.onap.aaf.authz.misc</groupId>
<artifactId>aaf-misc-rosetta</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.onap.aaf.authz.cadi</groupId>
<artifactId>aaf-cadi-core</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
diff --git a/cadi/core/pom.xml b/cadi/core/pom.xml
index b2f03be8..9491b99a 100644
--- a/cadi/core/pom.xml
+++ b/cadi/core/pom.xml
@@ -15,7 +15,7 @@
<parent>
<groupId>org.onap.aaf.authz.cadi</groupId>
<artifactId>parent</artifactId>
- <relativePath>..</relativePath>
+ <relativePath>../pom.xml</relativePath>
<version>2.1.0-SNAPSHOT</version>
</parent>
diff --git a/cadi/oauth-enduser/pom.xml b/cadi/oauth-enduser/pom.xml
index 2f5dc166..102d3b49 100644
--- a/cadi/oauth-enduser/pom.xml
+++ b/cadi/oauth-enduser/pom.xml
@@ -22,11 +22,17 @@
<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>
+ <parent>
+ <groupId>org.onap.aaf.authz.cadi</groupId>
+ <artifactId>parent</artifactId>
+ <version>2.1.0-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
<name>AAF CADI Sample OAuth EndUser</name>
<groupId>org.onap.aaf.authz.cadi</groupId>
<version>2.1.0-SNAPSHOT</version>
<artifactId>aaf-cadi-oauth-enduser</artifactId>
-
<packaging>jar</packaging>
<properties>
@@ -79,12 +85,12 @@
<dependency>
<groupId>org.onap.aaf.authz.cadi</groupId>
<artifactId>aaf-cadi-core</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.onap.aaf.authz.cadi</groupId>
<artifactId>aaf-cadi-aaf</artifactId>
- <version>2.1.0-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
diff --git a/cadi/pom.xml b/cadi/pom.xml
index 451335bf..74773676 100644
--- a/cadi/pom.xml
+++ b/cadi/pom.xml
@@ -40,8 +40,6 @@
<properties>
<skipSigning>true</skipSigning>
<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 -->
@@ -148,7 +146,7 @@
<dependency>
<groupId>org.onap.aaf.authz.auth</groupId>
<artifactId>aaf-auth-client</artifactId>
- <version>${project.authClientVersion}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
@@ -206,19 +204,19 @@
<dependency>
<groupId>org.onap.aaf.authz.misc</groupId>
<artifactId>aaf-misc-env</artifactId>
- <version>${project.miscVersion}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.onap.aaf.authz.misc</groupId>
<artifactId>aaf-misc-rosetta</artifactId>
- <version>${project.miscVersion}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.onap.aaf.authz.misc</groupId>
<artifactId>aaf-misc-log4j</artifactId>
- <version>${project.miscVersion}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
diff --git a/cadi/shiro/pom.xml b/cadi/shiro/pom.xml
index 990b9ceb..7302a411 100644
--- a/cadi/shiro/pom.xml
+++ b/cadi/shiro/pom.xml
@@ -25,7 +25,7 @@
<groupId>org.onap.aaf.authz.cadi</groupId>
<artifactId>parent</artifactId>
<version>2.1.0-SNAPSHOT</version>
- <relativePath>..</relativePath>
+ <relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -91,6 +91,7 @@
<dependency>
<groupId>org.onap.aaf.authz.cadi</groupId>
<artifactId>aaf-cadi-aaf</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.shiro</groupId>