updated the poms with project versions

Issue-ID: AAF-215
Change-Id: I48ab110906f6e165cde0b3bb21b52178d36eb566
Signed-off-by: su622b <sunil.unnava@att.com>

diff --git a/auth/auth-batch/pom.xml b/auth/auth-batch/pom.xml
index bd04980..8d97f10 100644 (file)
--- 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 7512553..88f49b6 100644 (file)
--- 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 0d37ac8..e1a40cd 100644 (file)
--- 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 0cf34aa..997bbcc 100644 (file)
--- 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 064495c..956094b 100644 (file)
--- 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 e753804..ef6ac49 100644 (file)
--- 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 1998bdc..738f5f8 100644 (file)
--- 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 bb61fb5..c0bbf45 100644 (file)
--- 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 c0221f8..774aa04 100644 (file)
--- 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 10164fe..6ebd7b8 100644 (file)
--- 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 3fab08b..0a94a9d 100644 (file)
--- 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 e9ce8b3..ce51d0b 100644 (file)
--- 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 8d9bd76..87b723a 100644 (file)
--- 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 54d9926..501530d 100644 (file)
--- 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 c0bd6af..410e88b 100644 (file)
--- 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 ab4b284..f6fb1fd 100644 (file)
--- 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 026b509..9c96cf3 100644 (file)
--- 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 b2f03be..9491b99 100644 (file)
--- 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 2f5dc16..102d3b4 100644 (file)
--- 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 451335b..7477367 100644 (file)
--- 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 990b9ce..7302a41 100644 (file)
--- 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>