Merge pull request #4396 from jansupol/gf.osgi.ver.up
Preparation for GF 6
diff --git a/containers/glassfish/jersey-gf-ejb/pom.xml b/containers/glassfish/jersey-gf-ejb/pom.xml
index 357c5bf..6ef98b2 100644
--- a/containers/glassfish/jersey-gf-ejb/pom.xml
+++ b/containers/glassfish/jersey-gf-ejb/pom.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright (c) 2012, 2019 Oracle and/or its affiliates. All rights reserved.
+ Copyright (c) 2012, 2020 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
@@ -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
index 3cad108..77c8cbe 100644
--- 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>
