[JAVA-39449] Upgraded di-modules\cdi from spring-5 to spring-6 (#17578)

Author: panos-kakos

di-modules/cdi/pom.xml

@@ -8,16 +8,16 @@
 
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>parent-spring-5</artifactId>
+        <artifactId>parent-spring-6</artifactId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../../parent-spring-5</relativePath>
+        <relativePath>../../parent-spring-6</relativePath>
     </parent>
 
     <dependencies>
         <dependency>
-            <groupId>javax.enterprise</groupId>
-            <artifactId>cdi-api</artifactId>
-            <version>${cdi-api.version}</version>
+            <groupId>jakarta.enterprise</groupId>
+            <artifactId>jakarta.enterprise.cdi-api</artifactId>
+            <version>${jakarta.enterprise.cdi-api.version}</version>
         </dependency>
         <dependency>
             <groupId>org.jboss.weld.se</groupId>
@@ -58,8 +58,8 @@
     </build>
 
     <properties>
-        <cdi-api.version>2.0.SP1</cdi-api.version>
-        <weld-se-core.version>3.1.6.Final</weld-se-core.version>
+        <jakarta.enterprise.cdi-api.version>4.1.0</jakarta.enterprise.cdi-api.version>
+        <weld-se-core.version>5.1.3.Final</weld-se-core.version>
         <aspectjweaver.version>1.9.20.1</aspectjweaver.version>
     </properties>
 

di-modules/cdi/src/main/java/com/baeldung/cdi2observers/application/BootstrappingApplication.java

@@ -2,15 +2,19 @@
 
 import com.baeldung.cdi2observers.events.ExampleEvent;
 
-import javax.enterprise.inject.se.SeContainer;
-import javax.enterprise.inject.se.SeContainerInitializer;
+import jakarta.enterprise.event.Event;
+import jakarta.enterprise.inject.se.SeContainer;
+import jakarta.enterprise.inject.se.SeContainerInitializer;
+import jakarta.enterprise.inject.spi.BeanManager;
 
 public class BootstrappingApplication {
 
     public static void main(String... args) {
         SeContainerInitializer containerInitializer = SeContainerInitializer.newInstance();
         try (SeContainer container = containerInitializer.initialize()) {
-            container.getBeanManager().fireEvent(new ExampleEvent("Welcome to Baeldung!"));
+            BeanManager beanManager = container.getBeanManager();
+            Event<ExampleEvent> event = (Event<ExampleEvent>) beanManager.createInstance().select(ExampleEvent.class).get();
+            event.fire(new ExampleEvent("Welcome to Baeldung!"));
         }
     }
 }

di-modules/cdi/src/main/java/com/baeldung/cdi2observers/events/ExampleEventSource.java

@@ -1,7 +1,7 @@
 package com.baeldung.cdi2observers.events;
 
-import javax.enterprise.event.Event;
-import javax.inject.Inject;
+import jakarta.enterprise.event.Event;
+import jakarta.inject.Inject;
 
 public class ExampleEventSource {
 

di-modules/cdi/src/main/java/com/baeldung/cdi2observers/observers/AnotherExampleEventObserver.java

@@ -2,8 +2,8 @@
 
 import com.baeldung.cdi2observers.events.ExampleEvent;
 
-import javax.annotation.Priority;
-import javax.enterprise.event.Observes;
+import jakarta.annotation.Priority;
+import jakarta.enterprise.event.Observes;
 
 public class AnotherExampleEventObserver {
 

di-modules/cdi/src/main/java/com/baeldung/cdi2observers/observers/ExampleEventObserver.java

@@ -2,8 +2,8 @@
 
 import com.baeldung.cdi2observers.events.ExampleEvent;
 import com.baeldung.cdi2observers.services.TextService;
-import javax.annotation.Priority;
-import javax.enterprise.event.Observes;
+import jakarta.annotation.Priority;
+import jakarta.enterprise.event.Observes;
 
 public class ExampleEventObserver {
 

di-modules/cdi/src/main/java/com/baeldung/dependencyinjection/factories/TimeLoggerFactory.java

@@ -3,7 +3,7 @@
 import com.baeldung.dependencyinjection.loggers.TimeLogger;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
-import javax.enterprise.inject.Produces;
+import jakarta.enterprise.inject.Produces;
 
 public class TimeLoggerFactory {
 

di-modules/cdi/src/main/java/com/baeldung/dependencyinjection/imageprocessors/ImageFileProcessor.java

@@ -2,7 +2,7 @@
 
 import com.baeldung.dependencyinjection.loggers.TimeLogger;
 import com.baeldung.dependencyinjection.qualifiers.PngFileEditorQualifier;
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 import com.baeldung.dependencyinjection.imagefileeditors.ImageFileEditor;
 
 public class ImageFileProcessor {

di-modules/cdi/src/main/java/com/baeldung/dependencyinjection/qualifiers/GifFileEditorQualifier.java

@@ -4,7 +4,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
 
 @Qualifier
 @Retention(RetentionPolicy.RUNTIME)

di-modules/cdi/src/main/java/com/baeldung/dependencyinjection/qualifiers/JpgFileEditorQualifier.java

@@ -4,7 +4,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
 
 @Qualifier
 @Retention(RetentionPolicy.RUNTIME)

di-modules/cdi/src/main/java/com/baeldung/dependencyinjection/qualifiers/PngFileEditorQualifier.java

@@ -4,7 +4,7 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-import javax.inject.Qualifier;
+import jakarta.inject.Qualifier;
 
 @Qualifier
 @Retention(RetentionPolicy.RUNTIME)

di-modules/cdi/src/main/java/com/baeldung/interceptor/Audited.java

@@ -5,7 +5,7 @@
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import javax.interceptor.InterceptorBinding;
+import jakarta.interceptor.InterceptorBinding;
 
 @InterceptorBinding
 @Target({ ElementType.METHOD, ElementType.TYPE })

di-modules/cdi/src/main/java/com/baeldung/interceptor/AuditedInterceptor.java

@@ -1,8 +1,8 @@
 package com.baeldung.interceptor;
 
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.Interceptor;
-import javax.interceptor.InvocationContext;
+import jakarta.interceptor.AroundInvoke;
+import jakarta.interceptor.Interceptor;
+import jakarta.interceptor.InvocationContext;
 
 @Audited
 @Interceptor