rpms/httpcomponents-client
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix for RH Bz#718830

Browse Source 
Add instructions so as to not Import-Package optional dependencies.
This commit is contained in:
Severin Gehwolf 2011-07-15 17:33:46 -04:00
parent ceb9872990
commit 0f67941d83
4 changed files with 118 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
httpclient-pom-fix.patch Normal file
View File

@ -0,0 +1,80 @@
--- httpclient/pom.xml.sav 2011-03-14 16:54:35.000000000 -0400
+++ httpclient/pom.xml 2011-07-15 16:41:41.568795119 -0400
@@ -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>

16
httpcomponents-client.spec
View File

@ -3,13 +3,17 @@
Name: httpcomponents-client
Summary: HTTP agent implementation based on httpcomponents HttpCore
Version: 4.1.1
Release: 2%{?dist}
Release: 3%{?dist}
Group: Development/Libraries
License: ASL 2.0
URL: http://hc.apache.org/
Source0: http://www.apache.org/dist/httpcomponents/httpclient/source/httpcomponents-client-%{version}-src.tar.gz
# Remove optional build deps not available in Fedora
Patch0: 0001-Cleanup-pom.patch
# and add proper Apache felix bundle plugin instructions
# so that we get a reasonable OSGi manifest.
Patch0: main-pom-fix.patch
Patch1: httpclient-pom-fix.patch
Patch2: httpmime-pom-fix.patch
BuildArch: noarch
@ -46,7 +50,9 @@ API docs for %{name}.
%prep
%setup -q
%patch0 -p1 -b .sav
%patch0 -b .sav
%patch1 -b .sav
%patch2 -b .sav
%build
mvn-rpmbuild -Dmaven.test.skip=true install javadoc:aggregate
@ -94,6 +100,10 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
%changelog
* Fri Jul 15 2011 Severin Gehwolf <sgehwolf@redhat.com> 4.1.1-3
- Fix for RH Bz#718830. Add instructions so as to not
Import-Package optional dependencies.
* Thu Apr 7 2011 Severin Gehwolf <sgehwolf@redhat.com> 4.1.1-2
- Add BR/R apache-commons-codec, since httpcomponents-client's
MANIFEST.MF has an Import-Package: org.apache.commons.codec

23
httpmime-pom-fix.patch Normal file
View File

@ -0,0 +1,23 @@
--- httpmime/pom.xml.sav 2011-03-14 16:54:32.000000000 -0400
+++ httpmime/pom.xml 2011-07-15 13:51:08.530725700 -0400
@@ -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>

125
0001-Cleanup-pom.patch → main-pom-fix.patch
View File

@ -1,123 +1,5 @@
From 1e435abf209089692a3ba2dca86be757e892c10b Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <sochotnicky@redhat.com>
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
--- pom.xml.sav 2011-03-14 16:54:35.000000000 -0400
+++ pom.xml 2011-07-15 13:51:08.537725611 -0400
@@ -82,28 +82,11 @@
<modules>
<module>httpclient</module>
@ -230,6 +112,3 @@ index e3ba289..8ab6b70 100644
</reporting>
</project>
--
1.7.4