[java-sig-commits] [httpcomponents-client] New upstream bugfix version (4.1.1)

[Stanislav Ochotnicky]

commit 9e9e64bfa4f13d0568cc3fad9068bb23e7c4fb69
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com&gt;
Date:   Tue Mar 29 14:08:37 2011 +0200

    New upstream bugfix version (4.1.1)

 .gitignore                 |    1 +
 0001-Cleanup-pom.patch     |  231 ++++++++++++++++++++++++--------------------
 httpcomponents-client.spec |    9 +-
 sources                    |    2 +-
 4 files changed, 135 insertions(+), 108 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 724c402..8f49a16 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /httpcomponents-client-4.0.3-src.tar.gz
 httpcomponents-client-4.1-src.tar.gz
+/httpcomponents-client-4.1.1-src.tar.gz
diff --git a/0001-Cleanup-pom.patch b/0001-Cleanup-pom.patch
index a3ba083..0577ad9 100644
--- a/0001-Cleanup-pom.patch
+++ b/0001-Cleanup-pom.patch
@@ -1,6 +1,124 @@
---- pom.xml.sav	2011-01-17 15:00:53.000000000 -0500
-+++ pom.xml	2011-03-10 09:45:01.330282001 -0500
-@@ -81,28 +81,11 @@
+From 1e435abf209089692a3ba2dca86be757e892c10b Mon Sep 17 00:00:00 2001
+From: Stanislav Ochotnicky <sochotnicky(a)redhat.com&gt;
+Date: Tue, 29 Mar 2011 14:02:03 +0200
+Subject: [PATCH] Cleanup pom
+
+---
+ httpclient/pom.xml |   45 +++++++++++------------------
+ httpmime/pom.xml   |    7 ++++-
+ pom.xml            |   79 +--------------------------------------------------
+ 3 files changed, 25 insertions(+), 106 deletions(-)
+
+diff --git a/httpclient/pom.xml b/httpclient/pom.xml
+index 4ce1cab..e0ac937 100644
+--- a/httpclient/pom.xml
++++ b/httpclient/pom.xml
+@@ -38,7 +38,7 @@
+    HttpComponents Client (base module)
+   </description>
+   <url>http://hc.apache.org/httpcomponents-client</url>
+-  <packaging>jar</packaging>
++  <packaging>bundle</packaging>
+ 
+   <dependencies>
+     <dependency>
+@@ -65,12 +65,6 @@
+       <version>${junit.version}</version>
+       <scope>test</scope>
+     </dependency>
+-    <dependency>
+-      <groupId>org.mockito</groupId>
+-      <artifactId>mockito-core</artifactId>
+-      <version>${mockito.version}</version>
+-      <scope>test</scope>
+-    </dependency>
+   </dependencies>
+ 
+   <properties>
+@@ -116,25 +110,18 @@
+           </execution>
+         </executions>
+       </plugin>
+-      <plugin>
+-        <groupId>com.atlassian.maven.plugins</groupId>
+-        <artifactId>maven-clover2-plugin</artifactId>
++      <plugin>   
++        <groupId>org.apache.felix</groupId>
++        <artifactId>maven-bundle-plugin</artifactId>
++        <extensions>true</extensions>
+         <configuration>
+-          <flushPolicy>threaded</flushPolicy>
+-          <flushInterval>100</flushInterval>
+-          <targetPercentage>50%</targetPercentage>
++            <instructions>
++                <Export-Package>*</Export-Package>
++                <Private-Package></Private-Package>
++            </instructions>
+         </configuration>
+-        <executions>
+-          <execution>
+-            <id>site</id>
+-            <phase>pre-site</phase>
+-            <goals>
+-              <goal>instrument</goal>
+-            </goals>
+-          </execution>
+-        </executions>
+-      </plugin>
+-    </plugins>
++      </plugin> 
++     </plugins>
+   </build>
+ 
+   <reporting>
+@@ -161,11 +148,13 @@
+       </plugin>
+ 
+       <plugin>
+-        <groupId>com.atlassian.maven.plugins</groupId>
+-        <artifactId>maven-clover2-plugin</artifactId>
+-        <version>${clover.version}</version>
++        <groupId>org.apache.felix</groupId>
++        <artifactId>maven-bundle-plugin</artifactId>
+         <configuration>
+-          <jdk>1.5</jdk>
++          <instructions>
++              <Export-Package>*</Export-Package>
++              <Private-Package></Private-Package>
++          </instructions>
+         </configuration>
+       </plugin>
+ 
+diff --git a/httpmime/pom.xml b/httpmime/pom.xml
+index 8853cc2..6922f99 100644
+--- a/httpmime/pom.xml
++++ b/httpmime/pom.xml
+@@ -38,7 +38,7 @@
+    HttpComponents HttpClient - MIME coded entities
+   </description>
+   <url>http://hc.apache.org/httpcomponents-client</url>
+-  <packaging>jar</packaging>
++  <packaging>bundle</packaging>
+ 
+   <dependencies>
+     <dependency>
+@@ -112,6 +112,11 @@
+           </execution>
+         </executions>
+       </plugin>
++      <plugin>   
++        <groupId>org.apache.felix</groupId>
++        <artifactId>maven-bundle-plugin</artifactId>
++        <extensions>true</extensions>
++      </plugin> 
+     </plugins>
+   </build>
+ 
+diff --git a/pom.xml b/pom.xml
+index e3ba289..8ab6b70 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -82,28 +82,11 @@
    <modules>
      <module>httpclient</module>
      <module>httpmime</module>
@@ -29,7 +147,7 @@
          <artifactId>maven-jar-plugin</artifactId>
          <configuration>
            <archive>
-@@ -189,49 +172,6 @@
+@@ -190,49 +173,6 @@
          </configuration>
        </plugin>
        <plugin>
@@ -79,7 +197,7 @@
            <artifactId>maven-resources-plugin</artifactId>
            <executions>
              <execution>
-@@ -252,14 +192,7 @@
+@@ -253,14 +193,7 @@
              </execution>
            </executions>
          </plugin>
@@ -95,7 +213,7 @@
    </build>
  
    <reporting>
-@@ -280,15 +213,7 @@
+@@ -281,15 +214,7 @@
           </reportSets>
        </plugin>
  
@@ -112,101 +230,6 @@
    </reporting>
  
  </project>
---- httpclient/pom.xml.sav	2011-01-17 15:00:53.000000000 -0500
-+++ httpclient/pom.xml	2011-03-10 09:50:50.829281988 -0500
-@@ -38,7 +38,7 @@
-    HttpComponents Client (base module)
-   </description>
-   <url>http://hc.apache.org/httpcomponents-client</url>
--  <packaging>jar</packaging>
-+  <packaging>bundle</packaging>
- 
-   <dependencies>
-     <dependency>
-@@ -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,18 @@
-           </execution>
-         </executions>
-       </plugin>
--      <plugin>
--        <groupId>com.atlassian.maven.plugins</groupId>
--        <artifactId>maven-clover2-plugin</artifactId>
-+      <plugin>   
-+        <groupId>org.apache.felix</groupId>
-+        <artifactId>maven-bundle-plugin</artifactId>
-+        <extensions>true</extensions>
-         <configuration>
--          <flushPolicy>threaded</flushPolicy>
--          <flushInterval>100</flushInterval>
--          <targetPercentage>50%</targetPercentage>
-+            <instructions>
-+                <Export-Package>*</Export-Package>
-+                <Private-Package></Private-Package>
-+            </instructions>
-         </configuration>
--        <executions>
--          <execution>
--            <id>site</id>
--            <phase>pre-site</phase>
--            <goals>
--              <goal>instrument</goal>
--            </goals>
--          </execution>
--        </executions>
--      </plugin>
--    </plugins>
-+      </plugin> 
-+     </plugins>
-   </build>
- 
-   <reporting>
-@@ -165,14 +151,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>
- 
---- httpmime/pom.xml.sav	2011-01-17 15:00:44.000000000 -0500
-+++ httpmime/pom.xml	2011-03-10 09:45:01.330282001 -0500
-@@ -38,7 +38,7 @@
-    HttpComponents HttpClient - MIME coded entities
-   </description>
-   <url>http://hc.apache.org/httpcomponents-client</url>
--  <packaging>jar</packaging>
-+  <packaging>bundle</packaging>
- 
-   <dependencies>
-     <dependency>
-@@ -112,6 +112,11 @@
-           </execution>
-         </executions>
-       </plugin>
-+      <plugin>   
-+        <groupId>org.apache.felix</groupId>
-+        <artifactId>maven-bundle-plugin</artifactId>
-+        <extensions>true</extensions>
-+      </plugin> 
-     </plugins>
-   </build>
- 
+-- 
+1.7.4
+
diff --git a/httpcomponents-client.spec b/httpcomponents-client.spec
index cc8553a..f203789 100644
--- a/httpcomponents-client.spec
+++ b/httpcomponents-client.spec
@@ -2,8 +2,8 @@
 
 Name:              httpcomponents-client
 Summary:           HTTP agent implementation based on httpcomponents HttpCore
-Version:           4.1
-Release:           6%{?dist}
+Version:           4.1.1
+Release:           1%{?dist}
 Group:             Development/Libraries
 License:           ASL 2.0
 URL:               http://hc.apache.org/
@@ -44,7 +44,7 @@ API docs for %{name}.
 
 %prep
 %setup -q
-%patch0 -b .sav
+%patch0 -p1 -b .sav
 
 %build
 mvn-rpmbuild -Dmaven.test.skip=true install javadoc:aggregate
@@ -92,6 +92,9 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
 
 
 %changelog
+* Tue Mar 29 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com&gt; - 4.1.1-1
+- New upstream bugfix version (4.1.1)
+
 * Tue Mar 15 2011 Severin Gehwolf <sgehwolf(a)redhat.com&gt; 4.1-6
 - Explicitly set PrivatePackage to the empty set, so as to
   export all packages.
diff --git a/sources b/sources
index f275dc8..038cbec 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1a50cf1c2eeac0ff29a3cd095ed19954  httpcomponents-client-4.1-src.tar.gz
+12be9646128db4a4383e47341cbeb7fd  httpcomponents-client-4.1.1-src.tar.gz