Merge changes I0e30376d,I7b95f664 into stable/boron

* changes:
  Add logging in tx facade along with the RemoteDeviceId
  Move SubmitFailedReply in the appropriate package

diff --git a/features/netconf-connector/pom.xml b/features/netconf-connector/pom.xml
index 623efe53fe0b33e5f3f48f486cc746ea065c3d25..bc21f58e3efb440dc9b9833074f6da635f62e131 100644 (file)
--- a/features/netconf-connector/pom.xml
+++ b/features/netconf-connector/pom.xml
@@ -12,24 +12,24 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>features-parent</artifactId>
-    <version>1.7.1-SNAPSHOT</version>
+    <version>1.7.2-SNAPSHOT</version>
     <relativePath/>
   </parent>
   <groupId>org.opendaylight.netconf</groupId>
   <artifactId>features-netconf-connector</artifactId>
-  <version>1.1.1-SNAPSHOT</version>
+  <version>1.1.2-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <properties>
-    <commons.opendaylight.version>1.7.1-SNAPSHOT</commons.opendaylight.version>
-    <controller.mdsal.version>1.4.1-SNAPSHOT</controller.mdsal.version>
-    <config.version>0.5.1-SNAPSHOT</config.version>
-    <features.test.version>1.7.1-SNAPSHOT</features.test.version>
-    <mdsal.version>2.1.1-SNAPSHOT</mdsal.version>
-    <mdsal.model.version>0.9.1-SNAPSHOT</mdsal.model.version>
-    <netconf.version>1.1.1-SNAPSHOT</netconf.version>
-    <netconf.connector.version>1.4.1-SNAPSHOT</netconf.connector.version>
-    <yangtools.version>1.0.1-SNAPSHOT</yangtools.version>
+    <commons.opendaylight.version>1.7.2-SNAPSHOT</commons.opendaylight.version>
+    <controller.mdsal.version>1.4.2-SNAPSHOT</controller.mdsal.version>
+    <config.version>0.5.2-SNAPSHOT</config.version>
+    <features.test.version>1.7.2-SNAPSHOT</features.test.version>
+    <mdsal.version>2.1.2-SNAPSHOT</mdsal.version>
+    <mdsal.model.version>0.9.2-SNAPSHOT</mdsal.model.version>
+    <netconf.version>1.1.2-SNAPSHOT</netconf.version>
+    <netconf.connector.version>1.4.2-SNAPSHOT</netconf.connector.version>
+    <yangtools.version>1.0.2-SNAPSHOT</yangtools.version>
 
     <features.file>features.xml</features.file>
     <config.configfile.directory>etc/opendaylight/karaf</config.configfile.directory>
@@ -44,7 +44,7 @@
       <dependency>
         <groupId>org.opendaylight.netconf</groupId>
         <artifactId>netconf-artifacts</artifactId>
-        <version>1.1.1-SNAPSHOT</version>
+        <version>1.1.2-SNAPSHOT</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/features/netconf/pom.xml b/features/netconf/pom.xml
index ae6cfb7de47af80424306f63b03f5379edaa2f6f..e0bdc1b06a289ce7fcebf93383eddd4d6333a5eb 100644 (file)
--- a/features/netconf/pom.xml
+++ b/features/netconf/pom.xml
@@ -4,25 +4,25 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>features-parent</artifactId>
-    <version>1.7.1-SNAPSHOT</version>
+    <version>1.7.2-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
   <groupId>org.opendaylight.netconf</groupId>
   <artifactId>features-netconf</artifactId>
-  <version>1.1.1-SNAPSHOT</version>
+  <version>1.1.2-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <properties>
-    <aaa.version>0.4.1-SNAPSHOT</aaa.version>
-    <commons.opendaylight.version>1.7.1-SNAPSHOT</commons.opendaylight.version>
-    <controller.mdsal.version>1.4.1-SNAPSHOT</controller.mdsal.version>
-    <config.version>0.5.1-SNAPSHOT</config.version>
-    <features.test.version>1.7.1-SNAPSHOT</features.test.version>
-    <mdsal.model.version>0.9.1-SNAPSHOT</mdsal.model.version>
-    <netconf.version>1.1.1-SNAPSHOT</netconf.version>
-    <protocol-framework.version>0.8.1-SNAPSHOT</protocol-framework.version>
-    <yangtools.version>1.0.1-SNAPSHOT</yangtools.version>
+    <aaa.version>0.4.2-SNAPSHOT</aaa.version>
+    <commons.opendaylight.version>1.7.2-SNAPSHOT</commons.opendaylight.version>
+    <controller.mdsal.version>1.4.2-SNAPSHOT</controller.mdsal.version>
+    <config.version>0.5.2-SNAPSHOT</config.version>
+    <features.test.version>1.7.2-SNAPSHOT</features.test.version>
+    <mdsal.model.version>0.9.2-SNAPSHOT</mdsal.model.version>
+    <netconf.version>1.1.2-SNAPSHOT</netconf.version>
+    <protocol-framework.version>0.8.2-SNAPSHOT</protocol-framework.version>
+    <yangtools.version>1.0.2-SNAPSHOT</yangtools.version>
     <sshd-core.version>0.14.0</sshd-core.version>
 
     <config.configfile.directory>etc/opendaylight/karaf</config.configfile.directory>
@@ -42,7 +42,7 @@
       <dependency>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-artifacts</artifactId>
-        <version>1.7.1-SNAPSHOT</version>
+        <version>1.7.2-SNAPSHOT</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/features/pom.xml b/features/pom.xml
index 812c3002bccb7735ca9bb3c028f1c71745dfed2b..25257a917add7094593ec835cf85952a8b16b2f8 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.netconf</groupId>
     <artifactId>netconf-parent</artifactId>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.1.2-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
   <artifactId>netconf-features-parent</artifactId>

diff --git a/features/restconf/pom.xml b/features/restconf/pom.xml
index f4d79b0293a11c3765b48008bf5683e0e814daeb..2e0dd747bc79efe15afb5363fe1d3395226fb6ba 100644 (file)
--- a/features/restconf/pom.xml
+++ b/features/restconf/pom.xml
@@ -12,22 +12,22 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>features-parent</artifactId>
-    <version>1.7.1-SNAPSHOT</version>
+    <version>1.7.2-SNAPSHOT</version>
     <relativePath/>
   </parent>
   <artifactId>features-restconf</artifactId>
   <groupId>org.opendaylight.netconf</groupId>
-  <version>1.4.1-SNAPSHOT</version>
+  <version>1.4.2-SNAPSHOT</version>
   <packaging>jar</packaging>
   <properties>
-    <aaa.version>0.4.1-SNAPSHOT</aaa.version>
-    <commons.opendaylight.version>1.7.1-SNAPSHOT</commons.opendaylight.version>
-    <controller.mdsal.version>1.4.1-SNAPSHOT</controller.mdsal.version>
-    <features.test.version>1.7.1-SNAPSHOT</features.test.version>
-    <mdsal.version>2.1.1-SNAPSHOT</mdsal.version>
-    <mdsal.model.version>0.9.1-SNAPSHOT</mdsal.model.version>
-    <restconf.version>1.4.1-SNAPSHOT</restconf.version>
-    <yangtools.version>1.0.1-SNAPSHOT</yangtools.version>
+    <aaa.version>0.4.2-SNAPSHOT</aaa.version>
+    <commons.opendaylight.version>1.7.2-SNAPSHOT</commons.opendaylight.version>
+    <controller.mdsal.version>1.4.2-SNAPSHOT</controller.mdsal.version>
+    <features.test.version>1.7.2-SNAPSHOT</features.test.version>
+    <mdsal.version>2.1.2-SNAPSHOT</mdsal.version>
+    <mdsal.model.version>0.9.2-SNAPSHOT</mdsal.model.version>
+    <restconf.version>1.4.2-SNAPSHOT</restconf.version>
+    <yangtools.version>1.0.2-SNAPSHOT</yangtools.version>
 
     <features.file>features.xml</features.file>
     <config.configfile.directory>etc/opendaylight/karaf</config.configfile.directory>
@@ -40,7 +40,7 @@
       <dependency>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-artifacts</artifactId>
-        <version>1.7.1-SNAPSHOT</version>
+        <version>1.7.2-SNAPSHOT</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/features/yanglib/pom.xml b/features/yanglib/pom.xml
index 8e136207a2e49418e9b9c4dc5afc59ab1d2fc978..af9025e1b4381a913c0f74bd8e53d207aa0a6c25 100644 (file)
--- a/features/yanglib/pom.xml
+++ b/features/yanglib/pom.xml
@@ -12,22 +12,22 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>features-parent</artifactId>
-        <version>1.7.1-SNAPSHOT</version>
+        <version>1.7.2-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.opendaylight.netconf</groupId>
     <artifactId>features-yanglib</artifactId>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.1.2-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <properties>
-        <controller.mdsal.version>1.4.1-SNAPSHOT</controller.mdsal.version>
-        <netconf.version>1.1.1-SNAPSHOT</netconf.version>
-        <mdsal.version>2.1.1-SNAPSHOT</mdsal.version>
-        <mdsal.model.version>0.9.1-SNAPSHOT</mdsal.model.version>
-        <restconf.version>1.4.1-SNAPSHOT</restconf.version>
-        <yangtools.version>1.0.1-SNAPSHOT</yangtools.version>
+        <controller.mdsal.version>1.4.2-SNAPSHOT</controller.mdsal.version>
+        <netconf.version>1.1.2-SNAPSHOT</netconf.version>
+        <mdsal.version>2.1.2-SNAPSHOT</mdsal.version>
+        <mdsal.model.version>0.9.2-SNAPSHOT</mdsal.model.version>
+        <restconf.version>1.4.2-SNAPSHOT</restconf.version>
+        <yangtools.version>1.0.2-SNAPSHOT</yangtools.version>
     </properties>
 
     <dependencyManagement>
@@ -35,7 +35,7 @@
             <dependency>
                 <groupId>org.opendaylight.odlparent</groupId>
                 <artifactId>odlparent-artifacts</artifactId>
-                <version>1.7.1-SNAPSHOT</version>
+                <version>1.7.2-SNAPSHOT</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

diff --git a/karaf/pom.xml b/karaf/pom.xml
index bac16d5d2e0adff1eac86a164f5b6b7d7a95afab..f465895d0c3d0ae6f2c3c2e2b5a7fd8bdeeac705 100644 (file)
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -10,19 +10,19 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>karaf-parent</artifactId>
-    <version>1.7.1-SNAPSHOT</version>
+    <version>1.7.2-SNAPSHOT</version>
     <relativePath></relativePath>
   </parent>
   <groupId>org.opendaylight.netconf</groupId>
   <artifactId>netconf-karaf</artifactId>
-  <version>1.4.1-SNAPSHOT</version>
+  <version>1.4.2-SNAPSHOT</version>
   <packaging>pom</packaging>
   <prerequisites>
     <maven>3.1.1</maven>
   </prerequisites>
   <properties>
-    <netconf.version>1.1.1-SNAPSHOT</netconf.version>
-    <restconf.version>1.4.1-SNAPSHOT</restconf.version>
+    <netconf.version>1.1.2-SNAPSHOT</netconf.version>
+    <restconf.version>1.4.2-SNAPSHOT</restconf.version>
   </properties>
 
   <dependencies>

diff --git a/netconf/aaa-authn-odl-plugin/pom.xml b/netconf/aaa-authn-odl-plugin/pom.xml
index f3a5ee8db5b275287e7b19a0e307de705077d3a5..9b36ec9630148ce0846df9ea89ad6faee52f9d0a 100644 (file)
--- a/netconf/aaa-authn-odl-plugin/pom.xml
+++ b/netconf/aaa-authn-odl-plugin/pom.xml
@@ -13,13 +13,13 @@
     <parent>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>config-parent</artifactId>
-        <version>0.5.1-SNAPSHOT</version>
+        <version>0.5.2-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.opendaylight.netconf</groupId>
     <artifactId>aaa-authn-odl-plugin</artifactId>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.1.2-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <dependencyManagement>

diff --git a/netconf/abstract-topology/pom.xml b/netconf/abstract-topology/pom.xml
index 275a3085541720ca96fbb0fc259f337dfacc1726..4d2ff454d5d9709112d505bb7c77af70f0f5d4a1 100644 (file)
--- a/netconf/abstract-topology/pom.xml
+++ b/netconf/abstract-topology/pom.xml
@@ -7,13 +7,13 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>bundle-parent</artifactId>
-        <version>1.7.1-SNAPSHOT</version>
+        <version>1.7.2-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.opendaylight.netconf</groupId>
     <artifactId>abstract-topology</artifactId>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.1.2-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <dependencyManagement>

diff --git a/netconf/config-netconf-connector/pom.xml b/netconf/config-netconf-connector/pom.xml
index 293328838130168c741bc304e0108e8a765ac7de..387a2d40cc578af3556a9363ebe4448b0350933e 100644 (file)
--- a/netconf/config-netconf-connector/pom.xml
+++ b/netconf/config-netconf-connector/pom.xml
@@ -5,13 +5,13 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
-    <version>1.7.1-SNAPSHOT</version>
+    <version>1.7.2-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
   <groupId>org.opendaylight.netconf</groupId>
   <artifactId>config-netconf-connector</artifactId>
-  <version>1.1.1-SNAPSHOT</version>
+  <version>1.1.2-SNAPSHOT</version>
   <name>${project.artifactId}</name>
   <packaging>bundle</packaging>
 

diff --git a/netconf/mdsal-netconf-connector/pom.xml b/netconf/mdsal-netconf-connector/pom.xml
index db8107c68ffddca562eda7ab7bec1fd49398cea3..fd38bf0bae76bc8d0776ac171f39aec4099e40ed 100644 (file)
--- a/netconf/mdsal-netconf-connector/pom.xml
+++ b/netconf/mdsal-netconf-connector/pom.xml
@@ -5,13 +5,13 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>config-parent</artifactId>
-    <version>0.5.1-SNAPSHOT</version>
+    <version>0.5.2-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
   <groupId>org.opendaylight.netconf</groupId>
   <artifactId>mdsal-netconf-connector</artifactId>
-  <version>1.1.1-SNAPSHOT</version>
+  <version>1.1.2-SNAPSHOT</version>
   <name>${project.artifactId}</name>
   <packaging>bundle</packaging>
 

diff --git a/netconf/mdsal-netconf-monitoring/pom.xml b/netconf/mdsal-netconf-monitoring/pom.xml
index 1fb42239c27b36a1c6fff34aeebf34bb303ce748..17ee60d27b66d2d454a23fa95440055f25b0860d 100644 (file)
--- a/netconf/mdsal-netconf-monitoring/pom.xml
+++ b/netconf/mdsal-netconf-monitoring/pom.xml
@@ -4,13 +4,13 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>config-parent</artifactId>
-    <version>0.5.1-SNAPSHOT</version>
+    <version>0.5.2-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
   <groupId>org.opendaylight.netconf</groupId>
   <artifactId>mdsal-netconf-monitoring</artifactId>
-  <version>1.1.1-SNAPSHOT</version>
+  <version>1.1.2-SNAPSHOT</version>
   <name>${project.artifactId}</name>
   <packaging>bundle</packaging>
 

diff --git a/netconf/mdsal-netconf-notification/pom.xml b/netconf/mdsal-netconf-notification/pom.xml
index ab0b2ce70436242773160183ac52fdf5ec22991f..56797af5c05685d24c735f8427039a27f2e192ad 100644 (file)
--- a/netconf/mdsal-netconf-notification/pom.xml
+++ b/netconf/mdsal-netconf-notification/pom.xml
@@ -4,13 +4,13 @@
     <parent>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>config-parent</artifactId>
-        <version>0.5.1-SNAPSHOT</version>
+        <version>0.5.2-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.opendaylight.netconf</groupId>
     <artifactId>mdsal-netconf-notification</artifactId>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.1.2-SNAPSHOT</version>
     <name>${project.artifactId}</name>
     <packaging>bundle</packaging>
 

diff --git a/netconf/mdsal-netconf-yang-library/pom.xml b/netconf/mdsal-netconf-yang-library/pom.xml
index 37b8d43ea2a932c8efd28cfe3e62e0c8ff3595a7..44580444803468a7a9c791ac3cfd47d30d27f8bd 100644 (file)
--- a/netconf/mdsal-netconf-yang-library/pom.xml
+++ b/netconf/mdsal-netconf-yang-library/pom.xml
@@ -12,13 +12,13 @@
     <parent>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>config-parent</artifactId>
-        <version>0.5.1-SNAPSHOT</version>
+        <version>0.5.2-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.opendaylight.netconf</groupId>
     <artifactId>mdsal-netconf-yang-library</artifactId>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.1.2-SNAPSHOT</version>
     <name>${project.artifactId}</name>
     <packaging>bundle</packaging>
 

diff --git a/netconf/messagebus-netconf/pom.xml b/netconf/messagebus-netconf/pom.xml
index 1a55f1d83221e2185ea031e6354303b37c319aef..c5846ea226e01af0cf4a7b594648c95018306079 100644 (file)
--- a/netconf/messagebus-netconf/pom.xml
+++ b/netconf/messagebus-netconf/pom.xml
@@ -14,13 +14,13 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <parent>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>config-parent</artifactId>
-        <version>0.5.1-SNAPSHOT</version>
+        <version>0.5.2-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.opendaylight.netconf</groupId>
     <artifactId>messagebus-netconf</artifactId>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.1.2-SNAPSHOT</version>
     <name>${project.artifactId}</name>
     <packaging>bundle</packaging>
 

diff --git a/netconf/models/ietf-netconf-monitoring-extension/pom.xml b/netconf/models/ietf-netconf-monitoring-extension/pom.xml
index ac63fbc43ad5f790a8af86663c9d859a2700e6dd..0b7246ac2ae9eef16da73d959b4958244a069651 100644 (file)
--- a/netconf/models/ietf-netconf-monitoring-extension/pom.xml
+++ b/netconf/models/ietf-netconf-monitoring-extension/pom.xml
@@ -5,13 +5,13 @@
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>0.9.1-SNAPSHOT</version>
+    <version>0.9.2-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
   <groupId>org.opendaylight.netconf</groupId>
   <artifactId>ietf-netconf-monitoring-extension</artifactId>
-  <version>1.1.1-SNAPSHOT</version>
+  <version>1.1.2-SNAPSHOT</version>
   <name>${project.artifactId}</name>
   <packaging>bundle</packaging>
 

diff --git a/netconf/models/ietf-netconf-monitoring/pom.xml b/netconf/models/ietf-netconf-monitoring/pom.xml
index ad16eacf3c66c05755ea9dfc2f5107eb1a16ad78..c718550afa7654af15aaf186dcc36c67ed89db30 100644 (file)
--- a/netconf/models/ietf-netconf-monitoring/pom.xml
+++ b/netconf/models/ietf-netconf-monitoring/pom.xml
@@ -5,13 +5,13 @@
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>0.9.1-SNAPSHOT</version>
+    <version>0.9.2-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
   <groupId>org.opendaylight.netconf</groupId>
   <artifactId>ietf-netconf-monitoring</artifactId>
-  <version>1.1.1-SNAPSHOT</version>
+  <version>1.1.2-SNAPSHOT</version>
   <name>${project.artifactId}</name>
   <packaging>bundle</packaging>
 

diff --git a/netconf/models/ietf-netconf-notifications/pom.xml b/netconf/models/ietf-netconf-notifications/pom.xml
index d61a2499cc91b3aaf7784dc3f37f700d91b950c7..27fce4a63e7faeba3a337c7016aede1af97c474c 100644 (file)
--- a/netconf/models/ietf-netconf-notifications/pom.xml
+++ b/netconf/models/ietf-netconf-notifications/pom.xml
@@ -13,13 +13,13 @@
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>0.9.1-SNAPSHOT</version>
+    <version>0.9.2-SNAPSHOT</version>
     <relativePath/>
   </parent>
   
   <groupId>org.opendaylight.netconf</groupId>
   <artifactId>ietf-netconf-notifications</artifactId>
-  <version>1.1.1-SNAPSHOT</version>
+  <version>1.1.2-SNAPSHOT</version>
   <name>${project.artifactId}</name>
   <packaging>bundle</packaging>
 

diff --git a/netconf/models/ietf-netconf-yang-library/pom.xml b/netconf/models/ietf-netconf-yang-library/pom.xml
index 01bf43f51563977f1f5ad658277210818b07f9b9..10ebfff5325e24577fe25ec9fb5c78ada39da819 100644 (file)
--- a/netconf/models/ietf-netconf-yang-library/pom.xml
+++ b/netconf/models/ietf-netconf-yang-library/pom.xml
@@ -14,13 +14,13 @@
     <parent>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>0.9.1-SNAPSHOT</version>
+        <version>0.9.2-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.opendaylight.netconf</groupId>
     <artifactId>ietf-netconf-yang-library</artifactId>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.1.2-SNAPSHOT</version>
     <name>${project.artifactId}</name>
     <packaging>bundle</packaging>
 

diff --git a/netconf/models/ietf-netconf/pom.xml b/netconf/models/ietf-netconf/pom.xml
index 701d111dffd47910972a79238e1ba460725a1884..72c8835485bf5d855febae42bf669bad2cce8d2b 100644 (file)
--- a/netconf/models/ietf-netconf/pom.xml
+++ b/netconf/models/ietf-netconf/pom.xml
@@ -13,13 +13,13 @@
     <parent>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>binding-parent</artifactId>
-       <version>0.9.1-SNAPSHOT</version>
+       <version>0.9.2-SNAPSHOT</version>
        <relativePath/>
     </parent>
 
     <groupId>org.opendaylight.netconf</groupId>
     <artifactId>ietf-netconf</artifactId>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.1.2-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>${project.artifactId}</name>
 

diff --git a/netconf/models/pom.xml b/netconf/models/pom.xml
index c82e584508ecae12a6c39709ebf2ec12b0be6ced..e603fef405c836132684104ed117554a88fb5d09 100644 (file)
--- a/netconf/models/pom.xml
+++ b/netconf/models/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.opendaylight.netconf</groupId>
     <artifactId>netconf-subsystem</artifactId>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.1.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>netconf-models</artifactId>

diff --git a/netconf/netconf-api/pom.xml b/netconf/netconf-api/pom.xml
index 35670de1c60a37c1be2e51e8c3403f7ff4444e8e..a4ce8038f3bd007ba9649e2951c229e47fef24f9 100644 (file)
--- a/netconf/netconf-api/pom.xml
+++ b/netconf/netconf-api/pom.xml
@@ -5,13 +5,13 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>config-parent</artifactId>
-    <version>0.5.1-SNAPSHOT</version>
+    <version>0.5.2-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
   <groupId>org.opendaylight.netconf</groupId>
   <artifactId>netconf-api</artifactId>
-  <version>1.1.1-SNAPSHOT</version>
+  <version>1.1.2-SNAPSHOT</version>
   <name>${project.artifactId}</name>
   <packaging>bundle</packaging>
 

diff --git a/netconf/netconf-artifacts/pom.xml b/netconf/netconf-artifacts/pom.xml
index d90781931ccf9d3d3b58516103a5cacf76758355..3c10649ec75697d4327269b6563f60df3fe95ddf 100644 (file)
--- a/netconf/netconf-artifacts/pom.xml
+++ b/netconf/netconf-artifacts/pom.xml
@@ -14,17 +14,17 @@
     <parent>
       <groupId>org.opendaylight.odlparent</groupId>
       <artifactId>odlparent-lite</artifactId>
-      <version>1.7.1-SNAPSHOT</version>
+      <version>1.7.2-SNAPSHOT</version>
       <relativePath/>
     </parent>
 
     <groupId>org.opendaylight.netconf</groupId>
     <artifactId>netconf-artifacts</artifactId>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.1.2-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <properties>
-        <mdsal.version>1.4.1-SNAPSHOT</mdsal.version>
+        <mdsal.version>1.4.2-SNAPSHOT</mdsal.version>
     </properties>
 
     <dependencyManagement>

diff --git a/netconf/netconf-auth/pom.xml b/netconf/netconf-auth/pom.xml
index 4cd4da1e8958e1c1779634e3eb6fadfb7d09e2b7..7ff18cbdbc0c0e2f643692858db9fa71d2517474 100644 (file)
--- a/netconf/netconf-auth/pom.xml
+++ b/netconf/netconf-auth/pom.xml
@@ -12,13 +12,13 @@
     <parent>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>config-parent</artifactId>
-        <version>0.5.1-SNAPSHOT</version>
+        <version>0.5.2-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.opendaylight.netconf</groupId>
     <artifactId>netconf-auth</artifactId>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.1.2-SNAPSHOT</version>
     <name>${project.artifactId}</name>
     <packaging>bundle</packaging>
 </project>

diff --git a/netconf/netconf-client/pom.xml b/netconf/netconf-client/pom.xml
index bf28bab339cb43ca2eaec4adefabe1f78fcc535b..57f67da23d6a29a552d4c823a0d8aa3b3aa70c0a 100644 (file)
--- a/netconf/netconf-client/pom.xml
+++ b/netconf/netconf-client/pom.xml
@@ -5,13 +5,13 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
-    <version>1.7.1-SNAPSHOT</version>
+    <version>1.7.2-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
   <groupId>org.opendaylight.netconf</groupId>
   <artifactId>netconf-client</artifactId>
-  <version>1.1.1-SNAPSHOT</version>
+  <version>1.1.2-SNAPSHOT</version>
   <name>${project.artifactId}</name>
   <packaging>bundle</packaging>
 

diff --git a/netconf/netconf-config-dispatcher/pom.xml b/netconf/netconf-config-dispatcher/pom.xml
index 3320c8ae7442bb1b15db55cb028703559477765e..7d6b47765401e2e428571420f393bd14d37f9cd0 100644 (file)
--- a/netconf/netconf-config-dispatcher/pom.xml
+++ b/netconf/netconf-config-dispatcher/pom.xml
@@ -11,13 +11,13 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>config-parent</artifactId>
-    <version>0.5.1-SNAPSHOT</version>
+    <version>0.5.2-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
   <groupId>org.opendaylight.netconf</groupId>
   <artifactId>netconf-config-dispatcher</artifactId>
-  <version>1.1.1-SNAPSHOT</version>
+  <version>1.1.2-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
     <dependencyManagement>

diff --git a/netconf/netconf-config/pom.xml b/netconf/netconf-config/pom.xml
index c2400e41187d14e593034a97b6b78e5777248b1f..41ee36274310d5f1ea910427253097da8fa17fa2 100644 (file)
--- a/netconf/netconf-config/pom.xml
+++ b/netconf/netconf-config/pom.xml
@@ -12,13 +12,13 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent</artifactId>
-    <version>1.7.1-SNAPSHOT</version>
+    <version>1.7.2-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
   <groupId>org.opendaylight.netconf</groupId>
   <artifactId>netconf-config</artifactId>
-  <version>1.1.1-SNAPSHOT</version>
+  <version>1.1.2-SNAPSHOT</version>
   <description>Configuration files for netconf</description>
   <packaging>jar</packaging>
 

diff --git a/netconf/netconf-connector-config/pom.xml b/netconf/netconf-connector-config/pom.xml
index eb2d80fb657b3f9515338d8ce2d1b0ebfb763ca0..bbb2499fbf9968b26fcca72739b3cde0a78a66c5 100644 (file)
--- a/netconf/netconf-connector-config/pom.xml
+++ b/netconf/netconf-connector-config/pom.xml
@@ -12,14 +12,14 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>1.7.1-SNAPSHOT</version>
+    <version>1.7.2-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
   <groupId>org.opendaylight.netconf</groupId>
   <artifactId>netconf-connector-config</artifactId>
   <description>Configuration files for netconf-connector</description>
-  <version>1.1.1-SNAPSHOT</version>
+  <version>1.1.2-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <build>

diff --git a/netconf/netconf-console/pom.xml b/netconf/netconf-console/pom.xml
index cddeb8b1a10f5d58a126074b3c8c6c3b1a11a1d6..bf1138b60cb7e8ac2baebadab54c29499f8d8a96 100644 (file)
--- a/netconf/netconf-console/pom.xml
+++ b/netconf/netconf-console/pom.xml
@@ -11,13 +11,13 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>config-parent</artifactId>
-    <version>0.5.1-SNAPSHOT</version>
+    <version>0.5.2-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
   <groupId>org.opendaylight.netconf</groupId>
   <artifactId>netconf-console</artifactId>
-  <version>1.1.1-SNAPSHOT</version>
+  <version>1.1.2-SNAPSHOT</version>
   <name>${project.artifactId}</name>
   <packaging>bundle</packaging>
 

diff --git a/netconf/netconf-impl/pom.xml b/netconf/netconf-impl/pom.xml
index d99c265ae796c166d028d8d18fcfce390a4885c5..06a4123c7eb1bda3fd9b2d842b83952d2fd9d28c 100644 (file)
--- a/netconf/netconf-impl/pom.xml
+++ b/netconf/netconf-impl/pom.xml
@@ -5,13 +5,13 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>config-parent</artifactId>
-    <version>0.5.1-SNAPSHOT</version>
+    <version>0.5.2-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
   <groupId>org.opendaylight.netconf</groupId>
   <artifactId>netconf-impl</artifactId>
-  <version>1.1.1-SNAPSHOT</version>
+  <version>1.1.2-SNAPSHOT</version>
   <name>${project.artifactId}</name>
   <packaging>bundle</packaging>
 

diff --git a/netconf/netconf-it/pom.xml b/netconf/netconf-it/pom.xml
index f90bd5d15eda43b11ed050c526baa7a26f7f67f5..5b8b7c7df55462f0bb3bca0fac1bbb4b9dfb3626 100644 (file)
--- a/netconf/netconf-it/pom.xml
+++ b/netconf/netconf-it/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.opendaylight.netconf</groupId>
     <artifactId>netconf-subsystem</artifactId>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.1.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>netconf-it</artifactId>

diff --git a/netconf/netconf-mapping-api/pom.xml b/netconf/netconf-mapping-api/pom.xml
index 9eb785d0685419a621cb89e519e3b8726dc17efe..932c8210d9097362dca52989cda5504be2b6afb3 100644 (file)
--- a/netconf/netconf-mapping-api/pom.xml
+++ b/netconf/netconf-mapping-api/pom.xml
@@ -5,13 +5,13 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>config-parent</artifactId>
-    <version>0.5.1-SNAPSHOT</version>
+    <version>0.5.2-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
   <groupId>org.opendaylight.netconf</groupId>
   <artifactId>netconf-mapping-api</artifactId>
-  <version>1.1.1-SNAPSHOT</version>
+  <version>1.1.2-SNAPSHOT</version>
   <name>${project.artifactId}</name>
   <packaging>bundle</packaging>
 

diff --git a/netconf/netconf-mdsal-config/pom.xml b/netconf/netconf-mdsal-config/pom.xml
index 2ee4bcbb1f1fa466da477485c9ef0fab2136db33..3adf88293eaa9845a0d84323ec4bde05e0955d46 100644 (file)
--- a/netconf/netconf-mdsal-config/pom.xml
+++ b/netconf/netconf-mdsal-config/pom.xml
@@ -12,13 +12,13 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>1.7.1-SNAPSHOT</version>
+    <version>1.7.2-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
   <groupId>org.opendaylight.netconf</groupId>
   <artifactId>netconf-mdsal-config</artifactId>
-  <version>1.1.1-SNAPSHOT</version>
+  <version>1.1.2-SNAPSHOT</version>
   <description>Configuration files for netconf for mdsal</description>
   <packaging>jar</packaging>
 

diff --git a/netconf/netconf-monitoring/pom.xml b/netconf/netconf-monitoring/pom.xml
index 2f122d538c993a123ac5877700d309fda5a9b167..e604dbcc22cf06499f460765be5e9d7c20b90c98 100644 (file)
--- a/netconf/netconf-monitoring/pom.xml
+++ b/netconf/netconf-monitoring/pom.xml
@@ -5,13 +5,13 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
-    <version>1.7.1-SNAPSHOT</version>
+    <version>1.7.2-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
   <groupId>org.opendaylight.netconf</groupId>
   <artifactId>netconf-monitoring</artifactId>
-  <version>1.1.1-SNAPSHOT</version>
+  <version>1.1.2-SNAPSHOT</version>
   <name>${project.artifactId}</name>
   <packaging>bundle</packaging>
 

diff --git a/netconf/netconf-netty-util/pom.xml b/netconf/netconf-netty-util/pom.xml
index 666c20c3ffe6f7742236ce75ffab6d06b62fb96e..318f9396f254decc959a9509eab9074c69525009 100644 (file)
--- a/netconf/netconf-netty-util/pom.xml
+++ b/netconf/netconf-netty-util/pom.xml
@@ -12,14 +12,14 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
-    <version>1.7.1-SNAPSHOT</version>
+    <version>1.7.2-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
   <groupId>org.opendaylight.netconf</groupId>
   <artifactId>netconf-netty-util</artifactId>
   <packaging>bundle</packaging>
-  <version>1.1.1-SNAPSHOT</version>
+  <version>1.1.2-SNAPSHOT</version>
   <name>${project.artifactId}</name>
 
   <dependencyManagement>

diff --git a/netconf/netconf-notifications-api/pom.xml b/netconf/netconf-notifications-api/pom.xml
index cafb37554ead86c178aa773bd929ed2652d765d3..5821320b8775e464c9ef204f94dfbffe5358e092 100644 (file)
--- a/netconf/netconf-notifications-api/pom.xml
+++ b/netconf/netconf-notifications-api/pom.xml
@@ -15,13 +15,13 @@
     <parent>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>config-parent</artifactId>
-        <version>0.5.1-SNAPSHOT</version>
+        <version>0.5.2-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.opendaylight.netconf</groupId>
     <artifactId>netconf-notifications-api</artifactId>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.1.2-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <dependencyManagement>

diff --git a/netconf/netconf-notifications-impl/pom.xml b/netconf/netconf-notifications-impl/pom.xml
index a8ae9b8ce121b5250de87e26808fc0408ed172e3..eef9152a595c8d019ea636b30a76b11577b6b813 100644 (file)
--- a/netconf/netconf-notifications-impl/pom.xml
+++ b/netconf/netconf-notifications-impl/pom.xml
@@ -14,13 +14,13 @@
     <parent>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>config-parent</artifactId>
-        <version>0.5.1-SNAPSHOT</version>
+        <version>0.5.2-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.opendaylight.netconf</groupId>
     <artifactId>netconf-notifications-impl</artifactId>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.1.2-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <dependencyManagement>

diff --git a/netconf/netconf-ssh/pom.xml b/netconf/netconf-ssh/pom.xml
index 21b0aa7f728551d2da0267e980f94b34f081fba2..47294c57bb362eca1e52b4d92751bd102937e5bb 100644 (file)
--- a/netconf/netconf-ssh/pom.xml
+++ b/netconf/netconf-ssh/pom.xml
@@ -4,13 +4,13 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>config-parent</artifactId>
-    <version>0.5.1-SNAPSHOT</version>
+    <version>0.5.2-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
   <groupId>org.opendaylight.netconf</groupId>
   <artifactId>netconf-ssh</artifactId>
-  <version>1.1.1-SNAPSHOT</version>
+  <version>1.1.2-SNAPSHOT</version>
   <name>${project.artifactId}</name>
   <packaging>bundle</packaging>
 

diff --git a/netconf/netconf-tcp/pom.xml b/netconf/netconf-tcp/pom.xml
index dff709fe1c63fc1cdaf539236390a4438de31e32..4fc631f35075d4b06879461d45e8bb441271851e 100644 (file)
--- a/netconf/netconf-tcp/pom.xml
+++ b/netconf/netconf-tcp/pom.xml
@@ -12,13 +12,13 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>config-parent</artifactId>
-    <version>0.5.1-SNAPSHOT</version>
+    <version>0.5.2-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
   <groupId>org.opendaylight.netconf</groupId>
   <artifactId>netconf-tcp</artifactId>
-  <version>1.1.1-SNAPSHOT</version>
+  <version>1.1.2-SNAPSHOT</version>
   <name>${project.artifactId}</name>
   <packaging>bundle</packaging>
 

diff --git a/netconf/netconf-topology-config/pom.xml b/netconf/netconf-topology-config/pom.xml
index c3110765cd175be0ee09c50f7f24d7e6a5b76674..29f0605c3b42bca8aaec68c965a8821b2cb47895 100644 (file)
--- a/netconf/netconf-topology-config/pom.xml
+++ b/netconf/netconf-topology-config/pom.xml
@@ -7,13 +7,13 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.7.1-SNAPSHOT</version>
+        <version>1.7.2-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.opendaylight.netconf</groupId>
     <artifactId>netconf-topology-config</artifactId>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.1.2-SNAPSHOT</version>
     <description>Configuration files for netconf topology</description>
     <packaging>jar</packaging>
 

diff --git a/netconf/netconf-topology-singleton/pom.xml b/netconf/netconf-topology-singleton/pom.xml
index fb3c450c4bc6a5903945f10beb347e6dd340934a..4133eecd1e2fc04ba8abfd138ec1e65b181a72ef 100644 (file)
--- a/netconf/netconf-topology-singleton/pom.xml
+++ b/netconf/netconf-topology-singleton/pom.xml
@@ -14,13 +14,13 @@
     <parent>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>config-parent</artifactId>
-        <version>0.5.1-SNAPSHOT</version>
+        <version>0.5.2-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.opendaylight.netconf</groupId>
     <artifactId>netconf-topology-singleton</artifactId>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.1.2-SNAPSHOT</version>
     <name>${project.artifactId}</name>
     <packaging>bundle</packaging>
 
@@ -33,6 +33,13 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>mdsal-artifacts</artifactId>
+                <version>1.4.1-SNAPSHOT</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -71,6 +78,10 @@
             <artifactId>akka-testkit_2.11</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>sal-distributed-datastore</artifactId>
+        </dependency>
     </dependencies>
 
 </project>
\ No newline at end of file

diff --git a/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/messages/NormalizedNodeMessage.java b/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/messages/NormalizedNodeMessage.java
index 48a86749f01127a903a02138d8d3078e9151764d..b4ede5bdbf5046c7388467523f50f618cf3b5289 100644 (file)
--- a/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/messages/NormalizedNodeMessage.java
+++ b/netconf/netconf-topology-singleton/src/main/java/org/opendaylight/netconf/topology/singleton/messages/NormalizedNodeMessage.java
@@ -12,13 +12,9 @@ import java.io.Externalizable;
 import java.io.IOException;
 import java.io.ObjectInput;
 import java.io.ObjectOutput;
-import org.opendaylight.controller.cluster.datastore.node.utils.stream.NormalizedNodeDataInput;
-import org.opendaylight.controller.cluster.datastore.node.utils.stream.NormalizedNodeDataOutput;
-import org.opendaylight.controller.cluster.datastore.node.utils.stream.NormalizedNodeInputOutput;
+import org.opendaylight.controller.cluster.datastore.utils.SerializationUtils;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
-import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeStreamWriter;
-import org.opendaylight.yangtools.yang.data.api.schema.stream.NormalizedNodeWriter;
 
 /**
  * Message which holds node data, prepared to sending between remote hosts with serialization.
@@ -48,20 +44,16 @@ public class NormalizedNodeMessage implements Externalizable {
 
     @Override
     public void writeExternal(final ObjectOutput out) throws IOException {
-        final NormalizedNodeDataOutput dataOutput = NormalizedNodeInputOutput.newDataOutput(out);
-        final NormalizedNodeWriter normalizedNodeWriter =
-                NormalizedNodeWriter.forStreamWriter((NormalizedNodeStreamWriter) dataOutput);
-
-        dataOutput.writeYangInstanceIdentifier(identifier);
-
-        normalizedNodeWriter.write(node);
+        SerializationUtils.serializePathAndNode(getIdentifier(), node, out);
     }
 
     @Override
     public void readExternal(final ObjectInput in) throws IOException, ClassNotFoundException {
-        final NormalizedNodeDataInput dataInput = NormalizedNodeInputOutput.newDataInput(in);
-
-        identifier = dataInput.readYangInstanceIdentifier();
-        node = dataInput.readNormalizedNode();
+        SerializationUtils.deserializePathAndNode(in, this, APPLIER);
     }
+
+    private static final SerializationUtils.Applier<NormalizedNodeMessage> APPLIER = (instance, path, node) -> {
+        instance.identifier = path;
+        instance.node = node;
+    };
 }

diff --git a/netconf/netconf-topology/pom.xml b/netconf/netconf-topology/pom.xml
index b30fc87f7b272f549e5918d18a580a891c9eeb6c..7cce23b225025c541010c479e23f64b1178057a0 100644 (file)
--- a/netconf/netconf-topology/pom.xml
+++ b/netconf/netconf-topology/pom.xml
@@ -6,13 +6,13 @@
     <parent>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>config-parent</artifactId>
-        <version>0.5.1-SNAPSHOT</version>
+        <version>0.5.2-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.opendaylight.netconf</groupId>
     <artifactId>netconf-topology</artifactId>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.1.2-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <dependencyManagement>

diff --git a/netconf/netconf-util/pom.xml b/netconf/netconf-util/pom.xml
index caf7e4f6a52c4ff12ebe5ae20f868dfbe0598049..2453b88a79b99933271e2c80fd39a9b8d8b8bfee 100644 (file)
--- a/netconf/netconf-util/pom.xml
+++ b/netconf/netconf-util/pom.xml
@@ -5,13 +5,13 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
-    <version>1.7.1-SNAPSHOT</version>
+    <version>1.7.2-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
   <groupId>org.opendaylight.netconf</groupId>
   <artifactId>netconf-util</artifactId>
-  <version>1.1.1-SNAPSHOT</version>
+  <version>1.1.2-SNAPSHOT</version>
   <name>${project.artifactId}</name>
   <packaging>bundle</packaging>
 

diff --git a/netconf/pom.xml b/netconf/pom.xml
index db4a1c24d6a1aa991da1fb32554c22097a2b5fba..8d953db6f38daaab4abadbd2741589c63a8f2bcf 100644 (file)
--- a/netconf/pom.xml
+++ b/netconf/pom.xml
@@ -13,13 +13,13 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>1.7.1-SNAPSHOT</version>
+    <version>1.7.2-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
   <groupId>org.opendaylight.netconf</groupId>
   <artifactId>netconf-subsystem</artifactId>
-  <version>1.1.1-SNAPSHOT</version>
+  <version>1.1.2-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>${project.artifactId}</name>
 
@@ -81,7 +81,7 @@
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>protocol-framework</artifactId>
-        <version>0.8.1-SNAPSHOT</version>
+        <version>0.8.2-SNAPSHOT</version>
       </dependency>
     </dependencies>
   </dependencyManagement>

diff --git a/netconf/sal-netconf-connector/pom.xml b/netconf/sal-netconf-connector/pom.xml
index 42e5914689546a10b958048ccc466019ce5a5328..a83cc977af929a1064ba10d9ae3d574131c43f57 100644 (file)
--- a/netconf/sal-netconf-connector/pom.xml
+++ b/netconf/sal-netconf-connector/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>config-parent</artifactId>
-    <version>0.5.1-SNAPSHOT</version>
+    <version>0.5.2-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
@@ -12,7 +12,7 @@
   <artifactId>sal-netconf-connector</artifactId>
 
   <!-- Preserve version from mdsal -->
-  <version>1.4.1-SNAPSHOT</version>
+  <version>1.4.2-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <dependencyManagement>
@@ -20,7 +20,7 @@
       <dependency>
         <groupId>org.opendaylight.netconf</groupId>
         <artifactId>netconf-artifacts</artifactId>
-        <version>1.1.1-SNAPSHOT</version>
+        <version>1.1.2-SNAPSHOT</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/netconf/tools/netconf-cli/pom.xml b/netconf/tools/netconf-cli/pom.xml
index 7d4022a58932580747904e5111a1e0078d7e9726..5d16b753111a19bc086b75228ce9d5acc55f588a 100644 (file)
--- a/netconf/tools/netconf-cli/pom.xml
+++ b/netconf/tools/netconf-cli/pom.xml
@@ -10,13 +10,13 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent</artifactId>
-    <version>1.7.1-SNAPSHOT</version>
+    <version>1.7.2-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
   <groupId>org.opendaylight.netconf</groupId>
   <artifactId>netconf-cli</artifactId>
-  <version>1.1.1-SNAPSHOT</version>
+  <version>1.1.2-SNAPSHOT</version>
   <packaging>jar</packaging>
   <name>${project.artifactId}</name>
 

diff --git a/netconf/tools/netconf-testtool/pom.xml b/netconf/tools/netconf-testtool/pom.xml
index 4a0ce3f9baae36e03b79f0c00919eeaca5b6d0ea..506e26e38e5325f6d6edbba6d676a0d9fb8317a2 100644 (file)
--- a/netconf/tools/netconf-testtool/pom.xml
+++ b/netconf/tools/netconf-testtool/pom.xml
@@ -14,14 +14,14 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>1.7.1-SNAPSHOT</version>
+        <version>1.7.2-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.opendaylight.netconf</groupId>
     <artifactId>netconf-testtool</artifactId>
     <name>${project.artifactId}</name>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.1.2-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <properties>

diff --git a/netconf/tools/pom.xml b/netconf/tools/pom.xml
index ab5dbc3d02199ffecd7556f6e8ebd32ff961ee76..3fbe1580d9b6384f1b304e5d4b8bd3b28e62ec8e 100644 (file)
--- a/netconf/tools/pom.xml
+++ b/netconf/tools/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.opendaylight.netconf</groupId>
     <artifactId>netconf-subsystem</artifactId>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.1.2-SNAPSHOT</version>
   </parent>
 
   <artifactId>netconf-tools</artifactId>

diff --git a/netconf/yanglib/pom.xml b/netconf/yanglib/pom.xml
index 96e7b3aca1dd1fddbc8b45b84598817690416c17..708cd32541844a2a9775b0c92881fe77ce9096a2 100644 (file)
--- a/netconf/yanglib/pom.xml
+++ b/netconf/yanglib/pom.xml
@@ -13,13 +13,13 @@
     <parent>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>config-parent</artifactId>
-        <version>0.5.1-SNAPSHOT</version>
+        <version>0.5.2-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.opendaylight.netconf</groupId>
     <artifactId>yanglib</artifactId>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.1.2-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <build>

diff --git a/pom.xml b/pom.xml
index ca16c8bee5a3d82cb895fbba1defeed2a6044231..5e310acfd5aca448aa80059f3297a5aa0b25909c 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.7.1-SNAPSHOT</version>
+        <version>1.7.2-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.opendaylight.netconf</groupId>
     <artifactId>netconf-parent</artifactId>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.1.2-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>${project.artifactId}</name>
 
@@ -24,16 +24,16 @@
     </modules>
 
     <properties>
-        <config.version>0.5.1-SNAPSHOT</config.version>
+        <config.version>0.5.2-SNAPSHOT</config.version>
         <config.configfile.directory>etc/opendaylight/karaf</config.configfile.directory>
-        <features.test.version>1.7.1-SNAPSHOT</features.test.version>
+        <features.test.version>1.7.2-SNAPSHOT</features.test.version>
 
-        <mdsal.version>2.1.1-SNAPSHOT</mdsal.version>
-        <mdsal.model.version>0.9.1-SNAPSHOT</mdsal.model.version>
-        <controller.mdsal.version>1.4.1-SNAPSHOT</controller.mdsal.version>
-        <netconf.version>1.1.1-SNAPSHOT</netconf.version>
-        <restconf.version>1.4.1-SNAPSHOT</restconf.version>
-        <yangtools.version>1.0.1-SNAPSHOT</yangtools.version>
+        <mdsal.version>2.1.2-SNAPSHOT</mdsal.version>
+        <mdsal.model.version>0.9.2-SNAPSHOT</mdsal.model.version>
+        <controller.mdsal.version>1.4.2-SNAPSHOT</controller.mdsal.version>
+        <netconf.version>1.1.2-SNAPSHOT</netconf.version>
+        <restconf.version>1.4.2-SNAPSHOT</restconf.version>
+        <yangtools.version>1.0.2-SNAPSHOT</yangtools.version>
     </properties>
 
 
@@ -63,7 +63,7 @@
         <dependency>
           <groupId>org.opendaylight.aaa</groupId>
           <artifactId>aaa-artifacts</artifactId>
-          <version>0.4.1-SNAPSHOT</version>
+          <version>0.4.2-SNAPSHOT</version>
           <type>pom</type>
           <scope>import</scope>
         </dependency>
@@ -94,7 +94,7 @@
                         <dependency>
                             <groupId>org.opendaylight.controller</groupId>
                             <artifactId>checkstyle</artifactId>
-                            <version>0.3.1-SNAPSHOT</version>
+                            <version>0.3.2-SNAPSHOT</version>
                         </dependency>
                     </dependencies>
                 </plugin>

diff --git a/restconf/pom.xml b/restconf/pom.xml
index 2ec7e01c23fc8edd6c9a9bde95b483ab382c0dc6..b60b1ff4409dbb11e56548185a782a7ee1adcbb0 100644 (file)
--- a/restconf/pom.xml
+++ b/restconf/pom.xml
@@ -5,13 +5,13 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.7.1-SNAPSHOT</version>
+        <version>1.7.2-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.opendaylight.netconf</groupId>
     <artifactId>restconf-parent</artifactId>
-    <version>1.4.1-SNAPSHOT</version>
+    <version>1.4.2-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>${project.artifactId}</name>
 

diff --git a/restconf/restconf-artifacts/pom.xml b/restconf/restconf-artifacts/pom.xml
index 2581bca4a26ad59d575b0032109ea89c70054608..6e54bf76e7315fbf66b4e020a4209a13e6449f83 100644 (file)
--- a/restconf/restconf-artifacts/pom.xml
+++ b/restconf/restconf-artifacts/pom.xml
@@ -8,13 +8,13 @@
     <parent>
       <groupId>org.opendaylight.odlparent</groupId>
       <artifactId>odlparent-lite</artifactId>
-      <version>1.7.1-SNAPSHOT</version>
+      <version>1.7.2-SNAPSHOT</version>
       <relativePath/>
     </parent>
 
     <groupId>org.opendaylight.netconf</groupId>
     <artifactId>restconf-artifacts</artifactId>
-    <version>1.4.1-SNAPSHOT</version>
+    <version>1.4.2-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <dependencyManagement>

diff --git a/restconf/sal-rest-connector-config/pom.xml b/restconf/sal-rest-connector-config/pom.xml
index 3f0919eec0f9f50d55e5312a2e569a599053ad69..d18ed440c5d7c6952e4f0a73d9da90843da8543c 100644 (file)
--- a/restconf/sal-rest-connector-config/pom.xml
+++ b/restconf/sal-rest-connector-config/pom.xml
@@ -12,13 +12,13 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>1.7.1-SNAPSHOT</version>
+    <version>1.7.2-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
   <groupId>org.opendaylight.netconf</groupId>
   <artifactId>sal-rest-connector-config</artifactId>
-  <version>1.4.1-SNAPSHOT</version>
+  <version>1.4.2-SNAPSHOT</version>
   <description>Configuration files for sal-rest-connector</description>
 
   <packaging>jar</packaging>

diff --git a/restconf/sal-rest-connector/pom.xml b/restconf/sal-rest-connector/pom.xml
index 277e35d193df17b516fa11443af31a06ac43526a..89a6f62624a8a5a99a0ba10a662abc0fcf5ac95f 100644 (file)
--- a/restconf/sal-rest-connector/pom.xml
+++ b/restconf/sal-rest-connector/pom.xml
@@ -4,13 +4,13 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>config-parent</artifactId>
-    <version>0.5.1-SNAPSHOT</version>
+    <version>0.5.2-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
   <groupId>org.opendaylight.netconf</groupId>
   <artifactId>sal-rest-connector</artifactId>
-  <version>1.4.1-SNAPSHOT</version>
+  <version>1.4.2-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <dependencyManagement>
@@ -18,7 +18,7 @@
       <dependency>
         <groupId>org.opendaylight.netconf</groupId>
         <artifactId>netconf-parent</artifactId>
-        <version>1.1.1-SNAPSHOT</version>
+        <version>1.1.2-SNAPSHOT</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/restconf/sal-rest-docgen-maven/pom.xml b/restconf/sal-rest-docgen-maven/pom.xml
index 961e367fde29c92b845d72518e2822d16e9c6464..46a04ea324f99e2674cb0f577b86f2da487cdb70 100644 (file)
--- a/restconf/sal-rest-docgen-maven/pom.xml
+++ b/restconf/sal-rest-docgen-maven/pom.xml
@@ -12,13 +12,13 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>1.7.1-SNAPSHOT</version>
+        <version>1.7.2-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.opendaylight.netconf</groupId>
     <artifactId>sal-rest-docgen-maven</artifactId>
-    <version>1.4.1-SNAPSHOT</version>
+    <version>1.4.2-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <dependencyManagement>
@@ -34,7 +34,7 @@
             <dependency>
                 <groupId>org.opendaylight.netconf</groupId>
                 <artifactId>netconf-parent</artifactId>
-                <version>1.1.1-SNAPSHOT</version>
+                <version>1.1.2-SNAPSHOT</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>

diff --git a/restconf/sal-rest-docgen/pom.xml b/restconf/sal-rest-docgen/pom.xml
index d311d9b164fdb219c71ea66507eeefcf481e2aac..e363869c4b127c7582ad2442d3d9861ef1ac0e6b 100644 (file)
--- a/restconf/sal-rest-docgen/pom.xml
+++ b/restconf/sal-rest-docgen/pom.xml
@@ -4,13 +4,13 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
-    <version>1.7.1-SNAPSHOT</version>
+    <version>1.7.2-SNAPSHOT</version>
     <relativePath/>
   </parent>
 
   <groupId>org.opendaylight.netconf</groupId>
   <artifactId>sal-rest-docgen</artifactId>
-  <version>1.4.1-SNAPSHOT</version>
+  <version>1.4.2-SNAPSHOT</version>
   <packaging>bundle</packaging>
 
   <dependencyManagement>
@@ -18,7 +18,7 @@
       <dependency>
         <groupId>org.opendaylight.netconf</groupId>
         <artifactId>netconf-parent</artifactId>
-        <version>1.1.1-SNAPSHOT</version>
+        <version>1.1.2-SNAPSHOT</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/restconf/sal-restconf-broker/pom.xml b/restconf/sal-restconf-broker/pom.xml
index 68fcfc67c8b6366483a6f4a2b45ca2d43e1aa570..ba63c45293111c43b96a3849cd339580075a9313 100644 (file)
--- a/restconf/sal-restconf-broker/pom.xml
+++ b/restconf/sal-restconf-broker/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.opendaylight.netconf</groupId>
     <artifactId>restconf-parent</artifactId>
-    <version>1.4.1-SNAPSHOT</version>
+    <version>1.4.2-SNAPSHOT</version>
   </parent>
   <artifactId>sal-restconf-broker</artifactId>
   <packaging>bundle</packaging>