BUG-8356: Rename features4-extras

Rename features4-extras which colides
with controller features4-extras, making
SingleFeatureTest for repos/index fail.

Change-Id: I04c693f853178e08a15eaa5435310659f66ee061
Signed-off-by: Claudio D. Gasparini <claudio.gasparini@pantheon.tech>

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 9efe02146cff8e4ac937d4661ad5e5dd8a6a0dd8..98fd7b690b0873a08acbccbae0c118f28bfa9679 100644 (file)
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -672,7 +672,7 @@
             </dependency>
             <dependency>
                 <groupId>org.opendaylight.bgpcep</groupId>
-                <artifactId>features4-extras</artifactId>
+                <artifactId>features4-bgpcep-extras</artifactId>
                 <classifier>features</classifier>
                 <type>xml</type>
                 <version>${project.version}</version>

diff --git a/features/extras/features-extras/pom.xml b/features/bgpcep-extras/features-extras/pom.xml
similarity index 100%
rename from features/extras/features-extras/pom.xml
rename to features/bgpcep-extras/features-extras/pom.xml

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

diff --git a/features/extras/features4-extras/pom.xml b/features/bgpcep-extras/features4-bgpcep-extras/pom.xml
similarity index 97%
rename from features/extras/features4-extras/pom.xml
rename to features/bgpcep-extras/features4-bgpcep-extras/pom.xml
index f56d70d1445f5b964913e5edddf98fd6ef05358c..6a3e7ce57d6a6540801d5ea9cc7818e085ae22f2 100644 (file)
--- a/features/extras/features4-extras/pom.xml
+++ b/features/bgpcep-extras/features4-bgpcep-extras/pom.xml
@@ -11,7 +11,7 @@
     </parent>
 
     <groupId>org.opendaylight.bgpcep</groupId>
-    <artifactId>features4-extras</artifactId>
+    <artifactId>features4-bgpcep-extras</artifactId>
     <version>0.8.0-SNAPSHOT</version>
     <packaging>feature</packaging>
 

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

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

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

diff --git a/features/extras/pom.xml b/features/bgpcep-extras/pom.xml
similarity index 93%
rename from features/extras/pom.xml
rename to features/bgpcep-extras/pom.xml
index d4bc4ddfe95351fb97676d4268d213be81f194bb..59e19a0aedec019975e6589453cbe90215080865 100644 (file)
--- a/features/extras/pom.xml
+++ b/features/bgpcep-extras/pom.xml
@@ -18,13 +18,13 @@
     </parent>
 
     <groupId>org.opendaylight.bgpcep</groupId>
-    <artifactId>features-aggregator-extras</artifactId>
+    <artifactId>features-aggregator-bgpcep-extras</artifactId>
     <version>0.8.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <modules>
         <module>features-extras</module>
-        <module>features4-extras</module>
+        <module>features4-bgpcep-extras</module>
         <module>odl-bgpcep-extras-dependencies</module>
         <module>odl-bgpcep-data-change-counter</module>
     </modules>

diff --git a/features/pom.xml b/features/pom.xml
index 17298514104933d33b81169ce9aff42fa90153f1..bed1ba67d2a5566dfe1deaea99a50b7cdb7d59dc 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -16,7 +16,7 @@
   <modules>
     <module>bgp</module>
     <module>pcep</module>
-    <module>extras</module>
+    <module>bgpcep-extras</module>
     <module>bmp</module>
     <module>rsvp</module>
   </modules>