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

[neutron.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index bce204ef5cb0f978098eb010a78490e0040ab8ec..25ba889303e61d4bfd0063b56861921a8728ae7a 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright IBM Corporation, 2013.  All rights reserved.
+<!-- Copyright IBM Corporation, 2013, 2016.  All rights reserved.
 
  This program and the accompanying materials are made available under the
  terms of the Eclipse Public License v1.0 which accompanies this distribution,
@@ -9,12 +9,12 @@
   <parent>
     <groupId>org.opendaylight.neutron</groupId>
     <artifactId>project-neutron-parent</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
+    <version>0.7.5-SNAPSHOT</version>
     <relativePath>parent</relativePath>
   </parent>
   <groupId>org.opendaylight.neutron</groupId>
   <artifactId>project-neutron</artifactId>
-  <version>0.6.0-SNAPSHOT</version>
+  <version>0.7.5-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>neutron</name> <!-- Used by Sonar to set project name -->
   <description>OpenDaylight Neutron Northbound Service</description>
@@ -93,7 +93,7 @@
     <module>neutron-spi</module>
     <module>northbound-api</module>
     <module>transcriber</module>
-    <module>dummyprovider</module>
+    <module>neutron-logger</module>
     <module>features/production</module>
     <module>features/test</module>
     <module>karaf</module>
@@ -106,17 +106,17 @@
         <artifactId>maven-antrun-plugin</artifactId>
         <executions>
           <execution>
-            <id>move-it-reports</id>
+            <id>copy-it-reports</id>
             <phase>verify</phase>
             <goals>
               <goal>run</goal>
             </goals>
             <configuration>
               <target>
-                <move todir="target/site">
+                <copy todir="target/site" failonerror="false">
                   <fileset dir="integration/test/target/site" />
-                </move>
-                <move file="integration/test/target/jacoco-it.exec" todir="target" />
+                </copy>
+                <copy file="integration/test/target/jacoco-it.exec" todir="target" failonerror="false" />
               </target>
             </configuration>
           </execution>
@@ -131,4 +131,53 @@
     <url>https://wiki.opendaylight.org/view/NeutronNorthbound:Main</url>
   </scm>
 
+  <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>