From 4c0d917d47bbcd3dcee604427c999041cc96b907 Mon Sep 17 00:00:00 2001
From: Stephen Kitt <skitt@redhat.com>
Date: Tue, 31 Jul 2018 11:09:34 +0200
Subject: [PATCH] Bump yangtools to 2.0.6.1

Change-Id: I10a397fd0b9b0e8b153060c62a34a369071755f3
Signed-off-by: Stephen Kitt <skitt@redhat.com>
---
 features/config/odl-config-util/pom.xml                  | 2 +-
 .../config/odl-config-util/src/main/feature/feature.xml  | 4 ++--
 features/mdsal/odl-mdsal-broker-local/pom.xml            | 2 +-
 .../odl-mdsal-broker-local/src/main/feature/feature.xml  | 2 +-
 opendaylight/blueprint/pom.xml                           | 2 +-
 opendaylight/config/config-parent/pom.xml                | 9 ++++-----
 opendaylight/md-sal/benchmark-data-store/pom.xml         | 2 +-
 opendaylight/md-sal/cds-access-api/pom.xml               | 2 +-
 opendaylight/md-sal/cds-access-client/pom.xml            | 2 +-
 opendaylight/md-sal/cds-dom-api/pom.xml                  | 2 +-
 opendaylight/md-sal/sal-binding-api/pom.xml              | 2 +-
 opendaylight/md-sal/sal-binding-broker/pom.xml           | 2 +-
 opendaylight/md-sal/sal-binding-dom-it/pom.xml           | 2 +-
 opendaylight/md-sal/sal-common-impl/pom.xml              | 2 +-
 opendaylight/md-sal/sal-common-testutil/pom.xml          | 2 +-
 opendaylight/md-sal/sal-common-util/pom.xml              | 2 +-
 opendaylight/md-sal/sal-connector-api/pom.xml            | 2 +-
 opendaylight/md-sal/sal-dom-api/pom.xml                  | 2 +-
 opendaylight/md-sal/sal-dom-broker/pom.xml               | 2 +-
 opendaylight/md-sal/sal-inmemory-datastore/pom.xml       | 2 +-
 opendaylight/md-sal/sal-remoterpc-connector/pom.xml      | 2 +-
 opendaylight/md-sal/sal-schema-service/pom.xml           | 2 +-
 22 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/features/config/odl-config-util/pom.xml b/features/config/odl-config-util/pom.xml
index 9082a7ffa0..a176075706 100644
--- a/features/config/odl-config-util/pom.xml
+++ b/features/config/odl-config-util/pom.xml
@@ -26,7 +26,7 @@
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yangtools-artifacts</artifactId>
-                <version>2.0.5</version>
+                <version>2.0.6.1</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
diff --git a/features/config/odl-config-util/src/main/feature/feature.xml b/features/config/odl-config-util/src/main/feature/feature.xml
index a48cd9f8f6..6562d68117 100644
--- a/features/config/odl-config-util/src/main/feature/feature.xml
+++ b/features/config/odl-config-util/src/main/feature/feature.xml
@@ -6,8 +6,8 @@
   ~ terms of the Eclipse Public License v1.0 which accompanies this distribution,
   ~ and is available at http://www.eclipse.org/legal/epl-v10.html
   -->
-<features name="odl-controller-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.4.0">
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-controller-${project.version}">
     <feature name="odl-config-util" version="${project.version}">
-        <feature version="[2.0.5,3)">odl-yangtools-data-api</feature>
+        <feature version="[2.0.6.1,3)">odl-yangtools-data-api</feature>
     </feature>
 </features>
diff --git a/features/mdsal/odl-mdsal-broker-local/pom.xml b/features/mdsal/odl-mdsal-broker-local/pom.xml
index fa096234bb..79188f58f5 100644
--- a/features/mdsal/odl-mdsal-broker-local/pom.xml
+++ b/features/mdsal/odl-mdsal-broker-local/pom.xml
@@ -41,7 +41,7 @@
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yangtools-artifacts</artifactId>
-                <version>2.0.5</version>
+                <version>2.0.6.1</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
diff --git a/features/mdsal/odl-mdsal-broker-local/src/main/feature/feature.xml b/features/mdsal/odl-mdsal-broker-local/src/main/feature/feature.xml
index d500294052..b1b192cb10 100644
--- a/features/mdsal/odl-mdsal-broker-local/src/main/feature/feature.xml
+++ b/features/mdsal/odl-mdsal-broker-local/src/main/feature/feature.xml
@@ -9,7 +9,7 @@
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="odl-mdsal-${project.version}">
     <feature name="odl-mdsal-broker-local" version="${project.version}">
         <feature version="[3.1.0,4)">odl-lmax-3</feature>
-        <feature version="[2.0.5,3)">odl-yangtools-codec</feature>
+        <feature version="[2.0.6.1,3)">odl-yangtools-codec</feature>
         <bundle start-level="70">mvn:org.opendaylight.controller/sal-schema-service/${project.version}</bundle>
         <bundle start-level="40">mvn:org.opendaylight.controller/blueprint/${blueprint.version}</bundle>
         <configfile finalname="${config.configfile.directory}/${config.mdsal.configfile}" override="true">
diff --git a/opendaylight/blueprint/pom.xml b/opendaylight/blueprint/pom.xml
index 6837e2a3cf..5fc1e49143 100644
--- a/opendaylight/blueprint/pom.xml
+++ b/opendaylight/blueprint/pom.xml
@@ -41,7 +41,7 @@
       <dependency>
         <groupId>org.opendaylight.yangtools</groupId>
         <artifactId>yangtools-artifacts</artifactId>
-        <version>2.0.5</version>
+        <version>2.0.6.1</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
diff --git a/opendaylight/config/config-parent/pom.xml b/opendaylight/config/config-parent/pom.xml
index b3b18106fa..e31c53dbe2 100644
--- a/opendaylight/config/config-parent/pom.xml
+++ b/opendaylight/config/config-parent/pom.xml
@@ -6,8 +6,7 @@ This program and the accompanying materials are made available under the
 terms of the Eclipse Public License v1.0 which accompanies this distribution,
 and is available at http://www.eclipse.org/legal/epl-v10.html
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
@@ -24,7 +23,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <properties>
     <config.version>0.8.3-SNAPSHOT</config.version>
     <mdsal.version>1.7.3-SNAPSHOT</mdsal.version>
-    <yangtools.version>2.0.5</yangtools.version>
+    <yangtools.version>2.0.6.1</yangtools.version>
     <jmxGeneratorPath>${project.build.directory}/generated-sources/config-binding</jmxGeneratorPath>
     <config.file>src/main/config/default-config.xml</config.file>
   </properties>
@@ -49,7 +48,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <dependency>
         <groupId>org.opendaylight.yangtools</groupId>
         <artifactId>yangtools-artifacts</artifactId>
-        <version>${yangtools.version}</version>
+        <version>2.0.6.1</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -83,7 +82,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <plugin>
           <groupId>org.opendaylight.yangtools</groupId>
           <artifactId>yang-maven-plugin</artifactId>
-          <version>${yangtools.version}</version>
+          <version>2.0.6.1</version>
           <dependencies>
             <dependency>
               <groupId>org.opendaylight.controller</groupId>
diff --git a/opendaylight/md-sal/benchmark-data-store/pom.xml b/opendaylight/md-sal/benchmark-data-store/pom.xml
index ddcff39a95..8ecd9e1fb6 100644
--- a/opendaylight/md-sal/benchmark-data-store/pom.xml
+++ b/opendaylight/md-sal/benchmark-data-store/pom.xml
@@ -26,7 +26,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <dependency>
         <groupId>org.opendaylight.yangtools</groupId>
         <artifactId>yangtools-artifacts</artifactId>
-        <version>2.0.5</version>
+        <version>2.0.6.1</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
diff --git a/opendaylight/md-sal/cds-access-api/pom.xml b/opendaylight/md-sal/cds-access-api/pom.xml
index dd5030d680..6514e76594 100644
--- a/opendaylight/md-sal/cds-access-api/pom.xml
+++ b/opendaylight/md-sal/cds-access-api/pom.xml
@@ -19,7 +19,7 @@
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yangtools-artifacts</artifactId>
-                <version>2.0.5</version>
+                <version>2.0.6.1</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
diff --git a/opendaylight/md-sal/cds-access-client/pom.xml b/opendaylight/md-sal/cds-access-client/pom.xml
index 56f288cd49..fbe9da3789 100644
--- a/opendaylight/md-sal/cds-access-client/pom.xml
+++ b/opendaylight/md-sal/cds-access-client/pom.xml
@@ -19,7 +19,7 @@
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yangtools-artifacts</artifactId>
-                <version>2.0.5</version>
+                <version>2.0.6.1</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
diff --git a/opendaylight/md-sal/cds-dom-api/pom.xml b/opendaylight/md-sal/cds-dom-api/pom.xml
index 21ecb657c3..163e5d3181 100644
--- a/opendaylight/md-sal/cds-dom-api/pom.xml
+++ b/opendaylight/md-sal/cds-dom-api/pom.xml
@@ -19,7 +19,7 @@
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yangtools-artifacts</artifactId>
-                <version>2.0.5</version>
+                <version>2.0.6.1</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
diff --git a/opendaylight/md-sal/sal-binding-api/pom.xml b/opendaylight/md-sal/sal-binding-api/pom.xml
index d971fa8833..c483db04de 100644
--- a/opendaylight/md-sal/sal-binding-api/pom.xml
+++ b/opendaylight/md-sal/sal-binding-api/pom.xml
@@ -18,7 +18,7 @@
       <dependency>
         <groupId>org.opendaylight.yangtools</groupId>
         <artifactId>yangtools-artifacts</artifactId>
-        <version>2.0.5</version>
+        <version>2.0.6.1</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
diff --git a/opendaylight/md-sal/sal-binding-broker/pom.xml b/opendaylight/md-sal/sal-binding-broker/pom.xml
index 0d96624c75..e5feeabe66 100644
--- a/opendaylight/md-sal/sal-binding-broker/pom.xml
+++ b/opendaylight/md-sal/sal-binding-broker/pom.xml
@@ -18,7 +18,7 @@
       <dependency>
         <groupId>org.opendaylight.yangtools</groupId>
         <artifactId>yangtools-artifacts</artifactId>
-        <version>2.0.5</version>
+        <version>2.0.6.1</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
diff --git a/opendaylight/md-sal/sal-binding-dom-it/pom.xml b/opendaylight/md-sal/sal-binding-dom-it/pom.xml
index c516f6d14c..b71448d64d 100644
--- a/opendaylight/md-sal/sal-binding-dom-it/pom.xml
+++ b/opendaylight/md-sal/sal-binding-dom-it/pom.xml
@@ -18,7 +18,7 @@
       <dependency>
         <groupId>org.opendaylight.yangtools</groupId>
         <artifactId>yangtools-artifacts</artifactId>
-        <version>2.0.5</version>
+        <version>2.0.6.1</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
diff --git a/opendaylight/md-sal/sal-common-impl/pom.xml b/opendaylight/md-sal/sal-common-impl/pom.xml
index 15e53f9481..c613d1d14a 100644
--- a/opendaylight/md-sal/sal-common-impl/pom.xml
+++ b/opendaylight/md-sal/sal-common-impl/pom.xml
@@ -18,7 +18,7 @@
       <dependency>
         <groupId>org.opendaylight.yangtools</groupId>
         <artifactId>yangtools-artifacts</artifactId>
-        <version>2.0.5</version>
+        <version>2.0.6.1</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
diff --git a/opendaylight/md-sal/sal-common-testutil/pom.xml b/opendaylight/md-sal/sal-common-testutil/pom.xml
index 5d375f208d..c8331021a7 100644
--- a/opendaylight/md-sal/sal-common-testutil/pom.xml
+++ b/opendaylight/md-sal/sal-common-testutil/pom.xml
@@ -27,7 +27,7 @@
     <dependency>
       <groupId>org.opendaylight.yangtools</groupId>
       <artifactId>testutils</artifactId>
-      <version>2.0.5</version>
+      <version>2.0.6.1</version>
     </dependency>
   </dependencies>
 </project>
diff --git a/opendaylight/md-sal/sal-common-util/pom.xml b/opendaylight/md-sal/sal-common-util/pom.xml
index 404e4b6cbf..13ce42080a 100644
--- a/opendaylight/md-sal/sal-common-util/pom.xml
+++ b/opendaylight/md-sal/sal-common-util/pom.xml
@@ -18,7 +18,7 @@
       <dependency>
         <groupId>org.opendaylight.yangtools</groupId>
         <artifactId>yangtools-artifacts</artifactId>
-        <version>2.0.5</version>
+        <version>2.0.6.1</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
diff --git a/opendaylight/md-sal/sal-connector-api/pom.xml b/opendaylight/md-sal/sal-connector-api/pom.xml
index 1e5d2af87e..78196cc8d7 100644
--- a/opendaylight/md-sal/sal-connector-api/pom.xml
+++ b/opendaylight/md-sal/sal-connector-api/pom.xml
@@ -18,7 +18,7 @@
       <dependency>
         <groupId>org.opendaylight.yangtools</groupId>
         <artifactId>yangtools-artifacts</artifactId>
-        <version>2.0.5</version>
+        <version>2.0.6.1</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
diff --git a/opendaylight/md-sal/sal-dom-api/pom.xml b/opendaylight/md-sal/sal-dom-api/pom.xml
index 6518142842..d947e1eac6 100644
--- a/opendaylight/md-sal/sal-dom-api/pom.xml
+++ b/opendaylight/md-sal/sal-dom-api/pom.xml
@@ -18,7 +18,7 @@
       <dependency>
         <groupId>org.opendaylight.yangtools</groupId>
         <artifactId>yangtools-artifacts</artifactId>
-        <version>2.0.5</version>
+        <version>2.0.6.1</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
diff --git a/opendaylight/md-sal/sal-dom-broker/pom.xml b/opendaylight/md-sal/sal-dom-broker/pom.xml
index 0ce7702be6..ef5a2134ca 100644
--- a/opendaylight/md-sal/sal-dom-broker/pom.xml
+++ b/opendaylight/md-sal/sal-dom-broker/pom.xml
@@ -18,7 +18,7 @@
       <dependency>
         <groupId>org.opendaylight.yangtools</groupId>
         <artifactId>yangtools-artifacts</artifactId>
-        <version>2.0.5</version>
+        <version>2.0.6.1</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
diff --git a/opendaylight/md-sal/sal-inmemory-datastore/pom.xml b/opendaylight/md-sal/sal-inmemory-datastore/pom.xml
index 142730267f..63887b45f7 100644
--- a/opendaylight/md-sal/sal-inmemory-datastore/pom.xml
+++ b/opendaylight/md-sal/sal-inmemory-datastore/pom.xml
@@ -17,7 +17,7 @@
       <dependency>
         <groupId>org.opendaylight.yangtools</groupId>
         <artifactId>yangtools-artifacts</artifactId>
-        <version>2.0.5</version>
+        <version>2.0.6.1</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
diff --git a/opendaylight/md-sal/sal-remoterpc-connector/pom.xml b/opendaylight/md-sal/sal-remoterpc-connector/pom.xml
index 8bc7900286..887c672d5b 100644
--- a/opendaylight/md-sal/sal-remoterpc-connector/pom.xml
+++ b/opendaylight/md-sal/sal-remoterpc-connector/pom.xml
@@ -25,7 +25,7 @@
             <dependency>
                 <groupId>org.opendaylight.yangtools</groupId>
                 <artifactId>yangtools-artifacts</artifactId>
-                <version>2.0.5</version>
+                <version>2.0.6.1</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
diff --git a/opendaylight/md-sal/sal-schema-service/pom.xml b/opendaylight/md-sal/sal-schema-service/pom.xml
index cfd7ce1d4c..8c3b3aa3b8 100644
--- a/opendaylight/md-sal/sal-schema-service/pom.xml
+++ b/opendaylight/md-sal/sal-schema-service/pom.xml
@@ -18,7 +18,7 @@
       <dependency>
         <groupId>org.opendaylight.yangtools</groupId>
         <artifactId>yangtools-artifacts</artifactId>
-        <version>2.0.5</version>
+        <version>2.0.6.1</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
-- 
2.36.6