From d47bcb076eda98afc13cdb29e8c56e8be25e78d3 Mon Sep 17 00:00:00 2001 From: Sean Hassan Date: Mon, 26 Oct 2020 20:54:21 -0500 Subject: [PATCH] Prepare for release 2.7.4 Issue-ID: AAF-1209 Change-Id: If4014cdbc72dc585b814b6d6ed0c66ffddb08eda 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 +- .../main/java/org/onap/aaf/cadi/aaf/v2_0/AAFAuthn.java | 15 +++++---------- 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, 33 insertions(+), 38 deletions(-) diff --git a/auth-client/pom.xml b/auth-client/pom.xml index b6c765e1..f87f982f 100644 --- a/auth-client/pom.xml +++ b/auth-client/pom.xml @@ -26,7 +26,7 @@ org.onap.aaf.authz parent - 2.7.3-SNAPSHOT + 2.7.4-SNAPSHOT aaf-auth-client diff --git a/auth/auth-batch/pom.xml b/auth/auth-batch/pom.xml index c8c3b8c0..b8cd5efa 100644 --- a/auth/auth-batch/pom.xml +++ b/auth/auth-batch/pom.xml @@ -25,7 +25,7 @@ org.onap.aaf.authz authparent - 2.7.3-SNAPSHOT + 2.7.4-SNAPSHOT ../pom.xml diff --git a/auth/auth-cass/pom.xml b/auth/auth-cass/pom.xml index d4716098..0be9d85a 100644 --- a/auth/auth-cass/pom.xml +++ b/auth/auth-cass/pom.xml @@ -17,7 +17,7 @@ org.onap.aaf.authz authparent - 2.7.3-SNAPSHOT + 2.7.4-SNAPSHOT ../pom.xml diff --git a/auth/auth-certman/pom.xml b/auth/auth-certman/pom.xml index aba1f988..94c2a6de 100644 --- a/auth/auth-certman/pom.xml +++ b/auth/auth-certman/pom.xml @@ -20,7 +20,7 @@ org.onap.aaf.authz authparent - 2.7.3-SNAPSHOT + 2.7.4-SNAPSHOT ../pom.xml diff --git a/auth/auth-cmd/pom.xml b/auth/auth-cmd/pom.xml index 0c926773..656d45af 100644 --- a/auth/auth-cmd/pom.xml +++ b/auth/auth-cmd/pom.xml @@ -18,7 +18,7 @@ org.onap.aaf.authz authparent - 2.7.3-SNAPSHOT + 2.7.4-SNAPSHOT ../pom.xml diff --git a/auth/auth-core/pom.xml b/auth/auth-core/pom.xml index d19326ec..3d3cedec 100644 --- a/auth/auth-core/pom.xml +++ b/auth/auth-core/pom.xml @@ -25,7 +25,7 @@ org.onap.aaf.authz authparent - 2.7.3-SNAPSHOT + 2.7.4-SNAPSHOT ../pom.xml diff --git a/auth/auth-deforg/pom.xml b/auth/auth-deforg/pom.xml index 605b7671..bd3af3a8 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.3-SNAPSHOT + 2.7.4-SNAPSHOT aaf-auth-deforg diff --git a/auth/auth-fs/pom.xml b/auth/auth-fs/pom.xml index 712ff753..21e820c0 100644 --- a/auth/auth-fs/pom.xml +++ b/auth/auth-fs/pom.xml @@ -17,7 +17,7 @@ org.onap.aaf.authz authparent - 2.7.3-SNAPSHOT + 2.7.4-SNAPSHOT ../pom.xml diff --git a/auth/auth-gui/pom.xml b/auth/auth-gui/pom.xml index 2afe19a7..cb61fe0f 100644 --- a/auth/auth-gui/pom.xml +++ b/auth/auth-gui/pom.xml @@ -17,7 +17,7 @@ org.onap.aaf.authz authparent - 2.7.3-SNAPSHOT + 2.7.4-SNAPSHOT ../pom.xml diff --git a/auth/auth-hello/pom.xml b/auth/auth-hello/pom.xml index 1a0c622d..856a316f 100644 --- a/auth/auth-hello/pom.xml +++ b/auth/auth-hello/pom.xml @@ -17,7 +17,7 @@ org.onap.aaf.authz authparent - 2.7.3-SNAPSHOT + 2.7.4-SNAPSHOT ../pom.xml diff --git a/auth/auth-locate/pom.xml b/auth/auth-locate/pom.xml index ebff0e7d..e30fc390 100644 --- a/auth/auth-locate/pom.xml +++ b/auth/auth-locate/pom.xml @@ -17,7 +17,7 @@ org.onap.aaf.authz authparent - 2.7.3-SNAPSHOT + 2.7.4-SNAPSHOT ../pom.xml diff --git a/auth/auth-oauth/pom.xml b/auth/auth-oauth/pom.xml index 574bb01c..19f6cfcc 100644 --- a/auth/auth-oauth/pom.xml +++ b/auth/auth-oauth/pom.xml @@ -17,7 +17,7 @@ org.onap.aaf.authz authparent - 2.7.3-SNAPSHOT + 2.7.4-SNAPSHOT ../pom.xml diff --git a/auth/auth-service/pom.xml b/auth/auth-service/pom.xml index 71f5b898..45cd601f 100644 --- a/auth/auth-service/pom.xml +++ b/auth/auth-service/pom.xml @@ -17,7 +17,7 @@ org.onap.aaf.authz authparent - 2.7.3-SNAPSHOT + 2.7.4-SNAPSHOT ../pom.xml diff --git a/auth/docker/pom.xml b/auth/docker/pom.xml index b239d0f1..8f7782e7 100644 --- a/auth/docker/pom.xml +++ b/auth/docker/pom.xml @@ -25,7 +25,7 @@ org.onap.aaf.authz authparent - 2.7.3-SNAPSHOT + 2.7.4-SNAPSHOT ../pom.xml diff --git a/auth/pom.xml b/auth/pom.xml index 76464783..16804d32 100644 --- a/auth/pom.xml +++ b/auth/pom.xml @@ -26,7 +26,7 @@ org.onap.aaf.authz parent - 2.7.3-SNAPSHOT + 2.7.4-SNAPSHOT authparent AAF Auth Parent diff --git a/cadi/aaf/pom.xml b/cadi/aaf/pom.xml index 7b475f52..5077ddb9 100644 --- a/cadi/aaf/pom.xml +++ b/cadi/aaf/pom.xml @@ -24,7 +24,7 @@ org.onap.aaf.authz cadiparent - 2.7.3-SNAPSHOT + 2.7.4-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 d1a3b19b..e16782fa 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 @@ -161,17 +161,12 @@ public class AAFAuthn extends AbsUserCache { 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 = con.clientIgnoreAlreadyAttempted(attemptedUris); + Rcli client = con.clientIgnoreAlreadyAttempted(attemptedUris).forUser(con.basicAuth(getName(), new String(getCred()))); thisUri = client.getURI(); - Future fp = client.readPost("/authn/validate", con.credReqDF, cr); - //Rcli client = con.client().forUser(con.basicAuth(getName(), new String(getCred()))); - //Future fp = client.read( - // "/authn/basicAuth", - // "text/plain" - // ); + Future fp = client.read( + "/authn/basicAuth", + "text/plain" + ); if (fp.get(con.timeout)) { expires = System.currentTimeMillis() + timeToLive; addUser(new User(this, timeToLive)); diff --git a/cadi/client/pom.xml b/cadi/client/pom.xml index d7810552..1ecc96ae 100644 --- a/cadi/client/pom.xml +++ b/cadi/client/pom.xml @@ -22,7 +22,7 @@ org.onap.aaf.authz cadiparent - 2.7.3-SNAPSHOT + 2.7.4-SNAPSHOT .. diff --git a/cadi/core/pom.xml b/cadi/core/pom.xml index c4d5d75b..1dc419aa 100644 --- a/cadi/core/pom.xml +++ b/cadi/core/pom.xml @@ -16,7 +16,7 @@ org.onap.aaf.authz cadiparent .. - 2.7.3-SNAPSHOT + 2.7.4-SNAPSHOT 4.0.0 diff --git a/cadi/oauth-enduser/pom.xml b/cadi/oauth-enduser/pom.xml index 54080f91..a9a2207f 100644 --- a/cadi/oauth-enduser/pom.xml +++ b/cadi/oauth-enduser/pom.xml @@ -25,7 +25,7 @@ org.onap.aaf.authz cadiparent - 2.7.3-SNAPSHOT + 2.7.4-SNAPSHOT .. diff --git a/cadi/pom.xml b/cadi/pom.xml index 89cb4058..ba74e929 100644 --- a/cadi/pom.xml +++ b/cadi/pom.xml @@ -24,7 +24,7 @@ org.onap.aaf.authz parent - 2.7.3-SNAPSHOT + 2.7.4-SNAPSHOT cadiparent AAF CADI Parent (Code, Access, Data, Identity) diff --git a/cadi/servlet-sample/pom.xml b/cadi/servlet-sample/pom.xml index ac80b1b7..c2f3982f 100644 --- a/cadi/servlet-sample/pom.xml +++ b/cadi/servlet-sample/pom.xml @@ -4,7 +4,7 @@ org.onap.aaf.authz cadiparent .. - 2.7.3-SNAPSHOT + 2.7.4-SNAPSHOT 4.0.0 CADI Servlet Sample (Test Only) diff --git a/misc/env/pom.xml b/misc/env/pom.xml index 1c8c98ce..58ba3642 100644 --- a/misc/env/pom.xml +++ b/misc/env/pom.xml @@ -24,7 +24,7 @@ org.onap.aaf.authz miscparent - 2.7.3-SNAPSHOT + 2.7.4-SNAPSHOT .. diff --git a/misc/log4j/pom.xml b/misc/log4j/pom.xml index e725fa28..cc08f441 100644 --- a/misc/log4j/pom.xml +++ b/misc/log4j/pom.xml @@ -24,7 +24,7 @@ org.onap.aaf.authz miscparent - 2.7.3-SNAPSHOT + 2.7.4-SNAPSHOT .. diff --git a/misc/pom.xml b/misc/pom.xml index b380d98f..1c475ce4 100644 --- a/misc/pom.xml +++ b/misc/pom.xml @@ -25,7 +25,7 @@ org.onap.aaf.authz parent - 2.7.3-SNAPSHOT + 2.7.4-SNAPSHOT miscparent AAF Misc Parent diff --git a/misc/rosetta/pom.xml b/misc/rosetta/pom.xml index d6a3566e..b0625333 100644 --- a/misc/rosetta/pom.xml +++ b/misc/rosetta/pom.xml @@ -24,7 +24,7 @@ org.onap.aaf.authz miscparent - 2.7.3-SNAPSHOT + 2.7.4-SNAPSHOT .. diff --git a/misc/xgen/pom.xml b/misc/xgen/pom.xml index 4bd271b6..8de93549 100644 --- a/misc/xgen/pom.xml +++ b/misc/xgen/pom.xml @@ -24,7 +24,7 @@ org.onap.aaf.authz miscparent - 2.7.3-SNAPSHOT + 2.7.4-SNAPSHOT .. diff --git a/pom.xml b/pom.xml index 25e25662..9edf385c 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.onap.aaf.authz parent - 2.7.3-SNAPSHOT + 2.7.4-SNAPSHOT aaf-authz pom diff --git a/version.properties b/version.properties index 9b78cd0b..9575b61b 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=3 +patch=4 base_version=${major}.${minor}.${patch} -- 2.16.6