X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=pom.xml;h=773e6de7455f06c568391db3f4900c4931715c1d;hb=e3233ae5c3fb026f17f7d4fcb44326b7c0233cff;hp=77011216fe69c25cf299ceec18e77eb2cb3cbdff;hpb=8884f45c88f417abd6fdc877e05c747adeb5b09b;p=mdsal.git

diff --git a/pom.xml b/pom.xml
index 77011216fe..773e6de745 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,104 +10,94 @@
 <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>3.1.2</version>
-      <relativePath/>
+        <groupId>org.opendaylight.odlparent</groupId>
+        <artifactId>odlparent-lite</artifactId>
+        <version>4.0.2</version>
+        <relativePath/>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>mdsal-agreggator</artifactId>
-    <version>2.2.0-SNAPSHOT</version>
-    <name>md-sal</name> <!-- Used by Sonar to set project name -->
+    <version>3.0.1-SNAPSHOT</version>
     <packaging>pom</packaging>
-
-    <scm>
-        <connection>scm:git:ssh://git.opendaylight.org:29418/mdsal.git</connection>
-        <developerConnection>scm:git:ssh://git.opendaylight.org:29418/mdsal.git</developerConnection>
-        <url>https://wiki.opendaylight.org/view/MD-SAL:Main</url>
-        <tag>HEAD</tag>
-    </scm>
+    <name>md-sal</name> <!-- Used by Sonar to set project name -->
 
     <modules>
-      <module>common</module>
-      <module>dom</module>
-      <module>binding</module>
-      <module>binding2</module>
-      <module>model</module>
-      <module>model-binding2</module>
-      <module>entityownership</module>
-      <module>singleton-service</module>
+        <module>artifacts</module>
+        <module>common</module>
+        <module>features</module>
+        <module>dom</module>
+        <module>binding</module>
+        <module>binding2</module>
+        <module>model</module>
+        <module>model-binding2</module>
+        <module>entityownership</module>
+        <module>singleton-service</module>
     </modules>
 
     <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-checkstyle-plugin</artifactId>
-                    <dependencies>
-                        <dependency>
-                            <groupId>org.opendaylight.yangtools</groupId>
-                            <artifactId>checkstyle-logging</artifactId>
-                            <version>2.0.7</version>
-                        </dependency>
-                    </dependencies>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
-
-  <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>
+            <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>
-    </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>
+    </build>
 
-  <distributionManagement>
-    <site>
-      <id>opendaylight-site</id>
-      <url>${nexus.site.url}/</url>
-    </site>
-  </distributionManagement>
+    <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>
 
+    <scm>
+        <connection>scm:git:ssh://git.opendaylight.org:29418/mdsal.git</connection>
+        <developerConnection>scm:git:ssh://git.opendaylight.org:29418/mdsal.git</developerConnection>
+        <url>https://wiki.opendaylight.org/view/MD-SAL:Main</url>
+        <tag>HEAD</tag>
+    </scm>
 </project>