From ff696dac1e539854085b48c51d9d315ab94e469c Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <sochotnicky@redhat.com>
Date: Thu, 1 Mar 2012 11:39:52 +0100
Subject: [PATCH 3/3] Make httpclient into bundle

Also remove few build deps we don't have
---
 httpclient/pom.xml |   47 +++++++++++++++++++----------------------------
 1 files changed, 19 insertions(+), 28 deletions(-)

diff --git a/httpclient/pom.xml b/httpclient/pom.xml
index 0e391f6..f0c6632 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,19 @@
           </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>
+                <Import-Package>!org.apache.avalon.framework.logger,!org.apache.log,!org.apache.log4j,*</Import-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 +149,14 @@
       </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>
+                <Import-Package>!org.apache.avalon.framework.logger,!org.apache.log,!org.apache.log4j,*</Import-Package>
+          </instructions>
         </configuration>
       </plugin>
 
-- 
1.7.7.6