Start the 4.0.2 development series

[odlparent.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 87bbe622e0751151e0fad0e47f03e8b1643b790d..005b4800bd002724d571d343f4d5b7496154555d 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -11,13 +11,11 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.6.0-SNAPSHOT</version>
+        <version>4.0.2-SNAPSHOT</version>
         <relativePath>odlparent-lite</relativePath>
     </parent>
 
-    <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-aggregator</artifactId>
-    <version>1.6.0-SNAPSHOT</version>
     <name>odlparent</name> <!-- Used by Sonar to set project name -->
     <packaging>pom</packaging>
 
@@ -28,34 +26,45 @@
         <url>https://wiki.opendaylight.org/view/ODL_Root_Parent:Main</url>
     </scm>
 
+    <properties>
+        <maven.deploy.skip>true</maven.deploy.skip>
+        <maven.install.skip>true</maven.install.skip>
+    </properties>
+
     <modules>
         <!-- odlparent tools -->
         <module>checkstyle</module>
+        <module>findbugs</module>
+        <module>spotbugs</module>
         <module>license</module>
 
-        <!-- odlparent core -->
-        <module>bundle-parent</module>
-        <module>features-parent</module>
+        <!-- Features test (SFT) -->
+        <module>bundles-test-lib</module>
+        <module>bundles4-test</module>
         <module>features-test</module>
-        <module>features-odlparent</module>
-        <module>odlparent-artifacts</module>
+
+        <!-- Karaf integration -->
+        <module>karaf</module>
+        <module>karaf-plugin</module>
+        <module>karaf-util</module>
+
+        <!-- Parent POMs -->
+        <module>bundle-parent</module>
+        <module>untested-single-feature-parent</module>
+        <module>single-feature-parent</module>
+        <module>feature-repo-parent</module>
         <module>odlparent</module>
         <module>odlparent-lite</module>
-        <module>karaf-plugin</module>
-    </modules>
 
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-deploy-plugin</artifactId>
-                <version>2.8.2</version>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
+        <!-- Features -->
+        <module>features</module>
+
+        <!-- Artifacts -->
+        <module>odlparent-artifacts</module>
+
+        <!-- Self-tests -->
+        <module>odlparent-dependency-check</module>
+    </modules>
 
     <profiles>
         <profile>
@@ -73,8 +82,8 @@
             <build>
                 <plugins>
                     <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-javadoc-plugin</artifactId>
+                        <version>3.0.0</version>
                         <inherited>false</inherited>
                         <executions>
                             <execution>
@@ -91,19 +100,4 @@
         </profile>
     </profiles>
 
-    <!--
-        Maven Site Configuration
-
-        The following configuration is necessary for maven-site-plugin to
-        correctly identify the correct deployment path for OpenDaylight Maven
-        sites.
-    -->
-    <url>${odl.site.url}/${project.groupId}/${stream}/</url>
-
-    <distributionManagement>
-        <site>
-            <id>opendaylight-site</id>
-            <url>${nexus.site.url}/</url>
-        </site>
-    </distributionManagement>
 </project>