[SCM] httpcomponents-client: HTTP/1.1 compliant HTTP agent Java implementation branch, master, updated. debian/4.1.1-1-5-g78653c9

[Jakub Adam]

The following commit has been merged in the master branch:
commit 97b97e3f62d89fd93017d2eff357ef44dc1a2535
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Tue Mar 27 21:34:45 2012 +0200

    Generate OSGi metadata

diff --git a/debian/changelog b/debian/changelog
index f1e4238..2a3e5d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+httpcomponents-client (4.1.1-2) UNRELEASED; urgency=low
+
+  * Add OSGi metadata to JAR manifest.
+
+ -- Jakub Adam <jakub.adam at ktknet.cz>  Tue, 27 Mar 2012 21:33:50 +0200
+
 httpcomponents-client (4.1.1-1) unstable; urgency=high
 
   * New upstream release:
diff --git a/debian/control b/debian/control
index 7827b17..1e0f7a0 100644
--- a/debian/control
+++ b/debian/control
@@ -12,6 +12,7 @@ Build-Depends-Indep:
  libmaven-antrun-plugin-java
  , libmaven-javadoc-plugin-java
  , libmaven-assembly-plugin-java
+ , libmaven-bundle-plugin-java
  , libhttpcore-java
  , libapache-mime4j-java
  , junit
diff --git a/debian/patches/01-generate_osgi_metadata.patch b/debian/patches/01-generate_osgi_metadata.patch
new file mode 100644
index 0000000..44dfabe
--- /dev/null
+++ b/debian/patches/01-generate_osgi_metadata.patch
@@ -0,0 +1,93 @@
+From: Jakub Adam <jakub.adam at ktknet.cz>
+Date: Wed, 28 Mar 2012 22:20:33 +0200
+Subject: generate-osgi-metadata
+
+---
+ httpclient/pom.xml |   67 ++++++++++++++++++++++++++++++++++++++++++++++-----
+ 1 files changed, 60 insertions(+), 7 deletions(-)
+
+diff --git a/httpclient/pom.xml b/httpclient/pom.xml
+index 4ce1cab..ffaaa0d 100644
+--- a/httpclient/pom.xml
++++ b/httpclient/pom.xml
+@@ -108,13 +108,11 @@
+       </plugin>
+       <plugin>
+         <artifactId>maven-jar-plugin</artifactId>
+-        <executions>
+-          <execution>
+-            <goals>
+-              <goal>test-jar</goal>
+-            </goals>
+-          </execution>
+-        </executions>
++        <configuration>
++          <archive>
++            <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
++          </archive>
++        </configuration>
+       </plugin>
+       <plugin>
+         <groupId>com.atlassian.maven.plugins</groupId>
+@@ -134,6 +132,61 @@
+           </execution>
+         </executions>
+       </plugin>
++      <plugin>
++        <groupId>org.apache.felix</groupId>
++        <artifactId>maven-bundle-plugin</artifactId>
++        <version>2.3.5</version>
++        <extensions>true</extensions>
++        <executions>
++          <execution>
++            <id>bundle-manifest</id>
++            <phase>process-classes</phase>
++            <goals>
++              <goal>manifest</goal>
++            </goals>
++          </execution>
++        </executions>
++        <configuration>
++          <instructions>
++            <Bundle-Name>Apache ${project.name}</Bundle-Name>
++            <Bundle-SymbolicName>${project.groupId}.httpclient</Bundle-SymbolicName>
++            <Bundle-Version>${debian.originalVersion}</Bundle-Version>
++            <_exportcontents>
++            org.apache.http.auth.*;version=${debian.originalVersion},
++            org.apache.http.cookie.*;version=${debian.originalVersion},
++            org.apache.http.conn.*;version=${debian.originalVersion},
++            org.apache.http.client.*;version=${debian.originalVersion},
++            org.apache.http.entity.mime.*;version=${debian.originalVersion},
++            org.apache.http.impl.auth.*;version=${debian.originalVersion},
++            org.apache.http.impl.cookie.*;version=${debian.originalVersion},
++            org.apache.http.impl.conn.*;version=${debian.originalVersion},
++            org.apache.http.impl.client.*;version=${debian.originalVersion}
++            </_exportcontents>
++            <Embed-Dependency>*;scope=compile|runtime;inline=false</Embed-Dependency>
++            <Import-Package>
++            javax.crypto,
++            javax.crypto.spec,
++            javax.net.ssl,javax.security.auth.x500,
++            org.ietf.jgss,
++            org.apache.commons.logging,
++            org.apache.http,
++            org.apache.http.entity,
++            org.apache.http.io,
++            org.apache.http.message,
++            org.apache.http.params,
++            org.apache.http.protocol,
++            org.apache.http.util,
++            org.apache.http.impl,
++            org.apache.http.impl.entity,
++            org.apache.http.impl.io,
++            net.sf.ehcache.*;resolution:=optional,
++            net.spy.memcached.*;resolution:=optional
++            </Import-Package>
++            <!-- Stop the JAVA_1_n_HOME variables from being treated as headers by Bnd -->
++            <_removeheaders>JAVA_1_3_HOME,JAVA_1_4_HOME</_removeheaders>
++          </instructions>
++        </configuration>
++      </plugin>
+     </plugins>
+   </build>
+ 
diff --git a/debian/patches/series b/debian/patches/series
index b75ec23..d39b602 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 00-fix_build.patch
+01-generate_osgi_metadata.patch

-- 
httpcomponents-client: HTTP/1.1 compliant HTTP agent Java implementation