[JAVA-26243] Upgraded spring-di-3 module to spring-boot 3 (#14997)

spring-di-2/pom.xml

@@ -9,9 +9,9 @@
 
     <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>
 
     <dependencyManagement>
@@ -46,11 +46,6 @@
             <groupId>org.springframework</groupId>
             <artifactId>spring-aspects</artifactId>
         </dependency>
-        <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
-            <version>${javax.inject.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
@@ -84,9 +79,8 @@
     </build>
 
     <properties>
-        <spring-boot.version>2.6.1</spring-boot.version>
+        <spring-boot.version>3.1.2</spring-boot.version>
         <aspectj-plugin.version>1.14.0</aspectj-plugin.version>
-        <javax.inject.version>1</javax.inject.version>
         <log4j2.version>2.17.1</log4j2.version>
     </properties>
 

spring-di-2/src/main/java/com/baeldung/di/aspectj/PersonEntity.java

@@ -3,9 +3,9 @@ package com.baeldung.di.aspectj;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Configurable;
 
-import javax.persistence.Entity;
+import jakarta.persistence.Entity;
-import javax.persistence.Id;
+import jakarta.persistence.Id;
-import javax.persistence.Transient;
+import jakarta.persistence.Transient;
 
 @Entity
 @Configurable(preConstruction = true)

spring-di-2/src/test/java/com/baeldung/wiring/configuration/inject/FieldByNameInjectIntegrationTest.java

@@ -3,8 +3,8 @@ package com.baeldung.wiring.configuration.inject;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
-import javax.inject.Named;
+import jakarta.inject.Named;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

spring-di-2/src/test/java/com/baeldung/wiring/configuration/inject/FieldInjectIntegrationTest.java

@@ -3,7 +3,7 @@ package com.baeldung.wiring.configuration.inject;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

spring-di-2/src/test/java/com/baeldung/wiring/configuration/inject/FieldQualifierInjectIntegrationTest.java

@@ -3,7 +3,7 @@ package com.baeldung.wiring.configuration.inject;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
-import javax.inject.Inject;
+import jakarta.inject.Inject;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

spring-di-2/src/test/java/com/baeldung/wiring/configuration/resource/FieldResourceInjectionIntegrationTest.java

@@ -5,7 +5,7 @@ import static org.junit.Assert.assertNotNull;
 
 import java.io.File;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

spring-di-2/src/test/java/com/baeldung/wiring/configuration/resource/MethodByQualifierResourceIntegrationTest.java

@@ -9,7 +9,7 @@ import org.springframework.test.context.support.AnnotationConfigContextLoader;
 
 import com.baeldung.wiring.configuration.ApplicationContextTestResourceQualifier;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.io.File;
 
 import static org.junit.Assert.assertEquals;

spring-di-2/src/test/java/com/baeldung/wiring/configuration/resource/MethodByTypeResourceIntegrationTest.java

@@ -8,7 +8,7 @@ import org.springframework.test.context.support.AnnotationConfigContextLoader;
 
 import com.baeldung.wiring.configuration.ApplicationContextTestResourceNameType;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.io.File;
 
 import static org.junit.Assert.assertEquals;

spring-di-2/src/test/java/com/baeldung/wiring/configuration/resource/MethodResourceInjectionIntegrationTest.java

@@ -8,7 +8,7 @@ import org.springframework.test.context.support.AnnotationConfigContextLoader;
 
 import com.baeldung.wiring.configuration.ApplicationContextTestResourceNameType;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.io.File;
 
 import static org.junit.Assert.assertEquals;

spring-di-2/src/test/java/com/baeldung/wiring/configuration/resource/NamedResourceIntegrationTest.java

@@ -8,7 +8,7 @@ import org.springframework.test.context.support.AnnotationConfigContextLoader;
 
 import com.baeldung.wiring.configuration.ApplicationContextTestResourceNameType;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.io.File;
 
 import static org.junit.Assert.assertEquals;

spring-di-2/src/test/java/com/baeldung/wiring/configuration/resource/QualifierResourceInjectionIntegrationTest.java

@@ -9,7 +9,7 @@ import org.springframework.test.context.support.AnnotationConfigContextLoader;
 
 import com.baeldung.wiring.configuration.ApplicationContextTestResourceQualifier;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.io.File;
 
 import static org.junit.Assert.assertEquals;

spring-di-2/src/test/java/com/baeldung/wiring/configuration/resource/SetterResourceInjectionIntegrationTest.java

@@ -8,7 +8,7 @@ import org.springframework.test.context.support.AnnotationConfigContextLoader;
 
 import com.baeldung.wiring.configuration.ApplicationContextTestResourceNameType;
 
-import javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import java.io.File;
 
 import static org.junit.Assert.assertEquals;

spring-di-3/pom.xml

@@ -9,9 +9,9 @@
 
     <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>
 
     <dependencyManagement>
@@ -45,8 +45,10 @@
     </dependencies>
 
     <properties>
-        <spring-boot.version>2.6.1</spring-boot.version>
+        <spring-boot.version>3.1.2</spring-boot.version>
         <log4j2.version>2.17.1</log4j2.version>
+        <org.slf4j.version>2.0.9</org.slf4j.version>
+        <logback.version>1.4.11</logback.version>
     </properties>
 
 </project>

spring-di-3/src/test/java/com/baeldung/dynamic/autowire/DynamicAutowireIntegrationTest.java

@@ -7,7 +7,7 @@ import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(classes = DynamicAutowireConfig.class)

spring-di-4/pom.xml

@@ -9,9 +9,9 @@
 
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>parent-boot-2</artifactId>
+        <artifactId>parent-boot-3</artifactId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-boot-2</relativePath>
+        <relativePath>../parent-boot-3</relativePath>
     </parent>
 
     <dependencies>

spring-di-4/src/main/java/com/baeldung/sampleabstract/BallService.java

@@ -2,7 +2,7 @@ package com.baeldung.sampleabstract;
 
 import org.springframework.beans.factory.annotation.Autowired;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 
 public abstract class BallService {
 

spring-di/pom.xml

@@ -10,9 +10,9 @@
 
     <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>
 
     <dependencyManagement>
@@ -48,11 +48,6 @@
             <artifactId>spring-context</artifactId>
             <version>${spring.version}</version>
         </dependency>
-        <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
-            <version>${javax.inject.version}</version>
-        </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
@@ -71,7 +66,7 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-test</artifactId>
-            <version>${mockito.spring.boot.version}</version>
+            <version>${spring-boot.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -89,11 +84,6 @@
         <!-- <groupId>org.springframework</groupId> -->
         <!-- <artifactId>spring-context</artifactId> -->
         <!-- </dependency> -->
-        <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>javax.annotation-api</artifactId>
-            <version>${annotation-api.version}</version>
-        </dependency>
         <!-- &lt;!&ndash; test scoped &ndash;&gt; -->
         <!-- <dependency> -->
         <!-- <groupId>org.springframework</groupId> -->
@@ -143,11 +133,7 @@
     <properties>
         <start-class>org.baeldung.org.baeldung.sample.App</start-class>
         <!-- Spring -->
-        <annotation-api.version>1.3.2</annotation-api.version>
+        <spring-boot.version>3.1.2</spring-boot.version>
-        <mockito.spring.boot.version>1.4.4.RELEASE</mockito.spring.boot.version>
-        <javax.inject.version>1</javax.inject.version>
-        <spring-boot.version>1.5.2.RELEASE</spring-boot.version>
-        <mockito.version>1.10.19</mockito.version>
         <aspectjweaver.version>1.9.5</aspectjweaver.version>
     </properties>