Move features

this moves the features artifact to the standardized place.

Change-Id: I0b4e9d82c51c46f742f3de5f1de46ba0cfe475d5
Signed-off-by: Robert Varga <rovarga@cisco.com>

diff --git a/bgp/pom.xml b/bgp/pom.xml
index a6bb49b71cf047e08a5912e779e1374811040cbe..56870e451ae0fbb7a1d993449c402adeb346fc88 100644 (file)
--- a/bgp/pom.xml
+++ b/bgp/pom.xml
@@ -46,7 +46,5 @@
         <module>util</module>
 
         <module>controller-config</module>
-        <module>feature</module>
-
     </modules>
 </project>

diff --git a/bgp/feature/.project b/features/.project
similarity index 100%
rename from bgp/feature/.project
rename to features/.project

diff --git a/bgp/feature/pom.xml b/features/pom.xml
similarity index 99%
rename from bgp/feature/pom.xml
rename to features/pom.xml
index 2d2d2ad28d41fcfc99983085ac23b822fca61e5c..898c24bddccbecda42e275451fec296ca994b275 100644 (file)
--- a/bgp/feature/pom.xml
+++ b/features/pom.xml
@@ -12,8 +12,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.opendaylight.bgpcep</groupId>
-        <artifactId>bgp-parent</artifactId>
+        <artifactId>bgpcep-parent</artifactId>
         <version>0.4.0-SNAPSHOT</version>
+        <relativePath>../parent</relativePath>
     </parent>
     <artifactId>features-bgp</artifactId>
 

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

diff --git a/pom.xml b/pom.xml
index 2051d5516672a7af65377aa0546a3481495780b1..05591f40ecc39ec6de58b1110f9fe7bcb35af99b 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -32,7 +32,7 @@
     <modules>
         <!-- Well-known -->
         <module>artifacts</module>
-        <!-- <module>feature</module> -->
+        <module>features</module>
         <module>parent</module>
 
         <!-- Common infra -->