Skip to content

Commit

Permalink
Fix OSGi veriables
Browse files Browse the repository at this point in the history
Signed-off-by: jansupol <[email protected]>
  • Loading branch information
jansupol authored and senivam committed Sep 4, 2022
1 parent c32a986 commit 0f7bd90
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion incubator/cdi-inject-weld/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@
<Import-Package>
sun.misc.*;resolution:=optional,
${cdi.osgi.version},
${javax.annotation.osgi.version},
${jakarta.annotation.osgi.version},
*
</Import-Package>
</instructions>
Expand Down
2 changes: 1 addition & 1 deletion media/json-gson/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
<configuration>
<instructions>
<Export-Package>org.glassfish.jersey.gson.*</Export-Package>
<Import-Package>${javax.annotation.osgi.version},*</Import-Package>
<Import-Package>${jakarta.annotation.osgi.version},*</Import-Package>
</instructions>
<unpackBundle>true</unpackBundle>
</configuration>
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2109,7 +2109,7 @@
each module; the default exclude filter file is at etc/config/findbugs-exclude.xml -->
<findbugs.exclude />
<findbugs.glassfish.logging.validLoggerPrefixes>
javax.enterprise
jakarta.enterprise
</findbugs.glassfish.logging.validLoggerPrefixes>
<java.version>1.8</java.version>
<!-- <jersey.repackaged.prefix>jersey.repackaged</jersey.repackaged.prefix>-->
Expand Down Expand Up @@ -2221,7 +2221,7 @@
<hk2.config.version>6.2.5</hk2.config.version>
<!-- Jakartified -->
<cdi.api.version>3.0.0</cdi.api.version>
<cdi.osgi.version>javax.enterprise.*;version="[3.0,5)"</cdi.osgi.version>
<cdi.osgi.version>jakarta.enterprise.*;version="[3.0,5)"</cdi.osgi.version>
<ejb.version>4.0.1</ejb.version>
<grizzly2.version>3.0.1</grizzly2.version>
<grizzly.npn.version>2.0.0</grizzly.npn.version>
Expand Down

0 comments on commit 0f7bd90

Please sign in to comment.