summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--auth/auth-batch/pom.xml5
-rw-r--r--auth/auth-cass/pom.xml2
-rw-r--r--auth/auth-certman/pom.xml3
-rw-r--r--auth/auth-client/pom.xml7
-rw-r--r--auth/auth-cmd/pom.xml2
-rw-r--r--auth/auth-core/pom.xml4
-rw-r--r--auth/auth-deforg/pom.xml2
-rw-r--r--auth/auth-fs/pom.xml2
-rw-r--r--auth/auth-gui/pom.xml7
-rw-r--r--auth/auth-hello/pom.xml2
-rw-r--r--auth/auth-locate/pom.xml3
-rw-r--r--auth/auth-oauth/pom.xml3
-rw-r--r--auth/auth-service/pom.xml7
-rw-r--r--auth/docker/dbuild.sh2
-rw-r--r--auth/pom.xml18
-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
21 files changed, 81 insertions, 25 deletions
diff --git a/auth/auth-batch/pom.xml b/auth/auth-batch/pom.xml
index bd049804..8d97f105 100644
--- a/auth/auth-batch/pom.xml
+++ b/auth/auth-batch/pom.xml
@@ -97,26 +97,31 @@
<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>
<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-aaf</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.onap.aaf.authz.auth</groupId>
<artifactId>aaf-auth-cass</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
diff --git a/auth/auth-cass/pom.xml b/auth/auth-cass/pom.xml
index 75125537..88f49b63 100644
--- a/auth/auth-cass/pom.xml
+++ b/auth/auth-cass/pom.xml
@@ -88,11 +88,13 @@
<dependency>
<groupId>org.onap.aaf.authz.auth</groupId>
<artifactId>aaf-auth-core</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.onap.aaf.authz.cadi</groupId>
<artifactId>aaf-cadi-aaf</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
diff --git a/auth/auth-certman/pom.xml b/auth/auth-certman/pom.xml
index 0d37ac8b..e1a40cdf 100644
--- a/auth/auth-certman/pom.xml
+++ b/auth/auth-certman/pom.xml
@@ -48,16 +48,19 @@
<dependency>
<groupId>org.onap.aaf.authz.auth</groupId>
<artifactId>aaf-auth-core</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.onap.aaf.authz.auth</groupId>
<artifactId>aaf-auth-cass</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.onap.aaf.authz.cadi</groupId>
<artifactId>aaf-cadi-aaf</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
diff --git a/auth/auth-client/pom.xml b/auth/auth-client/pom.xml
index 0cf34aa8..997bbccd 100644
--- a/auth/auth-client/pom.xml
+++ b/auth/auth-client/pom.xml
@@ -23,12 +23,17 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_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>
<!-- No Parent on Purpose!!! -->
<artifactId>aaf-auth-client</artifactId>
<name>AAF Auth Client</name>
<description>XSD Generated classes for AAF Auth</description>
<groupId>org.onap.aaf.authz.auth</groupId>
- <version>2.10-SNAPSHOT</version>
+ <version>2.1.0-SNAPSHOT</version>
<packaging>jar</packaging>
<properties>
diff --git a/auth/auth-cmd/pom.xml b/auth/auth-cmd/pom.xml
index 064495ce..956094b8 100644
--- a/auth/auth-cmd/pom.xml
+++ b/auth/auth-cmd/pom.xml
@@ -172,11 +172,13 @@
<dependency>
<groupId>org.onap.aaf.authz.cadi</groupId>
<artifactId>aaf-cadi-aaf</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.onap.aaf.authz.auth</groupId>
<artifactId>aaf-auth-core</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
diff --git a/auth/auth-core/pom.xml b/auth/auth-core/pom.xml
index e7538042..ef6ac493 100644
--- a/auth/auth-core/pom.xml
+++ b/auth/auth-core/pom.xml
@@ -92,10 +92,12 @@
<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-aaf</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
@@ -106,11 +108,13 @@
<dependency>
<groupId>org.onap.aaf.authz.misc</groupId>
<artifactId>aaf-misc-log4j</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/auth/auth-deforg/pom.xml b/auth/auth-deforg/pom.xml
index 1998bdce..738f5f87 100644
--- a/auth/auth-deforg/pom.xml
+++ b/auth/auth-deforg/pom.xml
@@ -95,11 +95,13 @@
<dependency>
<groupId>org.onap.aaf.authz.cadi</groupId>
<artifactId>aaf-cadi-core</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.onap.aaf.authz.auth</groupId>
<artifactId>aaf-auth-core</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
diff --git a/auth/auth-fs/pom.xml b/auth/auth-fs/pom.xml
index bb61fb59..c0bbf45f 100644
--- a/auth/auth-fs/pom.xml
+++ b/auth/auth-fs/pom.xml
@@ -86,11 +86,13 @@
<dependency>
<groupId>org.onap.aaf.authz.auth</groupId>
<artifactId>aaf-auth-core</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.onap.aaf.authz.cadi</groupId>
<artifactId>aaf-cadi-core</artifactId>
+ <version>${project.version}</version>
</dependency>
</dependencies>
diff --git a/auth/auth-gui/pom.xml b/auth/auth-gui/pom.xml
index c0221f8c..774aa04a 100644
--- a/auth/auth-gui/pom.xml
+++ b/auth/auth-gui/pom.xml
@@ -50,16 +50,19 @@
<dependency>
<groupId>org.onap.aaf.authz.auth</groupId>
<artifactId>aaf-auth-core</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.onap.aaf.authz.auth</groupId>
<artifactId>aaf-auth-client</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.onap.aaf.authz.auth</groupId>
<artifactId>aaf-auth-cmd</artifactId>
+ <version>${project.version}</version>
</dependency>
<!-- Add the Organizations you wish to support. You can delete ONAP if
@@ -68,21 +71,25 @@
<dependency>
<groupId>org.onap.aaf.authz.auth</groupId>
<artifactId>aaf-auth-deforg</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.onap.aaf.authz.cadi</groupId>
<artifactId>aaf-cadi-aaf</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-xgen</artifactId>
+ <version>${project.version}</version>
</dependency>
diff --git a/auth/auth-hello/pom.xml b/auth/auth-hello/pom.xml
index 10164fea..6ebd7b8a 100644
--- a/auth/auth-hello/pom.xml
+++ b/auth/auth-hello/pom.xml
@@ -49,11 +49,13 @@
<dependency>
<groupId>org.onap.aaf.authz.auth</groupId>
<artifactId>aaf-auth-core</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.onap.aaf.authz.cadi</groupId>
<artifactId>aaf-cadi-aaf</artifactId>
+ <version>${project.version}</version>
</dependency>
</dependencies>
diff --git a/auth/auth-locate/pom.xml b/auth/auth-locate/pom.xml
index 3fab08b8..0a94a9d0 100644
--- a/auth/auth-locate/pom.xml
+++ b/auth/auth-locate/pom.xml
@@ -49,16 +49,19 @@
<dependency>
<groupId>org.onap.aaf.authz.auth</groupId>
<artifactId>aaf-auth-core</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.onap.aaf.authz.auth</groupId>
<artifactId>aaf-auth-cass</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.onap.aaf.authz.cadi</groupId>
<artifactId>aaf-cadi-aaf</artifactId>
+ <version>${project.version}</version>
</dependency>
</dependencies>
diff --git a/auth/auth-oauth/pom.xml b/auth/auth-oauth/pom.xml
index e9ce8b37..ce51d0b7 100644
--- a/auth/auth-oauth/pom.xml
+++ b/auth/auth-oauth/pom.xml
@@ -49,16 +49,19 @@
<dependency>
<groupId>org.onap.aaf.authz.auth</groupId>
<artifactId>aaf-auth-core</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.onap.aaf.authz.auth</groupId>
<artifactId>aaf-auth-cass</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.onap.aaf.authz.cadi</groupId>
<artifactId>aaf-cadi-aaf</artifactId>
+ <version>${project.version}</version>
</dependency>
</dependencies>
diff --git a/auth/auth-service/pom.xml b/auth/auth-service/pom.xml
index 8d9bd76b..87b723ad 100644
--- a/auth/auth-service/pom.xml
+++ b/auth/auth-service/pom.xml
@@ -50,11 +50,13 @@
<dependency>
<groupId>org.onap.aaf.authz.auth</groupId>
<artifactId>aaf-auth-client</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.onap.aaf.authz.auth</groupId>
<artifactId>aaf-auth-core</artifactId>
+ <version>${project.version}</version>
</dependency>
<!-- Add the Organizations you wish to support. You can delete ONAP if
@@ -63,26 +65,31 @@
<dependency>
<groupId>org.onap.aaf.authz.auth</groupId>
<artifactId>aaf-auth-deforg</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.onap.aaf.authz.auth</groupId>
<artifactId>aaf-auth-cass</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.onap.aaf.authz.auth</groupId>
<artifactId>aaf-auth-oauth</artifactId>
+ <version>${project.version}</version>
</dependency>
<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-aaf</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
diff --git a/auth/docker/dbuild.sh b/auth/docker/dbuild.sh
index 54d9926a..501530db 100644
--- a/auth/docker/dbuild.sh
+++ b/auth/docker/dbuild.sh
@@ -3,7 +3,7 @@
# Docker Building Script. Reads all the components generated by install, on per-version basis
#
# Pull in Variables from d.props
-. d.props
+./d.props
# TODO add ability to do DEBUG settings
if ["$1" == ""]; then
diff --git a/auth/pom.xml b/auth/pom.xml
index c0bd6af9..410e88b2 100644
--- a/auth/pom.xml
+++ b/auth/pom.xml
@@ -38,8 +38,6 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.interfaceVersion>2.10-SNAPSHOT</project.interfaceVersion>
- <project.miscVersion>2.1.0-SNAPSHOT</project.miscVersion>
- <project.cadiVersion>2.1.0-SNAPSHOT</project.cadiVersion>
<!-- >project.jettyVersion>9.3.22.v20171030</project.jettyVersion -->
<project.jettyVersion>9.4.8.v20171121</project.jettyVersion>
<powermock.version>1.5.1</powermock.version>
@@ -386,43 +384,43 @@
<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-log4j</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-xgen</artifactId>
- <version>${project.miscVersion}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.onap.aaf.authz.cadi</groupId>
<artifactId>aaf-cadi-core</artifactId>
- <version>${project.cadiVersion}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.onap.aaf.authz.cadi</groupId>
<artifactId>aaf-cadi-client</artifactId>
- <version>${project.cadiVersion}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.onap.aaf.authz.cadi</groupId>
<artifactId>aaf-cadi-aaf</artifactId>
- <version>${project.cadiVersion}</version>
+ <version>${project.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.cassandra</groupId>
@@ -434,7 +432,7 @@
<dependency>
<groupId>org.onap.aaf.authz.auth</groupId>
<artifactId>aaf-auth-client</artifactId>
- <version>${project.interfaceVersion}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
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>