From 71ba4dc9540db18cc51e318df94c81e7b49613af Mon Sep 17 00:00:00 2001 From: "Hassan, Sean (sh265m)" Date: Thu, 24 Sep 2020 12:03:43 -0500 Subject: Create and prepare non-deploy release 2.7.2 Issue-ID: AAF-1203 Change-Id: I5c8c5bca1c5804211ba514b5d6492ef1ba81cc24 Signed-off-by: Sean Hassan --- auth-client/pom.xml | 2 +- auth/auth-batch/pom.xml | 2 +- auth/auth-cass/pom.xml | 2 +- auth/auth-certman/pom.xml | 2 +- auth/auth-cmd/pom.xml | 2 +- auth/auth-core/pom.xml | 2 +- auth/auth-deforg/pom.xml | 2 +- auth/auth-fs/pom.xml | 2 +- auth/auth-gui/pom.xml | 2 +- auth/auth-hello/pom.xml | 2 +- auth/auth-locate/pom.xml | 2 +- auth/auth-oauth/pom.xml | 2 +- auth/auth-service/pom.xml | 2 +- auth/docker/pom.xml | 2 +- auth/pom.xml | 2 +- cadi/aaf/pom.xml | 2 +- cadi/aaf/src/main/java/org/onap/aaf/cadi/aaf/v2_0/AAFAuthn.java | 8 ++++---- cadi/client/pom.xml | 2 +- cadi/core/pom.xml | 2 +- cadi/oauth-enduser/pom.xml | 2 +- cadi/pom.xml | 2 +- cadi/servlet-sample/pom.xml | 2 +- misc/env/pom.xml | 2 +- misc/log4j/pom.xml | 2 +- misc/pom.xml | 2 +- misc/rosetta/pom.xml | 2 +- misc/xgen/pom.xml | 2 +- pom.xml | 2 +- version.properties | 2 +- 29 files changed, 32 insertions(+), 32 deletions(-) diff --git a/auth-client/pom.xml b/auth-client/pom.xml index bb6043c4..8d9f389d 100644 --- a/auth-client/pom.xml +++ b/auth-client/pom.xml @@ -26,7 +26,7 @@ org.onap.aaf.authz parent - 2.7.1-SNAPSHOT + 2.7.2-SNAPSHOT aaf-auth-client diff --git a/auth/auth-batch/pom.xml b/auth/auth-batch/pom.xml index dfd6ef63..dc8c2d01 100644 --- a/auth/auth-batch/pom.xml +++ b/auth/auth-batch/pom.xml @@ -25,7 +25,7 @@ org.onap.aaf.authz authparent - 2.7.1-SNAPSHOT + 2.7.2-SNAPSHOT ../pom.xml diff --git a/auth/auth-cass/pom.xml b/auth/auth-cass/pom.xml index a82fbc7a..e9c0ecaf 100644 --- a/auth/auth-cass/pom.xml +++ b/auth/auth-cass/pom.xml @@ -17,7 +17,7 @@ org.onap.aaf.authz authparent - 2.7.1-SNAPSHOT + 2.7.2-SNAPSHOT ../pom.xml diff --git a/auth/auth-certman/pom.xml b/auth/auth-certman/pom.xml index cc825192..9c928a42 100644 --- a/auth/auth-certman/pom.xml +++ b/auth/auth-certman/pom.xml @@ -20,7 +20,7 @@ org.onap.aaf.authz authparent - 2.7.1-SNAPSHOT + 2.7.2-SNAPSHOT ../pom.xml diff --git a/auth/auth-cmd/pom.xml b/auth/auth-cmd/pom.xml index 4ffd87bf..5722e4af 100644 --- a/auth/auth-cmd/pom.xml +++ b/auth/auth-cmd/pom.xml @@ -18,7 +18,7 @@ org.onap.aaf.authz authparent - 2.7.1-SNAPSHOT + 2.7.2-SNAPSHOT ../pom.xml diff --git a/auth/auth-core/pom.xml b/auth/auth-core/pom.xml index 0c251bfb..3fe252d6 100644 --- a/auth/auth-core/pom.xml +++ b/auth/auth-core/pom.xml @@ -25,7 +25,7 @@ org.onap.aaf.authz authparent - 2.7.1-SNAPSHOT + 2.7.2-SNAPSHOT ../pom.xml diff --git a/auth/auth-deforg/pom.xml b/auth/auth-deforg/pom.xml index 257db1d7..b3be5c1d 100644 --- a/auth/auth-deforg/pom.xml +++ b/auth/auth-deforg/pom.xml @@ -26,7 +26,7 @@ authparent ../pom.xml org.onap.aaf.authz - 2.7.1-SNAPSHOT + 2.7.2-SNAPSHOT aaf-auth-deforg diff --git a/auth/auth-fs/pom.xml b/auth/auth-fs/pom.xml index d5217ed4..25c7db6e 100644 --- a/auth/auth-fs/pom.xml +++ b/auth/auth-fs/pom.xml @@ -17,7 +17,7 @@ org.onap.aaf.authz authparent - 2.7.1-SNAPSHOT + 2.7.2-SNAPSHOT ../pom.xml diff --git a/auth/auth-gui/pom.xml b/auth/auth-gui/pom.xml index 1d7460b6..312e5c3e 100644 --- a/auth/auth-gui/pom.xml +++ b/auth/auth-gui/pom.xml @@ -17,7 +17,7 @@ org.onap.aaf.authz authparent - 2.7.1-SNAPSHOT + 2.7.2-SNAPSHOT ../pom.xml diff --git a/auth/auth-hello/pom.xml b/auth/auth-hello/pom.xml index cfc94e11..63c0d05e 100644 --- a/auth/auth-hello/pom.xml +++ b/auth/auth-hello/pom.xml @@ -17,7 +17,7 @@ org.onap.aaf.authz authparent - 2.7.1-SNAPSHOT + 2.7.2-SNAPSHOT ../pom.xml diff --git a/auth/auth-locate/pom.xml b/auth/auth-locate/pom.xml index 0b89dd39..e85484cd 100644 --- a/auth/auth-locate/pom.xml +++ b/auth/auth-locate/pom.xml @@ -17,7 +17,7 @@ org.onap.aaf.authz authparent - 2.7.1-SNAPSHOT + 2.7.2-SNAPSHOT ../pom.xml diff --git a/auth/auth-oauth/pom.xml b/auth/auth-oauth/pom.xml index e234ea8c..b503eeaf 100644 --- a/auth/auth-oauth/pom.xml +++ b/auth/auth-oauth/pom.xml @@ -17,7 +17,7 @@ org.onap.aaf.authz authparent - 2.7.1-SNAPSHOT + 2.7.2-SNAPSHOT ../pom.xml diff --git a/auth/auth-service/pom.xml b/auth/auth-service/pom.xml index 45f89bfc..501a9f97 100644 --- a/auth/auth-service/pom.xml +++ b/auth/auth-service/pom.xml @@ -17,7 +17,7 @@ org.onap.aaf.authz authparent - 2.7.1-SNAPSHOT + 2.7.2-SNAPSHOT ../pom.xml diff --git a/auth/docker/pom.xml b/auth/docker/pom.xml index ab99c702..f5ce443b 100644 --- a/auth/docker/pom.xml +++ b/auth/docker/pom.xml @@ -25,7 +25,7 @@ org.onap.aaf.authz authparent - 2.7.1-SNAPSHOT + 2.7.2-SNAPSHOT ../pom.xml diff --git a/auth/pom.xml b/auth/pom.xml index fbb050ea..e392cdc6 100644 --- a/auth/pom.xml +++ b/auth/pom.xml @@ -26,7 +26,7 @@ org.onap.aaf.authz parent - 2.7.1-SNAPSHOT + 2.7.2-SNAPSHOT authparent AAF Auth Parent diff --git a/cadi/aaf/pom.xml b/cadi/aaf/pom.xml index 8051ffa8..5504e265 100644 --- a/cadi/aaf/pom.xml +++ b/cadi/aaf/pom.xml @@ -24,7 +24,7 @@ org.onap.aaf.authz cadiparent - 2.7.1-SNAPSHOT + 2.7.2-SNAPSHOT .. 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 dbb9d5c9..f74306fb 100644 --- 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 @@ -108,7 +108,7 @@ public class AAFAuthn extends AbsUserCache { } } - AAFCachedPrincipal cp = new AAFCachedPrincipal(user, bytes, con.cleanInterval); + AAFCachedPrincipal cp = new AAFCachedPrincipal(user, bytes, con.userExpires); // Since I've relocated the Validation piece in the Principal, just revalidate, then do Switch // Statement switch(cp.revalidate(state)) { @@ -116,13 +116,13 @@ public class AAFAuthn extends AbsUserCache { if (usr!=null) { usr.principal = cp; } else { - addUser(new User(cp,con.timeout)); + addUser(new User(cp,con.userExpires)); } return null; case INACCESSIBLE: return "AAF Inaccessible"; case UNVALIDATED: - addUser(new User(user,bytes,con.timeout)); + addUser(new User(user,bytes,con.userExpires)); return "user/pass combo invalid for " + user; case DENIED: return "AAF denies API for " + user; @@ -169,7 +169,7 @@ public class AAFAuthn extends AbsUserCache { // ); if (fp.get(con.timeout)) { expires = System.currentTimeMillis() + timeToLive; - addUser(new User(this, expires)); + addUser(new User(this, timeToLive)); return Resp.REVALIDATED; } else { addMiss(getName(), getCred()); diff --git a/cadi/client/pom.xml b/cadi/client/pom.xml index b0a4492b..a87867dc 100644 --- a/cadi/client/pom.xml +++ b/cadi/client/pom.xml @@ -22,7 +22,7 @@ org.onap.aaf.authz cadiparent - 2.7.1-SNAPSHOT + 2.7.2-SNAPSHOT .. diff --git a/cadi/core/pom.xml b/cadi/core/pom.xml index eda4a394..1bd1d5ac 100644 --- a/cadi/core/pom.xml +++ b/cadi/core/pom.xml @@ -16,7 +16,7 @@ org.onap.aaf.authz cadiparent .. - 2.7.1-SNAPSHOT + 2.7.2-SNAPSHOT 4.0.0 diff --git a/cadi/oauth-enduser/pom.xml b/cadi/oauth-enduser/pom.xml index 0c4a7019..3043f15c 100644 --- a/cadi/oauth-enduser/pom.xml +++ b/cadi/oauth-enduser/pom.xml @@ -25,7 +25,7 @@ org.onap.aaf.authz cadiparent - 2.7.1-SNAPSHOT + 2.7.2-SNAPSHOT .. diff --git a/cadi/pom.xml b/cadi/pom.xml index ebfaf509..6c7e2896 100644 --- a/cadi/pom.xml +++ b/cadi/pom.xml @@ -24,7 +24,7 @@ org.onap.aaf.authz parent - 2.7.1-SNAPSHOT + 2.7.2-SNAPSHOT cadiparent AAF CADI Parent (Code, Access, Data, Identity) diff --git a/cadi/servlet-sample/pom.xml b/cadi/servlet-sample/pom.xml index 0350df49..b0d4a677 100644 --- a/cadi/servlet-sample/pom.xml +++ b/cadi/servlet-sample/pom.xml @@ -4,7 +4,7 @@ org.onap.aaf.authz cadiparent .. - 2.7.1-SNAPSHOT + 2.7.2-SNAPSHOT 4.0.0 CADI Servlet Sample (Test Only) diff --git a/misc/env/pom.xml b/misc/env/pom.xml index 409ce4be..3776f637 100644 --- a/misc/env/pom.xml +++ b/misc/env/pom.xml @@ -24,7 +24,7 @@ org.onap.aaf.authz miscparent - 2.7.1-SNAPSHOT + 2.7.2-SNAPSHOT .. diff --git a/misc/log4j/pom.xml b/misc/log4j/pom.xml index 463029a5..db3bd301 100644 --- a/misc/log4j/pom.xml +++ b/misc/log4j/pom.xml @@ -24,7 +24,7 @@ org.onap.aaf.authz miscparent - 2.7.1-SNAPSHOT + 2.7.2-SNAPSHOT .. diff --git a/misc/pom.xml b/misc/pom.xml index 66eb64a8..5720cfb1 100644 --- a/misc/pom.xml +++ b/misc/pom.xml @@ -25,7 +25,7 @@ org.onap.aaf.authz parent - 2.7.1-SNAPSHOT + 2.7.2-SNAPSHOT miscparent AAF Misc Parent diff --git a/misc/rosetta/pom.xml b/misc/rosetta/pom.xml index c7cbd7dd..aca025b5 100644 --- a/misc/rosetta/pom.xml +++ b/misc/rosetta/pom.xml @@ -24,7 +24,7 @@ org.onap.aaf.authz miscparent - 2.7.1-SNAPSHOT + 2.7.2-SNAPSHOT .. diff --git a/misc/xgen/pom.xml b/misc/xgen/pom.xml index 90f287f4..1df6056e 100644 --- a/misc/xgen/pom.xml +++ b/misc/xgen/pom.xml @@ -24,7 +24,7 @@ org.onap.aaf.authz miscparent - 2.7.1-SNAPSHOT + 2.7.2-SNAPSHOT .. diff --git a/pom.xml b/pom.xml index 8ba61fea..38d43025 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.onap.aaf.authz parent - 2.7.1-SNAPSHOT + 2.7.2-SNAPSHOT aaf-authz pom diff --git a/version.properties b/version.properties index 77d490c5..9bdcd7be 100644 --- a/version.properties +++ b/version.properties @@ -27,7 +27,7 @@ # This TAG 2.7.0-SNAPSHOT is here to help remember to change this file. Keep it up to date with the following "real" entries: major=2 minor=7 -patch=1 +patch=2 base_version=${major}.${minor}.${patch} -- cgit 1.2.3-korg