Skip to content
This repository was archived by the owner on May 28, 2018. It is now read-only.

Commit bf3b5fb

Browse files
author
Marek Potociar
committed
Fixed JERSEY-2975: OSGi imports in jersey-gf-ejb now support GF 5.x
- minor clean-up of commented out config in POMs. Change-Id: I449a4112081a87aa8be5a77990c2e95dab11b7cf Signed-off-by: Marek Potociar <[email protected]>
1 parent b0a8a4f commit bf3b5fb

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

containers/glassfish/jersey-gf-ejb/pom.xml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,13 @@
130130
<extensions>true</extensions>
131131
<configuration>
132132
<instructions>
133-
<Import-Package>javax.interceptor;version="[1.1.99,1.3)",*</Import-Package>
133+
<!-- Explicitly set versions for packages from GlassFish to allow future uptake of GlassFish 5.x-->
134+
<Import-Package>
135+
com.sun.*;version="[4.0,6)",
136+
org.glassfish.ejb.*;version="[4.0,6)",
137+
org.glassfish.internal.*;version="[4.0,6)",
138+
*
139+
</Import-Package>
134140
<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
135141
<_nodefaultversion>false</_nodefaultversion>
136142
</instructions>

ext/cdi/jersey-cdi1x-transaction/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,6 @@
112112
<extensions>true</extensions>
113113
<configuration>
114114
<instructions>
115-
<!--Import-Package>javax.interceptor;version="[1.0-4)",*</Import-Package-->
116115
<Export-Package>org.glassfish.jersey.ext.cdi1x.transaction.internal</Export-Package>
117116
<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>
118117
<_nodefaultversion>false</_nodefaultversion>

ext/cdi/jersey-cdi1x/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@
9494
<extensions>true</extensions>
9595
<configuration>
9696
<instructions>
97-
<!--Import-Package>javax.interceptor;version="[1.0-4)",*</Import-Package-->
9897
<Export-Package>
9998
org.glassfish.jersey.ext.cdi1x.spi,org.glassfish.jersey.ext.cdi1x.internal,
10099
org.glassfish.jersey.ext.cdi1x.internal.spi

0 commit comments

Comments
 (0)