From 0543808cb4e2796426366d033d684c0437f26c4a Mon Sep 17 00:00:00 2001
From: Jens Kordowski <jens.kordowski@sap.com>
Date: Mon, 14 Jan 2019 15:10:45 +0100
Subject: [PATCH 1/2] reenable osgi support
---
pom.xml | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/pom.xml b/pom.xml
index dbc923422e..e0c8269af7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -151,6 +151,28 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>3.0.1</version>
+ <extensions>true</extensions>
+ <configuration>
+ <manifestLocation>META-INF</manifestLocation>
+ <instructions>
+ <Bundle-Version>$(replace;$(project.version);-SNAPSHOT;.$(tstamp;yyyyMMdd-HHmm))</Bundle-Version>
+ <Bundle-Vendor>The AsyncHttpClient Project</Bundle-Vendor>
+ </instructions>
+ </configuration>
+ <executions>
+ <execution>
+ <id>osgi-bundle</id>
+ <phase>package</phase>
+ <goals>
+ <goal>bundle</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
<pluginManagement>
<plugins>
From 51e0feccbd8a40c79156c3a7b6fd19d428d48b04 Mon Sep 17 00:00:00 2001
From: Jens Kordowski <jens.kordowski@sap.com>
Date: Thu, 17 Jan 2019 15:13:30 +0100
Subject: [PATCH 2/2] accept javax.activation 1.1 to support karaf with java 8
---
pom.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/pom.xml b/pom.xml
index e0c8269af7..2c319c1bf7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -161,6 +161,7 @@
<instructions>
<Bundle-Version>$(replace;$(project.version);-SNAPSHOT;.$(tstamp;yyyyMMdd-HHmm))</Bundle-Version>
<Bundle-Vendor>The AsyncHttpClient Project</Bundle-Vendor>
+ <Import-Package>javax.activation;version="[1.1,2)", *</Import-Package>
</instructions>
</configuration>
<executions>