X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=pom.xml;h=935ff9b7d241e594e67c93cdd4be851455e33c64;hb=14372ca8ee0e2da543549143cba4eedb585530b6;hp=0f4dbc0cf31cd3c127ce8d2519c7addbef2b8c60;hpb=5b4c141f15ecd949b1ca82a5a4255286de57b8c4;p=yangtools.git

diff --git a/pom.xml b/pom.xml
index 0f4dbc0cf3..935ff9b7d2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,14 +12,14 @@
     <parent>
       <groupId>org.opendaylight.odlparent</groupId>
       <artifactId>odlparent-lite</artifactId>
-      <version>4.0.0</version>
+      <version>4.0.9</version>
       <relativePath/>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.opendaylight.yangtools</groupId>
     <artifactId>yangtools-aggregator</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.1.9-SNAPSHOT</version>
     <name>yangtools</name> <!-- Used by Sonar to set project name -->
     <packaging>pom</packaging>
 
@@ -30,25 +30,40 @@
         <tag>HEAD</tag>
     </scm>
 
-    <properties>
-        <sonar.jacoco.reportPath>${project.build.directory}/jacoco.exec</sonar.jacoco.reportPath>
-    </properties>
-
     <modules>
         <module>artifacts</module>
         <module>benchmarks</module>
+        <module>bundle-parent</module>
         <module>common</module>
+        <module>docs</module>
         <module>features</module>
         <module>yang</module>
         <module>yang-validation-tool</module>
         <module>third-party</module>
     </modules>
 
+    <properties>
+        <maven.deploy.skip>true</maven.deploy.skip>
+        <maven.install.skip>true</maven.install.skip>
+    </properties>
+
     <profiles>
         <profile>
-            <id>sonar-jacoco-aggregate</id>
+            <id>karaf</id>
             <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
 
+            <modules>
+                <module>distribution-karaf</module>
+            </modules>
+        </profile>
+        <profile>
+            <id>sonar-jacoco-aggregate</id>
+            <activation>
+                <property>
+                    <name>odl.jacoco.aggregateFile</name>
+                </property>
             </activation>
             <build>
                 <plugins>
@@ -79,42 +94,5 @@
                 </plugins>
             </build>
         </profile>
-
-        <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>
-                                <configuration>
-                                    <!-- Xerces-J has non-compliant javadocs -->
-                                    <additionalparam>-Xdoclint:none</additionalparam>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
     </profiles>
-
 </project>