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/06/15 19:11:31 UTC

svn commit: r1493401 - in /httpcomponents/httpcore/trunk: asl2.header hc-checkstyle.xml pom.xml

Author: olegk
Date: Sat Jun 15 17:11:31 2013
New Revision: 1493401

URL: http://svn.apache.org/r1493401
Log:
Changed to use shared checkstyle config v1

Removed:
    httpcomponents/httpcore/trunk/asl2.header
    httpcomponents/httpcore/trunk/hc-checkstyle.xml
Modified:
    httpcomponents/httpcore/trunk/pom.xml

Modified: httpcomponents/httpcore/trunk/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/pom.xml?rev=1493401&r1=1493400&r2=1493401&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/pom.xml (original)
+++ httpcomponents/httpcore/trunk/pom.xml Sat Jun 15 17:11:31 2013
@@ -291,19 +291,43 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-checkstyle-plugin</artifactId>
         <version>2.9.1</version>
+        <dependencies>
+          <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>hc-stylecheck</artifactId>
+            <version>1</version>
+          </dependency>
+        </dependencies>
         <configuration>
           <encoding>UTF-8</encoding>
         </configuration>
         <executions>
           <execution>
-            <id>validate</id>
+            <id>validate-main</id>
             <phase>validate</phase>
             <configuration>
-              <configLocation>hc-checkstyle.xml</configLocation>
+              <configLocation>hc-stylecheck/default.xml</configLocation>
+              <headerLocation>hc-stylecheck/asl2.header</headerLocation>
               <consoleOutput>true</consoleOutput>
               <failsOnError>true</failsOnError>
               <linkXRef>false</linkXRef>
-              <sourceDirectory>${basedir}/src</sourceDirectory>
+              <sourceDirectory>${basedir}/src/main</sourceDirectory>
+              <sourceDirectory>${basedir}/src/test</sourceDirectory>
+            </configuration>
+            <goals>
+              <goal>checkstyle</goal>
+            </goals>
+          </execution>
+          <execution>
+            <id>validate-examples</id>
+            <phase>validate</phase>
+            <configuration>
+              <configLocation>hc-stylecheck/minimal.xml</configLocation>
+              <headerLocation>hc-stylecheck/asl2.header</headerLocation>
+              <consoleOutput>true</consoleOutput>
+              <failsOnError>true</failsOnError>
+              <linkXRef>false</linkXRef>
+              <sourceDirectory>${basedir}/src/examples</sourceDirectory>
             </configuration>
             <goals>
               <goal>checkstyle</goal>