From e1784820d36580214bf99178d4c09ef129043c67 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Wed, 10 Oct 2018 12:22:03 +0200
Subject: [PATCH] Integrate Neon MRI artifacts

This bumps versions used in int/dist to Neon MRI versions.

Change-Id: I5edef4a04382700c5fec4e0d7c2918cb2e6da2b7
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 artifacts/all/pom.xml                         |  2 +-
 artifacts/distribution/pom.xml                |  2 +-
 artifacts/pom.xml                             |  2 +-
 artifacts/upstream/all/pom.xml                |  2 +-
 artifacts/upstream/pom.xml                    |  2 +-
 artifacts/upstream/properties/pom.xml         |  4 ++--
 docs/platform-versions.rst                    |  8 +++----
 features/pom.xml                              |  2 +-
 features/repos/index/pom.xml                  |  2 +-
 features/repos/pom.xml                        |  2 +-
 features/repos/test/pom.xml                   |  2 +-
 features/singles/odl-integration-all/pom.xml  |  2 +-
 .../pom.xml                                   |  2 +-
 features/singles/pom.xml                      |  2 +-
 karaf/pom.xml                                 | 23 +------------------
 pom.xml                                       |  2 +-
 16 files changed, 20 insertions(+), 41 deletions(-)

diff --git a/artifacts/all/pom.xml b/artifacts/all/pom.xml
index 3bf7bf03..7f4e6401 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>3.1.3</version>
+      <version>4.0.2</version>
       <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
diff --git a/artifacts/distribution/pom.xml b/artifacts/distribution/pom.xml
index 5a208b51..91c8f841 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>3.1.3</version>
+      <version>4.0.2</version>
       <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 8236d4ef..946914a7 100644
--- 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>4.0.2</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
diff --git a/artifacts/upstream/all/pom.xml b/artifacts/upstream/all/pom.xml
index c5c3ffaa..a2f6d3d9 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>3.1.3</version>
+      <version>4.0.2</version>
       <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
diff --git a/artifacts/upstream/pom.xml b/artifacts/upstream/pom.xml
index 9758f13e..6f8d25a1 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>3.1.3</version>
+      <version>4.0.2</version>
       <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
diff --git a/artifacts/upstream/properties/pom.xml b/artifacts/upstream/properties/pom.xml
index 2fecc2bc..58f67da9 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>3.1.3</version>
+        <version>4.0.2</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
@@ -57,7 +57,7 @@
         <netconf.version>1.6.0-SNAPSHOT</netconf.version>
         <netvirt.version>0.8.0-SNAPSHOT</netvirt.version>
         <neutron.version>0.12.0-SNAPSHOT</neutron.version>
-        <odlparent.version>3.1.3</odlparent.version>
+        <odlparent.version>4.0.2</odlparent.version>
         <openflowplugin.version>0.8.0-SNAPSHOT</openflowplugin.version>
         <ovsdb.version>1.8.0-SNAPSHOT</ovsdb.version>
         <restconf.version>1.9.0-SNAPSHOT</restconf.version>
diff --git a/docs/platform-versions.rst b/docs/platform-versions.rst
index 386bfaed..99c6e608 100644
--- a/docs/platform-versions.rst
+++ b/docs/platform-versions.rst
@@ -13,19 +13,19 @@ Platform versions
 
    * - org.opendaylight.odlparent
      - \*
-     - 4.0.0
+     - 4.0.2
 
    * - org.opendaylight.yangtools
      - yangtools-artifacts
-     - 2.1.0
+     - 2.1.2
 
    * - org.opendaylight.mdsal
      - binding-parent
-     - 0.15.0
+     - 3.0.1
 
    * - org.opendaylight.mdsal
      - mdsal-artifacts
-     - 2.7.0
+     - 3.0.1
 
    * - org.opendaylight.controller
      - mdsal-artifacts
diff --git a/features/pom.xml b/features/pom.xml
index 7931ba54..ae2e8e9f 100644
--- 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>4.0.2</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
diff --git a/features/repos/index/pom.xml b/features/repos/index/pom.xml
index fe021021..57b8bc70 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>3.1.3</version>
+        <version>4.0.2</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
diff --git a/features/repos/pom.xml b/features/repos/pom.xml
index 37b6ff29..d74a12aa 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>3.1.3</version>
+        <version>4.0.2</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
diff --git a/features/repos/test/pom.xml b/features/repos/test/pom.xml
index 27c14b1f..7a6bc812 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>3.1.3</version>
+        <version>4.0.2</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 f7e99ac6..de952e7c 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>3.1.3</version>
+        <version>4.0.2</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 2bbe3ecd..9ebf922d 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>3.1.3</version>
+        <version>4.0.2</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
diff --git a/features/singles/pom.xml b/features/singles/pom.xml
index 3b82389f..747ef1dc 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>3.1.3</version>
+        <version>4.0.2</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
diff --git a/karaf/pom.xml b/karaf/pom.xml
index e7da3377..eed20e9d 100644
--- 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>4.0.2</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
@@ -129,27 +129,6 @@
                     </execution>
                 </executions>
             </plugin>
-
-            <!-- ODLPARENT-142: Heavy-handed workaround to remove mysql dependencies from system -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>prepare-package</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <delete includeemptydirs="true">
-                                    <fileset dir="${project.build.directory}/assembly/system/mysql"/>
-                                </delete>
-                            </tasks>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 
diff --git a/pom.xml b/pom.xml
index 74215d20..d23ee9f8 100644
--- 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>4.0.2</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
-- 
2.36.6