Bump MRI upstreams 24/96024/3
authorRobert Varga <robert.varga@pantheon.tech>
Fri, 7 May 2021 17:28:58 +0000 (19:28 +0200)
committerRobert Varga <robert.varga@pantheon.tech>
Fri, 7 May 2021 18:22:47 +0000 (20:22 +0200)
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 <robert.varga@pantheon.tech>
29 files changed:
aaa-cli/src/main/java/org/opendaylight/aaa/cli/dmstore/AddDomain.java
aaa-cli/src/main/java/org/opendaylight/aaa/cli/dmstore/AddGrant.java
aaa-cli/src/main/java/org/opendaylight/aaa/cli/dmstore/AddRole.java
aaa-cli/src/main/java/org/opendaylight/aaa/cli/dmstore/ChangeUserPassword.java
aaa-cli/src/main/java/org/opendaylight/aaa/cli/dmstore/RemoveDomain.java
aaa-cli/src/main/java/org/opendaylight/aaa/cli/dmstore/RemoveGrant.java
aaa-cli/src/main/java/org/opendaylight/aaa/cli/dmstore/RemoveRole.java
aaa-cli/src/main/java/org/opendaylight/aaa/cli/dmstore/RemoveUser.java
aaa-encrypt-service/pom.xml
aaa-password-service/pom.xml
aaa-shiro/impl/src/main/java/org/opendaylight/aaa/shiro/idm/OSGIIdmLightProxy.java
aaa-shiro/impl/src/main/java/org/opendaylight/aaa/shiro/realm/KeystoneAuthRealm.java
aaa-shiro/pom.xml
artifacts/pom.xml
docs/pom.xml
features/features-aaa/pom.xml
features/odl-aaa-api/pom.xml
features/odl-aaa-cert/pom.xml
features/odl-aaa-cli/pom.xml
features/odl-aaa-encryption-service/pom.xml
features/odl-aaa-password-service/pom.xml
features/odl-aaa-shiro/pom.xml
features/odl-aaa-web/pom.xml
features/pom.xml
karaf/pom.xml
parent/pom.xml
pom.xml
web/pom.xml
web/testutils/pom.xml

index d566bd993d406bfbd51493f317b87044ba26bf42..bfa1424bf80df8b1ac38d6ae54d0374d0cc80857 100644 (file)
@@ -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
index da8ca018fc22f7328b0672d1874a7d794f604812..89105c09f0c40987625f05e42da8b3e1edae91b2 100644 (file)
@@ -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
index eb4d99b4873737d2807f1ff2e8e74a0619a34f61..d50bf70c8ac8aa691d2e818f38ecfa9e3ae8fec5 100644 (file)
@@ -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
index 659287522ab3938cd506ca37d26c1c6dd00c268e..78fcadf909c458a9612ff3770dcdb71dea9b1143 100644 (file)
@@ -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",
index 9992af69fc4e191b3914d4ee1ab178fdef4991c8..e6faf26b16ce65fbfc75adb15c557205f2a5ef2f 100644 (file)
@@ -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
index d54db5af6d51155b9216c2ee930c49c353bf332a..92351bb4c98dbb004f9648e9e471ec78439a4521 100644 (file)
@@ -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
index 31a1374cdc8e718cab89fb1f9eaee20f8b5d219e..742fc04bf3c76564e4ebdffe4a5a5f382109e6ab 100644 (file)
@@ -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
index b5f5b43ed70f5f1e25cf22d8a67cd9ec7c613ddc..a359f298eb1055b2660565e75fdbe68508cf8fce 100644 (file)
@@ -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
index c0e484939900df883a7e59314dfeb4ba36019838..8378514711a9e3b3406937ba798a5da8ea738e9d 100644 (file)
@@ -10,7 +10,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>8.1.1</version>
+    <version>8.1.2</version>
     <relativePath/>
   </parent>
 
index e0ad05d812d79db2c581c3e3794ae02a6a672b06..e10e901271aa395aced8d7286a8ad2f826b06eb8 100644 (file)
@@ -11,7 +11,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>8.1.1</version>
+    <version>8.1.2</version>
     <relativePath/>
   </parent>
 
index e613430259091956e41e60a3c36b2032927551ca..beec52e2929dfaf7af1591d8d8d4b11921ed418f 100644 (file)
@@ -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
index 0b1906a1965fb205c414dab6a9cf55163e6d1877..1749515c9be26aa29b055847445f78f0b1cf59bf 100644 (file)
@@ -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,
index 9421530979c773c50baed3e4d388cefe5fd77ef3..91b020357f917fbd57193fc8aed39ee97901250e 100644 (file)
@@ -11,7 +11,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>8.1.1</version>
+    <version>8.1.2</version>
     <relativePath/>
   </parent>
 
index d5d15ad16bed539753e757015ce5b8400814d3bd..ae3cdf30837e646ae203f387803a0b7173bfa2c0 100644 (file)
@@ -13,7 +13,7 @@
     <parent>
       <groupId>org.opendaylight.odlparent</groupId>
       <artifactId>odlparent-lite</artifactId>
-      <version>8.1.1</version>
+      <version>8.1.2</version>
       <relativePath/>
     </parent>
 
index c050a05449d2868c5cee40476d7361d14f20d7f1..8749660a428899fd776b97ea9e1196ee9c50edb5 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>8.1.1</version>
+        <version>8.1.2</version>
         <relativePath/>
     </parent>
 
         <dependency>
             <groupId>org.opendaylight.infrautils</groupId>
             <artifactId>inject.guice.testutils</artifactId>
-            <version>1.9.6</version>
+            <version>1.9.7</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
                         <link>https://commons.apache.org/proper/commons-lang/javadocs/api-3.11/</link>
                         <link>https://commons.apache.org/proper/commons-codec/apidocs/</link>
 
-                        <link>https://www.javadoc.io/doc/org.opendaylight.odlparent/odlparent-docs/8.1.1/</link>
-                        <link>https://www.javadoc.io/doc/org.opendaylight.infrautils/infrautils-docs/1.9.6/</link>
-                        <link>https://www.javadoc.io/doc/org.opendaylight.yangtools/yangtools-docs/6.0.5/</link>
-                        <link>https://www.javadoc.io/doc/org.opendaylight.mdsal/mdsal-docs/7.0.6/</link>
-                        <link>https://www.javadoc.io/doc/org.opendaylight.controller/controller-docs/3.0.7/</link>
+                        <link>https://www.javadoc.io/doc/org.opendaylight.odlparent/odlparent-docs/8.1.2/</link>
+                        <link>https://www.javadoc.io/doc/org.opendaylight.infrautils/infrautils-docs/1.9.7/</link>
+                        <link>https://www.javadoc.io/doc/org.opendaylight.yangtools/yangtools-docs/6.0.6/</link>
+                        <link>https://www.javadoc.io/doc/org.opendaylight.mdsal/mdsal-docs/7.0.7/</link>
+                        <link>https://www.javadoc.io/doc/org.opendaylight.controller/controller-docs/3.0.8/</link>
                     </links>
 
                     <!--groups>
index 998640c9d233d82cfd7302f8e9e30e87f98ae1c7..1475e158e0fa75e9de46ff55e21f042c5c285819 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>8.1.1</version>
+        <version>8.1.2</version>
         <relativePath/>
     </parent>
 
index 59f54f2c7d801574c7abc450bee1931329fdcf21..530a3ff418ea71d9f428c78f2fbb61e8d79f71f3 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>8.1.1</version>
+        <version>8.1.2</version>
         <relativePath/>
     </parent>
 
@@ -44,7 +44,7 @@
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>odl-mdsal-binding-base</artifactId>
-            <version>7.0.6</version>
+            <version>7.0.7</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
index ccc926486db75f4fb9a082ed440d8891c5e3dd3e..92089e6d3d5928110a6a2f20b460159fc4eb4841 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>8.1.1</version>
+        <version>8.1.2</version>
         <relativePath/>
     </parent>
 
@@ -27,7 +27,7 @@
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-mdsal-broker</artifactId>
-            <version>3.0.7</version>
+            <version>3.0.8</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
index 229af7eb36c3dd3f22b70922d0ce708a0152ec7e..cd4838fc37368efc71f75801b5c6a7e0a826e306 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>8.1.1</version>
+        <version>8.1.2</version>
         <relativePath/>
     </parent>
 
index 2f4fb42cfc99044eb2f4a3b36d438d59e1ad4a75..2aa389f5c1d3c81c203030d00f5a6481e042276a 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>8.1.1</version>
+        <version>8.1.2</version>
         <relativePath/>
     </parent>
 
@@ -40,7 +40,7 @@
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-mdsal-broker</artifactId>
-            <version>3.0.7</version>
+            <version>3.0.8</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
index 12591effe007de9256bb81c263fc5a46810e9087..bd669509741dd225873b4c1b2b58ac06cc0c3dd8 100644 (file)
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>8.1.1</version>
+        <version>8.1.2</version>
         <relativePath/>
     </parent>
 
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>odl-mdsal-binding-base</artifactId>
-            <version>7.0.6</version>
+            <version>7.0.7</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-mdsal-broker</artifactId>
-            <version>3.0.7</version>
+            <version>3.0.8</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
index eca00172fc61eb82e0d25a5fe78a84a38b7d8db3..500ba26de5d6b9b4cabf5fb6785eb32169c6645d 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>8.1.1</version>
+        <version>8.1.2</version>
         <relativePath/>
     </parent>
 
index 360b115574f9767ccd15f998324d28e89c3ede5f..e4fcd58d275bb7686f06e1a829fb5507676963d3 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>8.1.1</version>
+        <version>8.1.2</version>
         <relativePath/>
     </parent>
 
@@ -35,7 +35,7 @@
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yangtools-artifacts</artifactId>
-                <version>6.0.5</version>
+                <version>6.0.6</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
index b56bc4cc8b3d49991a110cf6dbaee57cb327254e..752848d733a2f0910d801a7f2055767575c3f521 100644 (file)
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>8.1.1</version>
+        <version>8.1.2</version>
         <relativePath/>
     </parent>
 
index 3b6ab006c0b8a288a5983785a536a2980cae2635..dd784fc13f080b6cc0defa3f85bd55398fabb137 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>karaf4-parent</artifactId>
-        <version>8.1.1</version>
+        <version>8.1.2</version>
         <relativePath/>
     </parent>
 
index bb1d4729a51906040444088f99d6e17267abed7d..db5c92d95deaf101a99616bb407757ef81e9691b 100644 (file)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>7.0.6</version>
+    <version>7.0.7</version>
     <relativePath/>
   </parent>
 
@@ -28,7 +28,7 @@
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>controller-artifacts</artifactId>
-        <version>3.0.7</version>
+        <version>3.0.8</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
diff --git a/pom.xml b/pom.xml
index 92137901cab40f954fca58565b624f9a05579231..289ca10d9643fbfb48270f424e40b9a22021b1a1 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>8.1.1</version>
+    <version>8.1.2</version>
     <relativePath/>
   </parent>
 
index 6f9e54832f1fd591052b86f783cc2ef7e1953f24..020384aac3a48c9647e63284b62591ffe4d98907 100644 (file)
@@ -13,7 +13,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>8.1.1</version>
+    <version>8.1.2</version>
     <relativePath/>
   </parent>
 
index 2278de8fea44bcd48955dca43f61d097e6f8a354..b103ac4189769e0e1367218dfa3b55e7bb524277 100644 (file)
@@ -27,7 +27,7 @@
       <dependency>
         <groupId>org.opendaylight.infrautils</groupId>
         <artifactId>infrautils-artifacts</artifactId>
-        <version>1.9.6</version>
+        <version>1.9.7</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>