Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

solves #3345: Add osgi headers #3346

Closed
wants to merge 4 commits into from
Closed

solves #3345: Add osgi headers #3346

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
68d5497
solves #3345: Add osgi headers
Oct 3, 2023
0e21c74
Update changelog
Oct 3, 2023
55fffa5
Make sure the packages are correctly exported
Oct 6, 2023
20a39c3
Only export the elastic apm api package
Oct 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.asciidoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
27 changes: 24 additions & 3 deletions apm-agent-api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: co.elastic.apm.api.*,!*.impl.*,!*.internal.*
]]>
</bnd>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>

Expand Down