PAYARA-2965-Update-hk2-to-2.5.0

- javax.inject is now -> jakarta.inject
- removed asm-repackaged since asm is now being used directly
- moved onto hk2 version 2.5.0.payara-p1

appserver/registration/glassfish-registration/src/main/java/com/sun/enterprise/registration/glassfish/ModuleMap.java

@@ -159,7 +159,7 @@ public class ModuleMap {
                 put("org.glassfish.hk2.config", 100);
                 put("org.glassfish.hk2.config-types", 101);
                 put("org.glassfish.hk2.core", 102);
-                put("org.glassfish.hk2.external.asm-repackaged", 103);
+                //put("org.glassfish.hk2.external.asm-repackaged", 103);
                 //put("org.glassfish.hk2.external.bean-validator", 104);
                 put("org.glassfish.hk2.hk2", 105);
                 put("org.glassfish.hk2.osgi-adapter", 106);

nucleus/osgi-platforms/felix/src/main/resources/config/osgi.properties

@@ -56,7 +56,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# Portions Copyright [2017-2018] [Payara Foundation and/or its affiliates]
+# Portions Copyright [2017-2019] [Payara Foundation and/or its affiliates]
 
 #
 # Framework config properties.
@@ -186,14 +186,13 @@ glassfish.osgi.auto.install=\
 hk2.bundles=\
  ${com.sun.aas.installRootURI}modules/hk2-api.jar \
  ${com.sun.aas.installRootURI}modules/hk2-utils.jar \
- ${com.sun.aas.installRootURI}modules/javax.inject.jar \
+ ${com.sun.aas.installRootURI}modules/jakarta.inject.jar \
  ${com.sun.aas.installRootURI}modules/osgi-resource-locator.jar \
  ${com.sun.aas.installRootURI}modules/hk2-locator.jar \
  ${com.sun.aas.installRootURI}modules/hk2-runlevel.jar \
  ${com.sun.aas.installRootURI}modules/hk2-config.jar \
  ${com.sun.aas.installRootURI}modules/config-types.jar \
  ${com.sun.aas.installRootURI}modules/class-model.jar \
- ${com.sun.aas.installRootURI}modules/asm-repackaged.jar \
  ${com.sun.aas.installRootURI}modules/osgi-adapter.jar
 
 core.bundles=\

nucleus/pom.xml

@@ -290,7 +290,7 @@
 
         <!-- Other -->
 
-        <hk2.version>2.5.0</hk2.version>
+        <hk2.version>2.5.0.payara-p1</hk2.version>
         <hk2.plugin.version>2.5.0-b61.payara-p2</hk2.plugin.version>
 
         <!-- 4.1.1-b001  -->