You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2013/01/15 23:13:19 UTC
svn commit: r1433693 - in /httpcomponents/httpclient/trunk: BUILDING.txt
pom.xml
Author: olegk
Date: Tue Jan 15 22:13:18 2013
New Revision: 1433693
URL: http://svn.apache.org/viewvc?rev=1433693&view=rev
Log:
Updated build instructions; Maven 3.0.3+ is not required; upgraded Clover plugin to 3.1.10
Modified:
httpcomponents/httpclient/trunk/BUILDING.txt
httpcomponents/httpclient/trunk/pom.xml
Modified: httpcomponents/httpclient/trunk/BUILDING.txt
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/BUILDING.txt?rev=1433693&r1=1433692&r2=1433693&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/BUILDING.txt (original)
+++ httpcomponents/httpclient/trunk/BUILDING.txt Tue Jan 15 22:13:18 2013
@@ -6,9 +6,7 @@ Building HttpComponents Client
JDK 1.5+ is required in order to compile and run HttpClient.
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
-to be incompatible with the Clover plugin. Use Maven 2.2.1 to generate
-web site content with Clover coverage reports.
+Version 3.0.3 or later is required.
Maven installation and configuration instructions can be found here:
@@ -59,11 +57,11 @@ Fix the archive files so the source file
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:
-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
Modified: httpcomponents/httpclient/trunk/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/pom.xml?rev=1433693&r1=1433692&r2=1433693&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/pom.xml (original)
+++ httpcomponents/httpclient/trunk/pom.xml Tue Jan 15 22:13:18 2013
@@ -357,6 +357,30 @@
<autoVersionSubmodules>true</autoVersionSubmodules>
</configuration>
</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>
</build>
@@ -392,53 +416,13 @@
<profiles>
<profile>
- <id>profile-checkstyle</id> <!-- Requires Maven 3 -->
- <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>
+ <id>clover</id>
<build>
<plugins>
<plugin>
<groupId>com.atlassian.maven.plugins</groupId>
<artifactId>maven-clover2-plugin</artifactId>
+ <version>3.1.10</version>
<configuration>
<flushPolicy>threaded</flushPolicy>
<flushInterval>100</flushInterval>
@@ -462,7 +446,7 @@
<plugin>
<groupId>com.atlassian.maven.plugins</groupId>
<artifactId>maven-clover2-plugin</artifactId>
- <version>${clover.version}</version>
+ <version>3.1.10</version>
<configuration>
<jdk>1.5</jdk>
</configuration>