Prepare for release 2.7.4

Issue-ID: AAF-1209
Change-Id: If4014cdbc72dc585b814b6d6ed0c66ffddb08eda
Signed-off-by: Sean Hassan <sean.hassan@att.com>

diff --git a/auth-client/pom.xml b/auth-client/pom.xml
index b6c765e..f87f982 100644 (file)
--- a/auth-client/pom.xml
+++ b/auth-client/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.onap.aaf.authz</groupId>
         <artifactId>parent</artifactId>
-        <version>2.7.3-SNAPSHOT</version>
+        <version>2.7.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>aaf-auth-client</artifactId>

diff --git a/auth/auth-batch/pom.xml b/auth/auth-batch/pom.xml
index c8c3b8c..b8cd5ef 100644 (file)
--- a/auth/auth-batch/pom.xml
+++ b/auth/auth-batch/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.onap.aaf.authz</groupId>
         <artifactId>authparent</artifactId>
-        <version>2.7.3-SNAPSHOT</version>
+        <version>2.7.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/auth/auth-cass/pom.xml b/auth/auth-cass/pom.xml
index d471609..0be9d85 100644 (file)
--- a/auth/auth-cass/pom.xml
+++ b/auth/auth-cass/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>org.onap.aaf.authz</groupId>
         <artifactId>authparent</artifactId>
-        <version>2.7.3-SNAPSHOT</version>
+        <version>2.7.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/auth/auth-certman/pom.xml b/auth/auth-certman/pom.xml
index aba1f98..94c2a6d 100644 (file)
--- a/auth/auth-certman/pom.xml
+++ b/auth/auth-certman/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>org.onap.aaf.authz</groupId>
         <artifactId>authparent</artifactId>
-        <version>2.7.3-SNAPSHOT</version>
+        <version>2.7.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/auth/auth-cmd/pom.xml b/auth/auth-cmd/pom.xml
index 0c92677..656d45a 100644 (file)
--- a/auth/auth-cmd/pom.xml
+++ b/auth/auth-cmd/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>org.onap.aaf.authz</groupId>
         <artifactId>authparent</artifactId>
-        <version>2.7.3-SNAPSHOT</version>
+        <version>2.7.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/auth/auth-core/pom.xml b/auth/auth-core/pom.xml
index d19326e..3d3cede 100644 (file)
--- a/auth/auth-core/pom.xml
+++ b/auth/auth-core/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.onap.aaf.authz</groupId>
         <artifactId>authparent</artifactId>
-        <version>2.7.3-SNAPSHOT</version>
+        <version>2.7.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/auth/auth-deforg/pom.xml b/auth/auth-deforg/pom.xml
index 605b767..bd3af3a 100644 (file)
--- a/auth/auth-deforg/pom.xml
+++ b/auth/auth-deforg/pom.xml
@@ -26,7 +26,7 @@
         <artifactId>authparent</artifactId>
         <relativePath>../pom.xml</relativePath>
         <groupId>org.onap.aaf.authz</groupId>
-        <version>2.7.3-SNAPSHOT</version>
+        <version>2.7.4-SNAPSHOT</version>
     </parent>
 
     <artifactId>aaf-auth-deforg</artifactId>

diff --git a/auth/auth-fs/pom.xml b/auth/auth-fs/pom.xml
index 712ff75..21e820c 100644 (file)
--- a/auth/auth-fs/pom.xml
+++ b/auth/auth-fs/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>org.onap.aaf.authz</groupId>
         <artifactId>authparent</artifactId>
-        <version>2.7.3-SNAPSHOT</version>
+        <version>2.7.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/auth/auth-gui/pom.xml b/auth/auth-gui/pom.xml
index 2afe19a..cb61fe0 100644 (file)
--- a/auth/auth-gui/pom.xml
+++ b/auth/auth-gui/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>org.onap.aaf.authz</groupId>
         <artifactId>authparent</artifactId>
-        <version>2.7.3-SNAPSHOT</version>
+        <version>2.7.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/auth/auth-hello/pom.xml b/auth/auth-hello/pom.xml
index 1a0c622..856a316 100644 (file)
--- a/auth/auth-hello/pom.xml
+++ b/auth/auth-hello/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>org.onap.aaf.authz</groupId>
         <artifactId>authparent</artifactId>
-        <version>2.7.3-SNAPSHOT</version>
+        <version>2.7.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/auth/auth-locate/pom.xml b/auth/auth-locate/pom.xml
index ebff0e7..e30fc39 100644 (file)
--- a/auth/auth-locate/pom.xml
+++ b/auth/auth-locate/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>org.onap.aaf.authz</groupId>
         <artifactId>authparent</artifactId>
-        <version>2.7.3-SNAPSHOT</version>
+        <version>2.7.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/auth/auth-oauth/pom.xml b/auth/auth-oauth/pom.xml
index 574bb01..19f6cfc 100644 (file)
--- a/auth/auth-oauth/pom.xml
+++ b/auth/auth-oauth/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>org.onap.aaf.authz</groupId>
         <artifactId>authparent</artifactId>
-        <version>2.7.3-SNAPSHOT</version>
+        <version>2.7.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/auth/auth-service/pom.xml b/auth/auth-service/pom.xml
index 71f5b89..45cd601 100644 (file)
--- a/auth/auth-service/pom.xml
+++ b/auth/auth-service/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>org.onap.aaf.authz</groupId>
         <artifactId>authparent</artifactId>
-        <version>2.7.3-SNAPSHOT</version>
+        <version>2.7.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/auth/docker/pom.xml b/auth/docker/pom.xml
index b239d0f..8f7782e 100644 (file)
--- a/auth/docker/pom.xml
+++ b/auth/docker/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.onap.aaf.authz</groupId>
         <artifactId>authparent</artifactId>
-        <version>2.7.3-SNAPSHOT</version>
+        <version>2.7.4-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/auth/pom.xml b/auth/pom.xml
index 7646478..16804d3 100644 (file)
--- a/auth/pom.xml
+++ b/auth/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.onap.aaf.authz</groupId>
         <artifactId>parent</artifactId>
-        <version>2.7.3-SNAPSHOT</version>
+        <version>2.7.4-SNAPSHOT</version>
     </parent>
     <artifactId>authparent</artifactId>
     <name>AAF Auth Parent</name>

diff --git a/cadi/aaf/pom.xml b/cadi/aaf/pom.xml
index 7b475f5..5077ddb 100644 (file)
--- a/cadi/aaf/pom.xml
+++ b/cadi/aaf/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.onap.aaf.authz</groupId>
         <artifactId>cadiparent</artifactId>
-        <version>2.7.3-SNAPSHOT</version>
+        <version>2.7.4-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/cadi/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFAuthn.java b/cadi/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFAuthn.java
index d1a3b19..e16782f 100644 (file)
--- a/cadi/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFAuthn.java
+++ b/cadi/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFAuthn.java
@@ -161,17 +161,12 @@ public class AAFAuthn<CLIENT> extends AbsUserCache<AAFPermission> {
                 try {
                     Miss missed = missed(getName(), getCred());
                     if (missed == null || missed.mayContinue()) {
-                        CredRequest cr = new CredRequest();
-                        cr.setId(getName());
-                        cr.setPassword(new String(getCred()));
-                        Rcli<CLIENT> client = con.clientIgnoreAlreadyAttempted(attemptedUris);
+                        Rcli<CLIENT> client = con.clientIgnoreAlreadyAttempted(attemptedUris).forUser(con.basicAuth(getName(), new String(getCred())));
                         thisUri = client.getURI();
-                        Future<String> fp = client.readPost("/authn/validate", con.credReqDF, cr);
-                        //Rcli<CLIENT> client = con.client().forUser(con.basicAuth(getName(), new String(getCred())));
-                        //Future<String> fp = client.read(
-                        //        "/authn/basicAuth",
-                        //        "text/plain"
-                        //       );
+                        Future<String> fp = client.read(
+                                "/authn/basicAuth",
+                                "text/plain"
+                               );
                         if (fp.get(con.timeout)) {
                             expires = System.currentTimeMillis() + timeToLive;
                             addUser(new User<AAFPermission>(this, timeToLive));

diff --git a/cadi/client/pom.xml b/cadi/client/pom.xml
index d781055..1ecc96a 100644 (file)
--- a/cadi/client/pom.xml
+++ b/cadi/client/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onap.aaf.authz</groupId>
         <artifactId>cadiparent</artifactId>
-        <version>2.7.3-SNAPSHOT</version>
+        <version>2.7.4-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/cadi/core/pom.xml b/cadi/core/pom.xml
index c4d5d75..1dc419a 100644 (file)
--- a/cadi/core/pom.xml
+++ b/cadi/core/pom.xml
@@ -16,7 +16,7 @@
         <groupId>org.onap.aaf.authz</groupId>
         <artifactId>cadiparent</artifactId>
         <relativePath>..</relativePath>
-        <version>2.7.3-SNAPSHOT</version>
+        <version>2.7.4-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/cadi/oauth-enduser/pom.xml b/cadi/oauth-enduser/pom.xml
index 54080f9..a9a2207 100644 (file)
--- a/cadi/oauth-enduser/pom.xml
+++ b/cadi/oauth-enduser/pom.xml
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.onap.aaf.authz</groupId>
         <artifactId>cadiparent</artifactId>
-        <version>2.7.3-SNAPSHOT</version>
+        <version>2.7.4-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
     

diff --git a/cadi/pom.xml b/cadi/pom.xml
index 89cb405..ba74e92 100644 (file)
--- a/cadi/pom.xml
+++ b/cadi/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.onap.aaf.authz</groupId>
         <artifactId>parent</artifactId>
-        <version>2.7.3-SNAPSHOT</version>
+        <version>2.7.4-SNAPSHOT</version>
     </parent>
     <artifactId>cadiparent</artifactId>
     <name>AAF CADI Parent (Code, Access, Data, Identity)</name>

diff --git a/cadi/servlet-sample/pom.xml b/cadi/servlet-sample/pom.xml
index ac80b1b..c2f3982 100644 (file)
--- a/cadi/servlet-sample/pom.xml
+++ b/cadi/servlet-sample/pom.xml
@@ -4,7 +4,7 @@
         <groupId>org.onap.aaf.authz</groupId>
         <artifactId>cadiparent</artifactId>
         <relativePath>..</relativePath>
-        <version>2.7.3-SNAPSHOT</version>
+        <version>2.7.4-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <name>CADI Servlet Sample (Test Only)</name>

diff --git a/misc/env/pom.xml b/misc/env/pom.xml
index 1c8c98c..58ba364 100644 (file)
--- a/misc/env/pom.xml
+++ b/misc/env/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.onap.aaf.authz</groupId>
         <artifactId>miscparent</artifactId>
-        <version>2.7.3-SNAPSHOT</version>
+        <version>2.7.4-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/misc/log4j/pom.xml b/misc/log4j/pom.xml
index e725fa2..cc08f44 100644 (file)
--- a/misc/log4j/pom.xml
+++ b/misc/log4j/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.onap.aaf.authz</groupId>
         <artifactId>miscparent</artifactId>
-        <version>2.7.3-SNAPSHOT</version>
+        <version>2.7.4-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/misc/pom.xml b/misc/pom.xml
index b380d98..1c475ce 100644 (file)
--- a/misc/pom.xml
+++ b/misc/pom.xml
@@ -25,7 +25,7 @@
     <parent>
        <groupId>org.onap.aaf.authz</groupId>
        <artifactId>parent</artifactId>
-       <version>2.7.3-SNAPSHOT</version>
+       <version>2.7.4-SNAPSHOT</version>
     </parent>
     <artifactId>miscparent</artifactId>
     <name>AAF Misc Parent</name>

diff --git a/misc/rosetta/pom.xml b/misc/rosetta/pom.xml
index d6a3566..b062533 100644 (file)
--- a/misc/rosetta/pom.xml
+++ b/misc/rosetta/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.onap.aaf.authz</groupId>
         <artifactId>miscparent</artifactId>
-        <version>2.7.3-SNAPSHOT</version>
+        <version>2.7.4-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/misc/xgen/pom.xml b/misc/xgen/pom.xml
index 4bd271b..8de9354 100644 (file)
--- a/misc/xgen/pom.xml
+++ b/misc/xgen/pom.xml
@@ -24,7 +24,7 @@
     <parent>
         <groupId>org.onap.aaf.authz</groupId>
         <artifactId>miscparent</artifactId>
-        <version>2.7.3-SNAPSHOT</version>
+        <version>2.7.4-SNAPSHOT</version>
         <relativePath>..</relativePath>
     </parent>
 

diff --git a/pom.xml b/pom.xml
index 25e2566..9edf385 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.onap.aaf.authz</groupId>
     <artifactId>parent</artifactId>
-    <version>2.7.3-SNAPSHOT</version>
+    <version>2.7.4-SNAPSHOT</version>
     <name>aaf-authz</name>
     <packaging>pom</packaging>
 

diff --git a/version.properties b/version.properties
index 9b78cd0..9575b61 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -27,7 +27,7 @@
 # This TAG <version>2.7.0-SNAPSHOT</version> is here to help remember to change this file.  Keep it up to date with the following "real" entries:
 major=2
 minor=7
-patch=3
+patch=4
 
 base_version=${major}.${minor}.${patch}