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>

diff --git a/artifacts/all/pom.xml b/artifacts/all/pom.xml
index 3bf7bf039e699648ad61fb037d6ff2b69ca1c909..7f4e64013129e197d65a02e0b3c22fd05f5c120f 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>4.0.2</version>
       <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>

diff --git a/artifacts/distribution/pom.xml b/artifacts/distribution/pom.xml
index 5a208b517336ad1454ad2d575fbde6387ed340ef..91c8f841077b86cb679e964d745b4c85066eb400 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>4.0.2</version>
       <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 8236d4ef18a9cdb7596671d12ae51f7d85420bee..946914a7a1f77d7f497df223edbe42d077eb012d 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>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 c5c3ffaaff9dc5d4c6cc44ccb4204737da9df171..a2f6d3d9125f372c2cb02173f62d869235d06007 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>4.0.2</version>
       <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>

diff --git a/artifacts/upstream/pom.xml b/artifacts/upstream/pom.xml
index 9758f13eb67c49a059829f2946d3fe2234702608..6f8d25a1aab430e33c372a4fc47ad9d78a1795de 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>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 2fecc2bcb02fc7e125614571d73749fec2a6cb88..58f67da9c01b7dc2c54fff4ba82eb9202671e19c 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>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 386bfaed829d5edc01d22f5616864984a4aea9a5..99c6e608ca1186748b7aba824f735bb1e0663f98 100644 (file)
--- 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 7931ba5488ec9720a018617e03a5729962eecf5a..ae2e8e9f31c306b405fb16a1223c235861952b03 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>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 fe021021b39a458a83683ec542d72c3d1626b223..57b8bc700e78c7913848ca575f45d738473eab60 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>4.0.2</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>

diff --git a/features/repos/pom.xml b/features/repos/pom.xml
index 37b6ff296ba27a4f931032b4d40f0a1f0adf5a16..d74a12aaf34393d20c46fbbc2ad8286a95a3976d 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>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 27c14b1fddc22711015ee2b0a41aed79a3e10afb..7a6bc81274683755229232e91f315a963d005d96 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>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 f7e99ac6bd4ece7e111ac3bcedf225a924f1db7b..de952e7cec40ba1e29cdf8cb59cec8a1a8c77384 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>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 2bbe3ecdb46f6ec7a0cb6501130c6b0c9f3039bc..9ebf922dd9bf17ffecf7b67e3854c80f8092f295 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>4.0.2</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>

diff --git a/features/singles/pom.xml b/features/singles/pom.xml
index 3b82389f82d150b8cb1f8be0a44e273cf54938b6..747ef1dcf910230c1b5c9e42f5caf12c39a1e764 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>4.0.2</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>

diff --git a/karaf/pom.xml b/karaf/pom.xml
index e7da3377d3a84a2f07fe348c554c977bb07f9eb4..eed20e9d2c6f14f71271f9ff323f391e9bd1e825 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>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 74215d20f3612c0c3e37ddd781daac92afc412ef..d23ee9f8c7c87d056ae13a6a706c11d935618e74 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>4.0.2</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>