Bump MRI upstreams

Adopt following versions:
- odlparent-8.0.2
- infrautils-1.9.3
- yangtools-6.0.2
- mdsal-7.0.3
- controller-3.0.3

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

diff --git a/applications/arbitratorreconciliation/pom.xml b/applications/arbitratorreconciliation/pom.xml
index 18ed94a27040fe9aa94e0d38fa21ba14e0e9f707..688d3b768b35c5fb893385e763597c5e9e74b367 100644 (file)
--- a/applications/arbitratorreconciliation/pom.xml
+++ b/applications/arbitratorreconciliation/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>8.0.0</version>
+        <version>8.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/BundleFlowForwarder.java b/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/BundleFlowForwarder.java
index 30120f294df341531b5331836e52ba31a1079c71..26d02fe6b63dcea40b96b6b5ad55517b4ac07cb2 100644 (file)
--- a/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/BundleFlowForwarder.java
+++ b/applications/forwardingrules-manager/src/main/java/org/opendaylight/openflowplugin/applications/frm/impl/BundleFlowForwarder.java
@@ -173,8 +173,7 @@ public class BundleFlowForwarder implements BundleMessagesCommiter<Flow> {
                         BundleInnerMessage bundleInnerMessage = new BundleAddGroupCaseBuilder()
                                 .setAddGroupCaseData(new AddGroupCaseDataBuilder(group.get()).build()).build();
                         Message groupMessage = new MessageBuilder()
-                                .setNode(
-                                new NodeRef(nodeIdent.firstIdentifierOf(Node.class)))
+                                .setNode(new NodeRef(nodeIdent.firstIdentifierOf(Node.class)))
                                 .setBundleInnerMessage(bundleInnerMessage)
                                 .build();
                         final List<Message> messages = new ArrayList<>(1);

diff --git a/applications/pom.xml b/applications/pom.xml
index 728e53803462c667cce3ec7dcf29582078387663..257632444ab30ae3102ddd969b2475378361c121 100644 (file)
--- a/applications/pom.xml
+++ b/applications/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>8.0.0</version>
+        <version>8.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/applications/topology-manager/src/test/java/org/opendaylight/openflowplugin/applications/topology/manager/FlowCapableTopologyExporterTest.java b/applications/topology-manager/src/test/java/org/opendaylight/openflowplugin/applications/topology/manager/FlowCapableTopologyExporterTest.java
index 34ac9ae80678ae7c040968e8be0e1127adccf569..d404fb285ea727dbd65ce69f1887aaaa5a4c80a7 100644 (file)
--- a/applications/topology-manager/src/test/java/org/opendaylight/openflowplugin/applications/topology/manager/FlowCapableTopologyExporterTest.java
+++ b/applications/topology-manager/src/test/java/org/opendaylight/openflowplugin/applications/topology/manager/FlowCapableTopologyExporterTest.java
@@ -149,7 +149,7 @@ public class FlowCapableTopologyExporterTest {
 
         exporter.onLinkRemoved(new LinkRemovedBuilder().setSource(
                 new NodeConnectorRef(sourceConnID)).setDestination(
-                new NodeConnectorRef(destConnID)).build());
+                    new NodeConnectorRef(destConnID)).build());
 
         waitForSubmit(submitLatch);
 
@@ -181,7 +181,7 @@ public class FlowCapableTopologyExporterTest {
 
         exporter.onLinkRemoved(new LinkRemovedBuilder().setSource(
                 new NodeConnectorRef(sourceConnID)).setDestination(
-                new NodeConnectorRef(destConnID)).build());
+                    new NodeConnectorRef(destConnID)).build());
 
         waitForSubmit(submitLatch);
 

diff --git a/applications/topology-manager/src/test/java/org/opendaylight/openflowplugin/applications/topology/manager/TestUtils.java b/applications/topology-manager/src/test/java/org/opendaylight/openflowplugin/applications/topology/manager/TestUtils.java
index f7569d28c1c7359bb2b5032c4b6638e0e66c2479..8dadd72a49a35db0490b49be02e14b041e67db5d 100644 (file)
--- a/applications/topology-manager/src/test/java/org/opendaylight/openflowplugin/applications/topology/manager/TestUtils.java
+++ b/applications/topology-manager/src/test/java/org/opendaylight/openflowplugin/applications/topology/manager/TestUtils.java
@@ -105,7 +105,7 @@ public final class TestUtils {
     static org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.NodeKey newInvNodeKey(String id) {
         org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.NodeKey nodeKey
                 = new org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.NodeKey(
-                new org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeId(id));
+                    new org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeId(id));
         return nodeKey;
     }
 

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 95e4061f8136aa984972f76e98a1489bdc643118..963c96fde559e3ff65e04455fc0486b865a4e39d 100644 (file)
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -13,7 +13,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>8.0.0</version>
+    <version>8.0.2</version>
     <relativePath/>
   </parent>
 

diff --git a/distribution/karaf/pom.xml b/distribution/karaf/pom.xml
index 0fb0a86e750b22fd0695b57d7c05c4378af44bbe..8cbfe761e476e1d75acdb8dcf06158684b53e0fe 100644 (file)
--- a/distribution/karaf/pom.xml
+++ b/distribution/karaf/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>karaf4-parent</artifactId>
-    <version>8.0.0</version>
+    <version>8.0.2</version>
   </parent>
   <groupId>org.opendaylight.openflowplugin</groupId>
   <artifactId>openflowplugin-karaf</artifactId>

diff --git a/extension/features-extension-aggregator/features-openflowplugin-extension/pom.xml b/extension/features-extension-aggregator/features-openflowplugin-extension/pom.xml
index c7e081cfb393ea8859ad23579130885343590ec1..3aeb97181cdbdf6771afca9c1823b3a0165e50a4 100644 (file)
--- a/extension/features-extension-aggregator/features-openflowplugin-extension/pom.xml
+++ b/extension/features-extension-aggregator/features-openflowplugin-extension/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>8.0.0</version>
+        <version>8.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/extension/features-extension-aggregator/odl-openflowplugin-eric-extensions/pom.xml b/extension/features-extension-aggregator/odl-openflowplugin-eric-extensions/pom.xml
index 3c9348fa8c70d176fc6cb2008c533033240282f5..edd3891f69a985cc30016d0363b0f08f6f791710 100644 (file)
--- a/extension/features-extension-aggregator/odl-openflowplugin-eric-extensions/pom.xml
+++ b/extension/features-extension-aggregator/odl-openflowplugin-eric-extensions/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>8.0.0</version>
+        <version>8.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/extension/features-extension-aggregator/odl-openflowplugin-nxm-extensions/pom.xml b/extension/features-extension-aggregator/odl-openflowplugin-nxm-extensions/pom.xml
index 85c93911a984191d299f0b72d91aae25caf02961..66d28c03be27b897ac3e7461391b50e4b357deb6 100644 (file)
--- a/extension/features-extension-aggregator/odl-openflowplugin-nxm-extensions/pom.xml
+++ b/extension/features-extension-aggregator/odl-openflowplugin-nxm-extensions/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>8.0.0</version>
+        <version>8.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/extension/features-extension-aggregator/odl-openflowplugin-onf-extensions/pom.xml b/extension/features-extension-aggregator/odl-openflowplugin-onf-extensions/pom.xml
index 10c5f2e38a29986ba10039e5f2cff767a27b623c..ac6006dceba3c6931ae6bfe0a0a707384d78ecb9 100644 (file)
--- a/extension/features-extension-aggregator/odl-openflowplugin-onf-extensions/pom.xml
+++ b/extension/features-extension-aggregator/odl-openflowplugin-onf-extensions/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>8.0.0</version>
+        <version>8.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/extension/features-extension-aggregator/pom.xml b/extension/features-extension-aggregator/pom.xml
index 6f70435dca5ca584dd55675c665032e614edfdb4..ada40845e3d15207f860bdcebc3630167a562677 100644 (file)
--- a/extension/features-extension-aggregator/pom.xml
+++ b/extension/features-extension-aggregator/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>8.0.0</version>
+        <version>8.0.2</version>
         <relativePath/>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/extension/openflowplugin-extension-eric/src/test/java/org/opendaylight/openflowplugin/extension/vendor/eric/convertor/match/Icmpv6NDOptionsTypeConvertorTest.java b/extension/openflowplugin-extension-eric/src/test/java/org/opendaylight/openflowplugin/extension/vendor/eric/convertor/match/Icmpv6NDOptionsTypeConvertorTest.java
index ce059e45d3030bd4d0e03bbe0a7a75686e8ec1fb..e98a050347df45190405d74f7e86db310ea70a28 100644 (file)
--- a/extension/openflowplugin-extension-eric/src/test/java/org/opendaylight/openflowplugin/extension/vendor/eric/convertor/match/Icmpv6NDOptionsTypeConvertorTest.java
+++ b/extension/openflowplugin-extension-eric/src/test/java/org/opendaylight/openflowplugin/extension/vendor/eric/convertor/match/Icmpv6NDOptionsTypeConvertorTest.java
@@ -119,10 +119,10 @@ public class Icmpv6NDOptionsTypeConvertorTest {
                 new GroupingLooseResolver<>(GeneralExtensionListGrouping.class);
         eqGroup.add(GeneralAugMatchNodesNodeTableFlowWriteActionsSetField.class);
 
-        ExtensionAugment<? extends Augmentation<Extension>> extensionMatch
-                =  new ExtensionAugment<>(EricAugMatchNodesNodeTableFlow.class,
+        ExtensionAugment<? extends Augmentation<Extension>> extensionMatch =
+            new ExtensionAugment<>(EricAugMatchNodesNodeTableFlow.class,
                 new EricAugMatchNodesNodeTableFlowBuilder().setEricOfIcmpv6NdOptionsType(
-                        new EricOfIcmpv6NdOptionsTypeBuilder().setIcmpv6NdOptionsType(Uint8.ONE).build()).build(),
+                    new EricOfIcmpv6NdOptionsTypeBuilder().setIcmpv6NdOptionsType(Uint8.ONE).build()).build(),
                 Icmpv6NdOptionsTypeKey.class);
 
         ExtensionListBuilder extListBld = null;
@@ -142,4 +142,4 @@ public class Icmpv6NDOptionsTypeConvertorTest {
                  .values().iterator().next().getExtensionKey());
     }
 
-}
\ No newline at end of file
+}

diff --git a/extension/openflowplugin-extension-eric/src/test/java/org/opendaylight/openflowplugin/extension/vendor/eric/convertor/match/Icmpv6NDReservedConvertorTest.java b/extension/openflowplugin-extension-eric/src/test/java/org/opendaylight/openflowplugin/extension/vendor/eric/convertor/match/Icmpv6NDReservedConvertorTest.java
index ed5b916273c28dd3bf3de1eaea87ff47ebf3952f..b81ba748074d1ae430e6ef136efa26be976a1435 100644 (file)
--- a/extension/openflowplugin-extension-eric/src/test/java/org/opendaylight/openflowplugin/extension/vendor/eric/convertor/match/Icmpv6NDReservedConvertorTest.java
+++ b/extension/openflowplugin-extension-eric/src/test/java/org/opendaylight/openflowplugin/extension/vendor/eric/convertor/match/Icmpv6NDReservedConvertorTest.java
@@ -118,10 +118,10 @@ public class Icmpv6NDReservedConvertorTest {
                 new GroupingLooseResolver<>(GeneralExtensionListGrouping.class);
         eqGroup.add(GeneralAugMatchNodesNodeTableFlowWriteActionsSetField.class);
 
-        ExtensionAugment<? extends Augmentation<Extension>> extensionMatch
-                =  new ExtensionAugment<>(EricAugMatchNodesNodeTableFlow.class,
+        ExtensionAugment<? extends Augmentation<Extension>> extensionMatch =
+            new ExtensionAugment<>(EricAugMatchNodesNodeTableFlow.class,
                 new EricAugMatchNodesNodeTableFlowBuilder().setEricOfIcmpv6NdReserved(
-                        new EricOfIcmpv6NdReservedBuilder().setIcmpv6NdReserved(Uint32.ONE).build()).build(),
+                    new EricOfIcmpv6NdReservedBuilder().setIcmpv6NdReserved(Uint32.ONE).build()).build(),
                 Icmpv6NdReservedKey.class);
 
         ExtensionListBuilder extListBld = null;
@@ -142,4 +142,4 @@ public class Icmpv6NDReservedConvertorTest {
                 .values().iterator().next().getExtensionKey());
     }
 
-}
\ No newline at end of file
+}

diff --git a/extension/pom.xml b/extension/pom.xml
index 97a1b8e003545062048e3eaf19733a24fa30aae9..510dcd86a652042788d8702516620da7d70f8af7 100644 (file)
--- a/extension/pom.xml
+++ b/extension/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>8.0.0</version>
+        <version>8.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features-aggregator/features-openflowplugin/pom.xml b/features-aggregator/features-openflowplugin/pom.xml
index 26516917a7897ed0f127eaf1f2d1bc9ca97f9ff9..e3b958bdb2605b5c63bcb9683a55e98fde631e79 100644 (file)
--- a/features-aggregator/features-openflowplugin/pom.xml
+++ b/features-aggregator/features-openflowplugin/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>8.0.0</version>
+        <version>8.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features-aggregator/odl-openflowplugin-app-arbitratorreconciliation/pom.xml b/features-aggregator/odl-openflowplugin-app-arbitratorreconciliation/pom.xml
index 7fb53fefaf1f4fdcb9c2d5591784b5241f66036f..f48a9be160718c5e39a16dc985d21ca970310899 100644 (file)
--- a/features-aggregator/odl-openflowplugin-app-arbitratorreconciliation/pom.xml
+++ b/features-aggregator/odl-openflowplugin-app-arbitratorreconciliation/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>8.0.0</version>
+        <version>8.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features-aggregator/odl-openflowplugin-app-bulk-o-matic/pom.xml b/features-aggregator/odl-openflowplugin-app-bulk-o-matic/pom.xml
index e8ba0562a6867ec808c911905a6d90953d09a74e..f21e02937cdb81ec1246c8a0e902a516c7cfdaba 100644 (file)
--- a/features-aggregator/odl-openflowplugin-app-bulk-o-matic/pom.xml
+++ b/features-aggregator/odl-openflowplugin-app-bulk-o-matic/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>8.0.0</version>
+        <version>8.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features-aggregator/odl-openflowplugin-app-config-pusher/pom.xml b/features-aggregator/odl-openflowplugin-app-config-pusher/pom.xml
index 1cd4225f9d1fae3c6eb1b8fdd013c3f778a3458b..74c5f15737c150ecd134a9ed3d77b7315932c029 100644 (file)
--- a/features-aggregator/odl-openflowplugin-app-config-pusher/pom.xml
+++ b/features-aggregator/odl-openflowplugin-app-config-pusher/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>8.0.0</version>
+        <version>8.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features-aggregator/odl-openflowplugin-app-forwardingrules-manager/pom.xml b/features-aggregator/odl-openflowplugin-app-forwardingrules-manager/pom.xml
index 83f4a6fb23893d203a675198b8d90d23ced80d7b..351be1a7251643f1ef387102fe0095c4e5dcc552 100644 (file)
--- a/features-aggregator/odl-openflowplugin-app-forwardingrules-manager/pom.xml
+++ b/features-aggregator/odl-openflowplugin-app-forwardingrules-manager/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>8.0.0</version>
+        <version>8.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features-aggregator/odl-openflowplugin-app-forwardingrules-sync/pom.xml b/features-aggregator/odl-openflowplugin-app-forwardingrules-sync/pom.xml
index 5ccb7fdc19f664da2c6de4f1f82fcbb98629cee9..37330967ee641d7c5db4c87927416198c1858b23 100644 (file)
--- a/features-aggregator/odl-openflowplugin-app-forwardingrules-sync/pom.xml
+++ b/features-aggregator/odl-openflowplugin-app-forwardingrules-sync/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>8.0.0</version>
+        <version>8.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features-aggregator/odl-openflowplugin-app-lldp-speaker/pom.xml b/features-aggregator/odl-openflowplugin-app-lldp-speaker/pom.xml
index 595b356ee6fbcc603e9767753930a75e290b5bc4..c883d27a6302e19bd8515592443a5fe46e638a91 100644 (file)
--- a/features-aggregator/odl-openflowplugin-app-lldp-speaker/pom.xml
+++ b/features-aggregator/odl-openflowplugin-app-lldp-speaker/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>8.0.0</version>
+        <version>8.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features-aggregator/odl-openflowplugin-app-notifications/pom.xml b/features-aggregator/odl-openflowplugin-app-notifications/pom.xml
index cd19f04a281d77081f35f840dce7b3dd102d945e..97de676e0cef5bcd3ba862ef1eafa9e9ac1104bd 100644 (file)
--- a/features-aggregator/odl-openflowplugin-app-notifications/pom.xml
+++ b/features-aggregator/odl-openflowplugin-app-notifications/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>8.0.0</version>
+        <version>8.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features-aggregator/odl-openflowplugin-app-reconciliation-framework/pom.xml b/features-aggregator/odl-openflowplugin-app-reconciliation-framework/pom.xml
index 6f6fac05b2c7bc0109558918919a1d00b26b1dbb..9d0156506fb632cde0b65564a1a50fd991b29927 100644 (file)
--- a/features-aggregator/odl-openflowplugin-app-reconciliation-framework/pom.xml
+++ b/features-aggregator/odl-openflowplugin-app-reconciliation-framework/pom.xml
@@ -4,7 +4,7 @@
 <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>single-feature-parent</artifactId>
-    <version>8.0.0</version>
+    <version>8.0.2</version>
     <relativePath/>
 </parent>
 

diff --git a/features-aggregator/odl-openflowplugin-app-southbound-cli/pom.xml b/features-aggregator/odl-openflowplugin-app-southbound-cli/pom.xml
index d629c5cd601c5a54c8cd4d93c57ddeddfff3c5f1..096652489d4e16fffc4e235a388c42cf4f16b5b1 100644 (file)
--- a/features-aggregator/odl-openflowplugin-app-southbound-cli/pom.xml
+++ b/features-aggregator/odl-openflowplugin-app-southbound-cli/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>8.0.0</version>
+        <version>8.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features-aggregator/odl-openflowplugin-app-table-miss-enforcer/pom.xml b/features-aggregator/odl-openflowplugin-app-table-miss-enforcer/pom.xml
index 4e3b863ec964ea33ec508d8ce9298b5b2e6536e1..5265ecd024b748950cc4a7b389c0613c083969b6 100644 (file)
--- a/features-aggregator/odl-openflowplugin-app-table-miss-enforcer/pom.xml
+++ b/features-aggregator/odl-openflowplugin-app-table-miss-enforcer/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>8.0.0</version>
+        <version>8.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features-aggregator/odl-openflowplugin-app-topology-lldp-discovery/pom.xml b/features-aggregator/odl-openflowplugin-app-topology-lldp-discovery/pom.xml
index ef2960e2ff23dfca97b6105918773344d08aa58a..f91ea06c0d741cbf3fc9d394b097938bd3320c63 100644 (file)
--- a/features-aggregator/odl-openflowplugin-app-topology-lldp-discovery/pom.xml
+++ b/features-aggregator/odl-openflowplugin-app-topology-lldp-discovery/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>8.0.0</version>
+        <version>8.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features-aggregator/odl-openflowplugin-app-topology-manager/pom.xml b/features-aggregator/odl-openflowplugin-app-topology-manager/pom.xml
index a7e9946f090695914e44d7fcd5729084008a0ed9..08d56dc87c1f6a3f584cba5df24513d7d81954a7 100644 (file)
--- a/features-aggregator/odl-openflowplugin-app-topology-manager/pom.xml
+++ b/features-aggregator/odl-openflowplugin-app-topology-manager/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>8.0.0</version>
+        <version>8.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features-aggregator/odl-openflowplugin-app-topology/pom.xml b/features-aggregator/odl-openflowplugin-app-topology/pom.xml
index 1754c472ed6fcc7bd1a10cc9bbad4fb774eaab38..1c90641f3003a8013143212db830cc1bb08581b5 100644 (file)
--- a/features-aggregator/odl-openflowplugin-app-topology/pom.xml
+++ b/features-aggregator/odl-openflowplugin-app-topology/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>8.0.0</version>
+        <version>8.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features-aggregator/odl-openflowplugin-drop-test/pom.xml b/features-aggregator/odl-openflowplugin-drop-test/pom.xml
index 16306bccbb3d0847170239c089938fa9815ef444..791edc9a0b3c344185296159a77c5c810defed43 100644 (file)
--- a/features-aggregator/odl-openflowplugin-drop-test/pom.xml
+++ b/features-aggregator/odl-openflowplugin-drop-test/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>8.0.0</version>
+        <version>8.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features-aggregator/odl-openflowplugin-flow-services-rest/pom.xml b/features-aggregator/odl-openflowplugin-flow-services-rest/pom.xml
index 91944a461fafba7c2164adcd3b2ec36752aa1979..58693b84c2f0d1c03036d0070196f972ed9aa045 100644 (file)
--- a/features-aggregator/odl-openflowplugin-flow-services-rest/pom.xml
+++ b/features-aggregator/odl-openflowplugin-flow-services-rest/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>8.0.0</version>
+        <version>8.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features-aggregator/odl-openflowplugin-flow-services/pom.xml b/features-aggregator/odl-openflowplugin-flow-services/pom.xml
index 3d956a5c950364b87aa703603117dcc4d2640c71..2369988d1902886353876255516073b01381339f 100644 (file)
--- a/features-aggregator/odl-openflowplugin-flow-services/pom.xml
+++ b/features-aggregator/odl-openflowplugin-flow-services/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>8.0.0</version>
+        <version>8.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features-aggregator/odl-openflowplugin-libraries/pom.xml b/features-aggregator/odl-openflowplugin-libraries/pom.xml
index 89e62946421aff1d55f070ff593ce5734a83a95c..44523b4f38944794ebd62320bfdea506aaeb7a1e 100644 (file)
--- a/features-aggregator/odl-openflowplugin-libraries/pom.xml
+++ b/features-aggregator/odl-openflowplugin-libraries/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>8.0.0</version>
+        <version>8.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features-aggregator/odl-openflowplugin-nsf-model/pom.xml b/features-aggregator/odl-openflowplugin-nsf-model/pom.xml
index 79af43a8e0757b946abbec39d7de26bf21a175e6..8362f10d70483e2661ac2588ff0838eedb79471d 100644 (file)
--- a/features-aggregator/odl-openflowplugin-nsf-model/pom.xml
+++ b/features-aggregator/odl-openflowplugin-nsf-model/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>8.0.0</version>
+        <version>8.0.2</version>
         <relativePath/>
     </parent>
 
@@ -21,7 +21,7 @@
             <dependency>
                 <groupId>org.opendaylight.mdsal</groupId>
                 <artifactId>mdsal-artifacts</artifactId>
-                <version>7.0.1</version>
+                <version>7.0.3</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.1</version>
+                <version>3.0.3</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>

diff --git a/features-aggregator/odl-openflowplugin-southbound/pom.xml b/features-aggregator/odl-openflowplugin-southbound/pom.xml
index 3248e83f7629e3ff245d0b13b9a5bd9ad27bce40..0a300e4f867e86e2a984da86184aa6d0db31e138 100644 (file)
--- a/features-aggregator/odl-openflowplugin-southbound/pom.xml
+++ b/features-aggregator/odl-openflowplugin-southbound/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>8.0.0</version>
+        <version>8.0.2</version>
         <relativePath/>
     </parent>
 
@@ -29,14 +29,14 @@
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>controller-artifacts</artifactId>
-                <version>3.0.1</version>
+                <version>3.0.3</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.infrautils</groupId>
                 <artifactId>infrautils-artifacts</artifactId>
-                <version>1.9.1</version>
+                <version>1.9.3</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>

diff --git a/features-aggregator/pom.xml b/features-aggregator/pom.xml
index 8114542fc3ae9f7de22719b37027a6a073a37ab7..3b2fa97a7d9c80aff42667d57b2e2ea72e4cf348 100644 (file)
--- a/features-aggregator/pom.xml
+++ b/features-aggregator/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>8.0.0</version>
+        <version>8.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/libraries/pom.xml b/libraries/pom.xml
index f6d4989b483ee528657c373592c5e98360ec92a5..4a5e75a8bb1da2741c3b3da0fe8eb7518e9c425e 100644 (file)
--- a/libraries/pom.xml
+++ b/libraries/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>8.0.0</version>
+        <version>8.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/model/pom.xml b/model/pom.xml
index a808424b2948ac3a0356bbd4d9b365d8779716d3..17c61eef1335ffc988af740774a62b9a839bb840 100644 (file)
--- a/model/pom.xml
+++ b/model/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>8.0.0</version>
+    <version>8.0.2</version>
     <relativePath/>
   </parent>
 

diff --git a/openflowjava/features-openflowjava-aggregator/features-openflowjava/pom.xml b/openflowjava/features-openflowjava-aggregator/features-openflowjava/pom.xml
index 46630cb07b0bb5a301ecfbae7d89e3cac49b91a6..859084ddd05bfd606dbc9b8bd05f049accc21ec2 100644 (file)
--- a/openflowjava/features-openflowjava-aggregator/features-openflowjava/pom.xml
+++ b/openflowjava/features-openflowjava-aggregator/features-openflowjava/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>feature-repo-parent</artifactId>
-    <version>8.0.0</version>
+    <version>8.0.2</version>
     <relativePath/>
   </parent>
 

diff --git a/openflowjava/features-openflowjava-aggregator/odl-openflowjava-protocol/pom.xml b/openflowjava/features-openflowjava-aggregator/odl-openflowjava-protocol/pom.xml
index 97116c7f0ff57b5973ae6cf760ebd5f124fd6a1f..3f32c84eeb6b6b383dd37f00adf0da61d9fcbf03 100644 (file)
--- a/openflowjava/features-openflowjava-aggregator/odl-openflowjava-protocol/pom.xml
+++ b/openflowjava/features-openflowjava-aggregator/odl-openflowjava-protocol/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>8.0.0</version>
+        <version>8.0.2</version>
         <relativePath/>
     </parent>
 
@@ -33,7 +33,7 @@
             <dependency>
                 <groupId>org.opendaylight.infrautils</groupId>
                 <artifactId>infrautils-artifacts</artifactId>
-                <version>1.9.1</version>
+                <version>1.9.3</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.1</version>
+                <version>7.0.3</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>

diff --git a/openflowjava/features-openflowjava-aggregator/pom.xml b/openflowjava/features-openflowjava-aggregator/pom.xml
index 94a1a78e1afb4aeafd02eb17e2d95329945010d9..47b83a8e5823f46c44a52b4588c20f364fae7c7e 100644 (file)
--- a/openflowjava/features-openflowjava-aggregator/pom.xml
+++ b/openflowjava/features-openflowjava-aggregator/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>8.0.0</version>
+    <version>8.0.2</version>
     <relativePath/>
   </parent>
 

diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/configuration/OpenFlowProviderConfigImpl.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/configuration/OpenFlowProviderConfigImpl.java
index 4f32dcdc641c1b1341a2dcb7fe80a651cff3e53f..10159837cefae3ab77528b07031d876c13717d01 100644 (file)
--- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/configuration/OpenFlowProviderConfigImpl.java
+++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/configuration/OpenFlowProviderConfigImpl.java
@@ -33,7 +33,7 @@ public class OpenFlowProviderConfigImpl extends AbstractAugmentable<OpenflowProv
     }
 
     @Override
-    public Boolean isSwitchFeaturesMandatory() {
+    public Boolean getSwitchFeaturesMandatory() {
         return service.getProperty(ConfigurationProperty.SWITCH_FEATURES_MANDATORY.toString(), Boolean::valueOf);
     }
 
@@ -43,43 +43,42 @@ public class OpenFlowProviderConfigImpl extends AbstractAugmentable<OpenflowProv
     }
 
     @Override
-    public Boolean isIsStatisticsPollingOn() {
+    public Boolean getIsStatisticsPollingOn() {
         return service.getProperty(ConfigurationProperty.IS_STATISTICS_POLLING_ON.toString(), Boolean::valueOf);
     }
 
     @Override
-    public Boolean isIsTableStatisticsPollingOn() {
+    public Boolean getIsTableStatisticsPollingOn() {
         return service.getProperty(ConfigurationProperty.IS_TABLE_STATISTICS_POLLING_ON.toString(), Boolean::valueOf);
     }
 
     @Override
-    public Boolean isIsFlowStatisticsPollingOn() {
+    public Boolean getIsFlowStatisticsPollingOn() {
         return service.getProperty(ConfigurationProperty.IS_FLOW_STATISTICS_POLLING_ON.toString(), Boolean::valueOf);
     }
 
     @Override
-    public Boolean isIsGroupStatisticsPollingOn() {
+    public Boolean getIsGroupStatisticsPollingOn() {
         return service.getProperty(ConfigurationProperty.IS_GROUP_STATISTICS_POLLING_ON.toString(), Boolean::valueOf);
     }
 
     @Override
-    public Boolean isIsMeterStatisticsPollingOn() {
+    public Boolean getIsMeterStatisticsPollingOn() {
         return service.getProperty(ConfigurationProperty.IS_METER_STATISTICS_POLLING_ON.toString(), Boolean::valueOf);
     }
 
     @Override
-    public Boolean isIsQueueStatisticsPollingOn() {
+    public Boolean getIsQueueStatisticsPollingOn() {
         return service.getProperty(ConfigurationProperty.IS_QUEUE_STATISTICS_POLLING_ON.toString(), Boolean::valueOf);
     }
 
     @Override
-    public Boolean isIsPortStatisticsPollingOn() {
+    public Boolean getIsPortStatisticsPollingOn() {
         return service.getProperty(ConfigurationProperty.IS_PORT_STATISTICS_POLLING_ON.toString(), Boolean::valueOf);
     }
 
-
     @Override
-    public Boolean isIsStatisticsRpcEnabled() {
+    public Boolean getIsStatisticsRpcEnabled() {
         return service.getProperty(ConfigurationProperty.IS_STATISTICS_RPC_ENABLED.toString(), Boolean::valueOf);
     }
 
@@ -118,17 +117,17 @@ public class OpenFlowProviderConfigImpl extends AbstractAugmentable<OpenflowProv
     }
 
     @Override
-    public Boolean isEnableFlowRemovedNotification() {
+    public Boolean getEnableFlowRemovedNotification() {
         return service.getProperty(ConfigurationProperty.ENABLE_FLOW_REMOVED_NOTIFICATION.toString(), Boolean::valueOf);
     }
 
     @Override
-    public Boolean isSkipTableFeatures() {
+    public Boolean getSkipTableFeatures() {
         return service.getProperty(ConfigurationProperty.SKIP_TABLE_FEATURES.toString(), Boolean::valueOf);
     }
 
     @Override
-    public Boolean isEnableEqualRole() {
+    public Boolean getEnableEqualRole() {
         return service.getProperty(ConfigurationProperty.ENABLE_EQUAL_ROLE.toString(), Boolean::valueOf);
     }
 
@@ -145,7 +144,7 @@ public class OpenFlowProviderConfigImpl extends AbstractAugmentable<OpenflowProv
     }
 
     @Override
-    public Boolean isUseSingleLayerSerialization() {
+    public Boolean getUseSingleLayerSerialization() {
         return service.getProperty(ConfigurationProperty.USE_SINGLE_LAYER_SERIALIZATION.toString(), Boolean::valueOf);
     }
 
@@ -168,7 +167,7 @@ public class OpenFlowProviderConfigImpl extends AbstractAugmentable<OpenflowProv
     }
 
     @Override
-    public Boolean isEnableCustomTrustManager() {
+    public Boolean getEnableCustomTrustManager() {
         return service.getProperty(ConfigurationProperty.ENABLE_CUSTOM_TRUST_MANAGER.toString(),
                 Boolean::valueOf);
     }

diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/multilayer/MultiLayerAggregateFlowMultipartService.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/multilayer/MultiLayerAggregateFlowMultipartService.java
index c9bbaf1b13bbfa72a089fcffdabfa2c77d8e5bbb..c2ebf4fbd5de6c4ac8b93b368262fff6e02d48bf 100644 (file)
--- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/multilayer/MultiLayerAggregateFlowMultipartService.java
+++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/services/multilayer/MultiLayerAggregateFlowMultipartService.java
@@ -121,7 +121,7 @@ public class MultiLayerAggregateFlowMultipartService extends AbstractAggregateFl
                 if (Preconditions.checkNotNull(result).isSuccessful()) {
                     final MessageTranslator<MultipartReply, AggregatedFlowStatistics>
                              messageTranslator = translatorLibrary.lookupTranslator(
-                             new TranslatorKey(getVersion(),
+                                 new TranslatorKey(getVersion(),
                                                MultipartReplyAggregateCase.class.getName()));
 
                     return RpcResultBuilder.success(

diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/StatisticsGatheringUtils.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/StatisticsGatheringUtils.java
index 5d62f7209efc3354bf4e333a5c819b42da4896a0..c63f3cd307d0a35f37ec37bb13c8d00c5207040d 100755 (executable)
--- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/StatisticsGatheringUtils.java
+++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/statistics/StatisticsGatheringUtils.java
@@ -72,7 +72,7 @@ public final class StatisticsGatheringUtils {
             final ConvertorExecutor convertorExecutor, final MultipartWriterProvider statisticsWriterProvider,
             final ListeningExecutorService executorService) {
         return Futures.transformAsync(statisticsGatheringService.getStatisticsOfType(
-           new EventIdentifier(QUEUE2_REQCTX + type.toString(), deviceInfo.getNodeId().toString()), type),
+            new EventIdentifier(QUEUE2_REQCTX + type.toString(), deviceInfo.getNodeId().toString()), type),
             rpcResult -> executorService.submit(() -> {
                 final boolean rpcResultIsNull = rpcResult == null;
 

diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/messages/AsyncConfigMessageSerializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/messages/AsyncConfigMessageSerializerTest.java
index 84b95c93ac134889185a1fee2b53e6444998f7fa..f3c0a31cfad98a2a378393b6fcee0417e8189816 100644 (file)
--- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/messages/AsyncConfigMessageSerializerTest.java
+++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/messages/AsyncConfigMessageSerializerTest.java
@@ -63,18 +63,24 @@ public class AsyncConfigMessageSerializerTest extends AbstractSerializerTest {
     private static final Boolean SLAVE_IS_FLOWDELETE = false;
     private static final Boolean SLAVE_IS_GROUPDELETE = false;
 
-    private static final AsyncConfigMessage MESSAGE = new AsyncConfigMessageBuilder().setXid(XID).setVersion(VERSION)
-            .setPacketInMask(new PacketInMaskBuilder().setMasterMask(
-                    new PacketInMask(MASTER_IS_ACTION, MASTER_IS_INVALID_TTL, MASTER_IS_NOMATCH)).setSlaveMask(
-                    new PacketInMask(SLAVE_IS_ACTION, SLAVE_IS_INVALID_TTL, SLAVE_IS_NOMATCH)).build())
-            .setPortStatusMask(new PortStatusMaskBuilder().setMasterMask(
-                    new PortStatusMask(MASTER_IS_ADD, MASTER_IS_DELETE, MASTER_IS_MODIFY))
-                                       .setSlaveMask(new PortStatusMask(SLAVE_IS_ADD, SLAVE_IS_DELETE, SLAVE_IS_MODIFY))
-                                       .build()).setFlowRemovedMask(new FlowRemovedMaskBuilder().setMasterMask(
-                    new FlowRemovedMask(MASTER_IS_FLOWDELETE, MASTER_IS_GROUPDELETE, MASTER_IS_HARDTIMEOUT,
-                                        MASTER_IS_IDLETIMEOUT)).setSlaveMask(
-                    new FlowRemovedMask(SLAVE_IS_FLOWDELETE, SLAVE_IS_GROUPDELETE, SLAVE_IS_HARDTIMEOUT,
-                                        SLAVE_IS_IDLETIMEOUT)).build()).build();
+    private static final AsyncConfigMessage MESSAGE = new AsyncConfigMessageBuilder()
+        .setXid(XID)
+        .setVersion(VERSION)
+        .setPacketInMask(new PacketInMaskBuilder()
+            .setMasterMask(new PacketInMask(MASTER_IS_ACTION, MASTER_IS_INVALID_TTL, MASTER_IS_NOMATCH))
+            .setSlaveMask(new PacketInMask(SLAVE_IS_ACTION, SLAVE_IS_INVALID_TTL, SLAVE_IS_NOMATCH))
+            .build())
+        .setPortStatusMask(new PortStatusMaskBuilder()
+            .setMasterMask(new PortStatusMask(MASTER_IS_ADD, MASTER_IS_DELETE, MASTER_IS_MODIFY))
+            .setSlaveMask(new PortStatusMask(SLAVE_IS_ADD, SLAVE_IS_DELETE, SLAVE_IS_MODIFY))
+            .build())
+        .setFlowRemovedMask(new FlowRemovedMaskBuilder()
+            .setMasterMask(new FlowRemovedMask(MASTER_IS_FLOWDELETE, MASTER_IS_GROUPDELETE, MASTER_IS_HARDTIMEOUT,
+                    MASTER_IS_IDLETIMEOUT))
+            .setSlaveMask(new FlowRemovedMask(SLAVE_IS_FLOWDELETE, SLAVE_IS_GROUPDELETE, SLAVE_IS_HARDTIMEOUT,
+                    SLAVE_IS_IDLETIMEOUT))
+            .build())
+        .build();
 
     private AsyncConfigMessageSerializer serializer;
 

diff --git a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/GroupConvertorTest.java b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/GroupConvertorTest.java
index 3c95cf670e26db13ae5c8d0ba5c7ecca60d25d9f..f36be89b7791ef24d5a3e33041b66eddfeb72f57 100644 (file)
--- a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/GroupConvertorTest.java
+++ b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/GroupConvertorTest.java
@@ -163,16 +163,16 @@ public class GroupConvertorTest {
 
         final List<Action> outActionList = outAddGroupInput.getBucketsList().get(0).getAction();
         assertEquals(ImmutableList.of(new org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action
-                    .rev150203.actions.grouping.ActionBuilder().setActionChoice(new GroupCaseBuilder().setGroupAction(
+            .rev150203.actions.grouping.ActionBuilder().setActionChoice(new GroupCaseBuilder().setGroupAction(
                 new org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping
-                        .action.choice.group._case.GroupActionBuilder().setGroupId(Uint32.valueOf(5)).build())
-                        .build()).build(),
-                    new org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping
-                    .ActionBuilder().setActionChoice(new GroupCaseBuilder().setGroupAction(
-                            new org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action
-                            .grouping.action.choice.group._case.GroupActionBuilder().setGroupId(Uint32.valueOf(5))
-                            .build()).build())
-                    .build()), outActionList);
+                .action.choice.group._case.GroupActionBuilder().setGroupId(Uint32.valueOf(5)).build())
+                .build()).build(),
+            new org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping
+            .ActionBuilder().setActionChoice(new GroupCaseBuilder().setGroupAction(
+                    new org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action
+                    .grouping.action.choice.group._case.GroupActionBuilder().setGroupId(Uint32.valueOf(5))
+                    .build()).build())
+            .build()), outActionList);
 
         assertEquals(50, outAddGroupInput.getBucketsList().get(1).getWeight().toJava());
         assertEquals(60, outAddGroupInput.getBucketsList().get(1).getWatchPort().getValue().toJava());
@@ -180,16 +180,16 @@ public class GroupConvertorTest {
 
         final List<Action> outActionList1 = outAddGroupInput.getBucketsList().get(1).getAction();
         assertEquals(ImmutableList.of(new org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action
-                    .rev150203.actions.grouping.ActionBuilder().setActionChoice(new GroupCaseBuilder().setGroupAction(
+            .rev150203.actions.grouping.ActionBuilder().setActionChoice(new GroupCaseBuilder().setGroupAction(
                 new org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action.grouping
-                        .action.choice.group._case.GroupActionBuilder().setGroupId(Uint32.valueOf(5)).build()).build())
-                    .build(),
-                    new org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping
-                    .ActionBuilder().setActionChoice(new GroupCaseBuilder().setGroupAction(
-                            new org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action
-                            .grouping.action.choice.group._case.GroupActionBuilder().setGroupId(Uint32.valueOf(5))
-                            .build()).build())
-                    .build()), outActionList1);
+                .action.choice.group._case.GroupActionBuilder().setGroupId(Uint32.valueOf(5)).build()).build())
+            .build(),
+            new org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.actions.grouping
+            .ActionBuilder().setActionChoice(new GroupCaseBuilder().setGroupAction(
+                    new org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev150203.action
+                    .grouping.action.choice.group._case.GroupActionBuilder().setGroupId(Uint32.valueOf(5))
+                    .build()).build())
+            .build()), outActionList1);
     }
 
     /**

diff --git a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/flow/FlowConvertorTest.java b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/flow/FlowConvertorTest.java
index f9a719cddbf1606eb11d04532a45c8164817d361..d0c9c855f24097a3926554d162221d435194b0e4 100644 (file)
--- a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/flow/FlowConvertorTest.java
+++ b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/flow/FlowConvertorTest.java
@@ -381,17 +381,17 @@ public class FlowConvertorTest {
         }
 
         @Override
-        public Boolean isInstallHw() {
+        public Boolean getInstallHw() {
             return null;
         }
 
         @Override
-        public Boolean isBarrier() {
+        public Boolean getBarrier() {
             return null;
         }
 
         @Override
-        public Boolean isStrict() {
+        public Boolean getStrict() {
             return null;
         }
 

diff --git a/parent/pom.xml b/parent/pom.xml
index 84ed0d21dfa73cce1ca9b263671bb66018a1bdfe..11448fef5a4c0ef6c7b069f2ba677c59b7834d91 100644 (file)
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>7.0.1</version>
+        <version>7.0.3</version>
         <relativePath/>
     </parent>
 
@@ -41,14 +41,14 @@
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
                 <artifactId>controller-artifacts</artifactId>
-                <version>3.0.1</version>
+                <version>3.0.3</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.infrautils</groupId>
                 <artifactId>infrautils-artifacts</artifactId>
-                <version>1.9.1</version>
+                <version>1.9.3</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

diff --git a/samples/pom.xml b/samples/pom.xml
index 94c83325dc8b07ccdac84bfbd52253fdf924b015..c4ee243c43d048fa4b0ee3cfa0fb31e832978366 100644 (file)
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>8.0.0</version>
+        <version>8.0.2</version>
         <relativePath/>
     </parent>