This is an automated email from the ASF dual-hosted git repository. struberg pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/openwebbeans.git
commit e9884e2925b6fbe449de9d7c7c9db1c8dda4b8a1 Author: Mark Struberg <[email protected]> AuthorDate: Tue Jan 24 15:22:16 2023 +0100 OWB-1417 enable owb-gradle and owb-junit5 --- pom.xml | 5 ++--- .../java/org/apache/openwebbeans/junit5/internal/CdiExtension.java | 2 +- ....inject.spi.Extension => jakarta.enterprise.inject.spi.Extension} | 0 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 6f57cb693..4c23da20b 100644 --- a/pom.xml +++ b/pom.xml @@ -584,9 +584,10 @@ <module>webbeans-tomcat</module> <module>webbeans-arquillian</module> <module>webbeans-slf4j</module> + <module>webbeans-gradle</module> + <module>webbeans-junit5</module> <!--X TODO re-enable <module>webbeans-ee-common</module> - <module>webbeans-ejb</module> <module>webbeans-ee</module> <module>webbeans-jetty9</module> <module>webbeans-jms</module> @@ -599,8 +600,6 @@ <module>webbeans-tck</module> <module>webbeans-tck-jakarta</module> <module>distribution</module> - <module>webbeans-gradle</module> - <module>webbeans-junit5</module> <module>bom</module> --> </modules> diff --git a/webbeans-junit5/src/main/java/org/apache/openwebbeans/junit5/internal/CdiExtension.java b/webbeans-junit5/src/main/java/org/apache/openwebbeans/junit5/internal/CdiExtension.java index ea47c0611..6f68cd2e3 100644 --- a/webbeans-junit5/src/main/java/org/apache/openwebbeans/junit5/internal/CdiExtension.java +++ b/webbeans-junit5/src/main/java/org/apache/openwebbeans/junit5/internal/CdiExtension.java @@ -138,7 +138,7 @@ public class CdiExtension extends CdiParametersResolverExtension implements Befo { final BeanManager manager = container.getBeanManager(); final AnnotatedType<?> annotatedType = manager.createAnnotatedType(instance.getClass()); - final InjectionTarget injectionTarget = manager.createInjectionTarget(annotatedType); + final InjectionTarget injectionTarget = manager.getInjectionTargetFactory(annotatedType).createInjectionTarget(null); final CreationalContext<Object> creationalContext = manager.createCreationalContext(null); creationalContexts.add(creationalContext); injectionTarget.inject(instance, creationalContext); diff --git a/webbeans-junit5/src/test/resources/META-INF/services/javax.enterprise.inject.spi.Extension b/webbeans-junit5/src/test/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension similarity index 100% rename from webbeans-junit5/src/test/resources/META-INF/services/javax.enterprise.inject.spi.Extension rename to webbeans-junit5/src/test/resources/META-INF/services/jakarta.enterprise.inject.spi.Extension
