Return-Path: 
 <commits-return-3643-apmail-hc-commits-archive=hc.apache.org@hc.apache.org>
Delivered-To: apmail-hc-commits-archive@www.apache.org
Received: (qmail 23758 invoked from network); 13 Dec 2010 17:54:21 -0000
Received: from unknown (HELO mail.apache.org) (140.211.11.3)
  by 140.211.11.9 with SMTP; 13 Dec 2010 17:54:21 -0000
Received: (qmail 72822 invoked by uid 500); 13 Dec 2010 17:54:21 -0000
Delivered-To: apmail-hc-commits-archive@hc.apache.org
Received: (qmail 72780 invoked by uid 500); 13 Dec 2010 17:54:20 -0000
Mailing-List: contact commits-help@hc.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@hc.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@hc.apache.org>
List-Post: <mailto:commits@hc.apache.org>
List-Id: <commits.hc.apache.org>
Reply-To: "HttpComponents Project" <dev@hc.apache.org>
Delivered-To: mailing list commits@hc.apache.org
Received: (qmail 72773 invoked by uid 99); 13 Dec 2010 17:54:20 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 13 Dec 2010 17:54:20 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 13 Dec 2010 17:54:20 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id DBC9C23889D7; Mon, 13 Dec 2010 17:53:59 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1045260 - in /httpcomponents/httpclient/trunk:
 httpclient-cache/pom.xml httpclient/pom.xml pom.xml
Date: Mon, 13 Dec 2010 17:53:59 -0000
To: commits@hc.apache.org
From: sebb@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20101213175359.DBC9C23889D7@eris.apache.org>

Author: sebb
Date: Mon Dec 13 17:53:59 2010
New Revision: 1045260

URL: http://svn.apache.org/viewvc?rev=1045260&view=rev
Log:
Fix up clirr version comparison so defaults to 4.0, except cache=4.1-alpha2
Can also override individually using -DcomparisonVersion and -Dcache.comparisonVersion

Modified:
    httpcomponents/httpclient/trunk/httpclient-cache/pom.xml
    httpcomponents/httpclient/trunk/httpclient/pom.xml
    httpcomponents/httpclient/trunk/pom.xml

Modified: httpcomponents/httpclient/trunk/httpclient-cache/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/pom.xml?rev=1045260&r1=1045259&r2=1045260&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/pom.xml (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/pom.xml Mon Dec 13 17:53:59 2010
@@ -111,6 +111,14 @@
     <maven.compile.target>1.5</maven.compile.target>
     <maven.compile.optimize>true</maven.compile.optimize>
     <maven.compile.deprecation>true</maven.compile.deprecation>
+    <!-- cache was not present in 4.0; it first appeared in 4.1-alpha2 -->
+    <comparisonVersion>4.1-alpha2</comparisonVersion>
+    <!-- 
+     -- Allow separate override of cache version, e.g.
+     --
+     -- mvn clirr:clirr -DcomparisonVersion=4.1-alpha1 -Dcache.comparisonVersion=4.1-alpha2
+     -->
+    <cache.comparisonVersion>${comparisonVersion}</cache.comparisonVersion>
   </properties>
 
   <build>
@@ -172,6 +180,13 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>clirr-maven-plugin</artifactId>
+        <configuration>
+          <comparisonVersion>${cache.comparisonVersion}</comparisonVersion>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 

Modified: httpcomponents/httpclient/trunk/httpclient/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/pom.xml?rev=1045260&r1=1045259&r2=1045260&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/pom.xml (original)
+++ httpcomponents/httpclient/trunk/httpclient/pom.xml Mon Dec 13 17:53:59 2010
@@ -187,14 +187,6 @@
       </plugin>
 
       <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>clirr-maven-plugin</artifactId>
-        <configuration>
-          <comparisonVersion>4.0</comparisonVersion>
-        </configuration>
-      </plugin>
-
-      <plugin>
         <artifactId>maven-jxr-plugin</artifactId>
       </plugin>
 

Modified: httpcomponents/httpclient/trunk/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/pom.xml?rev=1045260&r1=1045259&r2=1045260&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/pom.xml (original)
+++ httpcomponents/httpclient/trunk/pom.xml Mon Dec 13 17:53:59 2010
@@ -75,6 +75,7 @@
     <slf4j.version>1.5.11</slf4j.version>
     <junit.version>4.8.1</junit.version>
     <easymock.version>2.5.2</easymock.version>
+    <comparisonVersion>4.0</comparisonVersion>
   </properties>
 
   <modules>
@@ -225,6 +226,13 @@
             </execution>
           </executions>
         </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>clirr-maven-plugin</artifactId>
+        <configuration>
+          <comparisonVersion>${comparisonVersion}</comparisonVersion>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 
@@ -246,6 +254,14 @@
          </reportSets>
       </plugin>
 
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>clirr-maven-plugin</artifactId>
+        <configuration>
+          <comparisonVersion>${comparisonVersion}</comparisonVersion>
+        </configuration>
+      </plugin>
+
     </plugins>
   </reporting>