Author: bobby Date: Wed Oct 17 20:49:44 2012 New Revision: 1399426 URL: http://svn.apache.org/viewvc?rev=1399426&view=rev Log: HADOOP-8930. Cumulative code coverage calculation (Andrey Klochkov via bobby)
Modified: hadoop/common/trunk/hadoop-project/pom.xml hadoop/common/trunk/pom.xml Modified: hadoop/common/trunk/hadoop-project/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-project/pom.xml?rev=1399426&r1=1399425&r2=1399426&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-project/pom.xml (original) +++ hadoop/common/trunk/hadoop-project/pom.xml Wed Oct 17 20:49:44 2012 @@ -656,12 +656,6 @@ <scope>compile</scope> </dependency> <dependency> - <groupId>com.cenqua.clover</groupId> - <artifactId>clover</artifactId> - <!-- Use the version needed by maven-clover-plugin --> - <version>3.0.2</version> - </dependency> - <dependency> <groupId>org.hsqldb</groupId> <artifactId>hsqldb</artifactId> <version>2.0.0</version> @@ -731,11 +725,6 @@ <version>2.3.2</version> </plugin> <plugin> - <groupId>com.atlassian.maven.plugins</groupId> - <artifactId>maven-clover2-plugin</artifactId> - <version>3.0.5</version> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> <version>2.6</version> @@ -909,54 +898,6 @@ <build.platform>Mac_OS_X-${sun.arch.data.model}</build.platform> </properties> </profile> - - <profile> - <id>clover</id> - <activation> - <activeByDefault>false</activeByDefault> - <property> - <name>clover</name> - </property> - </activation> - <properties> - <cloverLicenseLocation>${user.home}/.clover.license</cloverLicenseLocation> - <cloverDatabase>${project.build.directory}/clover/hadoop-coverage.db</cloverDatabase> - </properties> - <build> - <plugins> - <plugin> - <groupId>com.atlassian.maven.plugins</groupId> - <artifactId>maven-clover2-plugin</artifactId> - <configuration> - <includesAllSourceRoots>true</includesAllSourceRoots> - <includesTestSourceRoots>true</includesTestSourceRoots> - <licenseLocation>${cloverLicenseLocation}</licenseLocation> - <cloverDatabase>${cloverDatabase}</cloverDatabase> - <targetPercentage>50%</targetPercentage> - <outputDirectory>${project.build.directory}/clover</outputDirectory> - <generateHtml>true</generateHtml> - <generateXml>true</generateXml> - </configuration> - <executions> - <execution> - <id>clover-setup</id> - <phase>process-sources</phase> - <goals> - <goal>setup</goal> - </goals> - </execution> - <execution> - <id>clover</id> - <phase>test</phase> - <goals> - <goal>clover</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> <profile> <id>test-patch</id> <activation> Modified: hadoop/common/trunk/pom.xml URL: http://svn.apache.org/viewvc/hadoop/common/trunk/pom.xml?rev=1399426&r1=1399425&r2=1399426&view=diff ============================================================================== --- hadoop/common/trunk/pom.xml (original) +++ hadoop/common/trunk/pom.xml Wed Oct 17 20:49:44 2012 @@ -23,6 +23,17 @@ xsi:schemaLocation="http://maven.apache. <name>Apache Hadoop Main</name> <packaging>pom</packaging> + <dependencyManagement> + <dependencies> + <dependency> + <groupId>com.cenqua.clover</groupId> + <artifactId>clover</artifactId> + <!-- Use the version needed by maven-clover-plugin --> + <version>3.0.2</version> + </dependency> + </dependencies> + </dependencyManagement> + <distributionManagement> <repository> <id>apache.staging.https</id> @@ -243,6 +254,11 @@ xsi:schemaLocation="http://maven.apache. </lifecycleMappingMetadata> </configuration> </plugin> + <plugin> + <groupId>com.atlassian.maven.plugins</groupId> + <artifactId>maven-clover2-plugin</artifactId> + <version>3.0.5</version> + </plugin> </plugins> </pluginManagement> @@ -483,6 +499,52 @@ xsi:schemaLocation="http://maven.apache. </plugins> </build> </profile> - + <profile> + <id>clover</id> + <activation> + <activeByDefault>false</activeByDefault> + <property> + <name>clover</name> + </property> + </activation> + <properties> + <cloverLicenseLocation>${user.home}/.clover.license</cloverLicenseLocation> + <cloverDatabase>${project.build.directory}/clover/hadoop-coverage.db</cloverDatabase> + </properties> + <build> + <plugins> + <plugin> + <groupId>com.atlassian.maven.plugins</groupId> + <artifactId>maven-clover2-plugin</artifactId> + <configuration> + <includesAllSourceRoots>true</includesAllSourceRoots> + <includesTestSourceRoots>true</includesTestSourceRoots> + <licenseLocation>${cloverLicenseLocation}</licenseLocation> + <cloverDatabase>${cloverDatabase}</cloverDatabase> + <targetPercentage>50%</targetPercentage> + <outputDirectory>${project.build.directory}/clover</outputDirectory> + <generateHtml>true</generateHtml> + <generateXml>true</generateXml> + </configuration> + <executions> + <execution> + <id>clover-setup</id> + <phase>process-sources</phase> + <goals> + <goal>setup</goal> + </goals> + </execution> + <execution> + <id>clover</id> + <phase>test</phase> + <goals> + <goal>clover</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> </profiles> </project>