Bump upstreams

Adopt:
- yangtools-8.0.3
- mdsal-9.0.2
- controller-5.0.2
- aaa-0.15.2

Change-Id: I085f1c8f3e6cc694ae43a3d43dc38c726c8a0f0e
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/karaf/pom.xml b/karaf/pom.xml
index 3cf1539ec4fe1bbde6528780d782d081e616de57..b2be53220df1ddb4a711f4b9d726c7af38f310ef 100644 (file)
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -24,7 +24,7 @@
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>controller-artifacts</artifactId>
-        <version>5.0.1</version>
+        <version>5.0.2</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/netconf/tools/netconf-test-perf/src/main/java/org/opendaylight/netconf/test/perf/notifications/NotificationsCounter.java b/netconf/tools/netconf-test-perf/src/main/java/org/opendaylight/netconf/test/perf/notifications/NotificationsCounter.java
index 38a3dbd4f6ad5b3b9b23eb8fb23e4e82aad072a5..7e530cb18d85774d75338f43e148f5c08b99ebd5 100644 (file)
--- a/netconf/tools/netconf-test-perf/src/main/java/org/opendaylight/netconf/test/perf/notifications/NotificationsCounter.java
+++ b/netconf/tools/netconf-test-perf/src/main/java/org/opendaylight/netconf/test/perf/notifications/NotificationsCounter.java
@@ -13,12 +13,10 @@ import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.mdsal.binding.dom.codec.api.BindingNormalizedNodeSerializer;
 import org.opendaylight.mdsal.dom.api.DOMNotification;
 import org.opendaylight.mdsal.dom.api.DOMNotificationListener;
 import org.opendaylight.yang.gen.v1.http.cisco.com.ns.yang.cisco.ios.xr.ip._static.cfg.rev130722.VRFPREFIXTABLE;
-import org.opendaylight.yangtools.yang.binding.Notification;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -45,16 +43,16 @@ public class NotificationsCounter implements DOMNotificationListener {
         Preconditions.checkArgument(matcher.matches());
         expectedNotificationCount = Long.parseLong(matcher.group(1));
         Preconditions.checkArgument(expectedNotificationCount > 0);
-        this.notifCounter = new AtomicLong(this.expectedNotificationCount);
+        notifCounter = new AtomicLong(expectedNotificationCount);
     }
 
 
     @Override
-    public void onNotification(@NonNull DOMNotification domNotification) {
+    public void onNotification(final DOMNotification domNotification) {
         final long andDecrement = notifCounter.getAndDecrement();
 
         if (andDecrement == expectedNotificationCount) {
-            this.stopWatch = Stopwatch.createStarted();
+            stopWatch = Stopwatch.createStarted();
             LOG.info("First notification received at {}", stopWatch);
         }
 
@@ -63,21 +61,21 @@ public class NotificationsCounter implements DOMNotificationListener {
             LOG.trace("Notification received: {}", domNotification);
         }
 
-        final Notification notification = serializer.fromNormalizedNodeNotification(domNotification.getType(),
+        final var notification = serializer.fromNormalizedNodeNotification(domNotification.getType(),
             domNotification.getBody());
         if (notification instanceof VRFPREFIXTABLE) {
             totalPrefixesReceived += ((VRFPREFIXTABLE)notification).getVrfPrefixes().getVrfPrefix().size();
         }
 
         if (andDecrement == 1) {
-            this.stopWatch.stop();
+            stopWatch.stop();
             LOG.info("Last notification received at {}", stopWatch);
             LOG.info("Elapsed ms for {} notifications: {}", expectedNotificationCount,
                 stopWatch.elapsed(TimeUnit.MILLISECONDS));
             LOG.info("Performance (notifications/second): {}",
-                (expectedNotificationCount * 1.0 / stopWatch.elapsed(TimeUnit.MILLISECONDS)) * 1000);
+                expectedNotificationCount * 1.0 / stopWatch.elapsed(TimeUnit.MILLISECONDS) * 1000);
             LOG.info("Performance (prefixes/second): {}",
-                (totalPrefixesReceived * 1.0 / stopWatch.elapsed(TimeUnit.MILLISECONDS)) * 1000);
+                totalPrefixesReceived * 1.0 / stopWatch.elapsed(TimeUnit.MILLISECONDS) * 1000);
         }
     }
 

diff --git a/parent/pom.xml b/parent/pom.xml
index 9d995a466c54b07bc46d241b31662ba28351bb0f..c7aea26edb65566f840476c2a4f7cddb0e1cf124 100644 (file)
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>9.0.1</version>
+    <version>9.0.2</version>
     <relativePath/>
   </parent>
 
@@ -25,14 +25,14 @@
       <dependency>
         <groupId>org.opendaylight.aaa</groupId>
         <artifactId>aaa-artifacts</artifactId>
-        <version>0.15.1</version>
+        <version>0.15.2</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>bundle-parent</artifactId>
-        <version>5.0.1</version>
+        <version>5.0.2</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>