[java-sig-commits] [httpcomponents-client] Really fix the pom and deps.

[Alexander Kurtakov]

commit 6b2c05e436f5ea2673fdcd6fbfc7e4c0945ff89d
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Fri Feb 18 11:09:22 2011 +0200

    Really fix the pom and deps.

 0001-Cleanup-pom.patch     |  101 +++++++++++++++++++++++++-------------------
 httpcomponents-client.spec |    1 -
 2 files changed, 57 insertions(+), 45 deletions(-)
---
diff --git a/0001-Cleanup-pom.patch b/0001-Cleanup-pom.patch
index 1a7621f..05e5e7e 100644
--- a/0001-Cleanup-pom.patch
+++ b/0001-Cleanup-pom.patch
@@ -1,47 +1,3 @@
---- httpclient/pom.xml.sav	2011-02-17 21:47:11.997569572 +0200
-+++ httpclient/pom.xml	2011-02-17 21:48:40.911717624 +0200
-@@ -122,25 +122,7 @@
-           </execution>
-         </executions>
-       </plugin>
--      <plugin>
--        <groupId>com.atlassian.maven.plugins</groupId>
--        <artifactId>maven-clover2-plugin</artifactId>
--        <configuration>
--          <flushPolicy>threaded</flushPolicy>
--          <flushInterval>100</flushInterval>
--          <targetPercentage>50%</targetPercentage>
--        </configuration>
--        <executions>
--          <execution>
--            <id>site</id>
--            <phase>pre-site</phase>
--            <goals>
--              <goal>instrument</goal>
--            </goals>
--          </execution>
--        </executions>
--      </plugin>
--    </plugins>
-+     </plugins>
-   </build>
- 
-   <reporting>
-@@ -165,14 +147,6 @@
-       </plugin>
- 
-       <plugin>
--        <groupId>com.atlassian.maven.plugins</groupId>
--        <artifactId>maven-clover2-plugin</artifactId>
--        <configuration>
--          <jdk>1.5</jdk>
--        </configuration>
--      </plugin>
--
--      <plugin>
-         <artifactId>maven-jxr-plugin</artifactId>
-       </plugin>
- 
 --- pom.xml.sav	2011-01-17 22:00:53.000000000 +0200
 +++ pom.xml	2011-02-17 22:03:40.828341546 +0200
 @@ -88,21 +88,6 @@
@@ -149,3 +105,60 @@
    </reporting>
  
  </project>
+--- httpclient/pom.xml.sav	2011-01-17 22:00:53.000000000 +0200
++++ httpclient/pom.xml	2011-02-18 11:05:10.474559948 +0200
+@@ -71,12 +71,6 @@
+       <version>${easymock.version}</version>
+       <scope>test</scope>
+     </dependency>
+-    <dependency>
+-      <groupId>org.easymock</groupId>
+-      <artifactId>easymockclassextension</artifactId>
+-      <version>${easymock.version}</version>
+-      <scope>test</scope>
+-    </dependency>
+   </dependencies>
+ 
+   <properties>
+@@ -122,25 +116,7 @@
+           </execution>
+         </executions>
+       </plugin>
+-      <plugin>
+-        <groupId>com.atlassian.maven.plugins</groupId>
+-        <artifactId>maven-clover2-plugin</artifactId>
+-        <configuration>
+-          <flushPolicy>threaded</flushPolicy>
+-          <flushInterval>100</flushInterval>
+-          <targetPercentage>50%</targetPercentage>
+-        </configuration>
+-        <executions>
+-          <execution>
+-            <id>site</id>
+-            <phase>pre-site</phase>
+-            <goals>
+-              <goal>instrument</goal>
+-            </goals>
+-          </execution>
+-        </executions>
+-      </plugin>
+-    </plugins>
++     </plugins>
+   </build>
+ 
+   <reporting>
+@@ -165,14 +141,6 @@
+       </plugin>
+ 
+       <plugin>
+-        <groupId>com.atlassian.maven.plugins</groupId>
+-        <artifactId>maven-clover2-plugin</artifactId>
+-        <configuration>
+-          <jdk>1.5</jdk>
+-        </configuration>
+-      </plugin>
+-
+-      <plugin>
+         <artifactId>maven-jxr-plugin</artifactId>
+       </plugin>
+ 
diff --git a/httpcomponents-client.spec b/httpcomponents-client.spec
index c233a08..af77b86 100644
--- a/httpcomponents-client.spec
+++ b/httpcomponents-client.spec
@@ -14,7 +14,6 @@ BuildArch:         noarch
 
 BuildRequires:     httpcomponents-project
 BuildRequires:     httpcomponents-core
-BuildRequires:     easymock-classextension
 
 
 Requires:          java >= 1:1.6.0