85 lines
2.3 KiB
Diff
85 lines
2.3 KiB
Diff
|
From 0a31cca76b16acedae35ae4d909beb463da16f3f Mon Sep 17 00:00:00 2001
|
||
|
|
From: Stanislav Ochotnicky <sochotnicky@redhat.com>
|
||
|
|
Date: Fri, 1 Jul 2011 13:14:11 +0200
|
||
|
|
Subject: [PATCH 2/2] Osgify modules
|
||
|
|
|
||
|
|
---
|
||
|
|
httpcore-nio/pom.xml | 12 +++++++++++-
|
||
|
|
httpcore/pom.xml | 16 +++++++++++++++-
|
||
|
|
2 files changed, 26 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/httpcore-nio/pom.xml b/httpcore-nio/pom.xml
|
||
|
|
index 1694003..3ca1390 100644
|
||
|
|
--- a/httpcore-nio/pom.xml
|
||
|
|
+++ b/httpcore-nio/pom.xml
|
||
|
|
@@ -39,7 +39,7 @@
|
||
|
|
HttpComponents Core (non-blocking I/O)
|
||
|
|
</description>
|
||
|
|
<url>http://hc.apache.org/httpcomponents-core-ga</url>
|
||
|
|
- <packaging>jar</packaging>
|
||
|
|
+ <packaging>bundle</packaging>
|
||
|
|
|
||
|
|
<dependencies>
|
||
|
|
<dependency>
|
||
|
|
@@ -86,6 +86,16 @@
|
||
|
|
<plugin>
|
||
|
|
<artifactId>maven-surefire-plugin</artifactId>
|
||
|
|
</plugin>
|
||
|
|
+ <plugin>
|
||
|
|
+ <groupId>org.apache.felix</groupId>
|
||
|
|
+ <artifactId>maven-bundle-plugin</artifactId>
|
||
|
|
+ <extensions>true</extensions>
|
||
|
|
+ <configuration>
|
||
|
|
+ <instructions>
|
||
|
|
+ <Export-Package>*</Export-Package>
|
||
|
|
+ </instructions>
|
||
|
|
+ </configuration>
|
||
|
|
+ </plugin>
|
||
|
|
</plugins>
|
||
|
|
</build>
|
||
|
|
|
||
|
|
diff --git a/httpcore/pom.xml b/httpcore/pom.xml
|
||
|
|
index 80d6de9..6f4ea07 100644
|
||
|
|
--- a/httpcore/pom.xml
|
||
|
|
+++ b/httpcore/pom.xml
|
||
|
|
@@ -39,7 +39,7 @@
|
||
|
|
HttpComponents Core (blocking I/O)
|
||
|
|
</description>
|
||
|
|
<url>http://hc.apache.org/httpcomponents-core-ga</url>
|
||
|
|
- <packaging>jar</packaging>
|
||
|
|
+ <packaging>bundle</packaging>
|
||
|
|
|
||
|
|
<properties>
|
||
|
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||
|
|
@@ -72,6 +72,7 @@
|
||
|
|
</includes>
|
||
|
|
</resource>
|
||
|
|
</resources>
|
||
|
|
+
|
||
|
|
<plugins>
|
||
|
|
<plugin>
|
||
|
|
<groupId>org.apache.maven.plugins</groupId>
|
||
|
|
@@ -92,6 +93,19 @@
|
||
|
|
<jvm>${httpcore.surefire.java}</jvm>
|
||
|
|
</configuration>
|
||
|
|
</plugin>
|
||
|
|
+
|
||
|
|
+ <plugin>
|
||
|
|
+ <groupId>org.apache.felix</groupId>
|
||
|
|
+ <artifactId>maven-bundle-plugin</artifactId>
|
||
|
|
+ <extensions>true</extensions>
|
||
|
|
+ <configuration>
|
||
|
|
+ <instructions>
|
||
|
|
+ <Export-Package>*</Export-Package>
|
||
|
|
+ <Private-Package></Private-Package>
|
||
|
|
+ </instructions>
|
||
|
|
+ </configuration>
|
||
|
|
+ </plugin>
|
||
|
|
+
|
||
|
|
</plugins>
|
||
|
|
</build>
|
||
|
|
|
||
|
|
--
|
||
|
|
1.7.5.4
|
||
|
|
|