diff --git a/pom.xml b/pom.xml
index 6a31edf..6a71b2d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1639,7 +1639,7 @@
             <dependency>
                 <groupId>org.glassfish.hk2</groupId>
                 <artifactId>osgi-resource-locator</artifactId>
-                <version>1.0.3</version> <!-- JDK 17 needed for 1.0.4 -->
+                <version>3.0.0</version> <!-- JDK 17 needed for 1.0.4 -->
             </dependency>
             <dependency>
                 <groupId>org.glassfish.main.hk2</groupId>
diff --git a/tests/integration/async-jersey-filter/src/main/java/org/glassfish/jersey/tests/integration/jersey2730/TestExceptionResource.java b/tests/integration/async-jersey-filter/src/main/java/org/glassfish/jersey/tests/integration/jersey2730/TestExceptionResource.java
index f146d44..e586628 100644
--- a/tests/integration/async-jersey-filter/src/main/java/org/glassfish/jersey/tests/integration/jersey2730/TestExceptionResource.java
+++ b/tests/integration/async-jersey-filter/src/main/java/org/glassfish/jersey/tests/integration/jersey2730/TestExceptionResource.java
@@ -68,7 +68,8 @@
     }
 
     /**
-     * Returns whether a thread that was processing a last request got stuck in {@link ResponseWriter}.
+     * Returns whether a thread that was processing a last request got stuck in
+     * org.glassfish.jersey.servlet.internal.ResponseWriter.
      * <p/>
      * Under normal circumstances, the last processing thread should return back to the servlet container
      * and its pool.
@@ -89,7 +90,7 @@
             case TIMED_WAITING:
             case WAITING:
                 for (StackTraceElement stackTraceElement : lastProcessingThread.getStackTrace()) {
-                    if ("ResponseWriter".equals(stackTraceElement.getClassName())) {
+                    if (stackTraceElement.getClassName().contains("ResponseWriter")) {
                         return true;
                     }
                 }