Updated build instructions; Maven 3.0.3+ is not required; upgraded Clover plugin to 3.1.10

git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@1433693 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Oleg Kalnichevski 2013-01-15 22:13:18 +00:00
parent 3d34035b17
commit e368786b20
2 changed files with 30 additions and 48 deletions

View File

@ -6,9 +6,7 @@ Building HttpComponents Client
JDK 1.5+ is required in order to compile and run HttpClient. JDK 1.5+ is required in order to compile and run HttpClient.
HttpClient utilizes Maven as a distribution management and packaging tool. HttpClient utilizes Maven as a distribution management and packaging tool.
Version 3.0.3 or later is recommended. Maven 3.0.x, however it is known Version 3.0.3 or later is required.
to be incompatible with the Clover plugin. Use Maven 2.2.1 to generate
web site content with Clover coverage reports.
Maven installation and configuration instructions can be found here: Maven installation and configuration instructions can be found here:
@ -59,11 +57,11 @@ Fix the archive files so the source files have the correct EOL settings:
mvn antrun:run mvn antrun:run
(7) Building project web site (7) Building project web site with Clover reports
Execute the following command in order to generate the project web site: Execute the following command in order to generate the project web site:
mvn site -Dmaven.clover.licenseLocation=<path>/clover.license mvn site -Pclover -Dmaven.clover.licenseLocation=<path>/clover.license
where <path> is a full path to Clover license file where <path> is a full path to Clover license file

70
pom.xml
View File

@ -357,6 +357,30 @@
<autoVersionSubmodules>true</autoVersionSubmodules> <autoVersionSubmodules>true</autoVersionSubmodules>
</configuration> </configuration>
</plugin> </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>2.9.1</version>
<configuration>
<encoding>UTF-8</encoding>
</configuration>
<executions>
<execution>
<id>validate</id>
<phase>validate</phase>
<configuration>
<configLocation>hc-checkstyle.xml</configLocation>
<consoleOutput>true</consoleOutput>
<failsOnError>true</failsOnError>
<linkXRef>false</linkXRef>
<sourceDirectory>${basedir}/src</sourceDirectory>
</configuration>
<goals>
<goal>checkstyle</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins> </plugins>
</build> </build>
@ -392,53 +416,13 @@
<profiles> <profiles>
<profile> <profile>
<id>profile-checkstyle</id> <!-- Requires Maven 3 --> <id>clover</id>
<activation>
<file>
<exists>${basedir}</exists>
</file>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<version>2.9.1</version>
<configuration>
<encoding>UTF-8</encoding>
</configuration>
<executions>
<execution>
<id>validate</id>
<phase>validate</phase>
<configuration>
<configLocation>hc-checkstyle.xml</configLocation>
<consoleOutput>true</consoleOutput>
<failsOnError>true</failsOnError>
<linkXRef>false</linkXRef>
<sourceDirectory>${basedir}/src</sourceDirectory>
</configuration>
<goals>
<goal>checkstyle</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>profile-clover-report</id> <!-- Requires Maven 2 -->
<activation>
<file>
<missing>${basedir}</missing>
</file>
</activation>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>com.atlassian.maven.plugins</groupId> <groupId>com.atlassian.maven.plugins</groupId>
<artifactId>maven-clover2-plugin</artifactId> <artifactId>maven-clover2-plugin</artifactId>
<version>3.1.10</version>
<configuration> <configuration>
<flushPolicy>threaded</flushPolicy> <flushPolicy>threaded</flushPolicy>
<flushInterval>100</flushInterval> <flushInterval>100</flushInterval>
@ -462,7 +446,7 @@
<plugin> <plugin>
<groupId>com.atlassian.maven.plugins</groupId> <groupId>com.atlassian.maven.plugins</groupId>
<artifactId>maven-clover2-plugin</artifactId> <artifactId>maven-clover2-plugin</artifactId>
<version>${clover.version}</version> <version>3.1.10</version>
<configuration> <configuration>
<jdk>1.5</jdk> <jdk>1.5</jdk>
</configuration> </configuration>