From 005e2535847fc602648fabb1972636bc345e0e60 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Fri, 7 May 2021 19:28:58 +0200 Subject: [PATCH] Bump MRI upstreams Adopt following versions: - odlparent-8.1.2 - infrautils-1.9.7 - yangtools-6.0.6 - mdsal-7.0.7 - controller-3.0.8 Change-Id: I2db011755ccea35c4fce4a78ad2c77f9885c2058 Signed-off-by: Robert Varga --- .../aaa/cli/dmstore/AddDomain.java | 15 ++++++++---- .../aaa/cli/dmstore/AddGrant.java | 22 ++++++++++++------ .../opendaylight/aaa/cli/dmstore/AddRole.java | 22 ++++++++++++------ .../aaa/cli/dmstore/ChangeUserPassword.java | 9 +++++--- .../aaa/cli/dmstore/RemoveDomain.java | 9 ++++---- .../aaa/cli/dmstore/RemoveGrant.java | 23 ++++++++++++------- .../aaa/cli/dmstore/RemoveRole.java | 9 ++++---- .../aaa/cli/dmstore/RemoveUser.java | 9 ++++---- aaa-encrypt-service/pom.xml | 2 +- aaa-password-service/pom.xml | 2 +- .../aaa/shiro/idm/OSGIIdmLightProxy.java | 4 ++-- .../aaa/shiro/realm/KeystoneAuthRealm.java | 6 ++--- aaa-shiro/pom.xml | 2 +- artifacts/pom.xml | 2 +- docs/pom.xml | 14 +++++------ features/features-aaa/pom.xml | 2 +- features/odl-aaa-api/pom.xml | 4 ++-- features/odl-aaa-cert/pom.xml | 4 ++-- features/odl-aaa-cli/pom.xml | 2 +- features/odl-aaa-encryption-service/pom.xml | 4 ++-- features/odl-aaa-password-service/pom.xml | 6 ++--- features/odl-aaa-shiro/pom.xml | 2 +- features/odl-aaa-web/pom.xml | 4 ++-- features/pom.xml | 2 +- karaf/pom.xml | 2 +- parent/pom.xml | 4 ++-- pom.xml | 2 +- web/pom.xml | 2 +- web/testutils/pom.xml | 2 +- 29 files changed, 112 insertions(+), 80 deletions(-) diff --git a/aaa-cli/src/main/java/org/opendaylight/aaa/cli/dmstore/AddDomain.java b/aaa-cli/src/main/java/org/opendaylight/aaa/cli/dmstore/AddDomain.java index d566bd993..bfa1424bf 100644 --- a/aaa-cli/src/main/java/org/opendaylight/aaa/cli/dmstore/AddDomain.java +++ b/aaa-cli/src/main/java/org/opendaylight/aaa/cli/dmstore/AddDomain.java @@ -22,13 +22,18 @@ import org.opendaylight.aaa.cli.AaaCliAbstractCommand; @Service @Command(name = "add-domain", scope = "aaa", description = "Add domain.") public class AddDomain extends AaaCliAbstractCommand { - - @Option(name = "-name", aliases = { - "--domainName" }, description = "The domain name", required = true, multiValued = false) + @Option(name = "-name", + aliases = { "--domainName" }, + description = "The domain name", + required = true, + multiValued = false) private String domainName; - @Option(name = "-desc", aliases = { - "--domainDescription" }, description = "The domain Description", required = true, multiValued = false) + @Option(name = "-desc", + aliases = { "--domainDescription" }, + description = "The domain Description", + required = true, + multiValued = false) private String domainDesc; @Override diff --git a/aaa-cli/src/main/java/org/opendaylight/aaa/cli/dmstore/AddGrant.java b/aaa-cli/src/main/java/org/opendaylight/aaa/cli/dmstore/AddGrant.java index da8ca018f..89105c09f 100644 --- a/aaa-cli/src/main/java/org/opendaylight/aaa/cli/dmstore/AddGrant.java +++ b/aaa-cli/src/main/java/org/opendaylight/aaa/cli/dmstore/AddGrant.java @@ -23,17 +23,25 @@ import org.opendaylight.aaa.cli.utils.DataStoreUtils; @Service @Command(name = "add-grant", scope = "aaa", description = "Add Grant.") public class AddGrant extends AaaCliAbstractCommand { - - @Option(name = "-uname", aliases = { - "--userName" }, description = "The user name", required = true, multiValued = false) + @Option(name = "-uname", + aliases = { "--userName" }, + description = "The user name", + required = true, + multiValued = false) private String userName; - @Option(name = "-dname", aliases = { - "--domainName" }, description = "The domain name", required = true, multiValued = false) + @Option(name = "-dname", + aliases = { "--domainName" }, + description = "The domain name", + required = true, + multiValued = false) private String domainName; - @Option(name = "-rname", aliases = { - "--roleName" }, description = "The role name", required = false, multiValued = false) + @Option(name = "-rname", + aliases = { "--roleName" }, + description = "The role name", + required = false, + multiValued = false) private String roleName; @Override diff --git a/aaa-cli/src/main/java/org/opendaylight/aaa/cli/dmstore/AddRole.java b/aaa-cli/src/main/java/org/opendaylight/aaa/cli/dmstore/AddRole.java index eb4d99b48..d50bf70c8 100644 --- a/aaa-cli/src/main/java/org/opendaylight/aaa/cli/dmstore/AddRole.java +++ b/aaa-cli/src/main/java/org/opendaylight/aaa/cli/dmstore/AddRole.java @@ -23,17 +23,25 @@ import org.opendaylight.aaa.cli.utils.DataStoreUtils; @Service @Command(name = "add-role", scope = "aaa", description = "Add role.") public class AddRole extends AaaCliAbstractCommand { - - @Option(name = "-name", aliases = { - "--roleName" }, description = "The role name", required = true, multiValued = false) + @Option(name = "-name", + aliases = { "--roleName" }, + description = "The role name", + required = true, + multiValued = false) private String roleName; - @Option(name = "-dname", aliases = { - "--domainName" }, description = "The domain name", required = true, multiValued = false) + @Option(name = "-dname", + aliases = { "--domainName" }, + description = "The domain name", + required = true, + multiValued = false) private String domainName; - @Option(name = "-desc", aliases = { - "--roleDescription" }, description = "The role Description", required = true, multiValued = false) + @Option(name = "-desc", + aliases = { "--roleDescription" }, + description = "The role Description", + required = true, + multiValued = false) private String roleDesc; @Override diff --git a/aaa-cli/src/main/java/org/opendaylight/aaa/cli/dmstore/ChangeUserPassword.java b/aaa-cli/src/main/java/org/opendaylight/aaa/cli/dmstore/ChangeUserPassword.java index 659287522..78fcadf90 100644 --- a/aaa-cli/src/main/java/org/opendaylight/aaa/cli/dmstore/ChangeUserPassword.java +++ b/aaa-cli/src/main/java/org/opendaylight/aaa/cli/dmstore/ChangeUserPassword.java @@ -26,12 +26,15 @@ import org.opendaylight.aaa.api.password.service.PasswordHashService; @Service @Command(name = "change-user-pwd", scope = "aaa", description = "Change the user password.") public class ChangeUserPassword implements Action { - public static final String CHANGE_PASSWORD_FAIL = "Wrong username or current password"; + @Reference private IIDMStore identityStore; - @Option(name = "-user", aliases = { - "--userName" }, description = "The user name", required = true, multiValued = false) + @Option(name = "-user", + aliases = { "--userName" }, + description = "The user name", + required = true, + multiValued = false) private String userName; @Option(name = "-pass", diff --git a/aaa-cli/src/main/java/org/opendaylight/aaa/cli/dmstore/RemoveDomain.java b/aaa-cli/src/main/java/org/opendaylight/aaa/cli/dmstore/RemoveDomain.java index 9992af69f..e6faf26b1 100644 --- a/aaa-cli/src/main/java/org/opendaylight/aaa/cli/dmstore/RemoveDomain.java +++ b/aaa-cli/src/main/java/org/opendaylight/aaa/cli/dmstore/RemoveDomain.java @@ -22,10 +22,11 @@ import org.opendaylight.aaa.cli.utils.DataStoreUtils; @Service @Command(name = "remove-domain", scope = "aaa", description = "Remove domain.") public class RemoveDomain extends AaaCliAbstractCommand { - - - @Option(name = "-name", aliases = { - "--domainName" }, description = "The domain name", required = true, multiValued = false) + @Option(name = "-name", + aliases = { "--domainName" }, + description = "The domain name", + required = true, + multiValued = false) private String domainName; @Override diff --git a/aaa-cli/src/main/java/org/opendaylight/aaa/cli/dmstore/RemoveGrant.java b/aaa-cli/src/main/java/org/opendaylight/aaa/cli/dmstore/RemoveGrant.java index d54db5af6..92351bb4c 100644 --- a/aaa-cli/src/main/java/org/opendaylight/aaa/cli/dmstore/RemoveGrant.java +++ b/aaa-cli/src/main/java/org/opendaylight/aaa/cli/dmstore/RemoveGrant.java @@ -22,18 +22,25 @@ import org.opendaylight.aaa.cli.utils.DataStoreUtils; @Service @Command(name = "remove-grant", scope = "aaa", description = "Remove grant.") public class RemoveGrant extends AaaCliAbstractCommand { - - - @Option(name = "-uname", aliases = { - "--userName" }, description = "The user name", required = true, multiValued = false) + @Option(name = "-uname", + aliases = { "--userName" }, + description = "The user name", + required = true, + multiValued = false) private String userName; - @Option(name = "-dname", aliases = { - "--domainName" }, description = "The domain name", required = true, multiValued = false) + @Option(name = "-dname", + aliases = { "--domainName" }, + description = "The domain name", + required = true, + multiValued = false) private String domainName; - @Option(name = "-rname", aliases = { - "--roleName" }, description = "The role name", required = false, multiValued = false) + @Option(name = "-rname", + aliases = { "--roleName" }, + description = "The role name", + required = false, + multiValued = false) private String roleName; @Override diff --git a/aaa-cli/src/main/java/org/opendaylight/aaa/cli/dmstore/RemoveRole.java b/aaa-cli/src/main/java/org/opendaylight/aaa/cli/dmstore/RemoveRole.java index 31a1374cd..742fc04bf 100644 --- a/aaa-cli/src/main/java/org/opendaylight/aaa/cli/dmstore/RemoveRole.java +++ b/aaa-cli/src/main/java/org/opendaylight/aaa/cli/dmstore/RemoveRole.java @@ -22,10 +22,11 @@ import org.opendaylight.aaa.cli.utils.DataStoreUtils; @Service @Command(name = "remove-role", scope = "aaa", description = "Remove role.") public class RemoveRole extends AaaCliAbstractCommand { - - - @Option(name = "-name", aliases = { - "--roleName" }, description = "The role name", required = true, multiValued = false) + @Option(name = "-name", + aliases = { "--roleName" }, + description = "The role name", + required = true, + multiValued = false) private String roleName; @Override diff --git a/aaa-cli/src/main/java/org/opendaylight/aaa/cli/dmstore/RemoveUser.java b/aaa-cli/src/main/java/org/opendaylight/aaa/cli/dmstore/RemoveUser.java index b5f5b43ed..a359f298e 100644 --- a/aaa-cli/src/main/java/org/opendaylight/aaa/cli/dmstore/RemoveUser.java +++ b/aaa-cli/src/main/java/org/opendaylight/aaa/cli/dmstore/RemoveUser.java @@ -22,10 +22,11 @@ import org.opendaylight.aaa.cli.utils.DataStoreUtils; @Service @Command(name = "remove-user", scope = "aaa", description = "Remove user.") public class RemoveUser extends AaaCliAbstractCommand { - - - @Option(name = "-name", aliases = { - "--userName" }, description = "The user name", required = true, multiValued = false) + @Option(name = "-name", + aliases = { "--userName" }, + description = "The user name", + required = true, + multiValued = false) private String userName; @Override diff --git a/aaa-encrypt-service/pom.xml b/aaa-encrypt-service/pom.xml index c0e484939..837851471 100644 --- a/aaa-encrypt-service/pom.xml +++ b/aaa-encrypt-service/pom.xml @@ -10,7 +10,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.odlparent odlparent-lite - 8.1.1 + 8.1.2 diff --git a/aaa-password-service/pom.xml b/aaa-password-service/pom.xml index e0ad05d81..e10e90127 100644 --- a/aaa-password-service/pom.xml +++ b/aaa-password-service/pom.xml @@ -11,7 +11,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.odlparent odlparent-lite - 8.1.1 + 8.1.2 diff --git a/aaa-shiro/impl/src/main/java/org/opendaylight/aaa/shiro/idm/OSGIIdmLightProxy.java b/aaa-shiro/impl/src/main/java/org/opendaylight/aaa/shiro/idm/OSGIIdmLightProxy.java index e61343025..beec52e29 100644 --- a/aaa-shiro/impl/src/main/java/org/opendaylight/aaa/shiro/idm/OSGIIdmLightProxy.java +++ b/aaa-shiro/impl/src/main/java/org/opendaylight/aaa/shiro/idm/OSGIIdmLightProxy.java @@ -26,8 +26,8 @@ import org.osgi.service.component.annotations.Deactivate; import org.osgi.service.component.annotations.Reference; @Beta -@Component(immediate = true, service = {CredentialAuth.class, PasswordCredentialAuth.class, IdMService.class, - ClaimCache.class}, property = "type=default") +@Component(immediate = true, property = "type=default", + service = { CredentialAuth.class, PasswordCredentialAuth.class, IdMService.class, ClaimCache.class }) public class OSGIIdmLightProxy extends ForwardingObject implements PasswordCredentialAuth, IdMService, ClaimCache { @Reference diff --git a/aaa-shiro/impl/src/main/java/org/opendaylight/aaa/shiro/realm/KeystoneAuthRealm.java b/aaa-shiro/impl/src/main/java/org/opendaylight/aaa/shiro/realm/KeystoneAuthRealm.java index 0b1906a19..1749515c9 100644 --- a/aaa-shiro/impl/src/main/java/org/opendaylight/aaa/shiro/realm/KeystoneAuthRealm.java +++ b/aaa-shiro/impl/src/main/java/org/opendaylight/aaa/shiro/realm/KeystoneAuthRealm.java @@ -114,11 +114,9 @@ public class KeystoneAuthRealm extends AuthorizingRealm { * but using the provided {@link SimpleHttpClient} to reach * the Keystone server. * - * @param authenticationToken see - * {@link AuthorizingRealm#doGetAuthenticationInfo(AuthenticationToken)} + * @param authenticationToken see {@link AuthorizingRealm#doGetAuthenticationInfo(AuthenticationToken)} * @param client the {@link SimpleHttpClient} to use. - * @return see - * {@link AuthorizingRealm#doGetAuthenticationInfo(AuthenticationToken)} + * @return see {@link AuthorizingRealm#doGetAuthenticationInfo(AuthenticationToken)} */ protected AuthenticationInfo doGetAuthenticationInfo( final AuthenticationToken authenticationToken, diff --git a/aaa-shiro/pom.xml b/aaa-shiro/pom.xml index 942153097..91b020357 100644 --- a/aaa-shiro/pom.xml +++ b/aaa-shiro/pom.xml @@ -11,7 +11,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL org.opendaylight.odlparent odlparent-lite - 8.1.1 + 8.1.2 diff --git a/artifacts/pom.xml b/artifacts/pom.xml index d5d15ad16..ae3cdf308 100644 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -13,7 +13,7 @@ org.opendaylight.odlparent odlparent-lite - 8.1.1 + 8.1.2 diff --git a/docs/pom.xml b/docs/pom.xml index c050a0544..8749660a4 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -12,7 +12,7 @@ org.opendaylight.odlparent odlparent - 8.1.1 + 8.1.2 @@ -111,7 +111,7 @@ org.opendaylight.infrautils inject.guice.testutils - 1.9.6 + 1.9.7 provided @@ -247,11 +247,11 @@ https://commons.apache.org/proper/commons-lang/javadocs/api-3.11/ https://commons.apache.org/proper/commons-codec/apidocs/ - https://www.javadoc.io/doc/org.opendaylight.odlparent/odlparent-docs/8.1.1/ - https://www.javadoc.io/doc/org.opendaylight.infrautils/infrautils-docs/1.9.6/ - https://www.javadoc.io/doc/org.opendaylight.yangtools/yangtools-docs/6.0.5/ - https://www.javadoc.io/doc/org.opendaylight.mdsal/mdsal-docs/7.0.6/ - https://www.javadoc.io/doc/org.opendaylight.controller/controller-docs/3.0.7/ + https://www.javadoc.io/doc/org.opendaylight.odlparent/odlparent-docs/8.1.2/ + https://www.javadoc.io/doc/org.opendaylight.infrautils/infrautils-docs/1.9.7/ + https://www.javadoc.io/doc/org.opendaylight.yangtools/yangtools-docs/6.0.6/ + https://www.javadoc.io/doc/org.opendaylight.mdsal/mdsal-docs/7.0.7/ + https://www.javadoc.io/doc/org.opendaylight.controller/controller-docs/3.0.8/