[java-sig-commits] [httpcomponents-client] OSGi export more packages.

[Alexander Kurtakov]

commit 8e3aaf5c2b06f1b3d3ac0bf2d5c25d1e2b6191a2
Author: Alexander Kurtakov <akurtako(a)redhat.com&gt;
Date:   Thu Mar 10 21:30:17 2011 +0200

    OSGi export more packages.

 0001-Cleanup-pom.patch     |  153 ++++++++++++++++++++++---------------------
 httpcomponents-client.spec |    5 +-
 2 files changed, 82 insertions(+), 76 deletions(-)
---
diff --git a/0001-Cleanup-pom.patch b/0001-Cleanup-pom.patch
index ac7b967..2ed82da 100644
--- a/0001-Cleanup-pom.patch
+++ b/0001-Cleanup-pom.patch
@@ -1,76 +1,5 @@
---- httpclient/pom.xml.sav	2011-01-17 22:00:53.000000000 +0200
-+++ httpclient/pom.xml	2011-02-18 13:38:36.221371560 +0200
-@@ -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,12 @@
-           </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>
-+      <plugin>   
-+        <groupId>org.apache.felix</groupId>
-+        <artifactId>maven-bundle-plugin</artifactId>
-+        <extensions>true</extensions>
-+      </plugin> 
-+     </plugins>
-   </build>
- 
-   <reporting>
-@@ -165,14 +146,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-25 20:17:20.519335750 +0200
+--- 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 @@
    <modules>
      <module>httpclient</module>
@@ -183,8 +112,82 @@
    </reporting>
  
  </project>
---- httpmime/pom.xml.sav	2011-01-17 22:00:44.000000000 +0200
-+++ httpmime/pom.xml	2011-02-25 20:19:09.191564653 +0200
+--- 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,17 @@
+           </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>
++            </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>
diff --git a/httpcomponents-client.spec b/httpcomponents-client.spec
index b2bf294..3cce83e 100644
--- a/httpcomponents-client.spec
+++ b/httpcomponents-client.spec
@@ -3,7 +3,7 @@
 Name:              httpcomponents-client
 Summary:           HTTP agent implementation based on httpcomponents HttpCore
 Version:           4.1
-Release:           4%{?dist}
+Release:           5%{?dist}
 Group:             Development/Libraries
 License:           ASL 2.0
 URL:               http://hc.apache.org/
@@ -92,6 +92,9 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
 
 
 %changelog
+* Thu Mar 10 2011 Alexander Kurtakov <akurtako(a)redhat.com&gt; 4.1-5
+- OSGi export more packages.
+
 * Fri Feb 25 2011 Alexander Kurtakov <akurtako(a)redhat.com&gt; 4.1-4
 - Build httpmime module.