Migrate to odlparent 2.0.0

In order to depend on fewer things,
most projects are temporarily removed.

What remains: distribution-version and restconf.

Change-Id: Ie3ca3ff097d46c7622571f3056cfae3859e6d45f
Signed-off-by: Vratko Polak <vrpolak@cisco.com>
Signed-off-by: Robert Varga <nite@hq.sk>

diff --git a/artifacts/all/pom.xml b/artifacts/all/pom.xml
index 08fb8670d0809cc9a74ae6d9be3b7bf013a8f7d7..5e5557a3ea31584e14eeb44f1860eaaab5f7d335 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>1.9.0</version>
+      <version>2.0.0</version>
       <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>

diff --git a/artifacts/distribution/pom.xml b/artifacts/distribution/pom.xml
index b2f75f0e40e970a6dac63daa2470981e5f70c616..d0af4f65ffe56f2bfa2b5fc1c4c6ec954a5abd90 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>1.9.0</version>
+      <version>2.0.0</version>
       <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
@@ -55,28 +55,6 @@
                 <type>xml</type>
                 <classifier>config</classifier>
             </dependency>
-            <!-- Karaf 3 features. -->
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>features3-distribution</artifactId>
-                <version>${project.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>features-integration-index</artifactId>
-                <version>${project.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>features-integration-test</artifactId>
-                <version>${project.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
             <!-- Karaf 4 single features. -->
             <dependency>
                 <groupId>${project.groupId}</groupId>

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index eddf22380413e0a2772833329658e90d3286d8c0..8470a028126533941379f8b7646f3c59ff3867af 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>1.9.0</version>
+        <version>2.0.0</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>

diff --git a/artifacts/upstream/all/pom.xml b/artifacts/upstream/all/pom.xml
index 50f2632efdd354bf22c044ea7e5204856ec9ef46..3e6ea46abf276dd97da35591546d2929915f608e 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>1.9.0</version>
+      <version>2.0.0</version>
       <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>

diff --git a/artifacts/upstream/artifacts/pom.xml b/artifacts/upstream/artifacts/pom.xml
index e213b39f54d84dfa1050ff846146732b0ae4ae55..be5c9e0fda57e05cc77f946bb91c3009c020b90d 100644 (file)
--- a/artifacts/upstream/artifacts/pom.xml
+++ b/artifacts/upstream/artifacts/pom.xml
@@ -57,6 +57,13 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                <groupId>org.opendaylight.netconf</groupId>
+                <artifactId>restconf-artifacts</artifactId>
+                <version>${restconf.version}</version>
+                <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 06e9e44e15b29b769103b5b5d05c75c7e3e64d3f..13d2f4d90af43dcc47eee2a89876e0f0852aec1f 100644 (file)
--- a/artifacts/upstream/feature-repos/pom.xml
+++ b/artifacts/upstream/feature-repos/pom.xml
@@ -41,170 +41,6 @@
     <dependencyManagement>
         <!-- User facing feature repositories. -->
         <dependencies>
-
-            <!-- AAA -->
-            <dependency>
-                <groupId>org.opendaylight.aaa</groupId>
-                <artifactId>features4-aaa</artifactId>
-                <version>${aaa.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.aaa</groupId>
-                <artifactId>features4-aaa-shiro</artifactId>
-                <version>${aaa.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-
-            <!-- Controller -->
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>features4-extras</artifactId>
-                <version>${controller.extras.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>features4-mdsal</artifactId>
-                <version>${mdsal.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>features4-mdsal-benchmark</artifactId>
-                <version>${benchmark.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-
-            <!-- Dlux -->
-            <!-- Commented out due to https://bugs.opendaylight.org/show_bug.cgi?id=8625
-            <dependency>
-                <groupId>org.opendaylight.dlux</groupId>
-                <artifactId>features4-dlux</artifactId>
-                <version>${dlux.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            -->
-
-            <!-- Dlux Apps -->
-            <!-- Commented out due to https://bugs.opendaylight.org/show_bug.cgi?id=8625
-            <dependency>
-                <groupId>org.opendaylight.dluxapps</groupId>
-                <artifactId>features4-dluxapps</artifactId>
-                <version>${dluxapps.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            -->
-
-            <!-- InfraUtils -->
-            <dependency>
-                <groupId>org.opendaylight.infrautils</groupId>
-                <artifactId>infrautils-features4</artifactId>
-                <version>${infrautils.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-
-            <!-- Netconf -->
-            <dependency>
-                <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>features4-netconf</artifactId>
-                <version>${netconf.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>features4-netconf-connector</artifactId>
-                <version>${netconf.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>features4-restconf</artifactId>
-                <version>${restconf.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-
-            <!-- ODL Parent -->
-            <dependency>
-                <groupId>org.opendaylight.odlparent</groupId>
-                <artifactId>features4-akka</artifactId>
-                <version>${odlparent.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.odlparent</groupId>
-                <artifactId>features4-odlparent</artifactId>
-                <version>${odlparent.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-
-            <!-- OpenFlow Plugin -->
-            <!-- Commented out due to https://bugs.opendaylight.org/show_bug.cgi?id=8625
-            <dependency>
-                <groupId>org.opendaylight.openflowplugin</groupId>
-                <artifactId>features4-openflowplugin</artifactId>
-                <version>${openflowplugin.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.openflowplugin</groupId>
-                <artifactId>features4-openflowplugin-he</artifactId>
-                <version>${openflowplugin.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.openflowplugin</groupId>
-                <artifactId>features4-openflowplugin-extension</artifactId>
-                <version>${openflowplugin.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.openflowplugin</groupId>
-                <artifactId>features4-openflowplugin-extension-he</artifactId>
-                <version>${openflowplugin.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            -->
-
-            <!-- SNMP -->
-            <!-- Commented out due to https://bugs.opendaylight.org/show_bug.cgi?id=8625
-            <dependency>
-                <groupId>org.opendaylight.snmp</groupId>
-                <artifactId>features4-snmp</artifactId>
-                <version>${snmp.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            -->
-
-            <!-- SXP -->
-            <!-- Commented out due to https://bugs.opendaylight.org/show_bug.cgi?id=8625
-            <dependency>
-                <groupId>org.opendaylight.sxp</groupId>
-                <artifactId>features4-sxp</artifactId>
-                <version>${sxp.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            -->
-
         </dependencies>
     </dependencyManagement>
 </project>

diff --git a/artifacts/upstream/pom.xml b/artifacts/upstream/pom.xml
index 75abff8365468d17c4fa18f9ed446dc61f7fa1b9..751b0f0c7b280e0d6a67b09dd04591f212e5b9e4 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>1.9.0</version>
+      <version>2.0.0</version>
       <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>

diff --git a/artifacts/upstream/properties/pom.xml b/artifacts/upstream/properties/pom.xml
index 548c716a77ed2fde5e6f805058b895408d5414ee..c48936d6d16859aaf838f9ee38e7d48ab0591152 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>1.9.0</version>
+        <version>2.0.0</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
@@ -76,7 +76,7 @@
         <nic.version>1.4.0-SNAPSHOT</nic.version>
         <neutron.version>0.9.0-SNAPSHOT</neutron.version>
         <ocpplugin.version>0.3.0-SNAPSHOT</ocpplugin.version>
-        <odlparent.version>1.9.0</odlparent.version>
+        <odlparent.version>2.0.0</odlparent.version>
         <of-config.version>1.3.0-SNAPSHOT</of-config.version>
         <openflowplugin.version>0.5.0-SNAPSHOT</openflowplugin.version>
         <ovsdb.version>1.5.0-SNAPSHOT</ovsdb.version>

diff --git a/artifacts/upstream/single-features/pom.xml b/artifacts/upstream/single-features/pom.xml
index df083d545349e36b21bf221f6f5d2017fff4dc2d..24211e32ba8d8792464f5bc8679d30f3b64ee0f2 100644 (file)
--- a/artifacts/upstream/single-features/pom.xml
+++ b/artifacts/upstream/single-features/pom.xml
@@ -41,95 +41,9 @@
         <dependencies>
             <!-- Non-user-facing single feature needed for Version. -->
 
-            <!-- Controller -->
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>odl-config-persister</artifactId>
-                <version>${config.version}</version>
-                <!-- TODO: Ask Controller to export this version in an artifact POM.-->
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-
             <!-- User facing single features. -->
             <!-- TODO: Open Bugs against projects to export user-facing single feature versions in artifact pom. -->
 
-            <!-- AAA -->
-            <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>
-
-            <!-- Dlux -->
-            <!-- Commented out due to https://bugs.opendaylight.org/show_bug.cgi?id=8625
-            <dependency>
-                <groupId>org.opendaylight.dlux</groupId>
-                <artifactId>odl-dlux-core</artifactId>
-                <version>${dlux.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            -->
-
-            <!-- Netconf -->
-            <dependency>
-                <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>odl-netconf-mdsal</artifactId>
-                <version>${mdsal.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.netconf</groupId>
-                <artifactId>odl-restconf</artifactId>
-                <version>${restconf.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-
-            <!-- OpenFlow Plugin -->
-            <!-- Commented out due to https://bugs.opendaylight.org/show_bug.cgi?id=8625
-            <dependency>
-                <groupId>org.opendaylight.openflowplugin</groupId>
-                <artifactId>odl-openflowplugin-flow-services-ui</artifactId>
-                <version>${openflowplugin.version}</version>
-                <type>xml</type>
-                <classifier>features</classifier>
-            </dependency>
-            -->
-
-            <!-- SNMP -->
-            <!-- Commented out due to https://bugs.opendaylight.org/show_bug.cgi?id=8625
-            <dependency>
-                <groupId>org.opendaylight.snmp</groupId>
-                <artifactId>odl-snmp-plugin</artifactId>
-                <version>${snmp.version}</version>
-                <type>xml</type>
-                <classifier>features</classifier>
-            </dependency>
-            -->
-
-            <!-- SXP -->
-            <!-- Commented out due to https://bugs.opendaylight.org/show_bug.cgi?id=8625
-            <dependency>
-                <groupId>org.opendaylight.sxp</groupId>
-                <artifactId>odl-sxp-controller</artifactId>
-                <version>${sxp.version}</version>
-                <type>xml</type>
-                <classifier>features</classifier>
-            </dependency>
-            -->
-
         </dependencies>
     </dependencyManagement>
 </project>

diff --git a/features/pom.xml b/features/pom.xml
index 0a56f0c4cf73b6c94969bb7ce3140de1fa9c69a1..1614154a363ba760257d09d003e53020bf6ab8f7 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>1.9.0</version>
+        <version>2.0.0</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>

diff --git a/features/repos/distribution/pom.xml b/features/repos/distribution/pom.xml
index 2a33e69ecb1b81f3eb3267a2b8b9ac701ca4ac4b..9156979d21466547a513745ffeb70f80f2ff4a16 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>1.9.0</version>
+        <version>2.0.0</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>

diff --git a/features/repos/index/pom.xml b/features/repos/index/pom.xml
index 6f10a3c00795ffaf896135e88abef0ec02309c9f..fd219fde8111918ea3094045ef00a6bb8c0af2ba 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>1.9.0</version>
+        <version>2.0.0</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
@@ -61,193 +61,31 @@
             <type>xml</type>
         </dependency>
 
-        <!-- Offset 0 -->
-
-        <!-- AAA -->
-        <dependency>
-            <groupId>org.opendaylight.aaa</groupId>
-            <artifactId>features4-aaa</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.aaa</groupId>
-            <artifactId>features4-aaa-shiro</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-
-        <!-- Controller -->
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>features4-extras</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>features4-mdsal</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>features4-mdsal-benchmark</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-
-        <!-- InfraUtils -->
-        <dependency>
-            <groupId>org.opendaylight.infrautils</groupId>
-            <artifactId>infrautils-features4</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-
-        <!-- FIXME: Add Mdsal -->
-
-        <!-- Netconf -->
-        <!-- Commented out due to https://bugs.opendaylight.org/show_bug.cgi?id=7891
-        <dependency>
-            <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>features4-netconf</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>features4-netconf-connector</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        -->
-        <dependency>
-            <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>features4-restconf</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
+        <!-- Offset 0, dependency order. -->
 
         <!-- ODL Parent -->
         <dependency>
             <groupId>org.opendaylight.odlparent</groupId>
-            <artifactId>features4-akka</artifactId>
+            <artifactId>features-akka</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.odlparent</groupId>
-            <artifactId>features4-odlparent</artifactId>
+            <artifactId>features-odlparent</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
 
-        <!-- FIXME: Add Yangtools -->
-
-        <!-- Higher offsets, temporarily removed due to Bug 8625 -->
-
-        <!-- BGPCEP -->
-        <!--
-        <dependency>
-            <groupId>org.opendaylight.bgpcep</groupId>
-            <artifactId>features4-bgp</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.bgpcep</groupId>
-            <artifactId>features4-bmp</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.bgpcep</groupId>
-            <artifactId>features4-bgpcep-extras</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.bgpcep</groupId>
-            <artifactId>features4-pcep</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.bgpcep</groupId>
-            <artifactId>features4-rsvp</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        -->
-
-        <!-- Dlux -->
-        <!--
-        <dependency>
-            <groupId>org.opendaylight.dlux</groupId>
-            <artifactId>features4-dlux</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        -->
-
-        <!-- Dlux Apps -->
-        <!--
-        <dependency>
-            <groupId>org.opendaylight.dluxapps</groupId>
-            <artifactId>features4-dluxapps</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        -->
-
-        <!-- OpenFlow Plugin -->
-        <!--
-        <dependency>
-            <groupId>org.opendaylight.openflowplugin</groupId>
-            <artifactId>features4-openflowplugin</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.openflowplugin</groupId>
-            <artifactId>features4-openflowplugin-he</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.openflowplugin</groupId>
-            <artifactId>features4-openflowplugin-extension</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.openflowplugin</groupId>
-            <artifactId>features4-openflowplugin-extension-he</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        -->
-
-        <!-- SNMP -->
-        <!--
+        <!-- Netconf -->
         <dependency>
-            <groupId>org.opendaylight.snmp</groupId>
-            <artifactId>features4-snmp</artifactId>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>features-restconf</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
-        -->
 
-        <!-- SXP -->
-        <!--
-        <dependency>
-            <groupId>org.opendaylight.sxp</groupId>
-            <artifactId>features4-sxp</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        -->
+        <!-- Higher offsets, temporarily removed due to Bug 8625 -->
 
     </dependencies>
 </project>

diff --git a/features/repos/pom.xml b/features/repos/pom.xml
index e71cfeecfa88a88dc4b6cc468aa946c1b8da3a49..9ab390df3bb008f462c742b3399f5ae8126d6f92 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>1.9.0</version>
+        <version>2.0.0</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>

diff --git a/features/repos/test/pom.xml b/features/repos/test/pom.xml
index 4a0536cf6822c9dff34ba6dff079a05468ae3986..70dfe64b859bd379bcb445ee4b51efdd3ccc3b87 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>1.9.0</version>
+        <version>2.0.0</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 b00a46056773d5a2db045653c2b026c088b08c1f..156ca3318cecf58cc872a55e0d345a2a6abedd87 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>1.9.0</version>
+        <version>2.0.0</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 d8ecd20f28149ace71684050f83ee7148fc23a76..386012659e277ef890b86524cdadd98eb6ae9567 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>1.9.0</version>
+        <version>2.0.0</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 e69f10f2b48dd9f76edba6ce7e04efcbdaaa61df..398d24ffe71711c216f6b16a5acf0a471d4c0f1e 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>1.9.0</version>
+        <version>2.0.0</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
@@ -51,8 +51,6 @@
         </dependencies>
     </dependencyManagement>
     <dependencies>
-        <!-- External single feature dependencies. -->
-
         <!-- Distribution -->
         <dependency>
             <groupId>${project.groupId}</groupId>
@@ -60,102 +58,12 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
-
-        <!-- AAA -->
-        <dependency>
-            <groupId>org.opendaylight.aaa</groupId>
-            <artifactId>odl-aaa-shiro</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-
-        <!-- BGPCEP -->
-        <!-- Commented out due to https://bugs.opendaylight.org/show_bug.cgi?id=8362
-        <dependency>
-            <groupId>org.opendaylight.bgpcep</groupId>
-            <artifactId>odl-bgpcep-bgp</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        -->
-        <!-- Commented out due to https://bugs.opendaylight.org/show_bug.cgi?id=8363
-        <dependency>
-            <groupId>org.opendaylight.bgpcep</groupId>
-            <artifactId>odl-bgpcep-bmp</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        -->
-        <!-- Commented out due to https://bugs.opendaylight.org/show_bug.cgi?id=8625
-        <dependency>
-            <groupId>org.opendaylight.bgpcep</groupId>
-            <artifactId>odl-bgpcep-pcep</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.bgpcep</groupId>
-            <artifactId>odl-bgpcep-rsvp</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        -->
-
-        <!-- Dlux -->
-        <!-- Commented out due to https://bugs.opendaylight.org/show_bug.cgi?id=8625
-        <dependency>
-            <groupId>org.opendaylight.dlux</groupId>
-            <artifactId>odl-dlux-core</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        -->
-
         <!-- Netconf -->
-        <!-- Commented out due to https://bugs.opendaylight.org/show_bug.cgi?id=7891
-        <dependency>
-            <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>odl-netconf-mdsal</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        -->
         <dependency>
             <groupId>org.opendaylight.netconf</groupId>
             <artifactId>odl-restconf</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
-
-        <!-- OpenFlow Plugin -->
-        <!-- Commented out due to https://bugs.opendaylight.org/show_bug.cgi?id=8625
-        <dependency>
-            <groupId>org.opendaylight.openflowplugin</groupId>
-            <artifactId>odl-openflowplugin-flow-services-ui</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        -->
-
-        <!-- SNMP -->
-        <!-- Commented out due to https://bugs.opendaylight.org/show_bug.cgi?id=8625
-        <dependency>
-            <groupId>org.opendaylight.snmp</groupId>
-            <artifactId>odl-snmp-plugin</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        -->
-
-        <!-- SXP -->
-        <!-- Commented out due to https://bugs.opendaylight.org/show_bug.cgi?id=8625
-        <dependency>
-            <groupId>org.opendaylight.sxp</groupId>
-            <artifactId>odl-sxp-controller</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        -->
-
     </dependencies>
 </project>

diff --git a/features/singles/pom.xml b/features/singles/pom.xml
index 73e9238469f28b453621c351cfb1122dcf1cb197..a7fa7a11665fb822dcb9ce3327f09801b61e5d7a 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>1.9.0</version>
+        <version>2.0.0</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>

diff --git a/karaf/pom.xml b/karaf/pom.xml
index 46a0b298efcb83aeb241feb64f26f49d83000821..87181edee501b57081c31e4a6029475dd45ecf55 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>1.9.0</version>
+        <version>2.0.0</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>

diff --git a/pom.xml b/pom.xml
index 51a9980df7c77d82c5d8bde3224178e7f323448b..8fb3aec0c497db5c78d6879c9454918b62e5e490 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.9.0</version>
+        <version>2.0.0</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>

diff --git a/version/pom.xml b/version/pom.xml
index 90f209faea9775a48a659e9de803d03234c458bb..6636c669a07a7ff14da6bfd81fc190dbf05a9fad 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>1.9.0</feature.odlparent.version>
+        <feature.odlparent.version>2.0.0</feature.odlparent.version>
     </properties>
 </project>