[JAVA-37199] Upgrade spring-core to use parent-spring-6 (#17068)

Author: panos-kakos

spring-core/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>
 
     <dependencies>
@@ -29,9 +29,9 @@
             <artifactId>spring-context</artifactId>
         </dependency>
         <dependency>
-            <groupId>javax.inject</groupId>
-            <artifactId>javax.inject</artifactId>
-            <version>${javax.inject.version}</version>
+            <groupId>jakarta.inject</groupId>
+            <artifactId>jakarta.inject-api</artifactId>
+            <version>${jakarta.inject-api.version}</version>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
@@ -55,9 +55,9 @@
             <version>${commons-io.version}</version>
         </dependency>
         <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>javax.annotation-api</artifactId>
-            <version>${annotation-api.version}</version>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
+            <version>${jakarta.annotation-api}</version>
         </dependency>
     </dependencies>
 
@@ -75,9 +75,8 @@
     </build>
 
     <properties>
-        <javax.inject.version>1</javax.inject.version>
-        <spring-boot.version>1.5.2.RELEASE</spring-boot.version>
-        <annotation-api.version>1.3.2</annotation-api.version>
+        <jakarta.inject-api.version>2.0.1</jakarta.inject-api.version>
+        <jakarta.annotation-api>3.0.0</jakarta.annotation-api>
     </properties>
 
 </project>

spring-core/src/main/java/com/baeldung/annotation/MyBean.java

@@ -1,8 +1,8 @@
 package com.baeldung.annotation;
 
 import org.springframework.stereotype.Component;
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PostConstruct;
+import jakarta.annotation.PreDestroy;
 
 @Component
 public class MyBean {

spring-core/src/main/java/com/baeldung/applicationcontext/Teacher.java

@@ -3,7 +3,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;

spring-core/src/main/java/com/baeldung/scope/prototype/PrototypeBean.java

@@ -1,10 +1,11 @@
 package com.baeldung.scope.prototype;
 
-import org.apache.log4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Logger;
 
 public class PrototypeBean {
 
-    private final Logger logger = Logger.getLogger(this.getClass());
+    private final Logger logger = LoggerFactory.getLogger(this.getClass());
 
     public PrototypeBean() {
         logger.info("Prototype instance created");

spring-core/src/main/java/com/baeldung/scope/singleton/SingletonBean.java

@@ -1,14 +1,14 @@
 package com.baeldung.scope.singleton;
 
 import com.baeldung.scope.prototype.PrototypeBean;
-import org.apache.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
-
 import java.time.LocalTime;
+import org.slf4j.LoggerFactory;
+import ch.qos.logback.classic.Logger;
 
 public class SingletonBean {
 
-    private final Logger logger = Logger.getLogger(this.getClass());
+    private final Logger logger = (Logger) LoggerFactory.getLogger(this.getClass());
 
     @Autowired
     private PrototypeBean prototypeBean;

spring-core/src/main/java/com/baeldung/scope/singleton/SingletonProviderBean.java

@@ -3,7 +3,7 @@
 import com.baeldung.scope.prototype.PrototypeBean;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import javax.inject.Provider;
+import jakarta.inject.Provider;
 
 public class SingletonProviderBean {