From 68d5497ae24b6a66d1043de72662f20b7a7878d6 Mon Sep 17 00:00:00 2001
From: Roy Teeuwen <c-roy.teeuwen@acolad.com>
Date: Tue, 3 Oct 2023 15:10:25 +0200
Subject: [PATCH 1/4] solves #3345: Add osgi headers

---
 apm-agent-api/pom.xml | 27 ++++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/apm-agent-api/pom.xml b/apm-agent-api/pom.xml
index c8769a1c6b..9711a36412 100644
--- a/apm-agent-api/pom.xml
+++ b/apm-agent-api/pom.xml
@@ -53,12 +53,33 @@
                 <artifactId>maven-jar-plugin</artifactId>
                 <configuration>
                     <archive>
-                        <manifestEntries>
-                            <Automatic-Module-Name>${project.groupId}.api</Automatic-Module-Name>
-                        </manifestEntries>
+                        <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
                     </archive>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>biz.aQute.bnd</groupId>
+                <artifactId>bnd-maven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>bnd-process</id>
+                        <goals>
+                            <goal>bnd-process</goal>
+                        </goals>
+                        <configuration>
+                            <bnd><![CDATA[
+                        Automatic-Module-Name: ${project.groupId}.api
+
+                        Import-Package: javax.annotation;version=0.0.0,*
+
+                        <!-- Export all non-internal packages by default -->
+                        Export-Package: !*.impl.*,!*.internal.*
+                            ]]>
+                            </bnd>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 

From 0e21c74f602d19d98e1cb164c86a09825d0c8e3a Mon Sep 17 00:00:00 2001
From: Roy Teeuwen <c-roy.teeuwen@acolad.com>
Date: Tue, 3 Oct 2023 15:38:19 +0200
Subject: [PATCH 2/4] Update changelog

---
 CHANGELOG.asciidoc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index ab4bdb037e..ca5a9b823d 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -30,6 +30,8 @@ Use subheadings with the "=====" level for adding notes for unreleased changes:
 ////
 
 === Unreleased
+===== Features
+* Add support for deploying the API in OSGi containers - {pull}3345[#3345]
 
 [[release-notes-1.x]]
 === Java Agent version 1.x

From 55fffa5422439c927ead48a525b53a82a7a858b4 Mon Sep 17 00:00:00 2001
From: Roy Teeuwen <c-roy.teeuwen@acolad.com>
Date: Fri, 6 Oct 2023 07:11:32 +0200
Subject: [PATCH 3/4] Make sure the packages are correctly exported

---
 apm-agent-api/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apm-agent-api/pom.xml b/apm-agent-api/pom.xml
index 9711a36412..afb1edae2d 100644
--- a/apm-agent-api/pom.xml
+++ b/apm-agent-api/pom.xml
@@ -73,7 +73,7 @@
                         Import-Package: javax.annotation;version=0.0.0,*
 
                         <!-- Export all non-internal packages by default -->
-                        Export-Package: !*.impl.*,!*.internal.*
+                        Export-Package: *,!*.impl.*,!*.internal.*
                             ]]>
                             </bnd>
                         </configuration>

From 20a39c309cd04514c8ed1e70afb36dae2f3e29e2 Mon Sep 17 00:00:00 2001
From: Roy Teeuwen <c-roy.teeuwen@acolad.com>
Date: Fri, 6 Oct 2023 08:08:33 +0200
Subject: [PATCH 4/4] Only export the elastic apm api package

---
 apm-agent-api/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apm-agent-api/pom.xml b/apm-agent-api/pom.xml
index afb1edae2d..51fc6b942c 100644
--- a/apm-agent-api/pom.xml
+++ b/apm-agent-api/pom.xml
@@ -73,7 +73,7 @@
                         Import-Package: javax.annotation;version=0.0.0,*
 
                         <!-- Export all non-internal packages by default -->
-                        Export-Package: *,!*.impl.*,!*.internal.*
+                        Export-Package: co.elastic.apm.api.*,!*.impl.*,!*.internal.*
                             ]]>
                             </bnd>
                         </configuration>