Bump to odlparent 3.1.4 and yangtools 2.0.6.5

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

diff --git a/artifacts/all/pom.xml b/artifacts/all/pom.xml
index 83cda42aff4f151c05cfe9df4709d3e8e497c8f0..3756fb84319f206917e611058aaf1df50c966029 100644 (file)
--- a/artifacts/all/pom.xml
+++ b/artifacts/all/pom.xml
@@ -12,7 +12,7 @@
     <parent>
       <groupId>org.opendaylight.odlparent</groupId>
       <artifactId>odlparent-lite</artifactId>
-      <version>3.1.3</version>
+      <version>3.1.4</version>
       <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>

diff --git a/artifacts/distribution/pom.xml b/artifacts/distribution/pom.xml
index 5454ce1ae2f51e9e6990430859ddbe88606b2104..9658aff6b2a7ab222ac9b83b6744c9d7b3183bd3 100644 (file)
--- a/artifacts/distribution/pom.xml
+++ b/artifacts/distribution/pom.xml
@@ -12,7 +12,7 @@
     <parent>
       <groupId>org.opendaylight.odlparent</groupId>
       <artifactId>odlparent-lite</artifactId>
-      <version>3.1.3</version>
+      <version>3.1.4</version>
       <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 55f10f7a5b8e92b119f984a227742d2c9bbfa378..436522f88937d12a7fcba266d95cd37af759aa10 100644 (file)
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>3.1.3</version>
+        <version>3.1.4</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>

diff --git a/artifacts/upstream/all/pom.xml b/artifacts/upstream/all/pom.xml
index 0c5c6efda8d810fd5412300d9c8835f2d601108b..12d74001db9123a4ad27590630343673d2f397ef 100644 (file)
--- a/artifacts/upstream/all/pom.xml
+++ b/artifacts/upstream/all/pom.xml
@@ -12,7 +12,7 @@
     <parent>
       <groupId>org.opendaylight.odlparent</groupId>
       <artifactId>odlparent-lite</artifactId>
-      <version>3.1.3</version>
+      <version>3.1.4</version>
       <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>

diff --git a/artifacts/upstream/pom.xml b/artifacts/upstream/pom.xml
index f9cae8d6fb78486572b6d8cb0d5cdfecfb949a55..00cdcdd0663bae3a30745a6cec93d7d15ca619bb 100644 (file)
--- a/artifacts/upstream/pom.xml
+++ b/artifacts/upstream/pom.xml
@@ -12,7 +12,7 @@
     <parent>
       <groupId>org.opendaylight.odlparent</groupId>
       <artifactId>odlparent-lite</artifactId>
-      <version>3.1.3</version>
+      <version>3.1.4</version>
       <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>

diff --git a/artifacts/upstream/properties/pom.xml b/artifacts/upstream/properties/pom.xml
index 8a6f9feacc5e138084a2999079cf308b393805c2..bd213ff89b20c12b8344cedd51262cfd1126c5b1 100644 (file)
--- a/artifacts/upstream/properties/pom.xml
+++ b/artifacts/upstream/properties/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>3.1.3</version>
+        <version>3.1.4</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
@@ -72,7 +72,7 @@
         <netide.version>0.5.4-SNAPSHOT</netide.version>
         <netvirt.version>0.6.4-SNAPSHOT</netvirt.version>
         <neutron.version>0.10.4-SNAPSHOT</neutron.version>
-        <odlparent.version>3.1.3</odlparent.version>
+        <odlparent.version>3.1.4</odlparent.version>
         <ofconfig.version>1.4.4-SNAPSHOT</ofconfig.version>
         <openflowplugin.version>0.6.4-SNAPSHOT</openflowplugin.version>
         <ovsdb.version>1.6.4-SNAPSHOT</ovsdb.version>
@@ -87,7 +87,7 @@
         <sxp.version>1.6.4-SNAPSHOT</sxp.version>
         <tsdr.version>1.5.4-SNAPSHOT</tsdr.version>
         <usc.version>1.5.4-SNAPSHOT</usc.version>
-        <yangtools.version>2.0.3</yangtools.version>
+        <yangtools.version>2.0.6.5</yangtools.version>
         <!-- Keep this list sorted alphabetically please. -->
     </properties>
 </project>

diff --git a/features/pom.xml b/features/pom.xml
index 21b0fc6d030429a6cc92d3abd9c363c6b69417f0..269bdf7ff7ed0150f82915504e3958bc97e58a78 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>3.1.3</version>
+        <version>3.1.4</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>

diff --git a/features/repos/distribution/pom.xml b/features/repos/distribution/pom.xml
index 34a50610de3abab2d7a4975bb59198b3702c1ee5..a8e350d24578dcb2242ca24f4e6b08a0c9a666fa 100644 (file)
--- a/features/repos/distribution/pom.xml
+++ b/features/repos/distribution/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>3.1.3</version>
+        <version>3.1.4</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>

diff --git a/features/repos/index/pom.xml b/features/repos/index/pom.xml
index 1bf35da3ce9b9f29ceda8d678284a6406a80dc77..32ace12b4244966d61b616b62e21bf8cd6b7c4f8 100644 (file)
--- a/features/repos/index/pom.xml
+++ b/features/repos/index/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>3.1.3</version>
+        <version>3.1.4</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>

diff --git a/features/repos/pom.xml b/features/repos/pom.xml
index c81c1f659f46722524323a3f2988a47761c9ba88..2081ad704259677eb7d3b32e3b8e49d86cc0ac83 100644 (file)
--- a/features/repos/pom.xml
+++ b/features/repos/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>3.1.3</version>
+        <version>3.1.4</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>

diff --git a/features/repos/test/pom.xml b/features/repos/test/pom.xml
index df866482c5efee5302f5fd43c254f1e80cbf2acc..c2194ee3d7d6bdd912e923a6c9861fad5aa77018 100644 (file)
--- a/features/repos/test/pom.xml
+++ b/features/repos/test/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>3.1.3</version>
+        <version>3.1.4</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>

diff --git a/features/singles/odl-distribution-version/pom.xml b/features/singles/odl-distribution-version/pom.xml
index fa12c833caf75aa9269e825a6aba938bb52eba30..baea28552441a38c9f819799a9674272f911064d 100644 (file)
--- a/features/singles/odl-distribution-version/pom.xml
+++ b/features/singles/odl-distribution-version/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>3.1.3</version>
+        <version>3.1.4</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>

diff --git a/features/singles/odl-integration-all/pom.xml b/features/singles/odl-integration-all/pom.xml
index 21beebce690884fa6b4da5809948ba81bcca0d87..a3ea4ae4899675fd6499fa99bb7cc0b649d6bd21 100644 (file)
--- a/features/singles/odl-integration-all/pom.xml
+++ b/features/singles/odl-integration-all/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>3.1.3</version>
+        <version>3.1.4</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>

diff --git a/features/singles/odl-integration-compatible-with-all/pom.xml b/features/singles/odl-integration-compatible-with-all/pom.xml
index 9d648a8ec1eb6dea76fa59d84779a491e5cb04e4..555ebb2835d704ef61dd3e31a7f24548b52b1c96 100644 (file)
--- a/features/singles/odl-integration-compatible-with-all/pom.xml
+++ b/features/singles/odl-integration-compatible-with-all/pom.xml
@@ -11,7 +11,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>3.1.3</version>
+        <version>3.1.4</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>

diff --git a/features/singles/pom.xml b/features/singles/pom.xml
index 89ca42e96cc66f376618627124eb48d05538e1db..1d75c19969dc7c0b05e09ebc93263dd138f3c202 100644 (file)
--- a/features/singles/pom.xml
+++ b/features/singles/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>3.1.3</version>
+        <version>3.1.4</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>

diff --git a/karaf/pom.xml b/karaf/pom.xml
index c20d831214936da5ef82865a8e097b3cf21c7cbb..b58a9211c4178ea7b107719202bf88462ce2bb50 100644 (file)
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>karaf4-parent</artifactId>
-        <version>3.1.3</version>
+        <version>3.1.4</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>

diff --git a/pom.xml b/pom.xml
index 3739d37766535e954d510f210ed572d2e8e8a6aa..f88c931d3f8f6c2068c445c34b38cc7810a3790b 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>3.1.3</version>
+        <version>3.1.4</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>

diff --git a/version/pom.xml b/version/pom.xml
index 72fafaf7c66e83fd3e723cc54edb4444c2ca3050..e804422868c2dea120dbcf47984dc91749d1e0d2 100644 (file)
--- a/version/pom.xml
+++ b/version/pom.xml
@@ -39,6 +39,6 @@
     </scm>
     <!-- Is there a way to inherit/include properties from a file bumped autimatically? -->
     <properties>
-        <feature.odlparent.version>3.1.3</feature.odlparent.version>
+        <feature.odlparent.version>3.1.4</feature.odlparent.version>
     </properties>
 </project>