Bump MRI upstreams 18/94518/2
authorRobert Varga <robert.varga@pantheon.tech>
Fri, 8 Jan 2021 20:50:00 +0000 (21:50 +0100)
committerRobert Varga <robert.varga@pantheon.tech>
Sat, 9 Jan 2021 09:33:09 +0000 (10:33 +0100)
Adopt following versions:
- odlparent-8.0.3
- infrautils-1.9.4
- yangtools-6.0.3
- mdsal-7.0.4
- controller-3.0.4

Change-Id: Ie85de0e127d1c0ea57c9758efdbc2c6a21ae521d
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
39 files changed:
applications/arbitratorreconciliation/pom.xml
applications/pom.xml
artifacts/pom.xml
distribution/karaf/pom.xml
extension/features-extension-aggregator/features-openflowplugin-extension/pom.xml
extension/features-extension-aggregator/odl-openflowplugin-eric-extensions/pom.xml
extension/features-extension-aggregator/odl-openflowplugin-nxm-extensions/pom.xml
extension/features-extension-aggregator/odl-openflowplugin-onf-extensions/pom.xml
extension/features-extension-aggregator/pom.xml
extension/pom.xml
features-aggregator/features-openflowplugin/pom.xml
features-aggregator/odl-openflowplugin-app-arbitratorreconciliation/pom.xml
features-aggregator/odl-openflowplugin-app-bulk-o-matic/pom.xml
features-aggregator/odl-openflowplugin-app-config-pusher/pom.xml
features-aggregator/odl-openflowplugin-app-forwardingrules-manager/pom.xml
features-aggregator/odl-openflowplugin-app-forwardingrules-sync/pom.xml
features-aggregator/odl-openflowplugin-app-lldp-speaker/pom.xml
features-aggregator/odl-openflowplugin-app-notifications/pom.xml
features-aggregator/odl-openflowplugin-app-reconciliation-framework/pom.xml
features-aggregator/odl-openflowplugin-app-southbound-cli/pom.xml
features-aggregator/odl-openflowplugin-app-table-miss-enforcer/pom.xml
features-aggregator/odl-openflowplugin-app-topology-lldp-discovery/pom.xml
features-aggregator/odl-openflowplugin-app-topology-manager/pom.xml
features-aggregator/odl-openflowplugin-app-topology/pom.xml
features-aggregator/odl-openflowplugin-drop-test/pom.xml
features-aggregator/odl-openflowplugin-flow-services-rest/pom.xml
features-aggregator/odl-openflowplugin-flow-services/pom.xml
features-aggregator/odl-openflowplugin-libraries/pom.xml
features-aggregator/odl-openflowplugin-nsf-model/pom.xml
features-aggregator/odl-openflowplugin-southbound/pom.xml
features-aggregator/pom.xml
libraries/liblldp/src/main/java/org/opendaylight/openflowplugin/libraries/liblldp/LLDPTLV.java
libraries/pom.xml
model/pom.xml
openflowjava/features-openflowjava-aggregator/features-openflowjava/pom.xml
openflowjava/features-openflowjava-aggregator/odl-openflowjava-protocol/pom.xml
openflowjava/features-openflowjava-aggregator/pom.xml
parent/pom.xml
samples/pom.xml

index 688d3b768b35c5fb893385e763597c5e9e74b367..5de1cf5e52ef8bcc02d8958fad17b9c529476c22 100644 (file)
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>8.0.2</version>
+        <version>8.0.3</version>
         <relativePath/>
     </parent>
 
index 257632444ab30ae3102ddd969b2475378361c121..e15fbce9a7b05a2040d50efd88775d4a7927e9cc 100644 (file)
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>8.0.2</version>
+        <version>8.0.3</version>
         <relativePath/>
     </parent>
 
index 963c96fde559e3ff65e04455fc0486b865a4e39d..e186b98e84d4049bb7b26f65ccbbc7ac5a0c41af 100644 (file)
@@ -13,7 +13,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>8.0.2</version>
+    <version>8.0.3</version>
     <relativePath/>
   </parent>
 
index 8cbfe761e476e1d75acdb8dcf06158684b53e0fe..78d52adf7c0cf8bbb6992526c0e8547232258e42 100644 (file)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>karaf4-parent</artifactId>
-    <version>8.0.2</version>
+    <version>8.0.3</version>
   </parent>
   <groupId>org.opendaylight.openflowplugin</groupId>
   <artifactId>openflowplugin-karaf</artifactId>
index 3aeb97181cdbdf6771afca9c1823b3a0165e50a4..5669f3e62de69119b1bc02d18978e35af3a31d50 100644 (file)
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>8.0.2</version>
+        <version>8.0.3</version>
         <relativePath/>
     </parent>
 
index edd3891f69a985cc30016d0363b0f08f6f791710..25807ed0e65c724cac1096a64e7e59a11de8cc3a 100644 (file)
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>8.0.2</version>
+        <version>8.0.3</version>
         <relativePath/>
     </parent>
 
index 66d28c03be27b897ac3e7461391b50e4b357deb6..fe84704223578a62c9dfce9621fa90d48d30cd56 100644 (file)
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>8.0.2</version>
+        <version>8.0.3</version>
         <relativePath/>
     </parent>
 
index ac6006dceba3c6931ae6bfe0a0a707384d78ecb9..6496101cc042aa61e0978f8f26f654bb4f80537f 100644 (file)
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>8.0.2</version>
+        <version>8.0.3</version>
         <relativePath/>
     </parent>
 
index ada40845e3d15207f860bdcebc3630167a562677..815b710db9e554def746446aab2aa4786bb6ec53 100644 (file)
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>8.0.2</version>
+        <version>8.0.3</version>
         <relativePath/>
     </parent>
     <modelVersion>4.0.0</modelVersion>
index 510dcd86a652042788d8702516620da7d70f8af7..a8fb4463091585d84260259b2247a0ae7f7aebde 100644 (file)
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>8.0.2</version>
+        <version>8.0.3</version>
         <relativePath/>
     </parent>
 
index e3b958bdb2605b5c63bcb9683a55e98fde631e79..90a79d48f251830de74f627300310b74c04d9080 100644 (file)
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>8.0.2</version>
+        <version>8.0.3</version>
         <relativePath/>
     </parent>
 
index f48a9be160718c5e39a16dc985d21ca970310899..0f6d4f1f92f9903badc6b99776700d15218c6ef2 100644 (file)
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>8.0.2</version>
+        <version>8.0.3</version>
         <relativePath/>
     </parent>
 
index f21e02937cdb81ec1246c8a0e902a516c7cfdaba..662eb9f7e34dcb34d083ab310e9bacc25ca5bb5f 100644 (file)
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>8.0.2</version>
+        <version>8.0.3</version>
         <relativePath/>
     </parent>
 
index 74c5f15737c150ecd134a9ed3d77b7315932c029..bd868bf6ed1c25015acbc607e4fb0521a2f6a5d2 100644 (file)
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>8.0.2</version>
+        <version>8.0.3</version>
         <relativePath/>
     </parent>
 
index 351be1a7251643f1ef387102fe0095c4e5dcc552..9b9a3109a4311a42b6e8a789795e5cf25e016505 100644 (file)
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>8.0.2</version>
+        <version>8.0.3</version>
         <relativePath/>
     </parent>
 
index 37330967ee641d7c5db4c87927416198c1858b23..af6dd5c7976f6223aa700b9633d6f4f7e7b73cbf 100644 (file)
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>8.0.2</version>
+        <version>8.0.3</version>
         <relativePath/>
     </parent>
 
index c883d27a6302e19bd8515592443a5fe46e638a91..ebbb5af6e0c56fe943e0c774634b787bb8966bf8 100644 (file)
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>8.0.2</version>
+        <version>8.0.3</version>
         <relativePath/>
     </parent>
 
index 97de676e0cef5bcd3ba862ef1eafa9e9ac1104bd..973799bff2c8b34565709dbe7ebf3a9fbebe1997 100644 (file)
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>8.0.2</version>
+        <version>8.0.3</version>
         <relativePath/>
     </parent>
 
index 9d0156506fb632cde0b65564a1a50fd991b29927..9987e01aa4f542bffbf8826912faf290493e4171 100644 (file)
@@ -4,7 +4,7 @@
 <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>single-feature-parent</artifactId>
-    <version>8.0.2</version>
+    <version>8.0.3</version>
     <relativePath/>
 </parent>
 
index 096652489d4e16fffc4e235a388c42cf4f16b5b1..ea407fcee1da33581dad4518878ab54bf57ce372 100644 (file)
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>8.0.2</version>
+        <version>8.0.3</version>
         <relativePath/>
     </parent>
 
index 5265ecd024b748950cc4a7b389c0613c083969b6..7e2bdd9b94ffa84c9eed5a8e81f23d4089b5d372 100644 (file)
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>8.0.2</version>
+        <version>8.0.3</version>
         <relativePath/>
     </parent>
 
index f91ea06c0d741cbf3fc9d394b097938bd3320c63..80ed8084ee93656905094f8dd74a8bb90ed93976 100644 (file)
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>8.0.2</version>
+        <version>8.0.3</version>
         <relativePath/>
     </parent>
 
index 08d56dc87c1f6a3f584cba5df24513d7d81954a7..73e9beec1ea8c73b3d3fadcfbf565255ab3e0cbf 100644 (file)
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>8.0.2</version>
+        <version>8.0.3</version>
         <relativePath/>
     </parent>
 
index 1c90641f3003a8013143212db830cc1bb08581b5..4f498e0f023db141e362201a0582fafcc2579ba1 100644 (file)
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>8.0.2</version>
+        <version>8.0.3</version>
         <relativePath/>
     </parent>
 
index 791edc9a0b3c344185296159a77c5c810defed43..1077162ce2627979a00b51f0d75387f4291cacd6 100644 (file)
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>8.0.2</version>
+        <version>8.0.3</version>
         <relativePath/>
     </parent>
 
index 58693b84c2f0d1c03036d0070196f972ed9aa045..c07e0f782a6a85d813a412c52d925f453c11b292 100644 (file)
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>8.0.2</version>
+        <version>8.0.3</version>
         <relativePath/>
     </parent>
 
index 2369988d1902886353876255516073b01381339f..c1c9e891a4ee66bb36265a30b5add77ee47ff59f 100644 (file)
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>8.0.2</version>
+        <version>8.0.3</version>
         <relativePath/>
     </parent>
 
index 44523b4f38944794ebd62320bfdea506aaeb7a1e..570e301d65db55687d842fdb691ad4f4b4c45410 100644 (file)
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>8.0.2</version>
+        <version>8.0.3</version>
         <relativePath/>
     </parent>
 
index 8362f10d70483e2661ac2588ff0838eedb79471d..0ba93b56d537329eabf72b0db04653cec6152354 100644 (file)
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>8.0.2</version>
+        <version>8.0.3</version>
         <relativePath/>
     </parent>
 
@@ -21,7 +21,7 @@
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
                 <artifactId>mdsal-artifacts</artifactId>
-                <version>7.0.3</version>
+                <version>7.0.4</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
@@ -30,7 +30,7 @@
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>controller-artifacts</artifactId>
-                <version>3.0.3</version>
+                <version>3.0.4</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
index 0a300e4f867e86e2a984da86184aa6d0db31e138..72584cfc959c2257edd5b3089d65ae8fdf686af0 100644 (file)
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>8.0.2</version>
+        <version>8.0.3</version>
         <relativePath/>
     </parent>
 
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>controller-artifacts</artifactId>
-                <version>3.0.3</version>
+                <version>3.0.4</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.infrautils</groupId>
                 <artifactId>infrautils-artifacts</artifactId>
-                <version>1.9.3</version>
+                <version>1.9.4</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
index 3b2fa97a7d9c80aff42667d57b2e2ea72e4cf348..6ae35656ca06fc65ada486541ac3148027c47c97 100644 (file)
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>8.0.2</version>
+        <version>8.0.3</version>
         <relativePath/>
     </parent>
 
index d8516f60d78e6029bab1707063a2bc417341a711..e1576945f83bacaa91d86db4a0583025ccbeec9c 100644 (file)
@@ -189,9 +189,9 @@ public class LLDPTLV extends Packet {
      * @return int - size in bits of full TLV
      */
     public int getTLVSize() {
-        return LLDPTLV.FIELD_COORDINATES.get(TYPE).getRight() // static
-                LLDPTLV.FIELD_COORDINATES.get(LENGTH).getRight() + // static
-                getfieldnumBits(VALUE); // variable
+        return LLDPTLV.FIELD_COORDINATES.get(TYPE).getRight() // static
+                + LLDPTLV.FIELD_COORDINATES.get(LENGTH).getRight() // static
+                getfieldnumBits(VALUE); // variable
     }
 
     /**
index 4a5e75a8bb1da2741c3b3da0fe8eb7518e9c425e..05d3ad52081eeea1e6a95f92e02e32bfe7c0915a 100644 (file)
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>8.0.2</version>
+        <version>8.0.3</version>
         <relativePath/>
     </parent>
 
index 17c61eef1335ffc988af740774a62b9a839bb840..5dc7561c25cc9a53757a9f1bc167008c172cd6d8 100644 (file)
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>8.0.2</version>
+    <version>8.0.3</version>
     <relativePath/>
   </parent>
 
index 859084ddd05bfd606dbc9b8bd05f049accc21ec2..fc35e7c7997fad90ecb76dd3f03837d754850044 100644 (file)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>feature-repo-parent</artifactId>
-    <version>8.0.2</version>
+    <version>8.0.3</version>
     <relativePath/>
   </parent>
 
index 3f32c84eeb6b6b383dd37f00adf0da61d9fcbf03..f1e3b9c4059bf33cb6349425cc804203f88e753d 100644 (file)
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>8.0.2</version>
+        <version>8.0.3</version>
         <relativePath/>
     </parent>
 
@@ -33,7 +33,7 @@
             <dependency>
                 <groupId>org.opendaylight.infrautils</groupId>
                 <artifactId>infrautils-artifacts</artifactId>
-                <version>1.9.3</version>
+                <version>1.9.4</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
@@ -42,7 +42,7 @@
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
                 <artifactId>mdsal-artifacts</artifactId>
-                <version>7.0.3</version>
+                <version>7.0.4</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
index 47b83a8e5823f46c44a52b4588c20f364fae7c7e..bceda4a43b947fbf1bf8e9f7e2b467e1dd4da09e 100644 (file)
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>8.0.2</version>
+    <version>8.0.3</version>
     <relativePath/>
   </parent>
 
index 11448fef5a4c0ef6c7b069f2ba677c59b7834d91..3eaef1a654f9205def765df07ef8d844f3fbe415 100644 (file)
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>7.0.3</version>
+        <version>7.0.4</version>
         <relativePath/>
     </parent>
 
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>controller-artifacts</artifactId>
-                <version>3.0.3</version>
+                <version>3.0.4</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.infrautils</groupId>
                 <artifactId>infrautils-artifacts</artifactId>
-                <version>1.9.3</version>
+                <version>1.9.4</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
index c4ee243c43d048fa4b0ee3cfa0fb31e832978366..ede27114fe4667d4c927680ce8fd2718dff2e859 100644 (file)
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>8.0.2</version>
+        <version>8.0.3</version>
         <relativePath/>
     </parent>