Preparation for GF 6

Signed-off-by: Jan Supol <jan.supol@oracle.com>
jansupol · Feb 19, 2020 · 22aabff · 22aabff
1 parent f2ccfd5
commit 22aabff
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/containers/glassfish/jersey-gf-ejb/pom.xml b/containers/glassfish/jersey-gf-ejb/pom.xml
@@ -115,10 +115,10 @@
  <instructions>
  <!-- Explicitly set versions for packages from GlassFish to allow future uptake of GlassFish 5.x-->
  <Import-Package>
- com.sun.*;version="[4.0,6)",
+ com.sun.*;version="[4.0,7)",
  ${javax.annotation.osgi.version},
- org.glassfish.ejb.*;version="[4.0,6)",
- org.glassfish.internal.*;version="[4.0,6)",
+ org.glassfish.ejb.*;version="[4.0,7)",
+ org.glassfish.internal.*;version="[4.0,7)",
  ${hk2.osgi.version},
  *
  </Import-Package>

diff --git a/pom.xml b/pom.xml
@@ -2101,8 +2101,8 @@
  <helidon.version>1.0.3</helidon.version>
  <xmlunit.version>1.6</xmlunit.version>
  <hk2.version>2.6.1</hk2.version>
- <hk2.osgi.version>org.glassfish.hk2.*;version="[2.5,3)"</hk2.osgi.version>
- <hk2.jvnet.osgi.version>org.jvnet.hk2.*;version="[2.5,3)"</hk2.jvnet.osgi.version>
+ <hk2.osgi.version>org.glassfish.hk2.*;version="[2.5,4)"</hk2.osgi.version>
+ <hk2.jvnet.osgi.version>org.jvnet.hk2.*;version="[2.5,4)"</hk2.jvnet.osgi.version>
  <hk2.config.version>5.1.0</hk2.config.version>
  <httpclient.version>4.5.9</httpclient.version>
  <istack.commons.runtime.version>3.0.8</istack.commons.runtime.version>