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

#5384 add missing osgi capability info for spifly injection #5851

Open
wants to merge 3 commits into
base: 3.1
Choose a base branch
from
+34 −1
Open

#5384 add missing osgi capability info for spifly injection #5851

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a26c608
Issue 5834
col-panic Jan 15, 2025
2f88c30
Issue 5834
col-panic Feb 3, 2025
430bb6c
format, add sse
col-panic Feb 4, 2025
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
10 changes: 10 additions & 0 deletions core-client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,16 @@
*
</Import-Package>
<unpackBundle>true</unpackBundle>
<!-- Needed to integrate ServiceLoader mechanism with OSGi -->
<Require-Capability><![CDATA[
osgi.extender;filter:="(&(osgi.extender=osgi.serviceloader.processor)(version>=1.0.0)(!(version>=2.0.0)))";resolution:=optional,
osgi.serviceloader;filter:="(osgi.serviceloader=jakarta.ws.rs.client.ClientBuilder)";osgi.serviceloader="jakarta.ws.rs.ClientBuilder";cardinality:=multiple;resolution:=optional
osgi.extender;filter:="(&(osgi.extender=osgi.serviceloader.registrar)(version>=1.0.0)(!(version>=2.0.0)))";resolution:=optional,
osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=1.8))"
]]></Require-Capability>
<Provide-Capability><![CDATA[
osgi.serviceloader;osgi.serviceloader="jakarta.ws.rs.client.ClientBuilder"
]]></Provide-Capability>
</instructions>
</configuration>
</plugin>
Expand Down
13 changes: 12 additions & 1 deletion core-common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,18 @@
</Import-Package>
<Bundle-ActivationPolicy>lazy</Bundle-ActivationPolicy>
<Export-Package>org.glassfish.jersey.*;version=${project.version}</Export-Package>
<Require-Capability>osgi.ee;filter:="(&amp;(osgi.ee=JavaSE)(version=1.8))"</Require-Capability>
<!-- Needed to integrate ServiceLoader mechanism with OSGi -->
<Require-Capability><![CDATA[
osgi.extender;filter:="(&(osgi.extender=osgi.serviceloader.processor)(version>=1.0.0)(!(version>=2.0.0)))";resolution:=optional,
osgi.extender;filter:="(&(osgi.extender=osgi.serviceloader.registrar)(version>=1.0.0)(!(version>=2.0.0)))";resolution:=optional,
osgi.serviceloader;filter:="(osgi.serviceloader=jakarta.ws.rs.ext.RuntimeDelegate)";osgi.serviceloader="jakarta.ws.rs.ext.RuntimeDelegate";cardinality:=multiple;resolution:=optional,
osgi.serviceloader;filter:="(osgi.serviceloader=org.glassfish.jersey.internal.spi.AutoDiscoverable)";osgi.serviceloader="org.glassfish.jersey.internal.spi.AutoDiscoverable";cardinality:=multiple;resolution:=optional,
osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=1.8))"
]]></Require-Capability>
<Provide-Capability><![CDATA[
osgi.serviceloader;osgi.serviceloader="jakarta.ws.rs.ext.RuntimeDelegate",
osgi.serviceloader;osgi.serviceloader="org.glassfish.jersey.internal.spi.AutoDiscoverable"
]]></Provide-Capability>
</instructions>
<unpackBundle>true</unpackBundle>
</configuration>
Expand Down
12 changes: 12 additions & 0 deletions media/sse/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,18 @@
<configuration>
<instructions>
<Import-Package>${jakarta.annotation.osgi.version},*</Import-Package>
<!-- Needed to integrate ServiceLoader mechanism with OSGi -->
<Require-Capability><![CDATA[
osgi.extender;filter:="(&(osgi.extender=osgi.serviceloader.processor)(version>=1.0.0)(!(version>=2.0.0)))";resolution:=optional,
osgi.extender;filter:="(&(osgi.extender=osgi.serviceloader.registrar)(version>=1.0.0)(!(version>=2.0.0)))";resolution:=optional,
osgi.serviceloader;filter:="(osgi.serviceloader=jakarta.ws.rs.sse.SseEventSource$Builder)";osgi.serviceloader="jakarta.ws.rs.sse.SseEventSource$Builder";cardinality:=multiple;resolution:=optional,
osgi.serviceloader;filter:="(osgi.serviceloader=org.glassfish.jersey.internal.spi.ForcedAutoDiscoverable)";osgi.serviceloader="org.glassfish.jersey.internal.spi.ForcedAutoDiscoverable";cardinality:=multiple;resolution:=optional,
osgi.ee;filter:="(&(osgi.ee=JavaSE)(version=1.8))"
]]></Require-Capability>
<Provide-Capability><![CDATA[
osgi.serviceloader;osgi.serviceloader="jakarta.ws.rs.sse.SseEventSource$Builder",
osgi.serviceloader;osgi.serviceloader="org.glassfish.jersey.internal.spi.ForcedAutoDiscoverable"
]]></Provide-Capability>
</instructions>
</configuration>
</plugin>
Expand Down