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

Change-Id: Iaffc891b26a8e1ff16b2dc14e3a0d4705421810a
Signed-off-by: Stephen Kitt <skitt@redhat.com>
---
 .../features4-packetcable-policy/pom.xml      |  8 +++----
 .../odl-packetcable-policy-model/pom.xml      |  8 +++----
 .../odl-packetcable-policy-server-all/pom.xml |  8 +++----
 .../odl-packetcable-policy-server/pom.xml     |  6 ++----
 features-packetcable-policy/pom.xml           |  7 +++----
 packetcable-driver/pom.xml                    | 21 +++++++++----------
 packetcable-policy-karaf/pom.xml              |  9 ++++----
 pom.xml                                       |  5 ++---
 8 files changed, 30 insertions(+), 42 deletions(-)

diff --git a/features-packetcable-policy/features4-packetcable-policy/pom.xml b/features-packetcable-policy/features4-packetcable-policy/pom.xml
index 30e2ec2..93a3d64 100644
--- a/features-packetcable-policy/features4-packetcable-policy/pom.xml
+++ b/features-packetcable-policy/features4-packetcable-policy/pom.xml
@@ -1,13 +1,11 @@
 <?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>feature-repo-parent</artifactId>
-        <version>3.0.2</version>
+        <version>3.1.0</version>
         <relativePath/>
     </parent>
     
@@ -40,4 +38,4 @@
         </dependency>
     </dependencies>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/features-packetcable-policy/odl-packetcable-policy-model/pom.xml b/features-packetcable-policy/odl-packetcable-policy-model/pom.xml
index 6389a79..6561627 100644
--- a/features-packetcable-policy/odl-packetcable-policy-model/pom.xml
+++ b/features-packetcable-policy/odl-packetcable-policy-model/pom.xml
@@ -1,13 +1,11 @@
 <?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>
 
@@ -44,4 +42,4 @@
         </dependency>
     </dependencies>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/features-packetcable-policy/odl-packetcable-policy-server-all/pom.xml b/features-packetcable-policy/odl-packetcable-policy-server-all/pom.xml
index 33b66c0..ef0c223 100644
--- a/features-packetcable-policy/odl-packetcable-policy-server-all/pom.xml
+++ b/features-packetcable-policy/odl-packetcable-policy-server-all/pom.xml
@@ -1,13 +1,11 @@
 <?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>
 
@@ -28,4 +26,4 @@
         </dependency>
     </dependencies>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/features-packetcable-policy/odl-packetcable-policy-server/pom.xml b/features-packetcable-policy/odl-packetcable-policy-server/pom.xml
index 400e6a4..76a0d28 100644
--- a/features-packetcable-policy/odl-packetcable-policy-server/pom.xml
+++ b/features-packetcable-policy/odl-packetcable-policy-server/pom.xml
@@ -1,13 +1,11 @@
 <?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-packetcable-policy/pom.xml b/features-packetcable-policy/pom.xml
index 63c3ff2..a93f71b 100644
--- a/features-packetcable-policy/pom.xml
+++ b/features-packetcable-policy/pom.xml
@@ -6,14 +6,13 @@
  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">
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>3.0.2</version>
-        <relativePath />
+        <version>3.1.0</version>
+        <relativePath/>
     </parent>
     <artifactId>features-packetcable-policy-aggregator</artifactId>
     <groupId>org.opendaylight.packetcable</groupId>
diff --git a/packetcable-driver/pom.xml b/packetcable-driver/pom.xml
index 7f8bc6c..2f5e962 100644
--- a/packetcable-driver/pom.xml
+++ b/packetcable-driver/pom.xml
@@ -1,6 +1,5 @@
 <?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>
@@ -16,7 +15,7 @@
         A lightweight implementation of PCMM COPS PDP client
     </description>
 
-    <url></url>
+    <url/>
     <inceptionYear>2013</inceptionYear>
 
     <licenses>
@@ -40,14 +39,14 @@
     </contributors>
 
     <scm>
-        <connection></connection>
-        <developerConnection></developerConnection>
-        <url></url>
+        <connection/>
+        <developerConnection/>
+        <url/>
     </scm>
 
     <issueManagement>
-        <system></system>
-        <url></url>
+        <system/>
+        <url/>
     </issueManagement>
 
     <properties>
@@ -70,7 +69,7 @@
         </dependency>
     </dependencies>
 
-    <modules></modules>
+    <modules/>
 
     <build>
         <directory>${project.basedir}/target</directory>
@@ -98,12 +97,12 @@
             <dependency>
               <groupId>org.opendaylight.odlparent</groupId>
               <artifactId>checkstyle</artifactId>
-              <version>3.0.2</version>
+              <version>3.1.0</version>
             </dependency>
             <dependency>
               <groupId>org.opendaylight.odlparent</groupId>
               <artifactId>odl-license</artifactId>
-              <version>3.0.2</version>
+              <version>3.1.0</version>
             </dependency>
           </dependencies>
 
diff --git a/packetcable-policy-karaf/pom.xml b/packetcable-policy-karaf/pom.xml
index b3051ec..db75dc5 100644
--- a/packetcable-policy-karaf/pom.xml
+++ b/packetcable-policy-karaf/pom.xml
@@ -1,12 +1,11 @@
 <?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>karaf4-parent</artifactId>
-        <version>3.0.2</version>
-        <relativePath />
+        <version>3.1.0</version>
+        <relativePath/>
     </parent>
     <artifactId>packetcable-policy-karaf</artifactId>
     <groupId>org.opendaylight.packetcable</groupId>
@@ -49,4 +48,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
\ No newline at end of file
+</project>
diff --git a/pom.xml b/pom.xml
index 5028d79..d1a45ef 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,12 +1,11 @@
 <?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>
     <!-- FIXME: Do not use sal-parent, use odlparent:odlparent or mdsal:binding-parent intstead. -->
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent</artifactId>
-        <version>3.0.2</version>
+        <version>3.1.0</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.packetcable</groupId>
-- 
2.36.6