From 153d8943f9b7456535d2f2058ecea9156543ffc4 Mon Sep 17 00:00:00 2001
From: Luis Gomez <ecelgp@gmail.com>
Date: Tue, 28 Apr 2020 23:24:50 -0700
Subject: [PATCH] Update MRI projects for Aluminium

This bumps versions to the following:
- odlparent-7.0.1
- yangtools-5.0.1
- mdsal-6.0.0
- controller-2.0.0

A references to benchmarks/trace/extras/config in controller
are removed in favor of the three feature repositories and unified
controller-artifacts.

Some cleaning of features and artifacts is done too.

Disable SM projects for now.

Change-Id: I3e1041af716ef4ba7ec3718734a1e3078748ca6b
Signed-off-by: Luis Gomez <ecelgp@gmail.com>
---
 artifacts/all/pom.xml                         |   2 +-
 artifacts/distribution/pom.xml                |   2 +-
 artifacts/pom.xml                             |   2 +-
 artifacts/upstream/all/pom.xml                |  18 +--
 artifacts/upstream/artifacts/pom.xml          |  80 +++++++++-
 artifacts/upstream/feature-repos/pom.xml      | 137 ------------------
 artifacts/upstream/pom.xml                    |   5 +-
 artifacts/upstream/properties/pom.xml         |  13 +-
 artifacts/upstream/single-features/pom.xml    |  87 -----------
 docs/platform-versions.rst                    |  18 +--
 features/pom.xml                              |   2 +-
 features/repos/index/pom.xml                  |  45 ++++--
 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-scripts/pom.xml                         |   2 +-
 karaf/pom.xml                                 |  10 +-
 onap-karaf/pom.xml                            |  25 ++--
 opendaylight/pom.xml                          |   2 +-
 pom.xml                                       |   2 +-
 22 files changed, 154 insertions(+), 308 deletions(-)
 delete mode 100644 artifacts/upstream/feature-repos/pom.xml
 delete mode 100644 artifacts/upstream/single-features/pom.xml

diff --git a/artifacts/all/pom.xml b/artifacts/all/pom.xml
index 77c9e45d..f9869cd9 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>6.0.4</version>
+      <version>7.0.1</version>
       <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
diff --git a/artifacts/distribution/pom.xml b/artifacts/distribution/pom.xml
index 7c97405f..32a4b849 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>6.0.4</version>
+      <version>7.0.1</version>
       <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 44e26ab3..e40de69b 100644
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>6.0.4</version>
+        <version>7.0.1</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
diff --git a/artifacts/upstream/all/pom.xml b/artifacts/upstream/all/pom.xml
index df82a18b..1e0447ee 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>6.0.4</version>
+      <version>7.0.1</version>
       <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
@@ -40,7 +40,6 @@
     <dependencyManagement>
         <!-- TODO: Hardcode versions when moving to semantic versioning. -->
         <dependencies>
-            <!-- Idealy, only artifact artifacts should be needed. -->
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>artifact-artifacts</artifactId>
@@ -48,21 +47,6 @@
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
-            <!-- TODO: All of the following should contain directions on how to get rid of their content. -->
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>feature-repo-artifacts</artifactId>
-                <version>${project.version}</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>single-feature-artifacts</artifactId>
-                <version>${project.version}</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>other-artifacts</artifactId>
diff --git a/artifacts/upstream/artifacts/pom.xml b/artifacts/upstream/artifacts/pom.xml
index 352ea0aa..03c43405 100644
--- a/artifacts/upstream/artifacts/pom.xml
+++ b/artifacts/upstream/artifacts/pom.xml
@@ -40,6 +40,23 @@
     <!-- TODO: Open Bugs agains projects to export a single artifact pom containing every public atrifact version. -->
     <!-- Project artifact poms. Alphabetical order -->
     <profiles>
+        <profile>
+            <id>aaa</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <dependencyManagement>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.opendaylight.aaa</groupId>
+                        <artifactId>aaa-artifacts</artifactId>
+                        <version>${aaa.version}</version>
+                        <type>pom</type>
+                        <scope>import</scope>
+                    </dependency>
+                </dependencies>
+            </dependencyManagement>
+        </profile>
         <profile>
             <id>bgpcep</id>
             <activation>
@@ -66,8 +83,8 @@
                 <dependencies>
                     <dependency>
                         <groupId>org.opendaylight.controller</groupId>
-                        <artifactId>config-artifacts</artifactId>
-                        <version>${config.version}</version>
+                        <artifactId>controller-artifacts</artifactId>
+                        <version>${controller.version}</version>
                         <type>pom</type>
                         <scope>import</scope>
                     </dependency>
@@ -159,6 +176,31 @@
                 </dependencies>
             </dependencyManagement>
         </profile>
+        <profile>
+            <id>mdsal</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <dependencyManagement>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.opendaylight.mdsal</groupId>
+                        <artifactId>mdsal-artifacts</artifactId>
+                        <version>${mdsal.version}</version>
+                        <type>pom</type>
+                        <scope>import</scope>
+                    </dependency>
+                    <!-- FIXME: remove this with mdsal-6.0.1+ -->
+                    <dependency>
+                        <groupId>org.opendaylight.mdsal</groupId>
+                        <artifactId>odl-mdsal-trace</artifactId>
+                        <version>${mdsal.version}</version>
+                        <classifier>features</classifier>
+                        <type>xml</type>
+                    </dependency>
+                </dependencies>
+            </dependencyManagement>
+        </profile>
         <profile>
             <id>netconf</id>
             <activation>
@@ -210,6 +252,23 @@
                 </dependencies>
             </dependencyManagement>
         </profile>
+        <profile>
+            <id>odlparent</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <dependencyManagement>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.opendaylight.odlparent</groupId>
+                        <artifactId>odlparent-artifacts</artifactId>
+                        <version>${odlparent.version}</version>
+                        <type>pom</type>
+                        <scope>import</scope>
+                    </dependency>
+                </dependencies>
+            </dependencyManagement>
+        </profile>
         <profile>
             <id>openflowplugin</id>
             <activation>
@@ -275,5 +334,22 @@
                 </dependencies>
             </dependencyManagement>
         </profile>
+        <profile>
+            <id>yangtools</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <dependencyManagement>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.opendaylight.yangtools</groupId>
+                        <artifactId>yangtools-artifacts</artifactId>
+                        <version>${yangtools.version}</version>
+                        <type>pom</type>
+                        <scope>import</scope>
+                    </dependency>
+                </dependencies>
+            </dependencyManagement>
+        </profile>
     </profiles>
 </project>
diff --git a/artifacts/upstream/feature-repos/pom.xml b/artifacts/upstream/feature-repos/pom.xml
deleted file mode 100644
index 257a7faf..00000000
--- a/artifacts/upstream/feature-repos/pom.xml
+++ /dev/null
@@ -1,137 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
- Copyright (c) 2017 Cisco Systems, Inc. and others.  All rights reserved.
-
- 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">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.opendaylight.integration</groupId>
-        <artifactId>properties</artifactId>
-        <version>0.13.0-SNAPSHOT</version>
-        <relativePath>../properties</relativePath>
-    </parent>
-    <artifactId>feature-repo-artifacts</artifactId>
-    <packaging>pom</packaging>
-    <!-- <name> formatting is used by autorelease to parse and notify projects on
-         build failure. Please do not modify this unless you have a good reason. -->
-    <name>ODL :: integration :: ${project.artifactId}</name>
-    <description>POM to import, with all upstream ODL user-facing feature repo artifact versions.</description>
-    <url>https://wiki.opendaylight.org/view/Integration/Distribution</url>
-    <licenses>
-        <license>
-            <name>Eclipse Public License v1.0</name>
-            <url>http://www.eclipse.org/legal/epl-v10.html</url>
-        </license>
-    </licenses>
-    <!-- FIXME: Add developers section -->
-    <scm>
-        <connection>scm:git:https://git.opendaylight.org/gerrit/integration/distribution.git</connection>
-        <developerConnection>scm:git:ssh://git.opendaylight.org:29418/integration/distribution.git</developerConnection>
-        <url>https://git.opendaylight.org/gerrit/gitweb?p=integration/distribution.git;a=tree;f=artifacts/upstream/feature-repos;hb=HEAD</url>
-        <tag>HEAD</tag>
-    </scm>
-    <!-- TODO: Open Bugs against projects to export user-facing feature repository versions in artifact poms. -->
-    <!-- User facing feature repositories. -->
-    <profiles>
-        <!-- AAA -->
-        <profile>
-            <id>aaa</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <dependencyManagement>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.opendaylight.aaa</groupId>
-                        <artifactId>features-aaa</artifactId>
-                        <version>${aaa.version}</version>
-                        <classifier>features</classifier>
-                        <type>xml</type>
-                    </dependency>
-                </dependencies>
-            </dependencyManagement>
-        </profile>
-        <!-- Controller -->
-        <profile>
-            <id>controller</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <dependencyManagement>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.opendaylight.controller</groupId>
-                        <artifactId>features-extras</artifactId>
-                        <version>${controller.extras.version}</version>
-                        <classifier>features</classifier>
-                        <type>xml</type>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.opendaylight.controller</groupId>
-                        <artifactId>features-mdsal</artifactId>
-                        <version>${controller.version}</version>
-                        <classifier>features</classifier>
-                        <type>xml</type>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.opendaylight.controller</groupId>
-                        <artifactId>features-mdsal-benchmark</artifactId>
-                        <version>${benchmark.version}</version>
-                        <classifier>features</classifier>
-                        <type>xml</type>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.opendaylight.controller</groupId>
-                        <artifactId>features-mdsal-trace</artifactId>
-                        <version>${controller.version}</version>
-                        <classifier>features</classifier>
-                        <type>xml</type>
-                    </dependency>
-                </dependencies>
-            </dependencyManagement>
-        </profile>
-        <!-- InfraUtils -->
-        <profile>
-            <id>infrautils</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <dependencyManagement>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.opendaylight.infrautils</groupId>
-                        <artifactId>infrautils-features</artifactId>
-                        <version>${infrautils.version}</version>
-                        <classifier>features</classifier>
-                        <type>xml</type>
-                    </dependency>
-                </dependencies>
-            </dependencyManagement>
-        </profile>
-        <!-- ODL Parent -->
-        <profile>
-            <id>odlparent</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <dependencyManagement>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.opendaylight.odlparent</groupId>
-                        <artifactId>features-odlparent</artifactId>
-                        <version>${odlparent.version}</version>
-                        <classifier>features</classifier>
-                        <type>xml</type>
-                    </dependency>
-                </dependencies>
-            </dependencyManagement>
-        </profile>
-    </profiles>
-</project>
diff --git a/artifacts/upstream/pom.xml b/artifacts/upstream/pom.xml
index 73ec27c3..c9e77a02 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>6.0.4</version>
+      <version>7.0.1</version>
       <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
@@ -37,12 +37,9 @@
         <url>https://git.opendaylight.org/gerrit/gitweb?p=integration/distribution.git;a=tree;f=artifacts/upstream;hb=HEAD</url>
         <tag>HEAD</tag>
     </scm>
-    <!-- TODO: Work towards using artifact-artifacts only. Properties, artifacts and all than can be joined to replace this pom. -->
     <modules>
         <module>properties</module>
         <module>artifacts</module>
-        <module>feature-repos</module>
-        <module>single-features</module>
         <module>other</module>
         <module>all</module>
     </modules>
diff --git a/artifacts/upstream/properties/pom.xml b/artifacts/upstream/properties/pom.xml
index 2754a96b..bc913b7d 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>6.0.4</version>
+        <version>7.0.1</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
@@ -44,25 +44,22 @@
         <!-- Version properties by project or component. -->
         <!-- Keep this list sorted alphabetically please. -->
         <aaa.version>0.12.0-SNAPSHOT</aaa.version>
-        <benchmark.version>1.9.0</benchmark.version>
         <bgpcep.version>0.14.0-SNAPSHOT</bgpcep.version>
-        <config.version>0.12.0</config.version>
-        <controller.version>1.11.0</controller.version>
-        <controller.extras.version>1.14.0</controller.extras.version>
+        <controller.version>2.0.0</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>5.0.9</mdsal.version>
+        <mdsal.version>6.0.0</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>6.0.4</odlparent.version>
+        <odlparent.version>7.0.1</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>4.0.6</yangtools.version>
+        <yangtools.version>5.0.1</yangtools.version>
         <!-- Keep this list sorted alphabetically please. -->
     </properties>
 </project>
diff --git a/artifacts/upstream/single-features/pom.xml b/artifacts/upstream/single-features/pom.xml
deleted file mode 100644
index 46e42067..00000000
--- a/artifacts/upstream/single-features/pom.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
- Copyright (c) 2017 Cisco Systems, Inc. and others.  All rights reserved.
-
- 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">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.opendaylight.integration</groupId>
-        <artifactId>properties</artifactId>
-        <version>0.13.0-SNAPSHOT</version>
-        <relativePath>../properties</relativePath>
-    </parent>
-    <artifactId>single-feature-artifacts</artifactId>
-    <packaging>pom</packaging>
-    <!-- <name> formatting is used by autorelease to parse and notify projects on
-         build failure. Please do not modify this unless you have a good reason. -->
-    <name>ODL :: integration :: ${project.artifactId}</name>
-    <description>POM to import, with all upstream ODL user-facing single feature artifact versions.</description>
-    <url>https://wiki.opendaylight.org/view/Integration/Distribution</url>
-    <licenses>
-        <license>
-            <name>Eclipse Public License v1.0</name>
-            <url>http://www.eclipse.org/legal/epl-v10.html</url>
-        </license>
-    </licenses>
-    <!-- FIXME: Add developers section -->
-    <scm>
-        <connection>scm:git:https://git.opendaylight.org/gerrit/integration/distribution.git</connection>
-        <developerConnection>scm:git:ssh://git.opendaylight.org:29418/integration/distribution.git</developerConnection>
-        <url>https://git.opendaylight.org/gerrit/gitweb?p=integration/distribution.git;a=tree;f=artifacts/upstream/single-features;hb=HEAD</url>
-        <tag>HEAD</tag>
-    </scm>
-    <!-- User facing single features. -->
-    <!-- TODO: Open Bugs against projects to export user-facing single feature versions in artifact pom. -->
-    <profiles>
-        <!-- AAA -->
-        <profile>
-            <id>aaa</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <dependencyManagement>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.opendaylight.aaa</groupId>
-                        <artifactId>odl-aaa-cert</artifactId>
-                        <version>${aaa.version}</version>
-                        <classifier>features</classifier>
-                        <type>xml</type>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.opendaylight.aaa</groupId>
-                        <artifactId>odl-aaa-shiro</artifactId>
-                        <version>${aaa.version}</version>
-                        <classifier>features</classifier>
-                        <type>xml</type>
-                    </dependency>
-                </dependencies>
-            </dependencyManagement>
-        </profile>
-        <!-- CONTROLLER -->
-        <profile>
-            <id>controller</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <dependencyManagement>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.opendaylight.controller</groupId>
-                        <artifactId>odl-mdsal-broker</artifactId>
-                        <version>${controller.version}</version>
-                        <classifier>features</classifier>
-                        <type>xml</type>
-                    </dependency>
-                </dependencies>
-            </dependencyManagement>
-        </profile>
-    </profiles>
-</project>
diff --git a/docs/platform-versions.rst b/docs/platform-versions.rst
index 1e108b8f..89c72521 100644
--- a/docs/platform-versions.rst
+++ b/docs/platform-versions.rst
@@ -13,23 +13,19 @@ Platform versions
 
    * - org.opendaylight.odlparent
      - \*
-     - 6.0.4
+     - 7.0.1
 
    * - org.opendaylight.yangtools
-     - yangtools-artifacts
-     - 4.0.6
-
-   * - org.opendaylight.mdsal
-     - binding-parent
-     - 5.0.9
+     - \*
+     - 5.0.1
 
    * - org.opendaylight.mdsal
-     - mdsal-artifacts
-     - 5.0.9
+     - \*
+     - 6.0.0
 
    * - org.opendaylight.controller
-     - mdsal-artifacts
-     - 1.11.0
+     - \*
+     - 2.0.0
 
    * - org.opendaylight.aaa
      - aaa-artifacts
diff --git a/features/pom.xml b/features/pom.xml
index 16915671..1cf54952 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>6.0.4</version>
+        <version>7.0.1</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
diff --git a/features/repos/index/pom.xml b/features/repos/index/pom.xml
index d9b17a50..a24ecf5a 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>6.0.4</version>
+        <version>7.0.1</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
@@ -115,25 +115,19 @@
             <dependencies>
                 <dependency>
                     <groupId>org.opendaylight.controller</groupId>
-                    <artifactId>features-extras</artifactId>
+                    <artifactId>features-controller</artifactId>
                     <classifier>features</classifier>
                     <type>xml</type>
                 </dependency>
                 <dependency>
                     <groupId>org.opendaylight.controller</groupId>
-                    <artifactId>features-mdsal</artifactId>
-                    <classifier>features</classifier>
-                    <type>xml</type>
-                </dependency>
-                <dependency>
-                    <groupId>org.opendaylight.controller</groupId>
-                    <artifactId>features-mdsal-benchmark</artifactId>
+                    <artifactId>features-controller-experimental</artifactId>
                     <classifier>features</classifier>
                     <type>xml</type>
                 </dependency>
                 <dependency>
                     <groupId>org.opendaylight.controller</groupId>
-                    <artifactId>features-mdsal-trace</artifactId>
+                    <artifactId>features-controller-testing</artifactId>
                     <classifier>features</classifier>
                     <type>xml</type>
                 </dependency>
@@ -214,7 +208,21 @@
                 </dependency>
             </dependencies>
         </profile>
-        <!-- FIXME: Add Mdsal -->
+        <!-- Mdsal -->
+        <profile>
+            <id>mdsal</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.opendaylight.mdsal</groupId>
+                    <artifactId>features-mdsal</artifactId>
+                    <classifier>features</classifier>
+                    <type>xml</type>
+                </dependency>
+            </dependencies>
+        </profile>
         <!-- Netconf -->
         <profile>
             <id>netconf</id>
@@ -356,5 +364,20 @@
                 </dependency>
             </dependencies>
         </profile>
+        <!-- Yangtools -->
+        <profile>
+            <id>yangtools</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <dependencies>
+                <dependency>
+                    <groupId>org.opendaylight.yangtools</groupId>
+                    <artifactId>features-yangtools</artifactId>
+                    <classifier>features</classifier>
+                    <type>xml</type>
+                </dependency>
+            </dependencies>
+        </profile>
     </profiles>
 </project>
diff --git a/features/repos/pom.xml b/features/repos/pom.xml
index 486ded21..656871ce 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>6.0.4</version>
+        <version>7.0.1</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
diff --git a/features/repos/test/pom.xml b/features/repos/test/pom.xml
index 7bed3e3e..fad6a966 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>6.0.4</version>
+        <version>7.0.1</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 251a3517..12c7efb9 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>6.0.4</version>
+        <version>7.0.1</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 cfbb0b9d..7a92d1a3 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>6.0.4</version>
+        <version>7.0.1</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
diff --git a/features/singles/pom.xml b/features/singles/pom.xml
index ab0bd362..83cd7197 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>6.0.4</version>
+        <version>7.0.1</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
diff --git a/karaf-scripts/pom.xml b/karaf-scripts/pom.xml
index dafc3274..c06e5619 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>6.0.4</version>
+        <version>7.0.1</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
diff --git a/karaf/pom.xml b/karaf/pom.xml
index f06658ca..5f0ee9f6 100644
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>karaf4-parent</artifactId>
-        <version>6.0.4</version>
+        <version>7.0.1</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
@@ -62,10 +62,6 @@
                     <groupId>org.opendaylight.odlparent</groupId>
                     <artifactId>opendaylight-karaf4-empty</artifactId>
                 </exclusion>
-                <exclusion>
-                    <groupId>org.opendaylight.controller</groupId>
-                    <artifactId>opendaylight-karaf-empty</artifactId>
-                </exclusion>
                 <exclusion>
                     <groupId>org.opendaylight.odlparent</groupId>
                     <artifactId>opendaylight-karaf-empty</artifactId>
@@ -84,10 +80,6 @@
                     <groupId>org.opendaylight.odlparent</groupId>
                     <artifactId>opendaylight-karaf4-empty</artifactId>
                 </exclusion>
-                <exclusion>
-                    <groupId>org.opendaylight.controller</groupId>
-                    <artifactId>opendaylight-karaf-empty</artifactId>
-                </exclusion>
                 <exclusion>
                     <groupId>org.opendaylight.odlparent</groupId>
                     <artifactId>opendaylight-karaf-empty</artifactId>
diff --git a/onap-karaf/pom.xml b/onap-karaf/pom.xml
index 1d160612..06c7a201 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>6.0.4</version>
+        <version>7.0.1</version>
         <relativePath/>
     </parent>
 
@@ -55,37 +55,42 @@
         <!-- Controller -->
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
-            <artifactId>features-extras</artifactId>
+            <artifactId>features-controller</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
-            <artifactId>features-mdsal</artifactId>
+            <artifactId>features-controller-experimental</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
             <scope>runtime</scope>
         </dependency>
+
+        <!-- Daexim -->
         <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>features-mdsal-benchmark</artifactId>
+            <groupId>org.opendaylight.daexim</groupId>
+            <artifactId>daexim-features</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
             <scope>runtime</scope>
         </dependency>
+
+        <!-- MD-SAL -->
         <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>features-mdsal-trace</artifactId>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>features-mdsal</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
             <scope>runtime</scope>
         </dependency>
 
-        <!-- Daexim -->
+        <!-- MD-SAL Trace -->
+        <!-- FIXME: remove this with mdsal-6.0.1+ -->
         <dependency>
-            <groupId>org.opendaylight.daexim</groupId>
-            <artifactId>daexim-features</artifactId>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>odl-mdsal-trace</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
             <scope>runtime</scope>
diff --git a/opendaylight/pom.xml b/opendaylight/pom.xml
index 88073784..abe5a89e 100644
--- a/opendaylight/pom.xml
+++ b/opendaylight/pom.xml
@@ -59,7 +59,7 @@
         <profile>
             <id>transportpce</id>
             <activation>
-                <activeByDefault>true</activeByDefault>
+                <activeByDefault>false</activeByDefault>
             </activation>
             <dependencies>
                 <dependency>
diff --git a/pom.xml b/pom.xml
index fa6a398c..a8fa42c5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>6.0.4</version>
+        <version>7.0.1</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
-- 
2.36.6