Updated Jakarta EE 10 versions

Signed-off-by: jansupol <[email protected]>
eclipse-ee4j · Mar 23, 2022 · d1f6b5b · d1f6b5b
1 parent eb220f7
commit d1f6b5b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/containers/glassfish/cdi/src/main/java/org/glassfish/tyrus/gf/cdi/CdiComponentProvider.java b/containers/glassfish/cdi/src/main/java/org/glassfish/tyrus/gf/cdi/CdiComponentProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2017 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2022 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
@@ -25,6 +25,7 @@
 import jakarta.enterprise.inject.spi.AnnotatedType;
 import jakarta.enterprise.inject.spi.BeanManager;
 import jakarta.enterprise.inject.spi.InjectionTarget;
+import jakarta.enterprise.inject.spi.InjectionTargetFactory;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
 
@@ -90,7 +91,8 @@ public <T> Object create(Class<T> c) {
             synchronized (beanManager) {
                 T managedObject;
                 AnnotatedType annotatedType = beanManager.createAnnotatedType(c);
-                InjectionTarget it = beanManager.createInjectionTarget(annotatedType);
+                InjectionTargetFactory<T> injectionTargetFactory = beanManager.getInjectionTargetFactory(annotatedType);
+                InjectionTarget<T> it = injectionTargetFactory.createInjectionTarget(null);
                 CreationalContext cc = beanManager.createCreationalContext(null);
                 managedObject = (T) it.produce(cc);
                 it.inject(managedObject, cc);

diff --git a/pom.xml b/pom.xml
@@ -105,13 +105,14 @@
         <!--<websocket.api.build_number>18</websocket.api.build_number>-->
 
         <annotation-api.version>2.1.0</annotation-api.version>
-        <cdi-api.version>3.0.0</cdi-api.version>
+        <cdi-api.version>4.0.0</cdi-api.version>
         <ejb-api.version>4.0.0</ejb-api.version>
-        <grizzly.version>3.0.1</grizzly.version>
+        <grizzly.version>4.0.0-M1</grizzly.version>
+        <glassfish.version>7.0.0-M1</glassfish.version>
         <json-api.version>2.1.0</json-api.version>
-        <json-impl.version>1.0.0</json-impl.version>
-        <jaxb.api.version>4.0.0-RC3</jaxb.api.version>
-        <jaxb.ri.version>4.0.0-M2</jaxb.ri.version>
+        <json-impl.version>1.1.0</json-impl.version>
+        <jaxb.api.version>4.0.0</jaxb.api.version>
+        <jaxb.ri.version>4.0.0-M3</jaxb.ri.version>
         <maven-javadoc-plugin.version>3.3.1</maven-javadoc-plugin.version>
         <servlet.api.version>6.0.0</servlet.api.version>
 
@@ -715,7 +716,7 @@
             <dependency>
                 <groupId>org.glassfish.main.extras</groupId>
                 <artifactId>glassfish-embedded-all</artifactId>
-                <version>6.2.1</version>
+                <version>${glassfish.version}</version>
             </dependency>
             <dependency>
                 <groupId>jakarta.xml.bind</groupId>