Bump versions by x.y.(z+1)

[bgpcep.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index d5668e7a1c25e33a6280e1be4b1b77f6d32a82bc..37a509ebf8b53445465420e7073540c297ab273c 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -19,17 +19,22 @@
     </scm>
     <parent>
         <groupId>org.opendaylight.bgpcep</groupId>
-        <artifactId>commons.parent</artifactId>
-        <version>0.3.1-SNAPSHOT</version>
-        <relativePath>commons/parent</relativePath>
+        <artifactId>bgpcep-parent</artifactId>
+        <version>0.6.5-SNAPSHOT</version>
+        <relativePath>parent</relativePath>
     </parent>
 
-    <artifactId>releasepom</artifactId>
+    <artifactId>bgpcep-aggregator</artifactId>
     <packaging>pom</packaging>
-    <name>BGPCEP release</name>
-    <description>BGPCEP top-level pom</description>
+    <name>bgpcep</name> <!-- Used by Sonar to set project name -->
+    <description>BGPCEP top-level aggregator</description>
 
     <modules>
+        <!-- Well-known -->
+        <module>artifacts</module>
+        <module>features</module>
+        <module>parent</module>
+
         <!-- Common infra -->
         <module>concepts</module>
         <module>util</module>
@@ -40,20 +45,27 @@
         <module>programming</module>
         <module>rsvp</module>
         <module>topology</module>
-        <module>tcp-md5</module>
 
         <!-- Integration tests -->
         <module>integration-tests</module>
 
-        <!-- Parents -->
-        <module>commons/parent</module>
+        <!--Test tools -->
+        <module>data-change-counter</module>
+        <module>testtool-util</module>
+        <module>data-change-counter-controller-config</module>
+
+        <module>distribution-karaf</module>
 
-        <!-- Distributions -->
-        <module>commons/distributions/bgpcep-controller</module>
     </modules>
 
     <build>
         <plugins>
+            <plugin>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
@@ -85,29 +97,56 @@
                     </reportSet>
                 </reportSets>
             </plugin>
-            <!--plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <reportSets>
-                    <reportSet>
-                        <id>aggregate</id>
-                        <reports>
-                            <report>aggregate</report>
-                        </reports>
-                    </reportSet>
-                </reportSets>
-            </plugin-->
-            <!--plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>findbugs-maven-plugin</artifactId>
-                <version>2.4.0</version>
-                <configuration>
-                    <effort>Max</effort>
-                    <threshold>Low</threshold>
-                    <goal>site</goal>
-                </configuration>
-            </plugin-->
         </plugins>
     </reporting>
 
+  <profiles>
+    <profile>
+      <!--
+          This profile is to ensure we only build javadocs reports
+          when we plan to deploy Maven site for our project.
+      -->
+      <id>maven-site</id>
+      <activation>
+        <file>
+          <exists>${user.dir}/deploy-site.xml</exists>
+        </file>
+      </activation>
+
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-javadoc-plugin</artifactId>
+            <inherited>false</inherited>
+            <executions>
+              <execution>
+                <id>aggregate</id>
+                <goals>
+                  <goal>aggregate</goal>
+                </goals>
+                <phase>package</phase>
+            </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </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>