Flatten features/ hierarchy

The hierarchy is needlessly complex, flatten it before we start making
sense of the features themselves.

Change-Id: Ia8b4c4aaf2c71f4e14471294c1ea7a5f7df72889
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/features/algo/pom.xml b/features/algo/pom.xml
deleted file mode 100644 (file)
index 136cfa0..0000000
--- a/features/algo/pom.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2019 Orange Labs and others.  All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v1.0 which accompanies this distribution,
- and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.opendaylight.odlparent</groupId>
-        <artifactId>odlparent-lite</artifactId>
-        <version>13.0.3</version>
-        <relativePath/>
-    </parent>
-
-    <artifactId>features-aggregator-algo</artifactId>
-    <groupId>org.opendaylight.bgpcep</groupId>
-    <version>0.20.0-SNAPSHOT</version>
-    <packaging>pom</packaging>
-
-    <modules>
-        <module>features-algo</module>
-        <module>odl-bgpcep-algo-api</module>
-        <module>odl-bgpcep-algo</module>
-    </modules>
-
-    <properties>
-        <maven.deploy.skip>true</maven.deploy.skip>
-        <maven.install.skip>true</maven.install.skip>
-    </properties>
-</project>

diff --git a/features/bgp/pom.xml b/features/bgp/pom.xml
deleted file mode 100644 (file)
index 9bec032..0000000
--- a/features/bgp/pom.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
- Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v1.0 which accompanies this distribution,
- and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.opendaylight.odlparent</groupId>
-        <artifactId>odlparent-lite</artifactId>
-        <version>13.0.3</version>
-        <relativePath/>
-    </parent>
-
-    <groupId>org.opendaylight.bgpcep</groupId>
-    <artifactId>features-aggregator-bgp</artifactId>
-    <version>0.20.0-SNAPSHOT</version>
-    <packaging>pom</packaging>
-
-    <modules>
-        <module>features-bgp</module>
-        <module>odl-bgpcep-bgp</module>
-        <module>odl-bgpcep-bgp-dependencies</module>
-        <module>odl-bgpcep-bgp-config-example</module>
-        <module>odl-bgpcep-bgp-openconfig</module>
-        <module>odl-bgpcep-bgp-parser</module>
-        <module>odl-bgpcep-bgp-parser-api</module>
-        <module>odl-bgpcep-bgp-rib-api</module>
-        <module>odl-bgpcep-bgp-path-selection-mode</module>
-        <module>odl-bgpcep-bgp-rib-impl</module>
-        <module>odl-bgpcep-bgp-topology</module>
-        <module>odl-bgpcep-bgp-benchmark</module>
-        <module>odl-bgpcep-bgp-cli</module>
-        <module>odl-bgpcep-bgp-openconfig-state</module>
-        <module>odl-bgpcep-bgp-openconfig-rp-spi</module>
-        <module>odl-bgpcep-bgp-openconfig-rp-impl</module>
-        <module>odl-bgpcep-bgp-openconfig-rp-statement</module>
-        <!-- Family extensions -->
-        <module>odl-bgpcep-bgp-extensions-api</module>
-        <module>odl-bgpcep-bgp-inet</module>
-        <module>odl-bgpcep-bgp-linkstate</module>
-        <module>odl-bgpcep-bgp-flowspec</module>
-        <module>odl-bgpcep-bgp-labeled-unicast</module>
-        <module>odl-bgpcep-bgp-l3vpn</module>
-        <module>odl-bgpcep-bgp-evpn</module>
-        <module>odl-bgpcep-bgp-mvpn</module>
-        <module>odl-bgpcep-bgp-route-target</module>
-    </modules>
-
-    <properties>
-        <maven.deploy.skip>true</maven.deploy.skip>
-        <maven.install.skip>true</maven.install.skip>
-    </properties>
-</project>

diff --git a/features/bgpcep-extras/pom.xml b/features/bgpcep-extras/pom.xml
deleted file mode 100644 (file)
index 4bd99a6..0000000
--- a/features/bgpcep-extras/pom.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
-      Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v1.0 which accompanies this distribution,
- and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.opendaylight.odlparent</groupId>
-        <artifactId>odlparent-lite</artifactId>
-        <version>13.0.3</version>
-        <relativePath/>
-    </parent>
-
-    <groupId>org.opendaylight.bgpcep</groupId>
-    <artifactId>features-aggregator-bgpcep-extras</artifactId>
-    <version>0.20.0-SNAPSHOT</version>
-    <packaging>pom</packaging>
-
-    <modules>
-        <module>features-bgpcep-extras</module>
-        <module>odl-bgpcep-extras-dependencies</module>
-        <module>odl-bgpcep-data-change-counter</module>
-    </modules>
-
-    <properties>
-        <maven.deploy.skip>true</maven.deploy.skip>
-        <maven.install.skip>true</maven.install.skip>
-    </properties>
-</project>

diff --git a/features/bmp/pom.xml b/features/bmp/pom.xml
deleted file mode 100644 (file)
index 341fffa..0000000
--- a/features/bmp/pom.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2017 Cisco Systems, Inc. and others.  All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v1.0 which accompanies this distribution,
- and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.opendaylight.odlparent</groupId>
-        <artifactId>odlparent-lite</artifactId>
-        <version>13.0.3</version>
-        <relativePath/>
-    </parent>
-
-    <artifactId>features-aggregator-bmp</artifactId>
-    <groupId>org.opendaylight.bgpcep</groupId>
-    <version>0.20.0-SNAPSHOT</version>
-    <packaging>pom</packaging>
-
-    <modules>
-        <module>features-bmp</module>
-        <module>odl-bgpcep-bmp</module>
-        <module>odl-bgpcep-bmp-api</module>
-        <module>odl-bgpcep-bmp-config-example</module>
-    </modules>
-
-    <properties>
-        <maven.deploy.skip>true</maven.deploy.skip>
-        <maven.install.skip>true</maven.install.skip>
-    </properties>
-</project>

diff --git a/features/concepts/pom.xml b/features/concepts/pom.xml
deleted file mode 100644 (file)
index 7196f05..0000000
--- a/features/concepts/pom.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
-  Copyright (c) 2017 Pantheon Technologies s.r.o. and others.  All rights reserved.
-
-  This program and the accompanying materials are made available under the
-  terms of the Eclipse Public License v1.0 which accompanies this distribution,
-  and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.opendaylight.odlparent</groupId>
-        <artifactId>odlparent-lite</artifactId>
-        <version>13.0.3</version>
-        <relativePath/>
-    </parent>
-
-    <groupId>org.opendaylight.bgpcep</groupId>
-    <artifactId>features-aggregator-concepts</artifactId>
-    <version>0.20.0-SNAPSHOT</version>
-    <packaging>pom</packaging>
-
-    <modules>
-        <module>features-concepts</module>
-        <module>odl-bgpcep-concepts</module>
-    </modules>
-
-    <properties>
-        <maven.deploy.skip>true</maven.deploy.skip>
-        <maven.install.skip>true</maven.install.skip>
-    </properties>
-</project>

diff --git a/features/config-loader/pom.xml b/features/config-loader/pom.xml
deleted file mode 100644 (file)
index 5c6556f..0000000
--- a/features/config-loader/pom.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright (c) 2017 AT&T Intellectual Property.
-  ~ All rights reserved.
-  ~ This program and the accompanying materials are made available under the
-  ~ terms of the Eclipse Public License v1.0 which accompanies this distribution,
-  ~ and is available at http://www.eclipse.org/legal/epl-v10.html
-  -->
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.opendaylight.odlparent</groupId>
-        <artifactId>odlparent-lite</artifactId>
-        <version>13.0.3</version>
-        <relativePath/>
-    </parent>
-
-    <groupId>org.opendaylight.bgpcep</groupId>
-    <artifactId>features-aggregator-config-loader</artifactId>
-    <version>0.20.0-SNAPSHOT</version>
-    <packaging>pom</packaging>
-
-    <modules>
-        <module>features-config-loader</module>
-        <module>odl-bgpcep-config-loader-spi</module>
-        <module>odl-bgpcep-config-loader-impl</module>
-        <module>odl-bgpcep-topology-config-loader</module>
-        <module>odl-bgpcep-protocols-config-loader</module>
-        <module>odl-bgpcep-bmp-config-loader</module>
-        <module>odl-bgpcep-routing-policy-config-loader</module>
-    </modules>
-
-    <properties>
-        <maven.deploy.skip>true</maven.deploy.skip>
-        <maven.install.skip>true</maven.install.skip>
-    </properties>
-</project>

diff --git a/features/algo/features-algo/pom.xml b/features/features-algo/pom.xml
similarity index 96%
rename from features/algo/features-algo/pom.xml
rename to features/features-algo/pom.xml
index e77e9727bec1e6b1471230e00baf1da428f0643a..14d9c1cafc7324fa045ad63e3e6d46109da0d5a2 100644 (file)
--- a/features/algo/features-algo/pom.xml
+++ b/features/features-algo/pom.xml
@@ -14,7 +14,7 @@
         <groupId>org.opendaylight.bgpcep</groupId>
         <artifactId>feature-repo-parent</artifactId>
         <version>0.20.0-SNAPSHOT</version>
-        <relativePath>../../../feature-repo-parent</relativePath>
+        <relativePath>../../feature-repo-parent</relativePath>
     </parent>
 
     <artifactId>features-algo</artifactId>

diff --git a/features/bgp/features-bgp/pom.xml b/features/features-bgp/pom.xml
similarity index 99%
rename from features/bgp/features-bgp/pom.xml
rename to features/features-bgp/pom.xml
index afc0fbf41b79adb7a92e1cb3198814af8cce1732..48e106f1660d4c9cca046422b0f819cfe180d2ef 100644 (file)
--- a/features/bgp/features-bgp/pom.xml
+++ b/features/features-bgp/pom.xml
@@ -14,7 +14,7 @@
         <groupId>org.opendaylight.bgpcep</groupId>
         <artifactId>feature-repo-parent</artifactId>
         <version>0.20.0-SNAPSHOT</version>
-        <relativePath>../../../feature-repo-parent</relativePath>
+        <relativePath>../../feature-repo-parent</relativePath>
     </parent>
 
     <artifactId>features-bgp</artifactId>

diff --git a/features/bgpcep-extras/features-bgpcep-extras/pom.xml b/features/features-bgpcep-extras/pom.xml
similarity index 95%
rename from features/bgpcep-extras/features-bgpcep-extras/pom.xml
rename to features/features-bgpcep-extras/pom.xml
index 5fcd0b6e375d5408dfc0b59273cfafb8c486caf6..866082b49ba272dc77753314998d859836f3ec25 100644 (file)
--- a/features/bgpcep-extras/features-bgpcep-extras/pom.xml
+++ b/features/features-bgpcep-extras/pom.xml
@@ -14,7 +14,7 @@
         <groupId>org.opendaylight.bgpcep</groupId>
         <artifactId>feature-repo-parent</artifactId>
         <version>0.20.0-SNAPSHOT</version>
-        <relativePath>../../../feature-repo-parent</relativePath>
+        <relativePath>../../feature-repo-parent</relativePath>
     </parent>
 
     <artifactId>features-bgpcep-extras</artifactId>

diff --git a/features/bmp/features-bmp/pom.xml b/features/features-bmp/pom.xml
similarity index 95%
rename from features/bmp/features-bmp/pom.xml
rename to features/features-bmp/pom.xml
index 17c54b05aea54294f265e20802ceea734fc80638..480db1332a2d15783388fa616c5dee052698a154 100644 (file)
--- a/features/bmp/features-bmp/pom.xml
+++ b/features/features-bmp/pom.xml
@@ -14,7 +14,7 @@
         <groupId>org.opendaylight.bgpcep</groupId>
         <artifactId>feature-repo-parent</artifactId>
         <version>0.20.0-SNAPSHOT</version>
-        <relativePath>../../../feature-repo-parent</relativePath>
+        <relativePath>../../feature-repo-parent</relativePath>
     </parent>
 
     <artifactId>features-bmp</artifactId>

diff --git a/features/concepts/features-concepts/pom.xml b/features/features-concepts/pom.xml
similarity index 93%
rename from features/concepts/features-concepts/pom.xml
rename to features/features-concepts/pom.xml
index 769a447976798d8c928ca445e99decb79de6cac3..61ee6a5fbaf88933656f7acabfb2520e6c5662bd 100644 (file)
--- a/features/concepts/features-concepts/pom.xml
+++ b/features/features-concepts/pom.xml
@@ -15,7 +15,7 @@
         <groupId>org.opendaylight.bgpcep</groupId>
         <artifactId>feature-repo-parent</artifactId>
         <version>0.20.0-SNAPSHOT</version>
-        <relativePath>../../../feature-repo-parent</relativePath>
+        <relativePath>../../feature-repo-parent</relativePath>
     </parent>
 
     <artifactId>features-concepts</artifactId>

diff --git a/features/config-loader/features-config-loader/pom.xml b/features/features-config-loader/pom.xml
similarity index 96%
rename from features/config-loader/features-config-loader/pom.xml
rename to features/features-config-loader/pom.xml
index e8e62c93708aa22c5bdb4cebcb6b2fec58f6cac6..948b06829cb2704fb17427f9041f939895bbb481 100644 (file)
--- a/features/config-loader/features-config-loader/pom.xml
+++ b/features/features-config-loader/pom.xml
@@ -15,7 +15,7 @@
         <groupId>org.opendaylight.bgpcep</groupId>
         <artifactId>feature-repo-parent</artifactId>
         <version>0.20.0-SNAPSHOT</version>
-        <relativePath>../../../feature-repo-parent</relativePath>
+        <relativePath>../../feature-repo-parent</relativePath>
     </parent>
 
     <artifactId>features-config-loader</artifactId>

diff --git a/features/graph/features-graph/pom.xml b/features/features-graph/pom.xml
similarity index 95%
rename from features/graph/features-graph/pom.xml
rename to features/features-graph/pom.xml
index 5e73f6df794427bb24f3e9b79c4856535e390a72..383991ac169bc457a56f4b1f6aefeb1b5a46196f 100644 (file)
--- a/features/graph/features-graph/pom.xml
+++ b/features/features-graph/pom.xml
@@ -14,7 +14,7 @@
         <groupId>org.opendaylight.bgpcep</groupId>
         <artifactId>feature-repo-parent</artifactId>
         <version>0.20.0-SNAPSHOT</version>
-        <relativePath>../../../feature-repo-parent</relativePath>
+        <relativePath>../../feature-repo-parent</relativePath>
     </parent>
 
     <artifactId>features-graph</artifactId>

diff --git a/features/pcep/features-pcep/pom.xml b/features/features-pcep/pom.xml
similarity index 98%
rename from features/pcep/features-pcep/pom.xml
rename to features/features-pcep/pom.xml
index 7268cfb666fab7001e0ee891e0b57ffdbf04c9ff..f6bc3541566a796feb777969d212dab93b7a058f 100644 (file)
--- a/features/pcep/features-pcep/pom.xml
+++ b/features/features-pcep/pom.xml
@@ -14,7 +14,7 @@
         <groupId>org.opendaylight.bgpcep</groupId>
         <artifactId>feature-repo-parent</artifactId>
         <version>0.20.0-SNAPSHOT</version>
-        <relativePath>../../../feature-repo-parent</relativePath>
+        <relativePath>../../feature-repo-parent</relativePath>
     </parent>
 
     <artifactId>features-pcep</artifactId>

diff --git a/features/rsvp/features-rsvp/pom.xml b/features/features-rsvp/pom.xml
similarity index 95%
rename from features/rsvp/features-rsvp/pom.xml
rename to features/features-rsvp/pom.xml
index a8a5b84b91842830aabb150115ca7a0f542deb44..7cc23dc6fe78efe13d4b6a2d49e98920916726b9 100644 (file)
--- a/features/rsvp/features-rsvp/pom.xml
+++ b/features/features-rsvp/pom.xml
@@ -14,7 +14,7 @@
         <groupId>org.opendaylight.bgpcep</groupId>
         <artifactId>feature-repo-parent</artifactId>
         <version>0.20.0-SNAPSHOT</version>
-        <relativePath>../../../feature-repo-parent</relativePath>
+        <relativePath>../../feature-repo-parent</relativePath>
     </parent>
 
     <artifactId>features-rsvp</artifactId>

diff --git a/features/topology/features-topology/pom.xml b/features/features-topology/pom.xml
similarity index 95%
rename from features/topology/features-topology/pom.xml
rename to features/features-topology/pom.xml
index 289aae64dc1b089e4a97a0f201c47a79ef8e5b7b..c59efb26e1db0d31f86358d330ebbaa4b405e7b1 100644 (file)
--- a/features/topology/features-topology/pom.xml
+++ b/features/features-topology/pom.xml
@@ -15,7 +15,7 @@
         <groupId>org.opendaylight.bgpcep</groupId>
         <artifactId>feature-repo-parent</artifactId>
         <version>0.20.0-SNAPSHOT</version>
-        <relativePath>../../../feature-repo-parent</relativePath>
+        <relativePath>../../feature-repo-parent</relativePath>
     </parent>
 
     <artifactId>features-topology</artifactId>

diff --git a/features/graph/pom.xml b/features/graph/pom.xml
deleted file mode 100644 (file)
index 64d9c1a..0000000
--- a/features/graph/pom.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2019 Orange Labs and others.  All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v1.0 which accompanies this distribution,
- and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.opendaylight.odlparent</groupId>
-        <artifactId>odlparent-lite</artifactId>
-        <version>13.0.3</version>
-        <relativePath/>
-    </parent>
-
-    <artifactId>features-aggregator-graph</artifactId>
-    <groupId>org.opendaylight.bgpcep</groupId>
-    <version>0.20.0-SNAPSHOT</version>
-    <packaging>pom</packaging>
-
-    <modules>
-        <module>features-graph</module>
-        <module>odl-bgpcep-graph-api</module>
-        <module>odl-bgpcep-graph</module>
-    </modules>
-
-    <properties>
-        <maven.deploy.skip>true</maven.deploy.skip>
-        <maven.install.skip>true</maven.install.skip>
-    </properties>
-</project>

diff --git a/features/algo/odl-bgpcep-algo-api/pom.xml b/features/odl-bgpcep-algo-api/pom.xml
similarity index 95%
rename from features/algo/odl-bgpcep-algo-api/pom.xml
rename to features/odl-bgpcep-algo-api/pom.xml
index 2e02e91352506c176c8ff1df90b7ced048c1d89d..250c5f68e2e30f716810a04d39f46828938412b1 100644 (file)
--- a/features/algo/odl-bgpcep-algo-api/pom.xml
+++ b/features/odl-bgpcep-algo-api/pom.xml
@@ -14,7 +14,7 @@
         <groupId>org.opendaylight.bgpcep</groupId>
         <artifactId>single-feature-parent</artifactId>
         <version>0.20.0-SNAPSHOT</version>
-        <relativePath>../../../single-feature-parent</relativePath>
+        <relativePath>../../single-feature-parent</relativePath>
     </parent>
 
     <artifactId>odl-bgpcep-algo-api</artifactId>

diff --git a/features/algo/odl-bgpcep-algo/pom.xml b/features/odl-bgpcep-algo/pom.xml
similarity index 95%
rename from features/algo/odl-bgpcep-algo/pom.xml
rename to features/odl-bgpcep-algo/pom.xml
index fbe1a88e9d7e18595c6eab9f7d5ca0d5e665a693..754bdd634b75ed81b05e4d8c5088b8c2c9afe910 100644 (file)
--- a/features/algo/odl-bgpcep-algo/pom.xml
+++ b/features/odl-bgpcep-algo/pom.xml
@@ -14,7 +14,7 @@
         <groupId>org.opendaylight.bgpcep</groupId>
         <artifactId>single-feature-parent</artifactId>
         <version>0.20.0-SNAPSHOT</version>
-        <relativePath>../../../single-feature-parent</relativePath>
+        <relativePath>../../single-feature-parent</relativePath>
     </parent>
 
     <artifactId>odl-bgpcep-algo</artifactId>

diff --git a/features/bgp/odl-bgpcep-bgp-benchmark/pom.xml b/features/odl-bgpcep-bgp-benchmark/pom.xml
similarity index 96%
rename from features/bgp/odl-bgpcep-bgp-benchmark/pom.xml
rename to features/odl-bgpcep-bgp-benchmark/pom.xml
index 9b141696792019129ace2aa0d3edec465a55a554..20f7caad6b061b1e4525fffe5c1a62dcd50ebe36 100644 (file)
--- a/features/bgp/odl-bgpcep-bgp-benchmark/pom.xml
+++ b/features/odl-bgpcep-bgp-benchmark/pom.xml
@@ -14,7 +14,7 @@
         <groupId>org.opendaylight.bgpcep</groupId>
         <artifactId>single-feature-parent</artifactId>
         <version>0.20.0-SNAPSHOT</version>
-        <relativePath>../../../single-feature-parent</relativePath>
+        <relativePath>../../single-feature-parent</relativePath>
     </parent>
 
     <artifactId>odl-bgpcep-bgp-benchmark</artifactId>

diff --git a/features/bgp/odl-bgpcep-bgp-benchmark/src/main/feature/feature.xml b/features/odl-bgpcep-bgp-benchmark/src/main/feature/feature.xml
similarity index 100%
rename from features/bgp/odl-bgpcep-bgp-benchmark/src/main/feature/feature.xml
rename to features/odl-bgpcep-bgp-benchmark/src/main/feature/feature.xml

diff --git a/features/bgp/odl-bgpcep-bgp-cli/pom.xml b/features/odl-bgpcep-bgp-cli/pom.xml
similarity index 95%
rename from features/bgp/odl-bgpcep-bgp-cli/pom.xml
rename to features/odl-bgpcep-bgp-cli/pom.xml
index 46c0b508b386be1cc408b007b12ea774a60e882d..d36f71610139303915def1ef1c575b5dfcb52734 100644 (file)
--- a/features/bgp/odl-bgpcep-bgp-cli/pom.xml
+++ b/features/odl-bgpcep-bgp-cli/pom.xml
@@ -14,7 +14,7 @@
         <groupId>org.opendaylight.bgpcep</groupId>
         <artifactId>single-feature-parent</artifactId>
         <version>0.20.0-SNAPSHOT</version>
-        <relativePath>../../../single-feature-parent</relativePath>
+        <relativePath>../../single-feature-parent</relativePath>
     </parent>
 
     <artifactId>odl-bgpcep-bgp-cli</artifactId>

diff --git a/features/bgp/odl-bgpcep-bgp-config-example/pom.xml b/features/odl-bgpcep-bgp-config-example/pom.xml
similarity index 95%
rename from features/bgp/odl-bgpcep-bgp-config-example/pom.xml
rename to features/odl-bgpcep-bgp-config-example/pom.xml
index fa7dce2ed6614f07b841d272f428e520c7100937..ca8b144c7c5fe2be6394ae6e67ac11046e1c55a2 100644 (file)
--- a/features/bgp/odl-bgpcep-bgp-config-example/pom.xml
+++ b/features/odl-bgpcep-bgp-config-example/pom.xml
@@ -14,7 +14,7 @@
         <groupId>org.opendaylight.bgpcep</groupId>
         <artifactId>single-feature-parent</artifactId>
         <version>0.20.0-SNAPSHOT</version>
-        <relativePath>../../../single-feature-parent</relativePath>
+        <relativePath>../../single-feature-parent</relativePath>
     </parent>
 
     <artifactId>odl-bgpcep-bgp-config-example</artifactId>

diff --git a/features/bgp/odl-bgpcep-bgp-config-example/src/main/feature/feature.xml b/features/odl-bgpcep-bgp-config-example/src/main/feature/feature.xml
similarity index 100%
rename from features/bgp/odl-bgpcep-bgp-config-example/src/main/feature/feature.xml
rename to features/odl-bgpcep-bgp-config-example/src/main/feature/feature.xml

diff --git a/features/bgp/odl-bgpcep-bgp-dependencies/pom.xml b/features/odl-bgpcep-bgp-dependencies/pom.xml
similarity index 95%
rename from features/bgp/odl-bgpcep-bgp-dependencies/pom.xml
rename to features/odl-bgpcep-bgp-dependencies/pom.xml
index 5889833cf07a670865da6bfb78673d86e27d894f..82736457240b3d114844cc6fcd2fa27db8e5b71c 100644 (file)
--- a/features/bgp/odl-bgpcep-bgp-dependencies/pom.xml
+++ b/features/odl-bgpcep-bgp-dependencies/pom.xml
@@ -14,7 +14,7 @@
         <groupId>org.opendaylight.bgpcep</groupId>
         <artifactId>single-feature-parent</artifactId>
         <version>0.20.0-SNAPSHOT</version>
-        <relativePath>../../../single-feature-parent</relativePath>
+        <relativePath>../../single-feature-parent</relativePath>
     </parent>
 
 

diff --git a/features/bgp/odl-bgpcep-bgp-dependencies/src/main/feature/feature.xml b/features/odl-bgpcep-bgp-dependencies/src/main/feature/feature.xml
similarity index 100%
rename from features/bgp/odl-bgpcep-bgp-dependencies/src/main/feature/feature.xml
rename to features/odl-bgpcep-bgp-dependencies/src/main/feature/feature.xml

diff --git a/features/bgp/odl-bgpcep-bgp-evpn/pom.xml b/features/odl-bgpcep-bgp-evpn/pom.xml
similarity index 96%
rename from features/bgp/odl-bgpcep-bgp-evpn/pom.xml
rename to features/odl-bgpcep-bgp-evpn/pom.xml
index cc2adf10e726c7298a62bee58f8b3d0623508dec..9d10fc6f749adc65cc547e3887ec9e954dca1298 100644 (file)
--- a/features/bgp/odl-bgpcep-bgp-evpn/pom.xml
+++ b/features/odl-bgpcep-bgp-evpn/pom.xml
@@ -14,7 +14,7 @@
         <groupId>org.opendaylight.bgpcep</groupId>
         <artifactId>single-feature-parent</artifactId>
         <version>0.20.0-SNAPSHOT</version>
-        <relativePath>../../../single-feature-parent</relativePath>
+        <relativePath>../../single-feature-parent</relativePath>
     </parent>
 
     <artifactId>odl-bgpcep-bgp-evpn</artifactId>

diff --git a/features/bgp/odl-bgpcep-bgp-evpn/src/main/feature/feature.xml b/features/odl-bgpcep-bgp-evpn/src/main/feature/feature.xml
similarity index 100%
rename from features/bgp/odl-bgpcep-bgp-evpn/src/main/feature/feature.xml
rename to features/odl-bgpcep-bgp-evpn/src/main/feature/feature.xml

diff --git a/features/bgp/odl-bgpcep-bgp-extensions-api/pom.xml b/features/odl-bgpcep-bgp-extensions-api/pom.xml
similarity index 95%
rename from features/bgp/odl-bgpcep-bgp-extensions-api/pom.xml
rename to features/odl-bgpcep-bgp-extensions-api/pom.xml
index 37100f2424eb724e6db7a457321b97e63ca81916..a40ba5232d14e808c3554c6c65ab49ff9c4c1de4 100644 (file)
--- a/features/bgp/odl-bgpcep-bgp-extensions-api/pom.xml
+++ b/features/odl-bgpcep-bgp-extensions-api/pom.xml
@@ -14,7 +14,7 @@
         <groupId>org.opendaylight.bgpcep</groupId>
         <artifactId>single-feature-parent</artifactId>
         <version>0.20.0-SNAPSHOT</version>
-        <relativePath>../../../single-feature-parent</relativePath>
+        <relativePath>../../single-feature-parent</relativePath>
     </parent>
 
     <artifactId>odl-bgpcep-bgp-extensions-api</artifactId>

diff --git a/features/bgp/odl-bgpcep-bgp-flowspec/pom.xml b/features/odl-bgpcep-bgp-flowspec/pom.xml
similarity index 96%
rename from features/bgp/odl-bgpcep-bgp-flowspec/pom.xml
rename to features/odl-bgpcep-bgp-flowspec/pom.xml
index 5371a7760433c49f4a9935389ac5c8c0e7af5215..5c6538aa013c98b9e6c5e2512ee954719ce9f424 100644 (file)
--- a/features/bgp/odl-bgpcep-bgp-flowspec/pom.xml
+++ b/features/odl-bgpcep-bgp-flowspec/pom.xml
@@ -14,7 +14,7 @@
         <groupId>org.opendaylight.bgpcep</groupId>
         <artifactId>single-feature-parent</artifactId>
         <version>0.20.0-SNAPSHOT</version>
-        <relativePath>../../../single-feature-parent</relativePath>
+        <relativePath>../../single-feature-parent</relativePath>
     </parent>
 
     <artifactId>odl-bgpcep-bgp-flowspec</artifactId>

diff --git a/features/bgp/odl-bgpcep-bgp-inet/pom.xml b/features/odl-bgpcep-bgp-inet/pom.xml
similarity index 95%
rename from features/bgp/odl-bgpcep-bgp-inet/pom.xml
rename to features/odl-bgpcep-bgp-inet/pom.xml
index 62f2c862a332ab66d580885d0d0b2f73f68a94a8..b7fa68a63be9d7f18659663bf18d3a205b1da07c 100644 (file)
--- a/features/bgp/odl-bgpcep-bgp-inet/pom.xml
+++ b/features/odl-bgpcep-bgp-inet/pom.xml
@@ -14,7 +14,7 @@
         <groupId>org.opendaylight.bgpcep</groupId>
         <artifactId>single-feature-parent</artifactId>
         <version>0.20.0-SNAPSHOT</version>
-        <relativePath>../../../single-feature-parent</relativePath>
+        <relativePath>../../single-feature-parent</relativePath>
     </parent>
 
     <artifactId>odl-bgpcep-bgp-inet</artifactId>

diff --git a/features/bgp/odl-bgpcep-bgp-l3vpn/pom.xml b/features/odl-bgpcep-bgp-l3vpn/pom.xml
similarity index 96%
rename from features/bgp/odl-bgpcep-bgp-l3vpn/pom.xml
rename to features/odl-bgpcep-bgp-l3vpn/pom.xml
index 04f5181232beecbd1dd31fc563902016d86294e0..4303a8af5d1a75c8dc1238c96d54cef06b3612d1 100644 (file)
--- a/features/bgp/odl-bgpcep-bgp-l3vpn/pom.xml
+++ b/features/odl-bgpcep-bgp-l3vpn/pom.xml
@@ -14,7 +14,7 @@
         <groupId>org.opendaylight.bgpcep</groupId>
         <artifactId>single-feature-parent</artifactId>
         <version>0.20.0-SNAPSHOT</version>
-        <relativePath>../../../single-feature-parent</relativePath>
+        <relativePath>../../single-feature-parent</relativePath>
     </parent>
 
     <artifactId>odl-bgpcep-bgp-l3vpn</artifactId>

diff --git a/features/bgp/odl-bgpcep-bgp-labeled-unicast/pom.xml b/features/odl-bgpcep-bgp-labeled-unicast/pom.xml
similarity index 96%
rename from features/bgp/odl-bgpcep-bgp-labeled-unicast/pom.xml
rename to features/odl-bgpcep-bgp-labeled-unicast/pom.xml
index cd15b8deb16beb64cbb5b3d9f248d19bd95557e0..37baae33dfd4353e13c663602b8260faf4b5a7c5 100644 (file)
--- a/features/bgp/odl-bgpcep-bgp-labeled-unicast/pom.xml
+++ b/features/odl-bgpcep-bgp-labeled-unicast/pom.xml
@@ -14,7 +14,7 @@
         <groupId>org.opendaylight.bgpcep</groupId>
         <artifactId>single-feature-parent</artifactId>
         <version>0.20.0-SNAPSHOT</version>
-        <relativePath>../../../single-feature-parent</relativePath>
+        <relativePath>../../single-feature-parent</relativePath>
     </parent>
 
     <artifactId>odl-bgpcep-bgp-labeled-unicast</artifactId>

diff --git a/features/bgp/odl-bgpcep-bgp-labeled-unicast/src/main/feature/feature.xml b/features/odl-bgpcep-bgp-labeled-unicast/src/main/feature/feature.xml
similarity index 100%
rename from features/bgp/odl-bgpcep-bgp-labeled-unicast/src/main/feature/feature.xml
rename to features/odl-bgpcep-bgp-labeled-unicast/src/main/feature/feature.xml

diff --git a/features/bgp/odl-bgpcep-bgp-linkstate/pom.xml b/features/odl-bgpcep-bgp-linkstate/pom.xml
similarity index 96%
rename from features/bgp/odl-bgpcep-bgp-linkstate/pom.xml
rename to features/odl-bgpcep-bgp-linkstate/pom.xml
index d0d352b7b96d545c77bcbe3b8d727f0d9e3ac68a..ce4b118c2220c4e7e6cbbfb588e79a0ba64fb429 100644 (file)
--- a/features/bgp/odl-bgpcep-bgp-linkstate/pom.xml
+++ b/features/odl-bgpcep-bgp-linkstate/pom.xml
@@ -14,7 +14,7 @@
         <groupId>org.opendaylight.bgpcep</groupId>
         <artifactId>single-feature-parent</artifactId>
         <version>0.20.0-SNAPSHOT</version>
-        <relativePath>../../../single-feature-parent</relativePath>
+        <relativePath>../../single-feature-parent</relativePath>
     </parent>
 
     <artifactId>odl-bgpcep-bgp-linkstate</artifactId>

diff --git a/features/bgp/odl-bgpcep-bgp-linkstate/src/main/feature/feature.xml b/features/odl-bgpcep-bgp-linkstate/src/main/feature/feature.xml
similarity index 100%
rename from features/bgp/odl-bgpcep-bgp-linkstate/src/main/feature/feature.xml
rename to features/odl-bgpcep-bgp-linkstate/src/main/feature/feature.xml

diff --git a/features/bgp/odl-bgpcep-bgp-mvpn/pom.xml b/features/odl-bgpcep-bgp-mvpn/pom.xml
similarity index 95%
rename from features/bgp/odl-bgpcep-bgp-mvpn/pom.xml
rename to features/odl-bgpcep-bgp-mvpn/pom.xml
index 7275abe3ea9674496772c76ab4b81bb7c968a667..16e910db07f3fd0cebf98ed382ce26feab051ec9 100644 (file)
--- a/features/bgp/odl-bgpcep-bgp-mvpn/pom.xml
+++ b/features/odl-bgpcep-bgp-mvpn/pom.xml
@@ -14,7 +14,7 @@
         <groupId>org.opendaylight.bgpcep</groupId>
         <artifactId>single-feature-parent</artifactId>
         <version>0.20.0-SNAPSHOT</version>
-        <relativePath>../../../single-feature-parent</relativePath>
+        <relativePath>../../single-feature-parent</relativePath>
     </parent>
 
     <artifactId>odl-bgpcep-bgp-mvpn</artifactId>

diff --git a/features/bgp/odl-bgpcep-bgp-openconfig-rp-impl/pom.xml b/features/odl-bgpcep-bgp-openconfig-rp-impl/pom.xml
similarity index 96%
rename from features/bgp/odl-bgpcep-bgp-openconfig-rp-impl/pom.xml
rename to features/odl-bgpcep-bgp-openconfig-rp-impl/pom.xml
index c6a670c818c0df083f621b0ae1325d931b8f3f69..bb8b6cd1549d5a5fdb55e42717608d7e186068dd 100644 (file)
--- a/features/bgp/odl-bgpcep-bgp-openconfig-rp-impl/pom.xml
+++ b/features/odl-bgpcep-bgp-openconfig-rp-impl/pom.xml
@@ -14,7 +14,7 @@
         <groupId>org.opendaylight.bgpcep</groupId>
         <artifactId>single-feature-parent</artifactId>
         <version>0.20.0-SNAPSHOT</version>
-        <relativePath>../../../single-feature-parent</relativePath>
+        <relativePath>../../single-feature-parent</relativePath>
     </parent>
 
     <artifactId>odl-bgpcep-bgp-openconfig-rp-impl</artifactId>

diff --git a/features/bgp/odl-bgpcep-bgp-openconfig-rp-impl/src/main/feature/feature.xml b/features/odl-bgpcep-bgp-openconfig-rp-impl/src/main/feature/feature.xml
similarity index 100%
rename from features/bgp/odl-bgpcep-bgp-openconfig-rp-impl/src/main/feature/feature.xml
rename to features/odl-bgpcep-bgp-openconfig-rp-impl/src/main/feature/feature.xml

diff --git a/features/bgp/odl-bgpcep-bgp-openconfig-rp-spi/pom.xml b/features/odl-bgpcep-bgp-openconfig-rp-spi/pom.xml
similarity index 94%
rename from features/bgp/odl-bgpcep-bgp-openconfig-rp-spi/pom.xml
rename to features/odl-bgpcep-bgp-openconfig-rp-spi/pom.xml
index f50b4045459ac026bc178400e26d148bbbc66324..c94c9c431b4b402a5a48cdf0bb8598bd9bcf682d 100644 (file)
--- a/features/bgp/odl-bgpcep-bgp-openconfig-rp-spi/pom.xml
+++ b/features/odl-bgpcep-bgp-openconfig-rp-spi/pom.xml
@@ -14,7 +14,7 @@
         <groupId>org.opendaylight.bgpcep</groupId>
         <artifactId>single-feature-parent</artifactId>
         <version>0.20.0-SNAPSHOT</version>
-        <relativePath>../../../single-feature-parent</relativePath>
+        <relativePath>../../single-feature-parent</relativePath>
     </parent>
 
     <artifactId>odl-bgpcep-bgp-openconfig-rp-spi</artifactId>

diff --git a/features/bgp/odl-bgpcep-bgp-openconfig-rp-statement/pom.xml b/features/odl-bgpcep-bgp-openconfig-rp-statement/pom.xml
similarity index 95%
rename from features/bgp/odl-bgpcep-bgp-openconfig-rp-statement/pom.xml
rename to features/odl-bgpcep-bgp-openconfig-rp-statement/pom.xml
index 4a921d1bf55f8bdda10096ad5e535f168718847b..14c94c559f04cf349acaefe2848882e1502e4fb5 100644 (file)
--- a/features/bgp/odl-bgpcep-bgp-openconfig-rp-statement/pom.xml
+++ b/features/odl-bgpcep-bgp-openconfig-rp-statement/pom.xml
@@ -14,7 +14,7 @@
         <groupId>org.opendaylight.bgpcep</groupId>
         <artifactId>single-feature-parent</artifactId>
         <version>0.20.0-SNAPSHOT</version>
-        <relativePath>../../../single-feature-parent</relativePath>
+        <relativePath>../../single-feature-parent</relativePath>
     </parent>
 
     <artifactId>odl-bgpcep-bgp-openconfig-rp-statement</artifactId>

diff --git a/features/bgp/odl-bgpcep-bgp-openconfig-rp-statement/src/main/feature/feature.xml b/features/odl-bgpcep-bgp-openconfig-rp-statement/src/main/feature/feature.xml
similarity index 100%
rename from features/bgp/odl-bgpcep-bgp-openconfig-rp-statement/src/main/feature/feature.xml
rename to features/odl-bgpcep-bgp-openconfig-rp-statement/src/main/feature/feature.xml

diff --git a/features/bgp/odl-bgpcep-bgp-openconfig-state/pom.xml b/features/odl-bgpcep-bgp-openconfig-state/pom.xml
similarity index 95%
rename from features/bgp/odl-bgpcep-bgp-openconfig-state/pom.xml
rename to features/odl-bgpcep-bgp-openconfig-state/pom.xml
index 1be31493d2db030562bf820fd65b539548acc6b8..b13bed2fff3635be6e15a7b2296b3e596acc147c 100644 (file)
--- a/features/bgp/odl-bgpcep-bgp-openconfig-state/pom.xml
+++ b/features/odl-bgpcep-bgp-openconfig-state/pom.xml
@@ -14,7 +14,7 @@
         <groupId>org.opendaylight.bgpcep</groupId>
         <artifactId>single-feature-parent</artifactId>
         <version>0.20.0-SNAPSHOT</version>
-        <relativePath>../../../single-feature-parent</relativePath>
+        <relativePath>../../single-feature-parent</relativePath>
     </parent>
 
     <artifactId>odl-bgpcep-bgp-openconfig-state</artifactId>

diff --git a/features/bgp/odl-bgpcep-bgp-openconfig/pom.xml b/features/odl-bgpcep-bgp-openconfig/pom.xml
similarity index 96%
rename from features/bgp/odl-bgpcep-bgp-openconfig/pom.xml
rename to features/odl-bgpcep-bgp-openconfig/pom.xml
index 36175bb143e5710dcd56d619330346c688e56cd7..7861dd87b5b438665ca2bc84dcc78186d2886940 100644 (file)
--- a/features/bgp/odl-bgpcep-bgp-openconfig/pom.xml
+++ b/features/odl-bgpcep-bgp-openconfig/pom.xml
@@ -14,7 +14,7 @@
         <groupId>org.opendaylight.bgpcep</groupId>
         <artifactId>single-feature-parent</artifactId>
         <version>0.20.0-SNAPSHOT</version>
-        <relativePath>../../../single-feature-parent</relativePath>
+        <relativePath>../../single-feature-parent</relativePath>
     </parent>
 
     <artifactId>odl-bgpcep-bgp-openconfig</artifactId>

diff --git a/features/bgp/odl-bgpcep-bgp-parser-api/pom.xml b/features/odl-bgpcep-bgp-parser-api/pom.xml
similarity index 96%
rename from features/bgp/odl-bgpcep-bgp-parser-api/pom.xml
rename to features/odl-bgpcep-bgp-parser-api/pom.xml
index 672c5fa95cc3f22fd1bdeeee74b7b5e22cdbe7bd..04b042b9f90a162fa96e6c40e9ede2ded83c0406 100644 (file)
--- a/features/bgp/odl-bgpcep-bgp-parser-api/pom.xml
+++ b/features/odl-bgpcep-bgp-parser-api/pom.xml
@@ -14,7 +14,7 @@
         <groupId>org.opendaylight.bgpcep</groupId>
         <artifactId>single-feature-parent</artifactId>
         <version>0.20.0-SNAPSHOT</version>
-        <relativePath>../../../single-feature-parent</relativePath>
+        <relativePath>../../single-feature-parent</relativePath>
     </parent>
 
     <artifactId>odl-bgpcep-bgp-parser-api</artifactId>

diff --git a/features/bgp/odl-bgpcep-bgp-parser-api/src/main/feature/feature.xml b/features/odl-bgpcep-bgp-parser-api/src/main/feature/feature.xml
similarity index 100%
rename from features/bgp/odl-bgpcep-bgp-parser-api/src/main/feature/feature.xml
rename to features/odl-bgpcep-bgp-parser-api/src/main/feature/feature.xml

diff --git a/features/bgp/odl-bgpcep-bgp-parser/pom.xml b/features/odl-bgpcep-bgp-parser/pom.xml
similarity index 95%
rename from features/bgp/odl-bgpcep-bgp-parser/pom.xml
rename to features/odl-bgpcep-bgp-parser/pom.xml
index ca38851ee3a10b3bc79e921fc5ecf453acb66f4a..7c42e7396abf4c2d19e0e777a290342376caa277 100644 (file)
--- a/features/bgp/odl-bgpcep-bgp-parser/pom.xml
+++ b/features/odl-bgpcep-bgp-parser/pom.xml
@@ -14,7 +14,7 @@
         <groupId>org.opendaylight.bgpcep</groupId>
         <artifactId>single-feature-parent</artifactId>
         <version>0.20.0-SNAPSHOT</version>
-        <relativePath>../../../single-feature-parent</relativePath>
+        <relativePath>../../single-feature-parent</relativePath>
     </parent>
 
     <artifactId>odl-bgpcep-bgp-parser</artifactId>

diff --git a/features/bgp/odl-bgpcep-bgp-path-selection-mode/pom.xml b/features/odl-bgpcep-bgp-path-selection-mode/pom.xml
similarity index 95%
rename from features/bgp/odl-bgpcep-bgp-path-selection-mode/pom.xml
rename to features/odl-bgpcep-bgp-path-selection-mode/pom.xml
index 9a1635413ddce5458a74b3ca8ac08fdea0eeb2c0..34b302de3715f26089d98bb327a49fd38b6837f5 100644 (file)
--- a/features/bgp/odl-bgpcep-bgp-path-selection-mode/pom.xml
+++ b/features/odl-bgpcep-bgp-path-selection-mode/pom.xml
@@ -14,7 +14,7 @@
         <groupId>org.opendaylight.bgpcep</groupId>
         <artifactId>single-feature-parent</artifactId>
         <version>0.20.0-SNAPSHOT</version>
-        <relativePath>../../../single-feature-parent</relativePath>
+        <relativePath>../../single-feature-parent</relativePath>
     </parent>
 
     <artifactId>odl-bgpcep-bgp-path-selection-mode</artifactId>

diff --git a/features/bgp/odl-bgpcep-bgp-rib-api/pom.xml b/features/odl-bgpcep-bgp-rib-api/pom.xml
similarity index 97%
rename from features/bgp/odl-bgpcep-bgp-rib-api/pom.xml
rename to features/odl-bgpcep-bgp-rib-api/pom.xml
index 1f3f71dd6d47c3f3c4dd92523c84dd031f5d522f..a4da3fbe5b94c0496584c31c56789a4b2de2f015 100644 (file)
--- a/features/bgp/odl-bgpcep-bgp-rib-api/pom.xml
+++ b/features/odl-bgpcep-bgp-rib-api/pom.xml
@@ -14,7 +14,7 @@
         <groupId>org.opendaylight.bgpcep</groupId>
         <artifactId>single-feature-parent</artifactId>
         <version>0.20.0-SNAPSHOT</version>
-        <relativePath>../../../single-feature-parent</relativePath>
+        <relativePath>../../single-feature-parent</relativePath>
     </parent>
 
     <artifactId>odl-bgpcep-bgp-rib-api</artifactId>

diff --git a/features/bgp/odl-bgpcep-bgp-rib-api/src/main/feature/feature.xml b/features/odl-bgpcep-bgp-rib-api/src/main/feature/feature.xml
similarity index 100%
rename from features/bgp/odl-bgpcep-bgp-rib-api/src/main/feature/feature.xml
rename to features/odl-bgpcep-bgp-rib-api/src/main/feature/feature.xml

diff --git a/features/bgp/odl-bgpcep-bgp-rib-impl/pom.xml b/features/odl-bgpcep-bgp-rib-impl/pom.xml
similarity index 98%
rename from features/bgp/odl-bgpcep-bgp-rib-impl/pom.xml
rename to features/odl-bgpcep-bgp-rib-impl/pom.xml
index 375e03410f3b7d9635372d7238a7e260cfc83f78..b23108475a86cc7f06e8a932e3731a21abdda4ef 100644 (file)
--- a/features/bgp/odl-bgpcep-bgp-rib-impl/pom.xml
+++ b/features/odl-bgpcep-bgp-rib-impl/pom.xml
@@ -14,7 +14,7 @@
         <groupId>org.opendaylight.bgpcep</groupId>
         <artifactId>single-feature-parent</artifactId>
         <version>0.20.0-SNAPSHOT</version>
-        <relativePath>../../../single-feature-parent</relativePath>
+        <relativePath>../../single-feature-parent</relativePath>
     </parent>
 
     <artifactId>odl-bgpcep-bgp-rib-impl</artifactId>

diff --git a/features/bgp/odl-bgpcep-bgp-rib-impl/src/main/feature/feature.xml b/features/odl-bgpcep-bgp-rib-impl/src/main/feature/feature.xml
similarity index 100%
rename from features/bgp/odl-bgpcep-bgp-rib-impl/src/main/feature/feature.xml
rename to features/odl-bgpcep-bgp-rib-impl/src/main/feature/feature.xml

diff --git a/features/bgp/odl-bgpcep-bgp-route-target/pom.xml b/features/odl-bgpcep-bgp-route-target/pom.xml
similarity index 94%
rename from features/bgp/odl-bgpcep-bgp-route-target/pom.xml
rename to features/odl-bgpcep-bgp-route-target/pom.xml
index 31c62bab1acd313db1d383f1f906f8c699475d73..c958432f45ba673b8464b30242a7ecab472e045e 100644 (file)
--- a/features/bgp/odl-bgpcep-bgp-route-target/pom.xml
+++ b/features/odl-bgpcep-bgp-route-target/pom.xml
@@ -14,7 +14,7 @@
         <groupId>org.opendaylight.bgpcep</groupId>
         <artifactId>single-feature-parent</artifactId>
         <version>0.20.0-SNAPSHOT</version>
-        <relativePath>../../../single-feature-parent</relativePath>
+        <relativePath>../../single-feature-parent</relativePath>
     </parent>
 
     <artifactId>odl-bgpcep-bgp-route-target</artifactId>

diff --git a/features/bgp/odl-bgpcep-bgp-topology/pom.xml b/features/odl-bgpcep-bgp-topology/pom.xml
similarity index 97%
rename from features/bgp/odl-bgpcep-bgp-topology/pom.xml
rename to features/odl-bgpcep-bgp-topology/pom.xml
index 745bee0aa97c3a0785869c1f70e965f1e4a1cac0..0e4b9fd24d04767c185cf31b90c7f6aea938a838 100644 (file)
--- a/features/bgp/odl-bgpcep-bgp-topology/pom.xml
+++ b/features/odl-bgpcep-bgp-topology/pom.xml
@@ -14,7 +14,7 @@
         <groupId>org.opendaylight.bgpcep</groupId>
         <artifactId>single-feature-parent</artifactId>
         <version>0.20.0-SNAPSHOT</version>
-        <relativePath>../../../single-feature-parent</relativePath>
+        <relativePath>../../single-feature-parent</relativePath>
     </parent>
 
     <artifactId>odl-bgpcep-bgp-topology</artifactId>

diff --git a/features/bgp/odl-bgpcep-bgp/pom.xml b/features/odl-bgpcep-bgp/pom.xml
similarity index 98%
rename from features/bgp/odl-bgpcep-bgp/pom.xml
rename to features/odl-bgpcep-bgp/pom.xml
index b79d2a36b61ff7ce2854efa114d666aff3176135..e844f80d324d016701f1dd65c087de32a7c98999 100644 (file)
--- a/features/bgp/odl-bgpcep-bgp/pom.xml
+++ b/features/odl-bgpcep-bgp/pom.xml
@@ -14,7 +14,7 @@
         <groupId>org.opendaylight.bgpcep</groupId>
         <artifactId>single-feature-parent</artifactId>
         <version>0.20.0-SNAPSHOT</version>
-        <relativePath>../../../single-feature-parent</relativePath>
+        <relativePath>../../single-feature-parent</relativePath>
     </parent>
 
     <artifactId>odl-bgpcep-bgp</artifactId>

diff --git a/features/bmp/odl-bgpcep-bmp-api/pom.xml b/features/odl-bgpcep-bmp-api/pom.xml
similarity index 95%
rename from features/bmp/odl-bgpcep-bmp-api/pom.xml
rename to features/odl-bgpcep-bmp-api/pom.xml
index 468e71573a56bb7f47acd67cbd571b8e9c5aa881..203ace18eb91e67e906155cf09a01ce4be202f13 100644 (file)
--- a/features/bmp/odl-bgpcep-bmp-api/pom.xml
+++ b/features/odl-bgpcep-bmp-api/pom.xml
@@ -14,7 +14,7 @@
         <groupId>org.opendaylight.bgpcep</groupId>
         <artifactId>single-feature-parent</artifactId>
         <version>0.20.0-SNAPSHOT</version>
-        <relativePath>../../../single-feature-parent</relativePath>
+        <relativePath>../../single-feature-parent</relativePath>
     </parent>
 
     <artifactId>odl-bgpcep-bmp-api</artifactId>

diff --git a/features/bmp/odl-bgpcep-bmp-config-example/pom.xml b/features/odl-bgpcep-bmp-config-example/pom.xml
similarity index 94%
rename from features/bmp/odl-bgpcep-bmp-config-example/pom.xml
rename to features/odl-bgpcep-bmp-config-example/pom.xml
index dac79403e6d00cab70057e3b1d8ceac97bd1a1af..277c12fcfc89548b66dcb5165eb54188736e2b7f 100644 (file)
--- a/features/bmp/odl-bgpcep-bmp-config-example/pom.xml
+++ b/features/odl-bgpcep-bmp-config-example/pom.xml
@@ -14,7 +14,7 @@
         <groupId>org.opendaylight.bgpcep</groupId>
         <artifactId>single-feature-parent</artifactId>
         <version>0.20.0-SNAPSHOT</version>
-        <relativePath>../../../single-feature-parent</relativePath>
+        <relativePath>../../single-feature-parent</relativePath>
     </parent>
 
     <artifactId>odl-bgpcep-bmp-config-example</artifactId>

diff --git a/features/bmp/odl-bgpcep-bmp-config-example/src/main/feature/feature.xml b/features/odl-bgpcep-bmp-config-example/src/main/feature/feature.xml
similarity index 100%
rename from features/bmp/odl-bgpcep-bmp-config-example/src/main/feature/feature.xml
rename to features/odl-bgpcep-bmp-config-example/src/main/feature/feature.xml

diff --git a/features/config-loader/odl-bgpcep-bmp-config-loader/pom.xml b/features/odl-bgpcep-bmp-config-loader/pom.xml
similarity index 96%
rename from features/config-loader/odl-bgpcep-bmp-config-loader/pom.xml
rename to features/odl-bgpcep-bmp-config-loader/pom.xml
index 9c9a3b1f8ccef3938f38634951c72fa83846848f..e75782403071d7227f3bab9138397089e95ae16b 100644 (file)
--- a/features/config-loader/odl-bgpcep-bmp-config-loader/pom.xml
+++ b/features/odl-bgpcep-bmp-config-loader/pom.xml
@@ -14,7 +14,7 @@
         <groupId>org.opendaylight.bgpcep</groupId>
         <artifactId>single-feature-parent</artifactId>
         <version>0.20.0-SNAPSHOT</version>
-        <relativePath>../../../single-feature-parent</relativePath>
+        <relativePath>../../single-feature-parent</relativePath>
     </parent>
 
     <artifactId>odl-bgpcep-bmp-config-loader</artifactId>

diff --git a/features/config-loader/odl-bgpcep-bmp-config-loader/src/main/feature/feature.xml b/features/odl-bgpcep-bmp-config-loader/src/main/feature/feature.xml
similarity index 100%
rename from features/config-loader/odl-bgpcep-bmp-config-loader/src/main/feature/feature.xml
rename to features/odl-bgpcep-bmp-config-loader/src/main/feature/feature.xml

diff --git a/features/bmp/odl-bgpcep-bmp/pom.xml b/features/odl-bgpcep-bmp/pom.xml
similarity index 98%
rename from features/bmp/odl-bgpcep-bmp/pom.xml
rename to features/odl-bgpcep-bmp/pom.xml
index b606f2589fde799fede589095a90b1481d8e659f..c03049e07c00ff18bbb0952891cc870ebe1477a8 100644 (file)
--- a/features/bmp/odl-bgpcep-bmp/pom.xml
+++ b/features/odl-bgpcep-bmp/pom.xml
@@ -14,7 +14,7 @@
         <groupId>org.opendaylight.bgpcep</groupId>
         <artifactId>single-feature-parent</artifactId>
         <version>0.20.0-SNAPSHOT</version>
-        <relativePath>../../../single-feature-parent</relativePath>
+        <relativePath>../../single-feature-parent</relativePath>
     </parent>
 
     <artifactId>odl-bgpcep-bmp</artifactId>

diff --git a/features/concepts/odl-bgpcep-concepts/pom.xml b/features/odl-bgpcep-concepts/pom.xml
similarity index 96%
rename from features/concepts/odl-bgpcep-concepts/pom.xml
rename to features/odl-bgpcep-concepts/pom.xml
index e915443d08e31aa9668852e199ca4bcb70214964..50de348c7967adee96e998c9aaa36e39b63b9893 100644 (file)
--- a/features/concepts/odl-bgpcep-concepts/pom.xml
+++ b/features/odl-bgpcep-concepts/pom.xml
@@ -15,7 +15,7 @@
         <groupId>org.opendaylight.bgpcep</groupId>
         <artifactId>single-feature-parent</artifactId>
         <version>0.20.0-SNAPSHOT</version>
-        <relativePath>../../../single-feature-parent</relativePath>
+        <relativePath>../../single-feature-parent</relativePath>
     </parent>
 
     <artifactId>odl-bgpcep-concepts</artifactId>

diff --git a/features/concepts/odl-bgpcep-concepts/src/main/feature/feature.xml b/features/odl-bgpcep-concepts/src/main/feature/feature.xml
similarity index 100%
rename from features/concepts/odl-bgpcep-concepts/src/main/feature/feature.xml
rename to features/odl-bgpcep-concepts/src/main/feature/feature.xml

diff --git a/features/config-loader/odl-bgpcep-config-loader-impl/pom.xml b/features/odl-bgpcep-config-loader-impl/pom.xml
similarity index 96%
rename from features/config-loader/odl-bgpcep-config-loader-impl/pom.xml
rename to features/odl-bgpcep-config-loader-impl/pom.xml
index 3e9b1cc627975784b5f54b5e44efe18d0667f508..4b1c5db6e54107bba76a19881f37d8465403c044 100644 (file)
--- a/features/config-loader/odl-bgpcep-config-loader-impl/pom.xml
+++ b/features/odl-bgpcep-config-loader-impl/pom.xml
@@ -15,7 +15,7 @@
         <groupId>org.opendaylight.bgpcep</groupId>
         <artifactId>single-feature-parent</artifactId>
         <version>0.20.0-SNAPSHOT</version>
-        <relativePath>../../../single-feature-parent</relativePath>
+        <relativePath>../../single-feature-parent</relativePath>
     </parent>
 
     <artifactId>odl-bgpcep-config-loader-impl</artifactId>

diff --git a/features/config-loader/odl-bgpcep-config-loader-impl/src/main/feature/feature.xml b/features/odl-bgpcep-config-loader-impl/src/main/feature/feature.xml
similarity index 100%
rename from features/config-loader/odl-bgpcep-config-loader-impl/src/main/feature/feature.xml
rename to features/odl-bgpcep-config-loader-impl/src/main/feature/feature.xml

diff --git a/features/config-loader/odl-bgpcep-config-loader-spi/pom.xml b/features/odl-bgpcep-config-loader-spi/pom.xml
similarity index 95%
rename from features/config-loader/odl-bgpcep-config-loader-spi/pom.xml
rename to features/odl-bgpcep-config-loader-spi/pom.xml
index 0ca92341477a44dd2db7018e52818a9b375336ef..4ba71c3a4d8f824dfd61d2dfb12e4a2398341027 100644 (file)
--- a/features/config-loader/odl-bgpcep-config-loader-spi/pom.xml
+++ b/features/odl-bgpcep-config-loader-spi/pom.xml
@@ -15,7 +15,7 @@
         <groupId>org.opendaylight.bgpcep</groupId>
         <artifactId>single-feature-parent</artifactId>
         <version>0.20.0-SNAPSHOT</version>
-        <relativePath>../../../single-feature-parent</relativePath>
+        <relativePath>../../single-feature-parent</relativePath>
     </parent>
 
     <artifactId>odl-bgpcep-config-loader-spi</artifactId>

diff --git a/features/config-loader/odl-bgpcep-config-loader-spi/src/main/feature/feature.xml b/features/odl-bgpcep-config-loader-spi/src/main/feature/feature.xml
similarity index 100%
rename from features/config-loader/odl-bgpcep-config-loader-spi/src/main/feature/feature.xml
rename to features/odl-bgpcep-config-loader-spi/src/main/feature/feature.xml

diff --git a/features/bgpcep-extras/odl-bgpcep-data-change-counter/pom.xml b/features/odl-bgpcep-data-change-counter/pom.xml
similarity index 96%
rename from features/bgpcep-extras/odl-bgpcep-data-change-counter/pom.xml
rename to features/odl-bgpcep-data-change-counter/pom.xml
index 2526d509baadf522b60df8df2c46698c7a02feeb..ab83406f2a5c03750db068ef84aeb285b00eb891 100644 (file)
--- a/features/bgpcep-extras/odl-bgpcep-data-change-counter/pom.xml
+++ b/features/odl-bgpcep-data-change-counter/pom.xml
@@ -14,7 +14,7 @@
         <groupId>org.opendaylight.bgpcep</groupId>
         <artifactId>single-feature-parent</artifactId>
         <version>0.20.0-SNAPSHOT</version>
-        <relativePath>../../../single-feature-parent</relativePath>
+        <relativePath>../../single-feature-parent</relativePath>
     </parent>
 
     <artifactId>odl-bgpcep-data-change-counter</artifactId>

diff --git a/features/bgpcep-extras/odl-bgpcep-data-change-counter/src/main/feature/feature.xml b/features/odl-bgpcep-data-change-counter/src/main/feature/feature.xml
similarity index 100%
rename from features/bgpcep-extras/odl-bgpcep-data-change-counter/src/main/feature/feature.xml
rename to features/odl-bgpcep-data-change-counter/src/main/feature/feature.xml

diff --git a/features/bgpcep-extras/odl-bgpcep-extras-dependencies/pom.xml b/features/odl-bgpcep-extras-dependencies/pom.xml
similarity index 95%
rename from features/bgpcep-extras/odl-bgpcep-extras-dependencies/pom.xml
rename to features/odl-bgpcep-extras-dependencies/pom.xml
index 6eba664eae850c057c69684b4f2d2cc8db48a24a..26c5f95da3d393c204ed8facaddc0f3966a5a7c8 100644 (file)
--- a/features/bgpcep-extras/odl-bgpcep-extras-dependencies/pom.xml
+++ b/features/odl-bgpcep-extras-dependencies/pom.xml
@@ -14,7 +14,7 @@
         <groupId>org.opendaylight.bgpcep</groupId>
         <artifactId>single-feature-parent</artifactId>
         <version>0.20.0-SNAPSHOT</version>
-        <relativePath>../../../single-feature-parent</relativePath>
+        <relativePath>../../single-feature-parent</relativePath>
     </parent>
 
     <artifactId>odl-bgpcep-extras-dependencies</artifactId>

diff --git a/features/bgpcep-extras/odl-bgpcep-extras-dependencies/src/main/feature/feature.xml b/features/odl-bgpcep-extras-dependencies/src/main/feature/feature.xml
similarity index 100%
rename from features/bgpcep-extras/odl-bgpcep-extras-dependencies/src/main/feature/feature.xml
rename to features/odl-bgpcep-extras-dependencies/src/main/feature/feature.xml

diff --git a/features/graph/odl-bgpcep-graph-api/pom.xml b/features/odl-bgpcep-graph-api/pom.xml
similarity index 95%
rename from features/graph/odl-bgpcep-graph-api/pom.xml
rename to features/odl-bgpcep-graph-api/pom.xml
index 4648c73b561c2e6d9f27d51244656f93bd51ae91..5e56dab97fcea46a340e5b71c8341f9a12425ce9 100644 (file)
--- a/features/graph/odl-bgpcep-graph-api/pom.xml
+++ b/features/odl-bgpcep-graph-api/pom.xml
@@ -14,7 +14,7 @@
         <groupId>org.opendaylight.bgpcep</groupId>
         <artifactId>single-feature-parent</artifactId>
         <version>0.20.0-SNAPSHOT</version>
-        <relativePath>../../../single-feature-parent</relativePath>
+        <relativePath>../../single-feature-parent</relativePath>
     </parent>
 
     <artifactId>odl-bgpcep-graph-api</artifactId>

diff --git a/features/graph/odl-bgpcep-graph-api/src/main/feature/feature.xml b/features/odl-bgpcep-graph-api/src/main/feature/feature.xml
similarity index 100%
rename from features/graph/odl-bgpcep-graph-api/src/main/feature/feature.xml
rename to features/odl-bgpcep-graph-api/src/main/feature/feature.xml

diff --git a/features/graph/odl-bgpcep-graph/pom.xml b/features/odl-bgpcep-graph/pom.xml
similarity index 95%
rename from features/graph/odl-bgpcep-graph/pom.xml
rename to features/odl-bgpcep-graph/pom.xml
index c9b143d2b62097e5642f24157da73d7f69f1fa99..5b2376fbc912523511e3ff05d3e64ed334cfd2b5 100644 (file)
--- a/features/graph/odl-bgpcep-graph/pom.xml
+++ b/features/odl-bgpcep-graph/pom.xml
@@ -14,7 +14,7 @@
         <groupId>org.opendaylight.bgpcep</groupId>
         <artifactId>single-feature-parent</artifactId>
         <version>0.20.0-SNAPSHOT</version>
-        <relativePath>../../../single-feature-parent</relativePath>
+        <relativePath>../../single-feature-parent</relativePath>
     </parent>
 
     <artifactId>odl-bgpcep-graph</artifactId>

diff --git a/features/graph/odl-bgpcep-graph/src/main/feature/feature.xml b/features/odl-bgpcep-graph/src/main/feature/feature.xml
similarity index 100%
rename from features/graph/odl-bgpcep-graph/src/main/feature/feature.xml
rename to features/odl-bgpcep-graph/src/main/feature/feature.xml

diff --git a/features/pcep/odl-bgpcep-pcep-api/pom.xml b/features/odl-bgpcep-pcep-api/pom.xml
similarity index 95%
rename from features/pcep/odl-bgpcep-pcep-api/pom.xml
rename to features/odl-bgpcep-pcep-api/pom.xml
index e9c9e9d72277b59260fc3ac9e9fbe9f592a5a171..1d441b20e9275b477ee7581702844027378f9b48 100644 (file)
--- a/features/pcep/odl-bgpcep-pcep-api/pom.xml
+++ b/features/odl-bgpcep-pcep-api/pom.xml
@@ -14,7 +14,7 @@
         <groupId>org.opendaylight.bgpcep</groupId>
         <artifactId>single-feature-parent</artifactId>
         <version>0.20.0-SNAPSHOT</version>
-        <relativePath>../../../single-feature-parent</relativePath>
+        <relativePath>../../single-feature-parent</relativePath>
     </parent>
 
     <artifactId>odl-bgpcep-pcep-api</artifactId>

diff --git a/features/pcep/odl-bgpcep-pcep-auto-bandwidth/pom.xml b/features/odl-bgpcep-pcep-auto-bandwidth/pom.xml
similarity index 95%
rename from features/pcep/odl-bgpcep-pcep-auto-bandwidth/pom.xml
rename to features/odl-bgpcep-pcep-auto-bandwidth/pom.xml
index 7db176b9bc88f19ad21a92432f2894fe1954e3e2..7c9dc0e0a5c72556011c84475609d7552137d468 100644 (file)
--- a/features/pcep/odl-bgpcep-pcep-auto-bandwidth/pom.xml
+++ b/features/odl-bgpcep-pcep-auto-bandwidth/pom.xml
@@ -14,7 +14,7 @@
         <groupId>org.opendaylight.bgpcep</groupId>
         <artifactId>single-feature-parent</artifactId>
         <version>0.20.0-SNAPSHOT</version>
-        <relativePath>../../../single-feature-parent</relativePath>
+        <relativePath>../../single-feature-parent</relativePath>
     </parent>
 
     <artifactId>odl-bgpcep-pcep-auto-bandwidth</artifactId>

diff --git a/features/pcep/odl-bgpcep-pcep-base-parser/pom.xml b/features/odl-bgpcep-pcep-base-parser/pom.xml
similarity index 94%
rename from features/pcep/odl-bgpcep-pcep-base-parser/pom.xml
rename to features/odl-bgpcep-pcep-base-parser/pom.xml
index 893e947f72763bee12ee9f4691a3e98fec6a4f76..b4188c5eedd1eadcdbcecf0df215bdf78d4b3ee0 100644 (file)
--- a/features/pcep/odl-bgpcep-pcep-base-parser/pom.xml
+++ b/features/odl-bgpcep-pcep-base-parser/pom.xml
@@ -15,7 +15,7 @@
         <groupId>org.opendaylight.bgpcep</groupId>
         <artifactId>single-feature-parent</artifactId>
         <version>0.20.0-SNAPSHOT</version>
-        <relativePath>../../../single-feature-parent</relativePath>
+        <relativePath>../../single-feature-parent</relativePath>
     </parent>
 
     <artifactId>odl-bgpcep-pcep-base-parser</artifactId>

diff --git a/features/pcep/odl-bgpcep-pcep-cli/pom.xml b/features/odl-bgpcep-pcep-cli/pom.xml
similarity index 95%
rename from features/pcep/odl-bgpcep-pcep-cli/pom.xml
rename to features/odl-bgpcep-pcep-cli/pom.xml
index 1fadf350c30f1cdb0ab89d88f8f56c8cd6f88021..8255fe0ebb3e132a7cfc5f0d7abcc5e37df6369a 100644 (file)
--- a/features/pcep/odl-bgpcep-pcep-cli/pom.xml
+++ b/features/odl-bgpcep-pcep-cli/pom.xml
@@ -14,7 +14,7 @@
         <groupId>org.opendaylight.bgpcep</groupId>
         <artifactId>single-feature-parent</artifactId>
         <version>0.20.0-SNAPSHOT</version>
-        <relativePath>../../../single-feature-parent</relativePath>
+        <relativePath>../../single-feature-parent</relativePath>
     </parent>
 
     <artifactId>odl-bgpcep-pcep-cli</artifactId>

diff --git a/features/pcep/odl-bgpcep-pcep-config-example/pom.xml b/features/odl-bgpcep-pcep-config-example/pom.xml
similarity index 94%
rename from features/pcep/odl-bgpcep-pcep-config-example/pom.xml
rename to features/odl-bgpcep-pcep-config-example/pom.xml
index e59356b44c1143dd34ea1c5ee267210d3b08eaa9..27588ded4171309ac0be8693b263b4b9f4e7d984 100644 (file)
--- a/features/pcep/odl-bgpcep-pcep-config-example/pom.xml
+++ b/features/odl-bgpcep-pcep-config-example/pom.xml
@@ -14,7 +14,7 @@
         <groupId>org.opendaylight.bgpcep</groupId>
         <artifactId>single-feature-parent</artifactId>
         <version>0.20.0-SNAPSHOT</version>
-        <relativePath>../../../single-feature-parent</relativePath>
+        <relativePath>../../single-feature-parent</relativePath>
     </parent>
 
     <artifactId>odl-bgpcep-pcep-config-example</artifactId>

diff --git a/features/pcep/odl-bgpcep-pcep-config-example/src/main/feature/feature.xml b/features/odl-bgpcep-pcep-config-example/src/main/feature/feature.xml
similarity index 100%
rename from features/pcep/odl-bgpcep-pcep-config-example/src/main/feature/feature.xml
rename to features/odl-bgpcep-pcep-config-example/src/main/feature/feature.xml

diff --git a/features/pcep/odl-bgpcep-pcep-impl/pom.xml b/features/odl-bgpcep-pcep-impl/pom.xml
similarity index 96%
rename from features/pcep/odl-bgpcep-pcep-impl/pom.xml
rename to features/odl-bgpcep-pcep-impl/pom.xml
index f7d1609676bf4d52d7320d9e2caae7a36a459c9d..c283d2e3377b9abc7e7b6f5654c2843ce8a2ffe2 100644 (file)
--- a/features/pcep/odl-bgpcep-pcep-impl/pom.xml
+++ b/features/odl-bgpcep-pcep-impl/pom.xml
@@ -14,7 +14,7 @@
         <groupId>org.opendaylight.bgpcep</groupId>
         <artifactId>single-feature-parent</artifactId>
         <version>0.20.0-SNAPSHOT</version>
-        <relativePath>../../../single-feature-parent</relativePath>
+        <relativePath>../../single-feature-parent</relativePath>
     </parent>
 
     <artifactId>odl-bgpcep-pcep-impl</artifactId>

diff --git a/features/pcep/odl-bgpcep-pcep-impl/src/main/feature/feature.xml b/features/odl-bgpcep-pcep-impl/src/main/feature/feature.xml
similarity index 100%
rename from features/pcep/odl-bgpcep-pcep-impl/src/main/feature/feature.xml
rename to features/odl-bgpcep-pcep-impl/src/main/feature/feature.xml

diff --git a/features/pcep/odl-bgpcep-pcep-p2mp-te-lsp/pom.xml b/features/odl-bgpcep-pcep-p2mp-te-lsp/pom.xml
similarity index 95%
rename from features/pcep/odl-bgpcep-pcep-p2mp-te-lsp/pom.xml
rename to features/odl-bgpcep-pcep-p2mp-te-lsp/pom.xml
index db0107b00e2d531405bb7d3bd5b66d2d1f0ec1d5..c4624192ff73323e3a2f9d1e5e50678b6a32fd9a 100644 (file)
--- a/features/pcep/odl-bgpcep-pcep-p2mp-te-lsp/pom.xml
+++ b/features/odl-bgpcep-pcep-p2mp-te-lsp/pom.xml
@@ -14,7 +14,7 @@
         <groupId>org.opendaylight.bgpcep</groupId>
         <artifactId>single-feature-parent</artifactId>
         <version>0.20.0-SNAPSHOT</version>
-        <relativePath>../../../single-feature-parent</relativePath>
+        <relativePath>../../single-feature-parent</relativePath>
     </parent>
 
     <artifactId>odl-bgpcep-pcep-p2mp-te-lsp</artifactId>

diff --git a/features/pcep/odl-bgpcep-pcep-p2mp-te-lsp/src/main/feature/feature.xml b/features/odl-bgpcep-pcep-p2mp-te-lsp/src/main/feature/feature.xml
similarity index 100%
rename from features/pcep/odl-bgpcep-pcep-p2mp-te-lsp/src/main/feature/feature.xml
rename to features/odl-bgpcep-pcep-p2mp-te-lsp/src/main/feature/feature.xml

diff --git a/features/pcep/odl-bgpcep-pcep-segment-routing/pom.xml b/features/odl-bgpcep-pcep-segment-routing/pom.xml
similarity index 95%
rename from features/pcep/odl-bgpcep-pcep-segment-routing/pom.xml
rename to features/odl-bgpcep-pcep-segment-routing/pom.xml
index c27ffe48715b0f5f2366ce518780573bf8d93af0..7a6df6ce9e28425b6fd307427a4f0b4774c6db65 100644 (file)
--- a/features/pcep/odl-bgpcep-pcep-segment-routing/pom.xml
+++ b/features/odl-bgpcep-pcep-segment-routing/pom.xml
@@ -14,7 +14,7 @@
         <groupId>org.opendaylight.bgpcep</groupId>
         <artifactId>single-feature-parent</artifactId>
         <version>0.20.0-SNAPSHOT</version>
-        <relativePath>../../../single-feature-parent</relativePath>
+        <relativePath>../../single-feature-parent</relativePath>
     </parent>
 
     <artifactId>odl-bgpcep-pcep-segment-routing</artifactId>

diff --git a/features/pcep/odl-bgpcep-pcep-server-provider/pom.xml b/features/odl-bgpcep-pcep-server-provider/pom.xml
similarity index 96%
rename from features/pcep/odl-bgpcep-pcep-server-provider/pom.xml
rename to features/odl-bgpcep-pcep-server-provider/pom.xml
index 01d36876c8414bde8c8910948b2063e416312dfb..d34c577e62da5ce30775562da1e751d7825882e2 100644 (file)
--- a/features/pcep/odl-bgpcep-pcep-server-provider/pom.xml
+++ b/features/odl-bgpcep-pcep-server-provider/pom.xml
@@ -14,7 +14,7 @@
         <groupId>org.opendaylight.bgpcep</groupId>
         <artifactId>single-feature-parent</artifactId>
         <version>0.20.0-SNAPSHOT</version>
-        <relativePath>../../../single-feature-parent</relativePath>
+        <relativePath>../../single-feature-parent</relativePath>
     </parent>
 
     <artifactId>odl-bgpcep-pcep-server-provider</artifactId>

diff --git a/features/pcep/odl-bgpcep-pcep-server/pom.xml b/features/odl-bgpcep-pcep-server/pom.xml
similarity index 96%
rename from features/pcep/odl-bgpcep-pcep-server/pom.xml
rename to features/odl-bgpcep-pcep-server/pom.xml
index 72bddcc1a636fff346bb2301c0b909dd5d4e5a7a..20c6d9be7ac9b930152a1d06d9e9706663cfd584 100644 (file)
--- a/features/pcep/odl-bgpcep-pcep-server/pom.xml
+++ b/features/odl-bgpcep-pcep-server/pom.xml
@@ -14,7 +14,7 @@
         <groupId>org.opendaylight.bgpcep</groupId>
         <artifactId>single-feature-parent</artifactId>
         <version>0.20.0-SNAPSHOT</version>
-        <relativePath>../../../single-feature-parent</relativePath>
+        <relativePath>../../single-feature-parent</relativePath>
     </parent>
 
     <artifactId>odl-bgpcep-pcep-server</artifactId>

diff --git a/features/pcep/odl-bgpcep-pcep-stateful/pom.xml b/features/odl-bgpcep-pcep-stateful/pom.xml
similarity index 95%
rename from features/pcep/odl-bgpcep-pcep-stateful/pom.xml
rename to features/odl-bgpcep-pcep-stateful/pom.xml
index fde9130908e4b569cc239becdec2524f6dbd090b..408fec33a525127b48ff3f4910db8283d24dd746 100644 (file)
--- a/features/pcep/odl-bgpcep-pcep-stateful/pom.xml
+++ b/features/odl-bgpcep-pcep-stateful/pom.xml
@@ -14,7 +14,7 @@
         <groupId>org.opendaylight.bgpcep</groupId>
         <artifactId>single-feature-parent</artifactId>
         <version>0.20.0-SNAPSHOT</version>
-        <relativePath>../../../single-feature-parent</relativePath>
+        <relativePath>../../single-feature-parent</relativePath>
     </parent>
 
     <artifactId>odl-bgpcep-pcep-stateful</artifactId>

diff --git a/features/pcep/odl-bgpcep-pcep-topology-provider/pom.xml b/features/odl-bgpcep-pcep-topology-provider/pom.xml
similarity index 96%
rename from features/pcep/odl-bgpcep-pcep-topology-provider/pom.xml
rename to features/odl-bgpcep-pcep-topology-provider/pom.xml
index 76266c2c9f60695e07674c888362089a0a1370fd..3b33dced04fd4fab755411c15172789cc593e6cc 100644 (file)
--- a/features/pcep/odl-bgpcep-pcep-topology-provider/pom.xml
+++ b/features/odl-bgpcep-pcep-topology-provider/pom.xml
@@ -14,7 +14,7 @@
         <groupId>org.opendaylight.bgpcep</groupId>
         <artifactId>single-feature-parent</artifactId>
         <version>0.20.0-SNAPSHOT</version>
-        <relativePath>../../../single-feature-parent</relativePath>
+        <relativePath>../../single-feature-parent</relativePath>
     </parent>
 
     <artifactId>odl-bgpcep-pcep-topology-provider</artifactId>

diff --git a/features/pcep/odl-bgpcep-pcep-topology/pom.xml b/features/odl-bgpcep-pcep-topology/pom.xml
similarity index 96%
rename from features/pcep/odl-bgpcep-pcep-topology/pom.xml
rename to features/odl-bgpcep-pcep-topology/pom.xml
index 6869e5099a1019759b09f2c6e64398437848b110..44d882ec762f9da42c3e5f9374789b95a335314d 100644 (file)
--- a/features/pcep/odl-bgpcep-pcep-topology/pom.xml
+++ b/features/odl-bgpcep-pcep-topology/pom.xml
@@ -14,7 +14,7 @@
         <groupId>org.opendaylight.bgpcep</groupId>
         <artifactId>single-feature-parent</artifactId>
         <version>0.20.0-SNAPSHOT</version>
-        <relativePath>../../../single-feature-parent</relativePath>
+        <relativePath>../../single-feature-parent</relativePath>
     </parent>
 
     <artifactId>odl-bgpcep-pcep-topology</artifactId>

diff --git a/features/pcep/odl-bgpcep-pcep-tunnel-provider/pom.xml b/features/odl-bgpcep-pcep-tunnel-provider/pom.xml
similarity index 95%
rename from features/pcep/odl-bgpcep-pcep-tunnel-provider/pom.xml
rename to features/odl-bgpcep-pcep-tunnel-provider/pom.xml
index 828531f56b3fa358e3d965912d815f4ce05e643f..595d2915b49d24ae85ca5c8af57fecd41ee05cb3 100644 (file)
--- a/features/pcep/odl-bgpcep-pcep-tunnel-provider/pom.xml
+++ b/features/odl-bgpcep-pcep-tunnel-provider/pom.xml
@@ -14,7 +14,7 @@
         <groupId>org.opendaylight.bgpcep</groupId>
         <artifactId>single-feature-parent</artifactId>
         <version>0.20.0-SNAPSHOT</version>
-        <relativePath>../../../single-feature-parent</relativePath>
+        <relativePath>../../single-feature-parent</relativePath>
     </parent>
 
     <artifactId>odl-bgpcep-pcep-tunnel-provider</artifactId>

diff --git a/features/pcep/odl-bgpcep-pcep-tunnel-provider/src/main/feature/feature.xml b/features/odl-bgpcep-pcep-tunnel-provider/src/main/feature/feature.xml
similarity index 100%
rename from features/pcep/odl-bgpcep-pcep-tunnel-provider/src/main/feature/feature.xml
rename to features/odl-bgpcep-pcep-tunnel-provider/src/main/feature/feature.xml

diff --git a/features/pcep/odl-bgpcep-pcep/pom.xml b/features/odl-bgpcep-pcep/pom.xml
similarity index 98%
rename from features/pcep/odl-bgpcep-pcep/pom.xml
rename to features/odl-bgpcep-pcep/pom.xml
index b23e1cb6491666eb7368ac7df978e86e64200eb6..cb7ade46363a5ed9c344454de5cff2f435af7523 100644 (file)
--- a/features/pcep/odl-bgpcep-pcep/pom.xml
+++ b/features/odl-bgpcep-pcep/pom.xml
@@ -14,7 +14,7 @@
         <groupId>org.opendaylight.bgpcep</groupId>
         <artifactId>single-feature-parent</artifactId>
         <version>0.20.0-SNAPSHOT</version>
-        <relativePath>../../../single-feature-parent</relativePath>
+        <relativePath>../../single-feature-parent</relativePath>
     </parent>
 
     <artifactId>odl-bgpcep-pcep</artifactId>

diff --git a/features/pcep/odl-bgpcep-programming-api/pom.xml b/features/odl-bgpcep-programming-api/pom.xml
similarity index 97%
rename from features/pcep/odl-bgpcep-programming-api/pom.xml
rename to features/odl-bgpcep-programming-api/pom.xml
index 37741f4aa18068129db0254319401e1dbf3502fd..3b88531ea55234e82644e2384dafa367b7bb6e1e 100644 (file)
--- a/features/pcep/odl-bgpcep-programming-api/pom.xml
+++ b/features/odl-bgpcep-programming-api/pom.xml
@@ -14,7 +14,7 @@
         <groupId>org.opendaylight.bgpcep</groupId>
         <artifactId>single-feature-parent</artifactId>
         <version>0.20.0-SNAPSHOT</version>
-        <relativePath>../../../single-feature-parent</relativePath>
+        <relativePath>../../single-feature-parent</relativePath>
     </parent>
 
     <artifactId>odl-bgpcep-programming-api</artifactId>

diff --git a/features/pcep/odl-bgpcep-programming-api/src/main/feature/feature.xml b/features/odl-bgpcep-programming-api/src/main/feature/feature.xml
similarity index 100%
rename from features/pcep/odl-bgpcep-programming-api/src/main/feature/feature.xml
rename to features/odl-bgpcep-programming-api/src/main/feature/feature.xml

diff --git a/features/pcep/odl-bgpcep-programming-impl/pom.xml b/features/odl-bgpcep-programming-impl/pom.xml
similarity index 96%
rename from features/pcep/odl-bgpcep-programming-impl/pom.xml
rename to features/odl-bgpcep-programming-impl/pom.xml
index 10c9e7de559981463ec806638d5f92cda9fa5c5c..e522b8cfb879a08fc5b85b9144f41c7fd1ba6f11 100644 (file)
--- a/features/pcep/odl-bgpcep-programming-impl/pom.xml
+++ b/features/odl-bgpcep-programming-impl/pom.xml
@@ -14,7 +14,7 @@
         <groupId>org.opendaylight.bgpcep</groupId>
         <artifactId>single-feature-parent</artifactId>
         <version>0.20.0-SNAPSHOT</version>
-        <relativePath>../../../single-feature-parent</relativePath>
+        <relativePath>../../single-feature-parent</relativePath>
     </parent>
 
     <artifactId>odl-bgpcep-programming-impl</artifactId>

diff --git a/features/pcep/odl-bgpcep-programming-impl/src/main/feature/feature.xml b/features/odl-bgpcep-programming-impl/src/main/feature/feature.xml
similarity index 100%
rename from features/pcep/odl-bgpcep-programming-impl/src/main/feature/feature.xml
rename to features/odl-bgpcep-programming-impl/src/main/feature/feature.xml

diff --git a/features/config-loader/odl-bgpcep-protocols-config-loader/pom.xml b/features/odl-bgpcep-protocols-config-loader/pom.xml
similarity index 95%
rename from features/config-loader/odl-bgpcep-protocols-config-loader/pom.xml
rename to features/odl-bgpcep-protocols-config-loader/pom.xml
index 49a53357a0bebd6c317d6fcd364a7dc666cd5049..7d42b725bad1c4df9e6d6f5ed09d4769f747eb81 100644 (file)
--- a/features/config-loader/odl-bgpcep-protocols-config-loader/pom.xml
+++ b/features/odl-bgpcep-protocols-config-loader/pom.xml
@@ -14,7 +14,7 @@
         <groupId>org.opendaylight.bgpcep</groupId>
         <artifactId>single-feature-parent</artifactId>
         <version>0.20.0-SNAPSHOT</version>
-        <relativePath>../../../single-feature-parent</relativePath>
+        <relativePath>../../single-feature-parent</relativePath>
     </parent>
 
     <artifactId>odl-bgpcep-protocols-config-loader</artifactId>

diff --git a/features/config-loader/odl-bgpcep-routing-policy-config-loader/pom.xml b/features/odl-bgpcep-routing-policy-config-loader/pom.xml
similarity index 96%
rename from features/config-loader/odl-bgpcep-routing-policy-config-loader/pom.xml
rename to features/odl-bgpcep-routing-policy-config-loader/pom.xml
index 7d3ebd104d59a8a2987a14c2b381aa6d56a20c03..cbd568b232a985d25b833023d425c717c64304d4 100644 (file)
--- a/features/config-loader/odl-bgpcep-routing-policy-config-loader/pom.xml
+++ b/features/odl-bgpcep-routing-policy-config-loader/pom.xml
@@ -15,7 +15,7 @@
         <groupId>org.opendaylight.bgpcep</groupId>
         <artifactId>single-feature-parent</artifactId>
         <version>0.20.0-SNAPSHOT</version>
-        <relativePath>../../../single-feature-parent</relativePath>
+        <relativePath>../../single-feature-parent</relativePath>
     </parent>
 
     <artifactId>odl-bgpcep-routing-policy-config-loader</artifactId>

diff --git a/features/rsvp/odl-bgpcep-rsvp-api/pom.xml b/features/odl-bgpcep-rsvp-api/pom.xml
similarity index 96%
rename from features/rsvp/odl-bgpcep-rsvp-api/pom.xml
rename to features/odl-bgpcep-rsvp-api/pom.xml
index a4baa1c6477f743c7205b536464a2332593e6da9..e65a29f88dfef2a337ab379be7e2388b41d7c851 100644 (file)
--- a/features/rsvp/odl-bgpcep-rsvp-api/pom.xml
+++ b/features/odl-bgpcep-rsvp-api/pom.xml
@@ -14,7 +14,7 @@
         <groupId>org.opendaylight.bgpcep</groupId>
         <artifactId>single-feature-parent</artifactId>
         <version>0.20.0-SNAPSHOT</version>
-        <relativePath>../../../single-feature-parent</relativePath>
+        <relativePath>../../single-feature-parent</relativePath>
     </parent>
 
     <artifactId>odl-bgpcep-rsvp-api</artifactId>

diff --git a/features/rsvp/odl-bgpcep-rsvp-api/src/main/feature/feature.xml b/features/odl-bgpcep-rsvp-api/src/main/feature/feature.xml
similarity index 100%
rename from features/rsvp/odl-bgpcep-rsvp-api/src/main/feature/feature.xml
rename to features/odl-bgpcep-rsvp-api/src/main/feature/feature.xml

diff --git a/features/rsvp/odl-bgpcep-rsvp/pom.xml b/features/odl-bgpcep-rsvp/pom.xml
similarity index 95%
rename from features/rsvp/odl-bgpcep-rsvp/pom.xml
rename to features/odl-bgpcep-rsvp/pom.xml
index 896b4e81b8e8ae31eaa7493ae0723ff0d07ba199..d8026cbaa49490f7859e955769497584eb8cd062 100644 (file)
--- a/features/rsvp/odl-bgpcep-rsvp/pom.xml
+++ b/features/odl-bgpcep-rsvp/pom.xml
@@ -14,7 +14,7 @@
         <groupId>org.opendaylight.bgpcep</groupId>
         <artifactId>single-feature-parent</artifactId>
         <version>0.20.0-SNAPSHOT</version>
-        <relativePath>../../../single-feature-parent</relativePath>
+        <relativePath>../../single-feature-parent</relativePath>
     </parent>
 
     <artifactId>odl-bgpcep-rsvp</artifactId>

diff --git a/features/topology/odl-bgpcep-topology-api/pom.xml b/features/odl-bgpcep-topology-api/pom.xml
similarity index 96%
rename from features/topology/odl-bgpcep-topology-api/pom.xml
rename to features/odl-bgpcep-topology-api/pom.xml
index a3caabf481f131de43d83ece2b27639f9514d0da..dded091ea396dda158876c18cae323a9f9c31a8c 100644 (file)
--- a/features/topology/odl-bgpcep-topology-api/pom.xml
+++ b/features/odl-bgpcep-topology-api/pom.xml
@@ -15,7 +15,7 @@
         <groupId>org.opendaylight.bgpcep</groupId>
         <artifactId>single-feature-parent</artifactId>
         <version>0.20.0-SNAPSHOT</version>
-        <relativePath>../../../single-feature-parent</relativePath>
+        <relativePath>../../single-feature-parent</relativePath>
     </parent>
 
     <artifactId>odl-bgpcep-topology-api</artifactId>

diff --git a/features/topology/odl-bgpcep-topology-api/src/main/feature/feature.xml b/features/odl-bgpcep-topology-api/src/main/feature/feature.xml
similarity index 100%
rename from features/topology/odl-bgpcep-topology-api/src/main/feature/feature.xml
rename to features/odl-bgpcep-topology-api/src/main/feature/feature.xml

diff --git a/features/config-loader/odl-bgpcep-topology-config-loader/pom.xml b/features/odl-bgpcep-topology-config-loader/pom.xml
similarity index 96%
rename from features/config-loader/odl-bgpcep-topology-config-loader/pom.xml
rename to features/odl-bgpcep-topology-config-loader/pom.xml
index 7bd39c2ec1909c4da23f1119ce969b8080ec2243..9434391d3e4d2fd94e97e92aea7d6cd947859a0c 100644 (file)
--- a/features/config-loader/odl-bgpcep-topology-config-loader/pom.xml
+++ b/features/odl-bgpcep-topology-config-loader/pom.xml
@@ -14,7 +14,7 @@
         <groupId>org.opendaylight.bgpcep</groupId>
         <artifactId>single-feature-parent</artifactId>
         <version>0.20.0-SNAPSHOT</version>
-        <relativePath>../../../single-feature-parent</relativePath>
+        <relativePath>../../single-feature-parent</relativePath>
     </parent>
 
     <artifactId>odl-bgpcep-topology-config-loader</artifactId>

diff --git a/features/config-loader/odl-bgpcep-topology-config-loader/src/main/feature/feature.xml b/features/odl-bgpcep-topology-config-loader/src/main/feature/feature.xml
similarity index 100%
rename from features/config-loader/odl-bgpcep-topology-config-loader/src/main/feature/feature.xml
rename to features/odl-bgpcep-topology-config-loader/src/main/feature/feature.xml

diff --git a/features/topology/odl-bgpcep-topology-segment-routing/pom.xml b/features/odl-bgpcep-topology-segment-routing/pom.xml
similarity index 94%
rename from features/topology/odl-bgpcep-topology-segment-routing/pom.xml
rename to features/odl-bgpcep-topology-segment-routing/pom.xml
index 8306263a84c8e5c02b72ae16f44c10336dd95545..b8599eb89064f8332b8ad93ab88db73cf79349d4 100644 (file)
--- a/features/topology/odl-bgpcep-topology-segment-routing/pom.xml
+++ b/features/odl-bgpcep-topology-segment-routing/pom.xml
@@ -15,7 +15,7 @@
         <groupId>org.opendaylight.bgpcep</groupId>
         <artifactId>single-feature-parent</artifactId>
         <version>0.20.0-SNAPSHOT</version>
-        <relativePath>../../../single-feature-parent</relativePath>
+        <relativePath>../../single-feature-parent</relativePath>
     </parent>
 
     <artifactId>odl-bgpcep-topology-segment-routing</artifactId>

diff --git a/features/topology/odl-bgpcep-topology-tunnel-api/pom.xml b/features/odl-bgpcep-topology-tunnel-api/pom.xml
similarity index 94%
rename from features/topology/odl-bgpcep-topology-tunnel-api/pom.xml
rename to features/odl-bgpcep-topology-tunnel-api/pom.xml
index d64dabf4542343abcbd404732183085130e940f7..ea17fa47b12d47dc69ed021e2a0db3f97a74fb9f 100644 (file)
--- a/features/topology/odl-bgpcep-topology-tunnel-api/pom.xml
+++ b/features/odl-bgpcep-topology-tunnel-api/pom.xml
@@ -15,7 +15,7 @@
         <groupId>org.opendaylight.bgpcep</groupId>
         <artifactId>single-feature-parent</artifactId>
         <version>0.20.0-SNAPSHOT</version>
-        <relativePath>../../../single-feature-parent</relativePath>
+        <relativePath>../../single-feature-parent</relativePath>
     </parent>
 
     <artifactId>odl-bgpcep-topology-tunnel-api</artifactId>

diff --git a/features/topology/odl-bgpcep-topology-tunnel-api/src/main/feature/feature.xml b/features/odl-bgpcep-topology-tunnel-api/src/main/feature/feature.xml
similarity index 100%
rename from features/topology/odl-bgpcep-topology-tunnel-api/src/main/feature/feature.xml
rename to features/odl-bgpcep-topology-tunnel-api/src/main/feature/feature.xml

diff --git a/features/pcep/pom.xml b/features/pcep/pom.xml
deleted file mode 100644 (file)
index c573e89..0000000
--- a/features/pcep/pom.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
-      Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v1.0 which accompanies this distribution,
- and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.opendaylight.odlparent</groupId>
-        <artifactId>odlparent-lite</artifactId>
-        <version>13.0.3</version>
-        <relativePath/>
-    </parent>
-
-    <groupId>org.opendaylight.bgpcep</groupId>
-    <artifactId>features-aggregator-pcep</artifactId>
-    <version>0.20.0-SNAPSHOT</version>
-    <packaging>pom</packaging>
-
-    <modules>
-        <module>features-pcep</module>
-        <module>odl-bgpcep-pcep</module>
-        <module>odl-bgpcep-pcep-api</module>
-        <module>odl-bgpcep-pcep-impl</module>
-        <module>odl-bgpcep-programming-api</module>
-        <module>odl-bgpcep-programming-impl</module>
-        <module>odl-bgpcep-pcep-server</module>
-        <module>odl-bgpcep-pcep-topology</module>
-        <module>odl-bgpcep-pcep-stateful</module>
-        <module>odl-bgpcep-pcep-server-provider</module>
-        <module>odl-bgpcep-pcep-topology-provider</module>
-        <module>odl-bgpcep-pcep-tunnel-provider</module>
-        <module>odl-bgpcep-pcep-segment-routing</module>
-        <module>odl-bgpcep-pcep-auto-bandwidth</module>
-        <module>odl-bgpcep-pcep-config-example</module>
-        <module>odl-bgpcep-pcep-cli</module>
-        <module>odl-bgpcep-pcep-base-parser</module>
-        <module>odl-bgpcep-pcep-p2mp-te-lsp</module>
-    </modules>
-
-    <properties>
-        <maven.deploy.skip>true</maven.deploy.skip>
-        <maven.install.skip>true</maven.install.skip>
-    </properties>
-</project>

diff --git a/features/pom.xml b/features/pom.xml
index e7cf4e32c0b04de3a21bf57cfb9a07f6e1884d8c..1039b9fadf541b50973c88ea1fbbc484c47d40e9 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -20,21 +20,94 @@
     <version>0.20.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
-    <modules>
-        <module>graph</module>
-        <module>bgp</module>
-        <module>algo</module>
-        <module>pcep</module>
-        <module>bgpcep-extras</module>
-        <module>bmp</module>
-        <module>rsvp</module>
-        <module>topology</module>
-        <module>concepts</module>
-        <module>config-loader</module>
-    </modules>
-
     <properties>
         <maven.deploy.skip>true</maven.deploy.skip>
         <maven.install.skip>true</maven.install.skip>
     </properties>
+
+    <modules>
+        <module>features-algo</module>
+        <module>odl-bgpcep-algo-api</module>
+        <module>odl-bgpcep-algo</module>
+
+        <module>features-concepts</module>
+        <module>odl-bgpcep-concepts</module>
+
+        <module>features-graph</module>
+        <module>odl-bgpcep-graph-api</module>
+        <module>odl-bgpcep-graph</module>
+
+        <module>features-bgp</module>
+        <module>odl-bgpcep-bgp</module>
+        <module>odl-bgpcep-bgp-dependencies</module>
+        <module>odl-bgpcep-bgp-config-example</module>
+        <module>odl-bgpcep-bgp-openconfig</module>
+        <module>odl-bgpcep-bgp-parser</module>
+        <module>odl-bgpcep-bgp-parser-api</module>
+        <module>odl-bgpcep-bgp-rib-api</module>
+        <module>odl-bgpcep-bgp-path-selection-mode</module>
+        <module>odl-bgpcep-bgp-rib-impl</module>
+        <module>odl-bgpcep-bgp-topology</module>
+        <module>odl-bgpcep-bgp-benchmark</module>
+        <module>odl-bgpcep-bgp-cli</module>
+        <module>odl-bgpcep-bgp-openconfig-state</module>
+        <module>odl-bgpcep-bgp-openconfig-rp-spi</module>
+        <module>odl-bgpcep-bgp-openconfig-rp-impl</module>
+        <module>odl-bgpcep-bgp-openconfig-rp-statement</module>
+        <!-- Family extensions -->
+        <module>odl-bgpcep-bgp-extensions-api</module>
+        <module>odl-bgpcep-bgp-inet</module>
+        <module>odl-bgpcep-bgp-linkstate</module>
+        <module>odl-bgpcep-bgp-flowspec</module>
+        <module>odl-bgpcep-bgp-labeled-unicast</module>
+        <module>odl-bgpcep-bgp-l3vpn</module>
+        <module>odl-bgpcep-bgp-evpn</module>
+        <module>odl-bgpcep-bgp-mvpn</module>
+        <module>odl-bgpcep-bgp-route-target</module>
+
+        <module>features-pcep</module>
+        <module>odl-bgpcep-pcep</module>
+        <module>odl-bgpcep-pcep-api</module>
+        <module>odl-bgpcep-pcep-impl</module>
+        <module>odl-bgpcep-programming-api</module>
+        <module>odl-bgpcep-programming-impl</module>
+        <module>odl-bgpcep-pcep-server</module>
+        <module>odl-bgpcep-pcep-topology</module>
+        <module>odl-bgpcep-pcep-stateful</module>
+        <module>odl-bgpcep-pcep-server-provider</module>
+        <module>odl-bgpcep-pcep-topology-provider</module>
+        <module>odl-bgpcep-pcep-tunnel-provider</module>
+        <module>odl-bgpcep-pcep-segment-routing</module>
+        <module>odl-bgpcep-pcep-auto-bandwidth</module>
+        <module>odl-bgpcep-pcep-config-example</module>
+        <module>odl-bgpcep-pcep-cli</module>
+        <module>odl-bgpcep-pcep-base-parser</module>
+        <module>odl-bgpcep-pcep-p2mp-te-lsp</module>
+
+        <module>features-bgpcep-extras</module>
+        <module>odl-bgpcep-extras-dependencies</module>
+        <module>odl-bgpcep-data-change-counter</module>
+
+        <module>features-rsvp</module>
+        <module>odl-bgpcep-rsvp</module>
+        <module>odl-bgpcep-rsvp-api</module>
+
+        <module>features-bmp</module>
+        <module>odl-bgpcep-bmp</module>
+        <module>odl-bgpcep-bmp-api</module>
+        <module>odl-bgpcep-bmp-config-example</module>
+
+        <module>features-topology</module>
+        <module>odl-bgpcep-topology-api</module>
+        <module>odl-bgpcep-topology-tunnel-api</module>
+        <module>odl-bgpcep-topology-segment-routing</module>
+
+        <module>features-config-loader</module>
+        <module>odl-bgpcep-config-loader-spi</module>
+        <module>odl-bgpcep-config-loader-impl</module>
+        <module>odl-bgpcep-topology-config-loader</module>
+        <module>odl-bgpcep-protocols-config-loader</module>
+        <module>odl-bgpcep-bmp-config-loader</module>
+        <module>odl-bgpcep-routing-policy-config-loader</module>
+    </modules>
 </project>

diff --git a/features/rsvp/pom.xml b/features/rsvp/pom.xml
deleted file mode 100644 (file)
index 4be1f1d..0000000
--- a/features/rsvp/pom.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
-      Copyright (c) 2015 Cisco Systems, Inc. and others.  All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v1.0 which accompanies this distribution,
- and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.opendaylight.odlparent</groupId>
-        <artifactId>odlparent-lite</artifactId>
-        <version>13.0.3</version>
-        <relativePath/>
-    </parent>
-
-    <artifactId>features-aggregator-rsvp</artifactId>
-    <groupId>org.opendaylight.bgpcep</groupId>
-    <version>0.20.0-SNAPSHOT</version>
-    <packaging>pom</packaging>
-
-    <modules>
-        <module>features-rsvp</module>
-        <module>odl-bgpcep-rsvp</module>
-        <module>odl-bgpcep-rsvp-api</module>
-    </modules>
-
-    <properties>
-        <maven.deploy.skip>true</maven.deploy.skip>
-        <maven.install.skip>true</maven.install.skip>
-    </properties>
-</project>

diff --git a/features/topology/pom.xml b/features/topology/pom.xml
deleted file mode 100644 (file)
index 5e0f697..0000000
--- a/features/topology/pom.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vi: set et smarttab sw=4 tabstop=4: -->
-<!--
-  Copyright (c) 2017 Pantheon Technologies s.r.o. and others.  All rights reserved.
-
-  This program and the accompanying materials are made available under the
-  terms of the Eclipse Public License v1.0 which accompanies this distribution,
-  and is available at http://www.eclipse.org/legal/epl-v10.html
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.opendaylight.odlparent</groupId>
-        <artifactId>odlparent-lite</artifactId>
-        <version>13.0.3</version>
-        <relativePath/>
-    </parent>
-
-    <groupId>org.opendaylight.bgpcep</groupId>
-    <artifactId>features-aggregator-topology</artifactId>
-    <version>0.20.0-SNAPSHOT</version>
-    <packaging>pom</packaging>
-
-    <modules>
-        <module>features-topology</module>
-        <module>odl-bgpcep-topology-api</module>
-        <module>odl-bgpcep-topology-tunnel-api</module>
-        <module>odl-bgpcep-topology-segment-routing</module>
-    </modules>
-
-    <properties>
-        <maven.deploy.skip>true</maven.deploy.skip>
-        <maven.install.skip>true</maven.install.skip>
-    </properties>
-</project>