From: Stephen Kitt <skitt@redhat.com>
Date: Wed, 10 Jan 2018 13:58:57 +0000 (+0100)
Subject: Adjust for odlparent 3 / yangtools 2
X-Git-Tag: release/oxygen~25
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=integration%2Fdistribution.git;a=commitdiff_plain;h=679e541c1f3cb77b2bcf9233c72c41a19c9c1cb4

Adjust for odlparent 3 / yangtools 2

This patch upgrades the distribution to odlparent 3.0.2 and yangtools
2.0.0, and drops all projects not needed for netvirt (this is a
temporary measure intended to facilitate the creation of a
distribution to run netvirt CSIT).

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

diff --git a/artifacts/all/pom.xml b/artifacts/all/pom.xml
index 8f30c6c3..1d33f6f0 100644
--- a/artifacts/all/pom.xml
+++ b/artifacts/all/pom.xml
@@ -14,7 +14,7 @@
     <parent>
       <groupId>org.opendaylight.odlparent</groupId>
       <artifactId>odlparent-lite</artifactId>
-      <version>2.0.5</version>
+      <version>3.0.2</version>
       <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
diff --git a/artifacts/distribution/pom.xml b/artifacts/distribution/pom.xml
index a9bfe1b6..2c9cda57 100644
--- a/artifacts/distribution/pom.xml
+++ b/artifacts/distribution/pom.xml
@@ -14,7 +14,7 @@
     <parent>
       <groupId>org.opendaylight.odlparent</groupId>
       <artifactId>odlparent-lite</artifactId>
-      <version>2.0.5</version>
+      <version>3.0.2</version>
       <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index b2f1d070..7c8cfa39 100644
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.0.5</version>
+        <version>3.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 7d211e09..fdbb897e 100644
--- a/artifacts/upstream/all/pom.xml
+++ b/artifacts/upstream/all/pom.xml
@@ -14,7 +14,7 @@
     <parent>
       <groupId>org.opendaylight.odlparent</groupId>
       <artifactId>odlparent-lite</artifactId>
-      <version>2.0.5</version>
+      <version>3.0.2</version>
       <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
diff --git a/artifacts/upstream/artifacts/pom.xml b/artifacts/upstream/artifacts/pom.xml
index 0f21719e..4bf8f597 100644
--- a/artifacts/upstream/artifacts/pom.xml
+++ b/artifacts/upstream/artifacts/pom.xml
@@ -139,6 +139,7 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <!-- Removed for the odlparent 3 / yangtools 2 migration
             <dependency>
                 <groupId>org.opendaylight.groupbasedpolicy</groupId>
                 <artifactId>groupbasedpolicy-artifacts</artifactId>
@@ -146,6 +147,7 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            -->
             <dependency>
                 <groupId>org.opendaylight.honeycomb.vbd</groupId>
                 <artifactId>vbd-artifacts</artifactId>
@@ -160,6 +162,7 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <!-- Removed for the odlparent 3 / yangtools 2 migration
             <dependency>
                 <groupId>org.opendaylight.tsdr</groupId>
                 <artifactId>tsdr-artifacts</artifactId>
@@ -174,6 +177,7 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            -->
         </dependencies>
     </dependencyManagement>
 </project>
diff --git a/artifacts/upstream/feature-repos/pom.xml b/artifacts/upstream/feature-repos/pom.xml
index bf458900..bde17376 100644
--- a/artifacts/upstream/feature-repos/pom.xml
+++ b/artifacts/upstream/feature-repos/pom.xml
@@ -53,6 +53,7 @@
             </dependency>
 
             <!-- ALTO -->
+            <!-- Removed for the odlparent 3 / yangtools 2 migration
             <dependency>
                 <groupId>org.opendaylight.alto</groupId>
                 <artifactId>features4-alto</artifactId>
@@ -60,6 +61,7 @@
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
+            -->
 
 
             <!-- BIER -->
@@ -122,6 +124,7 @@
             </dependency>
 
             <!-- Eman -->
+            <!-- Removed for the odlparent 3 / yangtools 2 migration
             <dependency>
                 <groupId>org.opendaylight.eman</groupId>
                 <artifactId>features-eman</artifactId>
@@ -129,8 +132,10 @@
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
+            -->
 
             <!-- FaaS -->
+            <!-- Removed for the odlparent 3 / yangtools 2 migration
             <dependency>
                 <groupId>org.opendaylight.faas</groupId>
                 <artifactId>features4-faas</artifactId>
@@ -138,6 +143,7 @@
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
+            -->
 
             <!-- InfraUtils -->
             <dependency>
@@ -158,6 +164,7 @@
             </dependency>
 
             <!-- NEMO -->
+            <!-- Removed for the odlparent 3 / yangtools 2 migration
             <dependency>
                 <groupId>org.opendaylight.nemo</groupId>
                 <artifactId>nemo-features</artifactId>
@@ -165,8 +172,10 @@
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
+            -->
 
             <!-- NIC -->
+            <!-- Removed for the odlparent 3 / yangtools 2 migration
             <dependency>
                 <groupId>org.opendaylight.nic</groupId>
                 <artifactId>features-nic</artifactId>
@@ -174,6 +183,7 @@
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
+            -->
 
             <!-- OCP Plugin -->
             <!-- Not active project
@@ -203,6 +213,7 @@
             </dependency>
 
             <!-- OF-CONFIG -->
+            <!-- Removed for the odlparent 3 / yangtools 2 migration
             <dependency>
                 <groupId>org.opendaylight.of-config</groupId>
                 <artifactId>features-of-config</artifactId>
@@ -210,8 +221,10 @@
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
+            -->
 
             <!-- P4 Plugin -->
+            <!-- Removed for the odlparent 3 / yangtools 2 migration
             <dependency>
                 <groupId>org.opendaylight.p4plugin</groupId>
                 <artifactId>features-p4plugin</artifactId>
@@ -219,8 +232,10 @@
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
+            -->
 
             <!-- Packetcable -->
+            <!-- Removed for the odlparent 3 / yangtools 2 migration
             <dependency>
                 <groupId>org.opendaylight.packetcable</groupId>
                 <artifactId>features4-packetcable-policy</artifactId>
@@ -228,6 +243,7 @@
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
+            -->
 
             <!-- SFC -->
             <dependency>
@@ -248,6 +264,7 @@
             </dependency>
 
             <!-- SNMP4SDN -->
+            <!-- Removed for the odlparent 3 / yangtools 2 migration
             <dependency>
                 <groupId>org.opendaylight.snmp4sdn</groupId>
                 <artifactId>features-snmp4sdn</artifactId>
@@ -255,6 +272,7 @@
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
+            -->
 
             <!-- SXP -->
             <dependency>
@@ -266,6 +284,7 @@
             </dependency>
 
             <!-- USC -->
+            <!-- Removed for the odlparent 3 / yangtools 2 migration
             <dependency>
                 <groupId>org.opendaylight.usc</groupId>
                 <artifactId>usc-features</artifactId>
@@ -273,8 +292,10 @@
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
+            -->
 
             <!-- VTN -->
+            <!-- Removed for the odlparent 3 / yangtools 2 migration
             <dependency>
                 <groupId>org.opendaylight.vtn</groupId>
                 <artifactId>features-vtn-manager</artifactId>
@@ -282,6 +303,7 @@
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
+            -->
 
         </dependencies>
     </dependencyManagement>
diff --git a/artifacts/upstream/pom.xml b/artifacts/upstream/pom.xml
index 227e8391..2db52ce6 100644
--- a/artifacts/upstream/pom.xml
+++ b/artifacts/upstream/pom.xml
@@ -14,7 +14,7 @@
     <parent>
       <groupId>org.opendaylight.odlparent</groupId>
       <artifactId>odlparent-lite</artifactId>
-      <version>2.0.5</version>
+      <version>3.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 62dacd30..44b2632f 100644
--- a/artifacts/upstream/properties/pom.xml
+++ b/artifacts/upstream/properties/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.0.5</version>
+        <version>3.0.2</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
@@ -77,7 +77,7 @@
         <nic.version>1.5.0-SNAPSHOT</nic.version>
         <neutron.version>0.10.0-SNAPSHOT</neutron.version>
         <ocpplugin.version>0.4.0-SNAPSHOT</ocpplugin.version>
-        <odlparent.version>2.0.5</odlparent.version>
+        <odlparent.version>3.0.2</odlparent.version>
         <ofconfig.version>1.4.0-SNAPSHOT</ofconfig.version>
         <openflowplugin.version>0.6.0-SNAPSHOT</openflowplugin.version>
         <ovsdb.version>1.6.0-SNAPSHOT</ovsdb.version>
@@ -94,7 +94,7 @@
         <usc.version>1.5.0-SNAPSHOT</usc.version>
         <vpnservice.version>0.6.0-SNAPSHOT</vpnservice.version>
         <vtn-manager.version>0.8.0-SNAPSHOT</vtn-manager.version>
-        <yangtools.version>1.2.0</yangtools.version>
+        <yangtools.version>2.0.0</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
index 1bb26484..2441ba56 100644
--- a/artifacts/upstream/single-features/pom.xml
+++ b/artifacts/upstream/single-features/pom.xml
@@ -59,6 +59,7 @@
             </dependency>
 
             <!-- ALTO -->
+            <!-- Removed for the odlparent 3 / yangtools 2 migration
             <dependency>
                 <groupId>org.opendaylight.alto</groupId>
                 <artifactId>odl-alto-simpleird</artifactId>
@@ -94,6 +95,7 @@
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
+            -->
 
             <!-- BIER -->
             <!-- Comment due to fail merge job
@@ -146,6 +148,7 @@
             </dependency>
 
             <!-- Eman -->
+            <!-- Removed for the odlparent 3 / yangtools 2 migration
             <dependency>
                 <groupId>org.opendaylight.eman</groupId>
                 <artifactId>odl-eman-ui</artifactId>
@@ -167,8 +170,10 @@
                 <type>xml</type>
                 <classifier>features</classifier>
             </dependency>
+            -->
 
             <!-- FAAS -->
+            <!-- Removed for the odlparent 3 / yangtools 2 migration
             <dependency>
                 <groupId>org.opendaylight.faas</groupId>
                 <artifactId>odl-faas-base</artifactId>
@@ -225,6 +230,7 @@
                 <type>xml</type>
                 <classifier>features</classifier>
             </dependency>
+            -->
 
             <!-- L2switch -->
             <dependency>
@@ -250,6 +256,7 @@
             </dependency>
 
             <!-- NEMO -->
+            <!-- Removed for the odlparent 3 / yangtools 2 migration
             <dependency>
                 <groupId>org.opendaylight.nemo</groupId>
                 <artifactId>odl-nemo-engine</artifactId>
@@ -285,8 +292,10 @@
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
+            -->
 
             <!-- NIC -->
+            <!-- Removed for the odlparent 3 / yangtools 2 migration
             <dependency>
                 <groupId>org.opendaylight.nic</groupId>
                 <artifactId>odl-nic-intent-common</artifactId>
@@ -301,6 +310,7 @@
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
+            -->
 
             <!-- OCP Plugin -->
             <!-- Not active project
@@ -314,6 +324,7 @@
             -->
 
             <!-- OF-CONFIG -->
+            <!-- Removed for the odlparent 3 / yangtools 2 migration
             <dependency>
                 <groupId>org.opendaylight.of-config</groupId>
                 <artifactId>odl-of-config-all</artifactId>
@@ -321,8 +332,10 @@
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
+            -->
 
             <!-- P4 Plugin -->
+            <!-- Removed for the odlparent 3 / yangtools 2 migration
             <dependency>
                 <groupId>org.opendaylight.p4plugin</groupId>
                 <artifactId>odl-p4plugin-all</artifactId>
@@ -330,8 +343,10 @@
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
+            -->
 
             <!-- Packetcable -->
+            <!-- Removed for the odlparent 3 / yangtools 2 migration
             <dependency>
                 <groupId>org.opendaylight.packetcable</groupId>
                 <artifactId>odl-packetcable-policy-model</artifactId>
@@ -353,6 +368,7 @@
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
+            -->
 
             <!-- SFC -->
             <dependency>
@@ -429,6 +445,7 @@
             </dependency>
 
             <!-- SNMP4SDN -->
+            <!-- Removed for the odlparent 3 / yangtools 2 migration
             <dependency>
                 <groupId>org.opendaylight.snmp4sdn</groupId>
                 <artifactId>odl-snmp4sdn-snmp4sdn</artifactId>
@@ -436,6 +453,7 @@
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
+            -->
 
             <!-- SXP -->
             <dependency>
@@ -447,6 +465,7 @@
             </dependency>
 
             <!-- UNIMGR -->
+            <!-- Removed for the odlparent 3 / yangtools 2 migration
             <dependency>
                 <groupId>org.opendaylight.unimgr</groupId>
                 <artifactId>odl-unimgr</artifactId>
@@ -454,8 +473,10 @@
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
+            -->
 
             <!-- USC -->
+            <!-- Removed for the odlparent 3 / yangtools 2 migration
             <dependency>
                 <groupId>org.opendaylight.usc</groupId>
                 <artifactId>odl-usc-channel-ui</artifactId>
@@ -463,8 +484,10 @@
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
+            -->
 
             <!-- VTN -->
+            <!-- Removed for the odlparent 3 / yangtools 2 migration
             <dependency>
                 <groupId>org.opendaylight.vtn</groupId>
                 <artifactId>odl-vtn-manager-rest</artifactId>
@@ -479,6 +502,7 @@
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
+            -->
         </dependencies>
     </dependencyManagement>
 </project>
diff --git a/features/pom.xml b/features/pom.xml
index 800d2cd6..bd10cdd0 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.0.5</version>
+        <version>3.0.2</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
diff --git a/features/repos/distribution/pom.xml b/features/repos/distribution/pom.xml
index 4ed1513f..12d51457 100644
--- a/features/repos/distribution/pom.xml
+++ b/features/repos/distribution/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>2.0.5</version>
+        <version>3.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 4e33482e..24ecbe25 100644
--- a/features/repos/index/pom.xml
+++ b/features/repos/index/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>2.0.5</version>
+        <version>3.0.2</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
@@ -64,12 +64,14 @@
         </dependency>
 
         <!-- ALTO -->
+        <!-- Removed for the odlparent 3 / yangtools 2 migration
         <dependency>
             <groupId>org.opendaylight.alto</groupId>
             <artifactId>features4-alto</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
+        -->
 
         <!-- BGPCEP -->
         <dependency>
@@ -180,20 +182,24 @@
         </dependency>
 
         <!-- Eman -->
+        <!-- Removed for the odlparent 3 / yangtools 2 migration
         <dependency>
             <groupId>org.opendaylight.eman</groupId>
             <artifactId>features-eman</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
+        -->
 
         <!-- FAAS -->
+        <!-- Removed for the odlparent 3 / yangtools 2 migration
         <dependency>
             <groupId>org.opendaylight.faas</groupId>
             <artifactId>features4-faas</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
+        -->
 
         <!-- Genius -->
         <dependency>
@@ -204,12 +210,14 @@
         </dependency>
 
         <!-- GROUPBASEDPOLICY -->
+        <!-- Removed for the odlparent 3 / yangtools 2 migration
         <dependency>
             <groupId>org.opendaylight.groupbasedpolicy</groupId>
             <artifactId>features-groupbasedpolicy</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
+        -->
 
         <!-- Honeycomb/VBD -->
         <dependency>
@@ -236,12 +244,14 @@
         </dependency>
 
         <!-- NEMO -->
+        <!-- Removed for the odlparent 3 / yangtools 2 migration
         <dependency>
             <groupId>org.opendaylight.nemo</groupId>
             <artifactId>nemo-features</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
+        -->
 
         <!-- LISP Flow Mapping -->
         <dependency>
@@ -296,12 +306,14 @@
         </dependency>
 
         <!-- NIC -->
+        <!-- Removed for the odlparent 3 / yangtools 2 migration
         <dependency>
             <groupId>org.opendaylight.nic</groupId>
             <artifactId>features-nic</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
+        -->
 
         <!-- OCPplugin -->
         <!-- Not active project
@@ -328,12 +340,14 @@
         </dependency>
 
         <!-- OF-CONFIG -->
+        <!-- Removed for the odlparent 3 / yangtools 2 migration
         <dependency>
             <groupId>org.opendaylight.of-config</groupId>
             <artifactId>features-of-config</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
+        -->
 
         <!-- OpenflowPlugin -->
         <dependency>
@@ -370,20 +384,24 @@
         </dependency>
 
         <!-- P4 Plugin -->
+        <!-- Removed for the odlparent 3 / yangtools 2 migration
         <dependency>
             <groupId>org.opendaylight.p4plugin</groupId>
             <artifactId>features-p4plugin</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
+        -->
 
         <!-- Packetcable -->
+        <!-- Removed for the odlparent 3 / yangtools 2 migration
         <dependency>
             <groupId>org.opendaylight.packetcable</groupId>
             <artifactId>features4-packetcable-policy</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
+        -->
 
         <!-- SFC -->
         <dependency>
@@ -402,12 +420,14 @@
         </dependency>
 
         <!-- SNMP4SDN -->
+        <!-- Removed for the odlparent 3 / yangtools 2 migration
         <dependency>
             <groupId>org.opendaylight.snmp4sdn</groupId>
             <artifactId>features-snmp4sdn</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
+        -->
 
         <!-- SXP -->
         <dependency>
@@ -418,36 +438,44 @@
         </dependency>
 
         <!-- TSDR  -->
+        <!-- Removed for the odlparent 3 / yangtools 2 migration
         <dependency>
             <groupId>org.opendaylight.tsdr</groupId>
             <artifactId>features-tsdr</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
+        -->
 
         <!-- Unimgr -->
+        <!-- Removed for the odlparent 3 / yangtools 2 migration
         <dependency>
             <groupId>org.opendaylight.unimgr</groupId>
             <artifactId>features4-unimgr</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
+        -->
 
         <!-- USC -->
+        <!-- Removed for the odlparent 3 / yangtools 2 migration
         <dependency>
             <groupId>org.opendaylight.usc</groupId>
             <artifactId>usc-features</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
+        -->
 
         <!-- VTN -->
+        <!-- Removed for the odlparent 3 / yangtools 2 migration
         <dependency>
             <groupId>org.opendaylight.vtn</groupId>
             <artifactId>features-vtn-manager</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
+        -->
 
         <!-- FIXME: Add Yangtools -->
 
diff --git a/features/repos/pom.xml b/features/repos/pom.xml
index c0ab473c..8990e83c 100644
--- a/features/repos/pom.xml
+++ b/features/repos/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.0.5</version>
+        <version>3.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 27286f0c..79319e52 100644
--- a/features/repos/test/pom.xml
+++ b/features/repos/test/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>2.0.5</version>
+        <version>3.0.2</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 d9882977..2324b470 100644
--- a/features/singles/odl-distribution-version/pom.xml
+++ b/features/singles/odl-distribution-version/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.5</version>
+        <version>3.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 99123b70..d0603c92 100644
--- a/features/singles/odl-integration-all/pom.xml
+++ b/features/singles/odl-integration-all/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.5</version>
+        <version>3.0.2</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
@@ -199,18 +199,6 @@
         </dependency>
 
         <!-- L2switch -->
-        <dependency>
-            <groupId>org.opendaylight.l2switch</groupId>
-            <artifactId>odl-l2switch-switch</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.l2switch</groupId>
-            <artifactId>odl-l2switch-switch-rest</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.l2switch</groupId>
             <artifactId>odl-l2switch-switch-ui</artifactId>
@@ -218,7 +206,8 @@
             <type>xml</type>
         </dependency>
 
-            <!-- NEMO -->
+        <!-- NEMO -->
+        <!-- Removed for the odlparent 3 / yangtools 2 migration
         <dependency>
             <groupId>org.opendaylight.nemo</groupId>
             <artifactId>odl-nemo-engine</artifactId>
@@ -249,6 +238,7 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
+        -->
 
         <!-- Netconf -->
         <dependency>
@@ -291,20 +281,24 @@
         </dependency>
 
         <!-- OF-CONFIG -->
+        <!--
         <dependency>
             <groupId>org.opendaylight.of-config</groupId>
             <artifactId>odl-of-config-all</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
+        -->
 
         <!-- P4 Plugin -->
+        <!-- Removed for the odlparent 3 / yangtools 2 migration
         <dependency>
             <groupId>org.opendaylight.p4plugin</groupId>
             <artifactId>odl-p4plugin-all</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
+        -->
 
         <!-- SFC -->
         <dependency>
@@ -333,30 +327,37 @@
         </dependency>
 
         <!-- TSDR -->
+        <!-- Removed for the odlparent 3 / yangtools 2 migration
         <dependency>
             <groupId>org.opendaylight.tsdr</groupId>
             <artifactId>odl-tsdr-hsqldb-all</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
+        -->
 
         <!-- Unimgr -->
+        <!-- Removed for the odlparent 3 / yangtools 2 migration
         <dependency>
             <groupId>org.opendaylight.unimgr</groupId>
             <artifactId>odl-unimgr</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
+        -->
 
         <!-- USC -->
+        <!-- Removed for the odlparent 3 / yangtools 2 migration
         <dependency>
             <groupId>org.opendaylight.usc</groupId>
             <artifactId>odl-usc-channel-ui</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
+        -->
 
         <!-- VTN -->
+        <!-- Removed for the odlparent 3 / yangtools 2 migration
         <dependency>
             <groupId>org.opendaylight.vtn</groupId>
             <artifactId>odl-vtn-manager-rest</artifactId>
@@ -369,6 +370,7 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
+        -->
 
     </dependencies>
 </project>
diff --git a/features/singles/odl-integration-compatible-with-all/pom.xml b/features/singles/odl-integration-compatible-with-all/pom.xml
index bb75398a..8ea93d2b 100644
--- a/features/singles/odl-integration-compatible-with-all/pom.xml
+++ b/features/singles/odl-integration-compatible-with-all/pom.xml
@@ -13,7 +13,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>2.0.5</version>
+        <version>3.0.2</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
@@ -263,12 +263,14 @@
         </dependency>
 
         <!-- Packetcable -->
+        <!-- Removed for the odlparent 3 / yangtools 2 migration
         <dependency>
             <groupId>org.opendaylight.packetcable</groupId>
             <artifactId>odl-packetcable-policy-model</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
+        -->
         <!-- Commenting because SFT memory issue
         <dependency>
             <groupId>org.opendaylight.packetcable</groupId>
@@ -317,12 +319,14 @@
         </dependency>
 
         <!-- SNMP4SDN -->
+        <!-- Removed for the odlparent 3 / yangtools 2 migration
         <dependency>
             <groupId>org.opendaylight.snmp4sdn</groupId>
             <artifactId>odl-snmp4sdn-snmp4sdn</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
+        -->
 
         <!-- SXP -->
         <dependency>
diff --git a/features/singles/pom.xml b/features/singles/pom.xml
index 137d0b91..61be4a61 100644
--- a/features/singles/pom.xml
+++ b/features/singles/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.0.5</version>
+        <version>3.0.2</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
diff --git a/karaf/pom.xml b/karaf/pom.xml
index 0fed7905..2d8c8a2d 100644
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>karaf4-parent</artifactId>
-        <version>2.0.5</version>
+        <version>3.0.2</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
diff --git a/pom.xml b/pom.xml
index 9d5901d1..452fa2a7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>2.0.5</version>
+        <version>3.0.2</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
diff --git a/version/pom.xml b/version/pom.xml
index c2cbf865..38fd98c7 100644
--- a/version/pom.xml
+++ b/version/pom.xml
@@ -41,6 +41,6 @@
     </scm>
     <!-- Is there a way to inherit/include properties from a file bumped autimatically? -->
     <properties>
-        <feature.odlparent.version>2.0.5</feature.odlparent.version>
+        <feature.odlparent.version>3.0.2</feature.odlparent.version>
     </properties>
 </project>