HK2 version update + OSGi tests improvements Signed-off-by: Maxim Nesen <maxim.nesen@oracle.com>
diff --git a/pom.xml b/pom.xml index 1f766b4..1f8069b 100644 --- a/pom.xml +++ b/pom.xml
@@ -2125,7 +2125,7 @@ <cdi.api.version>3.0.0</cdi.api.version> <ejb.version>4.0.0</ejb.version> <grizzly2.version>3.0.0-M1</grizzly2.version> - <hk2.version>3.0.0-M2</hk2.version> + <hk2.version>3.0.0-RC1</hk2.version> <jsp.version>3.0.0</jsp.version> <jstl.version>2.0.0</jstl.version> <jta.api.version>2.0.0</jta.api.version>
diff --git a/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/util/Helper.java b/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/util/Helper.java index b5573f9..18ac479 100644 --- a/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/util/Helper.java +++ b/tests/osgi/functional/src/test/java/org/glassfish/jersey/osgi/test/util/Helper.java
@@ -151,7 +151,7 @@ mavenBundle().groupId("org.glassfish.hk2").artifactId("osgi-resource-locator").versionAsInProject(), mavenBundle().groupId("org.glassfish.hk2").artifactId("hk2-locator").versionAsInProject(), mavenBundle().groupId("org.glassfish.hk2").artifactId("hk2-utils").versionAsInProject(), - mavenBundle().groupId("org.glassfish.hk2.external").artifactId("jakarta.inject").versionAsInProject(), + // mavenBundle().groupId("org.glassfish.hk2.external").artifactId("jakarta.inject").versionAsInProject(), mavenBundle().groupId("org.glassfish.hk2.external").artifactId("aopalliance-repackaged").versionAsInProject(), mavenBundle().groupId("org.javassist").artifactId("javassist").versionAsInProject(), @@ -162,7 +162,7 @@ mavenBundle().groupId("org.glassfish.grizzly").artifactId("grizzly-http-server").versionAsInProject(), // jakarta.validation - mavenBundle().groupId("jakarta.validation").artifactId("validation-api").versionAsInProject(), + mavenBundle().groupId("jakarta.validation").artifactId("jakarta.validation-api").versionAsInProject(), // Jersey Grizzly mavenBundle().groupId("org.glassfish.jersey.containers").artifactId("jersey-container-grizzly2-http")