Author: bobby
Date: Wed Oct 17 20:51:28 2012
New Revision: 1399427
URL: http://svn.apache.org/viewvc?rev=1399427&view=rev
Log:
svn merge -c 1399426 FIXES: HADOOP-8930. Cumulative code coverage calculation
(Andrey Klochkov via bobby)
Modified:
hadoop/common/branches/branch-2/hadoop-project/pom.xml
hadoop/common/branches/branch-2/pom.xml
Modified: hadoop/common/branches/branch-2/hadoop-project/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-project/pom.xml?rev=1399427&r1=1399426&r2=1399427&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-project/pom.xml (original)
+++ hadoop/common/branches/branch-2/hadoop-project/pom.xml Wed Oct 17 20:51:28
2012
@@ -658,12 +658,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>
@@ -733,11 +727,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>
@@ -949,54 +938,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/branches/branch-2/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/pom.xml?rev=1399427&r1=1399426&r2=1399427&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/pom.xml (original)
+++ hadoop/common/branches/branch-2/pom.xml Wed Oct 17 20:51:28 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>
@@ -136,6 +147,11 @@ xsi:schemaLocation="http://maven.apache.
</dependency>
</dependencies>
</plugin>
+ <plugin>
+ <groupId>com.atlassian.maven.plugins</groupId>
+ <artifactId>maven-clover2-plugin</artifactId>
+ <version>3.0.5</version>
+ </plugin>
</plugins>
</pluginManagement>
@@ -376,6 +392,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>
