From 6f64d6f04ddc2f448fb0c7d7ddc67143bbb6e031 Mon Sep 17 00:00:00 2001
From: Stephen Kitt <skitt@redhat.com>
Date: Thu, 22 Mar 2018 18:24:32 +0100
Subject: [PATCH] Bump to odlparent 3.1.0 and yangtools 2.0.3

Change-Id: I0d83ad3abf88e50a60c1ba1ee4139604692deb0d
Signed-off-by: Stephen Kitt <skitt@redhat.com>
---
 artifacts/pom.xml                                         | 3 ++-
 distribution-karaf/pom.xml                                | 8 +++-----
 features/features-groupbasedpolicy/pom.xml                | 6 ++----
 features/odl-groupbasedpolicy-base/pom.xml                | 6 ++----
 features/odl-groupbasedpolicy-domain-extensions/pom.xml   | 2 +-
 features/odl-groupbasedpolicy-ios-xe/pom.xml              | 6 ++----
 features/odl-groupbasedpolicy-iovisor/pom.xml             | 6 ++----
 .../pom.xml                                               | 6 ++----
 .../odl-groupbasedpolicy-ne-location-provider/pom.xml     | 6 ++----
 .../odl-groupbasedpolicy-neutron-and-ofoverlay/pom.xml    | 6 ++----
 features/odl-groupbasedpolicy-neutron-vpp-mapper/pom.xml  | 6 ++----
 features/odl-groupbasedpolicy-neutronmapper/pom.xml       | 6 ++----
 features/odl-groupbasedpolicy-ofoverlay/pom.xml           | 6 ++----
 features/odl-groupbasedpolicy-sxp-ep-provider/pom.xml     | 6 ++----
 features/odl-groupbasedpolicy-sxp-ise-adapter/pom.xml     | 6 ++----
 features/odl-groupbasedpolicy-vpp/pom.xml                 | 6 ++----
 features/pom.xml                                          | 5 ++---
 pom.xml                                                   | 5 +++--
 18 files changed, 37 insertions(+), 64 deletions(-)
 mode change 100755 => 100644 artifacts/pom.xml
 mode change 100755 => 100644 features/pom.xml

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
old mode 100755
new mode 100644
index b07328d11..8b22f9167
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -1,10 +1,11 @@
+<?xml version="1.0"?>
 <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">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>3.0.2</version>
+    <version>3.1.0</version>
     <relativePath/>
   </parent>
 
diff --git a/distribution-karaf/pom.xml b/distribution-karaf/pom.xml
index a2a02657a..ed4d84b59 100644
--- a/distribution-karaf/pom.xml
+++ b/distribution-karaf/pom.xml
@@ -3,16 +3,14 @@
   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:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>karaf4-parent</artifactId>
-    <version>3.0.2</version>
-    <relativePath />
+    <version>3.1.0</version>
+    <relativePath/>
   </parent>
 
   <artifactId>distribution-karaf</artifactId>
diff --git a/features/features-groupbasedpolicy/pom.xml b/features/features-groupbasedpolicy/pom.xml
index c7915f009..aba69122d 100644
--- a/features/features-groupbasedpolicy/pom.xml
+++ b/features/features-groupbasedpolicy/pom.xml
@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>3.0.2</version>
+        <version>3.1.0</version>
         <relativePath/>
     </parent>
 
diff --git a/features/odl-groupbasedpolicy-base/pom.xml b/features/odl-groupbasedpolicy-base/pom.xml
index 15c982290..f741dd441 100644
--- a/features/odl-groupbasedpolicy-base/pom.xml
+++ b/features/odl-groupbasedpolicy-base/pom.xml
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>3.0.2</version>
+        <version>3.1.0</version>
         <relativePath/>
     </parent>
 
diff --git a/features/odl-groupbasedpolicy-domain-extensions/pom.xml b/features/odl-groupbasedpolicy-domain-extensions/pom.xml
index 92b77e61a..852011492 100644
--- a/features/odl-groupbasedpolicy-domain-extensions/pom.xml
+++ b/features/odl-groupbasedpolicy-domain-extensions/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>3.0.2</version>
+        <version>3.1.0</version>
         <relativePath/>
     </parent>
 
diff --git a/features/odl-groupbasedpolicy-ios-xe/pom.xml b/features/odl-groupbasedpolicy-ios-xe/pom.xml
index f01f8dc77..d943a4300 100644
--- a/features/odl-groupbasedpolicy-ios-xe/pom.xml
+++ b/features/odl-groupbasedpolicy-ios-xe/pom.xml
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>3.0.2</version>
+        <version>3.1.0</version>
         <relativePath/>
     </parent>
 
diff --git a/features/odl-groupbasedpolicy-iovisor/pom.xml b/features/odl-groupbasedpolicy-iovisor/pom.xml
index 04fc2dbb0..4a4daff8f 100644
--- a/features/odl-groupbasedpolicy-iovisor/pom.xml
+++ b/features/odl-groupbasedpolicy-iovisor/pom.xml
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>3.0.2</version>
+        <version>3.1.0</version>
         <relativePath/>
     </parent>
 
diff --git a/features/odl-groupbasedpolicy-ip-sgt-distribution-service/pom.xml b/features/odl-groupbasedpolicy-ip-sgt-distribution-service/pom.xml
index a59d7f87a..3b029a611 100644
--- a/features/odl-groupbasedpolicy-ip-sgt-distribution-service/pom.xml
+++ b/features/odl-groupbasedpolicy-ip-sgt-distribution-service/pom.xml
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>3.0.2</version>
+        <version>3.1.0</version>
         <relativePath/>
     </parent>
 
diff --git a/features/odl-groupbasedpolicy-ne-location-provider/pom.xml b/features/odl-groupbasedpolicy-ne-location-provider/pom.xml
index 3ef53065f..37e597ea1 100644
--- a/features/odl-groupbasedpolicy-ne-location-provider/pom.xml
+++ b/features/odl-groupbasedpolicy-ne-location-provider/pom.xml
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>3.0.2</version>
+        <version>3.1.0</version>
         <relativePath/>
     </parent>
 
diff --git a/features/odl-groupbasedpolicy-neutron-and-ofoverlay/pom.xml b/features/odl-groupbasedpolicy-neutron-and-ofoverlay/pom.xml
index 2e87729b9..57b00428b 100644
--- a/features/odl-groupbasedpolicy-neutron-and-ofoverlay/pom.xml
+++ b/features/odl-groupbasedpolicy-neutron-and-ofoverlay/pom.xml
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>3.0.2</version>
+        <version>3.1.0</version>
         <relativePath/>
     </parent>
 
diff --git a/features/odl-groupbasedpolicy-neutron-vpp-mapper/pom.xml b/features/odl-groupbasedpolicy-neutron-vpp-mapper/pom.xml
index e1f8c306f..cde487bbc 100644
--- a/features/odl-groupbasedpolicy-neutron-vpp-mapper/pom.xml
+++ b/features/odl-groupbasedpolicy-neutron-vpp-mapper/pom.xml
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>3.0.2</version>
+        <version>3.1.0</version>
         <relativePath/>
     </parent>
 
diff --git a/features/odl-groupbasedpolicy-neutronmapper/pom.xml b/features/odl-groupbasedpolicy-neutronmapper/pom.xml
index 1caec1a9f..f8fae2728 100644
--- a/features/odl-groupbasedpolicy-neutronmapper/pom.xml
+++ b/features/odl-groupbasedpolicy-neutronmapper/pom.xml
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>3.0.2</version>
+        <version>3.1.0</version>
         <relativePath/>
     </parent>
 
diff --git a/features/odl-groupbasedpolicy-ofoverlay/pom.xml b/features/odl-groupbasedpolicy-ofoverlay/pom.xml
index 8899b630e..ed7908a6f 100644
--- a/features/odl-groupbasedpolicy-ofoverlay/pom.xml
+++ b/features/odl-groupbasedpolicy-ofoverlay/pom.xml
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>3.0.2</version>
+        <version>3.1.0</version>
         <relativePath/>
     </parent>
 
diff --git a/features/odl-groupbasedpolicy-sxp-ep-provider/pom.xml b/features/odl-groupbasedpolicy-sxp-ep-provider/pom.xml
index a20fe5302..a1e019448 100644
--- a/features/odl-groupbasedpolicy-sxp-ep-provider/pom.xml
+++ b/features/odl-groupbasedpolicy-sxp-ep-provider/pom.xml
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>3.0.2</version>
+        <version>3.1.0</version>
         <relativePath/>
     </parent>
 
diff --git a/features/odl-groupbasedpolicy-sxp-ise-adapter/pom.xml b/features/odl-groupbasedpolicy-sxp-ise-adapter/pom.xml
index f233c3b2c..887c57171 100644
--- a/features/odl-groupbasedpolicy-sxp-ise-adapter/pom.xml
+++ b/features/odl-groupbasedpolicy-sxp-ise-adapter/pom.xml
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>3.0.2</version>
+        <version>3.1.0</version>
         <relativePath/>
     </parent>
 
diff --git a/features/odl-groupbasedpolicy-vpp/pom.xml b/features/odl-groupbasedpolicy-vpp/pom.xml
index 235a3c002..654b40457 100644
--- a/features/odl-groupbasedpolicy-vpp/pom.xml
+++ b/features/odl-groupbasedpolicy-vpp/pom.xml
@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>3.0.2</version>
+        <version>3.1.0</version>
         <relativePath/>
     </parent>
 
diff --git a/features/pom.xml b/features/pom.xml
old mode 100755
new mode 100644
index 74be4228e..ad44f9192
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>3.0.2</version>
+        <version>3.1.0</version>
         <relativePath/>
     </parent>
 
diff --git a/pom.xml b/pom.xml
index 602193dcc..ea8e39c95 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,13 +2,14 @@
 <!-- Copyright (c) 2015 Cisco Systems, Inc. and others. All rights reserved.
   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">
+  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">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>3.0.2</version>
+    <version>3.1.0</version>
     <relativePath/>
   </parent>
 
-- 
2.36.6