X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=pom.xml;h=834d0eac1ad66a4721e86032b3f8a2df62fd622e;hb=84a7d0a360f0d5f9b588e269840a92158d1be7d2;hp=94420585bd27e58b5f7411b4cefb39ca9861bef0;hpb=bbca33e745150213c192f3660399c61ea8ed30cd;p=netvirt.git

diff --git a/pom.xml b/pom.xml
index 94420585bd..834d0eac1a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,120 +6,122 @@ This program and the accompanying materials are made available under the
 terms of the Eclipse Public License v1.0 which accompanies this distribution,
 and is available at http://www.eclipse.org/legal/epl-v10.html
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
-  <parent>
-    <groupId>org.opendaylight.odlparent</groupId>
-    <artifactId>odlparent-lite</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
-    <relativePath/>
-  </parent>
+    <parent>
+        <groupId>org.opendaylight.odlparent</groupId>
+        <artifactId>odlparent-lite</artifactId>
+        <version>6.0.4</version>
+        <relativePath/>
+    </parent>
 
-  <groupId>org.opendaylight.netvirt</groupId>
-  <artifactId>netvirt</artifactId>
-  <version>1.3.0-SNAPSHOT</version>
-  <name>${project.artifactId}</name> <!-- Used by Sonar to set project name -->
-  <packaging>pom</packaging>
-  <description>The OVSDB Plugin integration project is a project for OpenDaylight that will implement the Open vSwitch Database RFC 7047 management protocol allowing the Southbound configuration of vSwitches and a network virtualization implementation.</description>
-  <licenses>
-    <license>
-      <name>Eclipse Public License v1.0</name>
-      <url>http://www.eclipse.org/legal/epl-v10.html</url>
-    </license>
-  </licenses>
-  <developers>
-    <developer>
-      <name>Sam Hague</name>
-      <email>shague@gmail.com</email>
-      <url>https://github.com/shague</url>
-    </developer>
-  </developers>
-  <scm>
-    <connection>scm:git:ssh://git.opendaylight.org:29418/netvirt.git</connection>
-    <developerConnection>scm:git:ssh://git.opendaylight.org:29418/netvirt.git</developerConnection>
-    <tag>HEAD</tag>
-    <url>https://wiki.opendaylight.org/view/OVSDB_Integration:Main</url>
-  </scm>
+    <groupId>org.opendaylight.netvirt</groupId>
+    <artifactId>netvirt-aggregator</artifactId>
+    <version>0.11.0-SNAPSHOT</version>
+    <name>netvirt</name> <!-- Used by Sonar to set project name -->
+    <packaging>pom</packaging>
+    <modelVersion>4.0.0</modelVersion>
 
-  <prerequisites>
-    <maven>3.1.1</maven>
-  </prerequisites>
+    <description>The NetVirt project is a project for OpenDaylight that implements a network virtualization
+        implementation.
+    </description>
+    <licenses>
+        <license>
+            <name>Eclipse Public License v1.0</name>
+            <url>http://www.eclipse.org/legal/epl-v10.html</url>
+        </license>
+    </licenses>
+    <developers>
+        <developer>
+            <name>Sam Hague</name>
+            <email>shague@gmail.com</email>
+            <url>https://github.com/shague</url>
+        </developer>
+    </developers>
+    <scm>
+        <connection>scm:git:ssh://git.opendaylight.org:29418/netvirt.git</connection>
+        <developerConnection>scm:git:ssh://git.opendaylight.org:29418/netvirt.git</developerConnection>
+        <tag>HEAD</tag>
+        <url>https://wiki.opendaylight.org/view/OVSDB_Integration:Main</url>
+    </scm>
 
-  <modules>
-    <module>openstack</module>
-    <module>vpnservice</module>
-  </modules>
+    <properties>
+        <!-- DO NOT install or deploy the repo root pom as it's only needed to initiate a build -->
+        <maven.deploy.skip>true</maven.deploy.skip>
+        <maven.install.skip>true</maven.install.skip>
 
-  <!-- DO NOT install or deploy the repo root pom as it's only needed to initiate a build -->
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-deploy-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-install-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
+    </properties>
 
-  <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>
+    <modules>
+        <module>aclservice</module>
+        <module>alarm</module>
+        <module>artifacts</module>
+        <module>bgpmanager</module>
+        <module>cache</module>
+        <module>commons</module>
+        <module>dhcpservice</module>
+        <module>elanmanager</module>
+        <module>features</module>
+        <module>fibmanager</module>
+        <module>ipv6service</module>
+        <module>karaf</module>
+        <module>model-bgp</module>
+        <module>natservice</module>
+        <module>neutronvpn</module>
+        <module>qosservice</module>
+        <module>statemanager</module>
+        <module>vpnmanager</module>
+    </modules>
 
-      <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>
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <!-- Downgrade javadoc plugin, as 3.1.0+ breaks with maven.compiler.release=11 + javadoc:aggregate -->
+                    <artifactId>maven-javadoc-plugin</artifactId>
+                    <version>3.0.1</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
 
-  <!--
-      Maven Site Configuration
+    <profiles>
+        <profile>
+            <id>sonar-jacoco-aggregate</id>
+            <activation>
+                <property>
+                    <name>odl.jacoco.aggregateFile</name>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.jacoco</groupId>
+                        <artifactId>jacoco-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>merge</id>
+                                <goals>
+                                    <goal>merge</goal>
+                                </goals>
+                                <phase>generate-resources</phase>
+                                <configuration>
+                                    <destFile>${odl.jacoco.aggregateFile}</destFile>
+                                    <fileSets>
+                                        <fileSet>
+                                            <directory>${project.basedir}</directory>
+                                            <includes>
+                                                <include>**/target/code-coverage/*.exec</include>
+                                            </includes>
+                                        </fileSet>
+                                    </fileSets>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 
-      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>
\ No newline at end of file
+</project>