Bump versions to 2.0.24-SNAPSHOT

[yangtools.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 183b3b1e263ba0204e0c47ed4be197b905620a17..7d66af218038042768f7e6e07a07fd7308ad90f0 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -12,14 +12,14 @@
     <parent>
       <groupId>org.opendaylight.odlparent</groupId>
       <artifactId>odlparent-lite</artifactId>
-      <version>3.1.6</version>
+      <version>3.1.9</version>
       <relativePath/>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.opendaylight.yangtools</groupId>
     <artifactId>yangtools-aggregator</artifactId>
-    <version>2.0.17-SNAPSHOT</version>
+    <version>2.0.24-SNAPSHOT</version>
     <name>yangtools</name> <!-- Used by Sonar to set project name -->
     <packaging>pom</packaging>
 
@@ -33,81 +33,64 @@
     <modules>
         <module>benchmarks</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>aggregate-javadoc</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>
                     <plugin>
-                        <artifactId>maven-javadoc-plugin</artifactId>
+                        <groupId>org.jacoco</groupId>
+                        <artifactId>jacoco-maven-plugin</artifactId>
                         <executions>
                             <execution>
-                                <id>aggregate</id>
-                                <phase>package</phase>
+                                <id>merge</id>
                                 <goals>
-                                    <goal>aggregate-jar</goal>
+                                    <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>
-        <profile>
-            <id>karaf</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-
-            <modules>
-                <module>distribution-karaf</module>
-            </modules>
-        </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>