Bump to odlparent 3.1.0 and yangtools 2.0.3

Change-Id: Idca8474f104b93a7c4a2e5148ad4d414306cfa69
Signed-off-by: Stephen Kitt <skitt@redhat.com>

diff --git a/aaa-shiro-act/pom.xml b/aaa-shiro-act/pom.xml
index 58897e9e0cbad2a9d353daf8a3f32f69c6c96066..1ce48d8c2c689c0923c0a29663c41cfcb235aaa9 100644 (file)
--- a/aaa-shiro-act/pom.xml
+++ b/aaa-shiro-act/pom.xml
@@ -11,7 +11,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent</artifactId>
-    <version>3.0.2</version>
+    <version>3.1.0</version>
     <relativePath/>
   </parent>
 

diff --git a/aaa-shiro/pom.xml b/aaa-shiro/pom.xml
index 7c08e5adaf0fca404ce5ddfdd8c470160ebd056b..4a3137215bc14c252ffd7c2a38e7323e648d0d9f 100644 (file)
--- a/aaa-shiro/pom.xml
+++ b/aaa-shiro/pom.xml
@@ -11,7 +11,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent</artifactId>
-    <version>3.0.2</version>
+    <version>3.1.0</version>
     <relativePath/>
   </parent>
 

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 472d1b3275ec9ac315b1b853973013cbc9138036..15f429313e78727ce3847133f15aac5edc63f8a1 100644 (file)
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -13,7 +13,7 @@
     <parent>
       <groupId>org.opendaylight.odlparent</groupId>
       <artifactId>odlparent-lite</artifactId>
-      <version>3.0.2</version>
+      <version>3.1.0</version>
       <relativePath/>
     </parent>
 

diff --git a/features/features-aaa/pom.xml b/features/features-aaa/pom.xml
index bd4b0eccf8a88a645a6c33de84160459ae1dc5ba..6ded722f651a03b3afa79a248a6bdcd985b9140b 100644 (file)
--- a/features/features-aaa/pom.xml
+++ b/features/features-aaa/pom.xml
@@ -6,15 +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>feature-repo-parent</artifactId>
-        <version>3.0.2</version>
+        <version>3.1.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-aaa-api/pom.xml b/features/odl-aaa-api/pom.xml
index c95b1c3a4ac02ff20cd6f51b93c1685950b47d1c..35e5f4953d4d76dafc5dc64141b6cc05374db32c 100644 (file)
--- a/features/odl-aaa-api/pom.xml
+++ b/features/odl-aaa-api/pom.xml
@@ -6,15 +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>single-feature-parent</artifactId>
-        <version>3.0.2</version>
+        <version>3.1.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-aaa-cert/pom.xml b/features/odl-aaa-cert/pom.xml
index 263f08574a279ad149cb897a33ef306e1c30a337..97e5af670b8ffa1a89e0f7e0fcffd926a9932698 100644 (file)
--- a/features/odl-aaa-cert/pom.xml
+++ b/features/odl-aaa-cert/pom.xml
@@ -6,15 +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>single-feature-parent</artifactId>
-        <version>3.0.2</version>
+        <version>3.1.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-aaa-cli/pom.xml b/features/odl-aaa-cli/pom.xml
index 4560922d84e1445b546239f2b6a59e0cf8c3d171..1079085ca1471968e3b86560ed254ecd124f51f8 100644 (file)
--- a/features/odl-aaa-cli/pom.xml
+++ b/features/odl-aaa-cli/pom.xml
@@ -6,15 +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>single-feature-parent</artifactId>
-        <version>3.0.2</version>
+        <version>3.1.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-aaa-encryption-service/pom.xml b/features/odl-aaa-encryption-service/pom.xml
index e7a875b2a3a53865d965462dc2bbf660bf2976ff..e08c53a4ae1d732b75b8b8fad2295a8dfb830cd9 100644 (file)
--- a/features/odl-aaa-encryption-service/pom.xml
+++ b/features/odl-aaa-encryption-service/pom.xml
@@ -6,15 +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>single-feature-parent</artifactId>
-        <version>3.0.2</version>
+        <version>3.1.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-aaa-shiro-act/pom.xml b/features/odl-aaa-shiro-act/pom.xml
index 657bf3e23af45aa5af68ee5ba733ddc68bc638ee..5226e8f28c809976d5d13f4c73519ae824cebf92 100644 (file)
--- a/features/odl-aaa-shiro-act/pom.xml
+++ b/features/odl-aaa-shiro-act/pom.xml
@@ -14,7 +14,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-aaa-shiro/pom.xml b/features/odl-aaa-shiro/pom.xml
index 0b45466aa03a4945de1a373bafa547946ac38b90..35f038c800c9680bde8f3f565573f488de9b1e29 100644 (file)
--- a/features/odl-aaa-shiro/pom.xml
+++ b/features/odl-aaa-shiro/pom.xml
@@ -6,15 +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>single-feature-parent</artifactId>
-        <version>3.0.2</version>
+        <version>3.1.0</version>
         <relativePath/>
     </parent>
 

diff --git a/features/odl-aaa-shiro/src/main/feature/feature.xml b/features/odl-aaa-shiro/src/main/feature/feature.xml
index 7a0153f275b73ff8d6b69753d507ee70053bf5dd..d48ae26ea57a33f8116f72b4d38345c6f6618431 100644 (file)
--- a/features/odl-aaa-shiro/src/main/feature/feature.xml
+++ b/features/odl-aaa-shiro/src/main/feature/feature.xml
@@ -20,7 +20,7 @@
         <configfile finalname="/etc/org.opendaylight.aaa.filterchain.cfg">
             mvn:org.opendaylight.aaa/aaa-filterchain/${project.version}/cfg/config
         </configfile>
-        <feature version="[3.0.0,4)">odl-karaf-feat-jdbc</feature>
-        <feature version="[3.0.0,4)">odl-karaf-feat-jetty</feature>
+        <feature version="[3.1.0,4)">odl-karaf-feat-jdbc</feature>
+        <feature version="[3.1.0,4)">odl-karaf-feat-jetty</feature>
     </feature>
 </features>

diff --git a/features/odl-aaa-web/pom.xml b/features/odl-aaa-web/pom.xml
index 71ab0d74b375c9f173958113049842709e7dbf57..76e044dc071abbf0352e2c6f19a5a62827466e40 100644 (file)
--- a/features/odl-aaa-web/pom.xml
+++ b/features/odl-aaa-web/pom.xml
@@ -6,15 +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>single-feature-parent</artifactId>
-        <version>3.0.2</version>
+        <version>3.1.0</version>
         <relativePath/>
     </parent>
 
@@ -29,7 +27,7 @@
         <dependency>
             <groupId>org.opendaylight.odlparent</groupId>
             <artifactId>odl-guava-23</artifactId>
-            <version>3.0.2</version>
+            <version>3.1.0</version>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>

diff --git a/features/odl-aaa-web/src/main/feature/feature.xml b/features/odl-aaa-web/src/main/feature/feature.xml
index 0f12ab4c4761858b1904e9ea42b7ace9e1454ff9..0bd03c7a6dc0b002c16b3cda0d7dd60bf6367ee1 100644 (file)
--- a/features/odl-aaa-web/src/main/feature/feature.xml
+++ b/features/odl-aaa-web/src/main/feature/feature.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-aaa-${project.version}">
     <feature name="odl-aaa-web" version="${project.version}">
-        <feature version="[3.0.0,4)">odl-karaf-feat-jetty</feature>
-        <feature version="[3.0.0,4)">odl-guava-23</feature>
+        <feature version="[3.1.0,4)">odl-karaf-feat-jetty</feature>
+        <feature version="[3.1.0,4)">odl-guava-23</feature>
     </feature>
 </features>

diff --git a/features/pom.xml b/features/pom.xml
index 76c8b627c23d8f70ffed6be8b8617f0135e4e5db..d73a29da388a4f39db22061204d4cb83187daf26 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -6,13 +6,12 @@
  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>
+        <version>3.1.0</version>
         <relativePath/>
     </parent>
 

diff --git a/karaf/pom.xml b/karaf/pom.xml
index 56996b2b6cfbdd04a6098af55363c6e546e56ecd..f22d826bf2384cdbbed708ad5cb8b60386d2e02a 100644 (file)
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -6,15 +6,14 @@
  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>karaf4-parent</artifactId>
-        <version>3.0.2</version>
-        <relativePath></relativePath>
+        <version>3.1.0</version>
+        <relativePath/>
     </parent>
 
     <groupId>org.opendaylight.aaa</groupId>

diff --git a/pom.xml b/pom.xml
index c10aacb61e0ed283979048801e2ddf830cdd1a64..a760a656a76ce27768dacedc7bbccd12e19214c3 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -5,12 +5,13 @@
  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">
   <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/web/pom.xml b/web/pom.xml
index 33c3599cefae2ec31756df419deabecb1e263bb1..dba58493e5d1fc94c5b2f8afeb92e247afcc3429 100644 (file)
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -7,15 +7,14 @@
  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>
 
   <groupId>org.opendaylight.aaa.web</groupId>