svn merge -c 1399426 FIXES: HADOOP-8930. Cumulative code coverage calculation (Andrey Klochkov via bobby)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1399427 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Robert Joseph Evans
parent
0f49f79ceb
commit
6d97a5001d
|
|
@ -802,9 +802,13 @@ Release 0.23.5 - UNRELEASED
|
|||
NEW FEATURES
|
||||
|
||||
IMPROVEMENTS
|
||||
|
||||
HADOOP-8923. JNI-based user-group mapping modules can be too chatty on
|
||||
lookup failures. (Kihwal Lee via suresh)
|
||||
|
||||
HADOOP-8930. Cumulative code coverage calculation (Andrey Klochkov via
|
||||
bobby)
|
||||
|
||||
OPTIMIZATIONS
|
||||
|
||||
BUG FIXES
|
||||
|
|
|
|||
|
|
@ -657,12 +657,6 @@
|
|||
<version>4.0.0</version>
|
||||
<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>
|
||||
|
|
@ -732,11 +726,6 @@
|
|||
<artifactId>findbugs-maven-plugin</artifactId>
|
||||
<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>
|
||||
|
|
@ -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>
|
||||
|
|
|
|||
64
pom.xml
64
pom.xml
|
|
@ -23,6 +23,17 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
|
|||
<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.org/POM/4.0.0 http://maven.apache.org/xs
|
|||
</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.org/POM/4.0.0 http://maven.apache.org/xs
|
|||
</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>
|
||||
|
|
|
|||
Loading…
Reference in New Issue