From: Robert Varga <robert.varga@pantheon.tech>
Date: Thu, 11 Jun 2020 21:52:34 +0000 (+0200)
Subject: Integrate controller-2.0.2
X-Git-Tag: release/aluminium~7
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=integration%2Fdistribution.git;a=commitdiff_plain;h=b27f4de7c0bd6193f7bf94eef589dbac076c738e

Integrate controller-2.0.2

This bumps versions to the following:
- odlparent-7.0.3
- yangtools-5.0.3
- mdsal-6.0.2
- controller-2.0.2

Change-Id: Ic925bdbfe48e5b1807365536dd2883162919f185
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---

diff --git a/artifacts/all/pom.xml b/artifacts/all/pom.xml
index d8292eb7..9263b011 100644
--- 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>7.0.2</version>
+      <version>7.0.3</version>
       <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
diff --git a/artifacts/distribution/pom.xml b/artifacts/distribution/pom.xml
index a518fdae..7fa239c9 100644
--- 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>7.0.2</version>
+      <version>7.0.3</version>
       <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index b3083060..22319873 100644
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>7.0.2</version>
+        <version>7.0.3</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
diff --git a/artifacts/upstream/all/pom.xml b/artifacts/upstream/all/pom.xml
index b87baa24..50d81129 100644
--- 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>7.0.2</version>
+      <version>7.0.3</version>
       <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
diff --git a/artifacts/upstream/pom.xml b/artifacts/upstream/pom.xml
index 1c649ce7..51f9fd77 100644
--- 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>7.0.2</version>
+      <version>7.0.3</version>
       <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
diff --git a/artifacts/upstream/properties/pom.xml b/artifacts/upstream/properties/pom.xml
index aa0a8d9f..29d1129c 100644
--- 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>7.0.2</version>
+        <version>7.0.3</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
@@ -45,21 +45,21 @@
         <!-- Keep this list sorted alphabetically please. -->
         <aaa.version>0.12.0-SNAPSHOT</aaa.version>
         <bgpcep.version>0.14.0-SNAPSHOT</bgpcep.version>
-        <controller.version>2.0.1</controller.version>
+        <controller.version>2.0.2</controller.version>
         <daexim.version>1.8.0-SNAPSHOT</daexim.version>
         <genius.version>0.9.0-SNAPSHOT</genius.version>
         <infrautils.version>1.8.0-SNAPSHOT</infrautils.version>
         <jsonrpc.version>1.9.0-SNAPSHOT</jsonrpc.version>
         <lispflowmapping.version>1.12.0-SNAPSHOT</lispflowmapping.version>
-        <mdsal.version>6.0.1</mdsal.version>
+        <mdsal.version>6.0.2</mdsal.version>
         <netconf.version>1.9.0-SNAPSHOT</netconf.version>
         <netvirt.version>0.11.0-SNAPSHOT</netvirt.version>
         <neutron.version>0.15.0-SNAPSHOT</neutron.version>
-        <odlparent.version>7.0.2</odlparent.version>
+        <odlparent.version>7.0.3</odlparent.version>
         <openflowplugin.version>0.11.0-SNAPSHOT</openflowplugin.version>
         <ovsdb.version>1.11.0-SNAPSHOT</ovsdb.version>
         <serviceutils.version>0.6.0-SNAPSHOT</serviceutils.version>
-        <yangtools.version>5.0.2</yangtools.version>
+        <yangtools.version>5.0.3</yangtools.version>
         <!-- Keep this list sorted alphabetically please. -->
     </properties>
 </project>
diff --git a/docs/platform-versions.rst b/docs/platform-versions.rst
index e8ba0758..0153fb5c 100644
--- a/docs/platform-versions.rst
+++ b/docs/platform-versions.rst
@@ -13,19 +13,19 @@ Platform versions
 
    * - org.opendaylight.odlparent
      - \*
-     - 7.0.2
+     - 7.0.3
 
    * - org.opendaylight.yangtools
      - \*
-     - 5.0.2
+     - 5.0.3
 
    * - org.opendaylight.mdsal
      - \*
-     - 6.0.1
+     - 6.0.2
 
    * - org.opendaylight.controller
      - \*
-     - 2.0.1
+     - 2.0.2
 
    * - org.opendaylight.aaa
      - aaa-artifacts
diff --git a/features/pom.xml b/features/pom.xml
index e6c9473a..196f999f 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>7.0.2</version>
+        <version>7.0.3</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
diff --git a/features/repos/index/pom.xml b/features/repos/index/pom.xml
index 8f59eff9..f31583a3 100644
--- 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>7.0.2</version>
+        <version>7.0.3</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
@@ -118,24 +118,18 @@
                     <artifactId>features-controller</artifactId>
                     <classifier>features</classifier>
                     <type>xml</type>
-                    <!-- FIXME: remove this with controller-2.0.2+ -->
-                    <scope>compile</scope>
                 </dependency>
                 <dependency>
                     <groupId>org.opendaylight.controller</groupId>
                     <artifactId>features-controller-experimental</artifactId>
                     <classifier>features</classifier>
                     <type>xml</type>
-                    <!-- FIXME: remove this with controller-2.0.2+ -->
-                    <scope>compile</scope>
                 </dependency>
                 <dependency>
                     <groupId>org.opendaylight.controller</groupId>
                     <artifactId>features-controller-testing</artifactId>
                     <classifier>features</classifier>
                     <type>xml</type>
-                    <!-- FIXME: remove this with controller-2.0.2+ -->
-                    <scope>compile</scope>
                 </dependency>
             </dependencies>
         </profile>
diff --git a/features/repos/pom.xml b/features/repos/pom.xml
index 8d73287f..0a70d3e3 100644
--- 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>7.0.2</version>
+        <version>7.0.3</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
diff --git a/features/repos/test/pom.xml b/features/repos/test/pom.xml
index 437e24f9..3eea9b3d 100644
--- 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>7.0.2</version>
+        <version>7.0.3</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 4c49d899..b1930e52 100644
--- 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>7.0.2</version>
+        <version>7.0.3</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 3219b138..0b661b43 100644
--- 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>7.0.2</version>
+        <version>7.0.3</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
diff --git a/features/singles/pom.xml b/features/singles/pom.xml
index f8670357..99889b4f 100644
--- 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>7.0.2</version>
+        <version>7.0.3</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
diff --git a/karaf-scripts/pom.xml b/karaf-scripts/pom.xml
index bf52b615..33ab97e2 100644
--- a/karaf-scripts/pom.xml
+++ b/karaf-scripts/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>7.0.2</version>
+        <version>7.0.3</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
diff --git a/karaf/pom.xml b/karaf/pom.xml
index 922bbdea..43ca5bd3 100644
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>karaf4-parent</artifactId>
-        <version>7.0.2</version>
+        <version>7.0.3</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
diff --git a/onap-karaf/pom.xml b/onap-karaf/pom.xml
index 6f84fd89..805d4b1a 100644
--- a/onap-karaf/pom.xml
+++ b/onap-karaf/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>karaf4-parent</artifactId>
-        <version>7.0.2</version>
+        <version>7.0.3</version>
         <relativePath/>
     </parent>
 
diff --git a/opendaylight/pom.xml b/opendaylight/pom.xml
index b24ccfdd..55899b0b 100644
--- a/opendaylight/pom.xml
+++ b/opendaylight/pom.xml
@@ -65,7 +65,7 @@
                 <dependency>
                     <groupId>org.opendaylight.transportpce</groupId>
                     <artifactId>odl-transportpce</artifactId>
-                    <version>2.0.1-SNAPSHOT</version>
+                    <version>2.0.2-SNAPSHOT</version>
                     <classifier>features</classifier>
                     <type>xml</type>
                     <scope>test</scope>
@@ -73,7 +73,7 @@
                 <dependency>
                     <groupId>org.opendaylight.transportpce</groupId>
                     <artifactId>odl-transportpce-tapi</artifactId>
-                    <version>2.0.1-SNAPSHOT</version>
+                    <version>2.0.2-SNAPSHOT</version>
                     <classifier>features</classifier>
                     <type>xml</type>
                     <scope>test</scope>
@@ -81,7 +81,7 @@
                 <dependency>
                     <groupId>org.opendaylight.transportpce</groupId>
                     <artifactId>odl-transportpce-inventory</artifactId>
-                    <version>2.0.1-SNAPSHOT</version>
+                    <version>2.0.2-SNAPSHOT</version>
                     <classifier>features</classifier>
                     <type>xml</type>
                     <scope>test</scope>
diff --git a/pom.xml b/pom.xml
index e8f6592a..c8c01032 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>7.0.2</version>
+        <version>7.0.3</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>