JERSEY-3172: HK2 update.

Change-Id: I356eadcfb236e5d800bf4cd34266c38a001a654e

Author: pavelbucek

core-common/src/test/java/org/glassfish/jersey/process/internal/RequestScopeTest.java

@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2012-2015 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012-2016 Oracle and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -40,6 +40,7 @@
 
 package org.glassfish.jersey.process.internal;
 
+import java.lang.reflect.Type;
 import java.util.concurrent.Callable;
 
 import org.glassfish.jersey.process.internal.RequestScope.Instance;
@@ -203,6 +204,11 @@ public Class<?> getImplementationClass() {
             return String.class;
         }
 
+        @Override
+        public Type getImplementationType() {
+            return getImplementationClass();
+        }
+
         @Override
         public String create(final ServiceHandle<?> root) {
             return id;

core-server/src/main/java/org/glassfish/jersey/server/internal/inject/DelegatedInjectionValueFactoryProvider.java

@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2012-2015 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012-2016 Oracle and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -41,6 +41,7 @@
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
 import java.util.Collections;
 
 import javax.inject.Inject;
@@ -165,6 +166,11 @@ public Class<T> getImplementationClass() {
                 return clazz;
             }
 
+            @Override
+            public Type getImplementationType() {
+                return getImplementationClass();
+            }
+
             @Override
             public T create(ServiceHandle sh) {
                 return null;

core-server/src/test/java/org/glassfish/jersey/server/internal/inject/ActiveDescriptorBindingTest.java

@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2015 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015-2016 Oracle and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -261,6 +261,11 @@ public Class<?> getImplementationClass() {
             return MyRequestData.class;
         }
 
+        @Override
+        public Type getImplementationType() {
+            return getImplementationClass();
+        }
+
         @Override
         public MyRequestData create(ServiceHandle<?> serviceHandle) {
 

pom.xml

@@ -1895,7 +1895,7 @@
         <guava.version>18.0</guava.version>
         <hamcrest.version>1.3</hamcrest.version>
         <xmlunit.version>1.6</xmlunit.version>
-        <hk2.version>2.5.0-b05</hk2.version>
+        <hk2.version>2.5.0-b30</hk2.version>
         <httpclient.version>4.5</httpclient.version>
         <jackson.version>2.5.4</jackson.version>
         <jackson1.version>1.9.13</jackson1.version>

tests/integration/servlet-request-wrapper-binding-2/src/main/java/org/glassfish/jersey/tests/integration/servlet_request_wrapper_binding2/RequestResponseWrapperProvider.java

@@ -1,7 +1,7 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2015 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015-2016 Oracle and/or its affiliates. All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -223,6 +223,11 @@ public Class<?> getImplementationClass() {
             return HttpServletRequest.class;
         }
 
+        @Override
+        public Type getImplementationType() {
+            return getImplementationClass();
+        }
+
         @Override
         public synchronized String getImplementation() {
             return HttpServletRequest.class.getName();

tests/mem-leaks/redeployment/redeployment-no-jersey-app/pom.xml

@@ -120,7 +120,7 @@
         <profile>
             <id>memleak-reproducer</id>
             <properties>
-                <hk2.version>2.4.0-b26</hk2.version>
+                <hk2.version>2.5.0-b30</hk2.version>
             </properties>
         </profile>
     </profiles>