Add missing M2E lifecycle mappings metadata

[odlparent.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index a8ee24306874a751db80d2317ca66c6aabbb44d5..11f3e77bc1073669d58146218cd2ed9f8ef964f1 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -10,9 +10,9 @@
 
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
-        <artifactId>odlparent-lite</artifactId>
-        <version>1.8.0-SNAPSHOT</version>
-        <relativePath>odlparent-lite</relativePath>
+        <artifactId>aggregator-parent</artifactId>
+        <version>3.0.0-SNAPSHOT</version>
+        <relativePath>aggregator-parent</relativePath>
     </parent>
 
     <artifactId>odlparent-aggregator</artifactId>
@@ -31,17 +31,21 @@
         <module>checkstyle</module>
         <module>findbugs</module>
         <module>license</module>
-        <module>bundles-test</module>
+
+        <!-- Features test (SFT) -->
+        <module>bundles-test-lib</module>
+        <module>bundles4-test</module>
         <module>features-test</module>
 
         <!-- Karaf integration -->
         <module>karaf</module>
         <module>karaf-plugin</module>
-        <module>karaf4-plugin</module>
+        <module>karaf-util</module>
 
         <!-- Parent POMs -->
+        <module>aggregator-parent</module>
         <module>bundle-parent</module>
-        <module>features-parent</module>
+        <module>untested-single-feature-parent</module>
         <module>single-feature-parent</module>
         <module>feature-repo-parent</module>
         <module>odlparent</module>
@@ -52,18 +56,10 @@
 
         <!-- Artifacts -->
         <module>odlparent-artifacts</module>
-    </modules>
 
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-deploy-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
+        <!-- Self-tests -->
+        <module>odlparent-dependency-check</module>
+    </modules>
 
     <profiles>
         <profile>
@@ -82,7 +78,7 @@
                 <plugins>
                     <plugin>
                         <artifactId>maven-javadoc-plugin</artifactId>
-                        <version>2.10.4</version>
+                        <version>3.0.0-M1</version>
                         <inherited>false</inherited>
                         <executions>
                             <execution>