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 8f30c6c3370c9498092239283cf209e6d791e13c..1d33f6f023844cb209d64ee1eaa2fd7f3753634d 100644 (file)
--- 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 a9bfe1b666d37d1432c51ea4d898c76d796ae80a..2c9cda5704b9f1bd723c5899d11bd3b712258050 100644 (file)
--- 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 b2f1d070ab61747105b4610ac4967a709ccc3741..7c8cfa393132ff2fbe276cc410b852322e34bb0e 100644 (file)
--- 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 7d211e092bbee94e7612a07865d96a07d9df5431..fdbb897e2e6ec9d350e848f3554d4f69678d5e19 100644 (file)
--- 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 0f21719e945a5977801e06123fc2ad570ae3fb60..4bf8f597d6d151c184764501a16b867b5f5537f6 100644 (file)
--- 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 bf458900964d6256cce0a9bf1e2c02811f20a5fd..bde17376ce5bc313e32605e761c2c72c2c288cee 100644 (file)
--- 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 227e83919e50ebd2202de5a811927180c9f7af85..2db52ce650b4c1a68ce278ac933200eaee6691fd 100644 (file)
--- 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 62dacd30fd3efae870c98609692c920796e464fa..44b2632fd385b44c94eaa3b136dc77b45ef8a6e7 100644 (file)
--- 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 1bb26484ab148c9196c58efdb1848772274d9c6c..2441ba56bbb03d6cead72dcf1c5f1a6e0af60da8 100644 (file)
--- 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 800d2cd67e33959d5e78b87a363537ccfd4cb086..bd10cdd05059fad1455609324b8eef2d35be05c4 100644 (file)
--- 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 4ed1513fac583b8c19780ff6ae48013b56cbeadb..12d5145727429bdf1d554cb9d3d7123ac8e3aab4 100644 (file)
--- 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 4e33482e10c5f91ff10aca2ac9e05b9bf63acbc9..24ecbe2516343bdc45f289baa9ac36d7fb630249 100644 (file)
--- 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 c0ab473c56d2157b67592c93ab89136672501b30..8990e83ccae6b23bd6ba125b1282333ee85d5a15 100644 (file)
--- 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 27286f0ca9268298aae512bc996aa243591041ba..79319e52cd9c5db33f88e89f314351ed439629c6 100644 (file)
--- 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 d988297784e61f79451828a9b6ee23300bc1bdc5..2324b4707440b17a5b7ab23cf5d0e6b1f12d7d0f 100644 (file)
--- 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 99123b70b3b1f4f39f1dc46f72394405ce5c00ec..d0603c926764426427f702a6fca9fe2db6c4ab61 100644 (file)
--- 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 bb75398a414b417fdd69eed8ab2ada0bf0212aa5..8ea93d2b0ae807a958830434e34a11745768df0e 100644 (file)
--- 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 137d0b91110c804f24b33e498dfea0f7c8cf0483..61be4a61abe87c3a0faf1bbc87e0a5fe5c0bf3e4 100644 (file)
--- 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 0fed79059f4148fc242b92e82d8ed23acec8b82b..2d8c8a2d74be9577c98e77d5ceb0cc13c2b0b0c4 100644 (file)
--- 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 9d5901d1755cc6c9f2c2b6155d877a1058accd90..452fa2a74a23e020e8332f3568581fd70a3ea89c 100644 (file)
--- 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 c2cbf8655a20481aeb704e6fe54b18994cf21f25..38fd98c7817ebecc3c6e0c17210250640207efd1 100644 (file)
--- 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>