JAVA-19964 Move code from spring-core-5 to spring-core-2 (#13856)

* JAVA-19964 Move code from spring-core-5 to spring-core-2

* JAVA-19964 Move code from spring-core-6 to spring-core-2

* JAVA-19964 Move code from spring-core-4 to spring-core-3

pom.xml

@@ -796,7 +796,6 @@
                 <!-- <module>core-java-modules/core-java-17</module> --> <!-- uses preview features, to be decided how to handle -->
                 <!-- <module>core-java-modules/core-java-19</module> --> <!-- uses preview features, to be decided how to handle -->
                 <module>custom-pmd</module>
-                <module>spring-core-6</module>
                 <module>data-structures</module>
                 <module>ddd-contexts</module>
                 <module>jackson-modules</module>
@@ -919,7 +918,6 @@
                 <module>spring-activiti</module>
                 <module>spring-core-2</module>
                 <module>spring-core-3</module>
-                <module>spring-core-5</module>
                 <module>spring-di-3</module>
                 <module>spring-cucumber</module>
 
@@ -1049,7 +1047,6 @@
                 <module>spring-aop</module>
                 <module>spring-aop-2</module>
                 <module>custom-pmd</module>
-                <module>spring-core-6</module>
                 <module>data-structures</module>
                 <module>ddd-contexts</module>
                 <module>jackson-modules</module>
@@ -1175,7 +1172,6 @@
                 <module>spring-activiti</module>
                 <module>spring-core-2</module>
                 <module>spring-core-3</module>
-                <module>spring-core-5</module>
                 <module>spring-di-3</module>
                 <module>spring-cucumber</module>
 

spring-core-2/.gitignore

@@ -1,13 +0,0 @@
-*.class
-
-#folders#
-/target
-/neoDb*
-/data
-/src/main/webapp/WEB-INF/classes
-*/META-INF/*
-
-# Packaged files #
-*.jar
-*.war
-*.ear

spring-core-2/README.md

@@ -6,4 +6,9 @@ This module contains articles about core Spring functionality
 
 - [Quick Guide to Spring Bean Scopes](http://www.baeldung.com/spring-bean-scopes)
 - [Spring Events](https://www.baeldung.com/spring-events)
+- [Solving Spring’s “not eligible for auto-proxying” Warning](https://www.baeldung.com/spring-not-eligible-for-auto-proxying)
+- [Finding the Spring Version](https://www.baeldung.com/spring-find-version)
+- [How Does the Spring Singleton Bean Serve Concurrent Requests?](https://www.baeldung.com/spring-singleton-concurrent-requests)
+- [Reinitialize Singleton Bean in Spring Context](https://www.baeldung.com/spring-reinitialize-singleton-bean)
+- [Getting the Current ApplicationContext in Spring](https://www.baeldung.com/spring-get-current-applicationcontext)
 - More articles: [[<-- prev]](/spring-core)[[next -->]](/spring-core-3)

spring-core-2/pom.xml

@@ -15,29 +15,15 @@
         <relativePath>../parent-boot-2</relativePath>
     </parent>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.springframework</groupId>
-                <artifactId>spring-framework-bom</artifactId>
-                <version>${org.springframework.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.springframework</groupId>
-                <artifactId>spring-core</artifactId>
-                <version>${org.springframework.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-starter-thymeleaf</artifactId>
-                <version>${org.springframework.version}</version>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
     <dependencies>
+		<dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
@@ -129,6 +115,11 @@
             <artifactId>spring-test</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
         <!-- ShedLock -->
         <dependency>
             <groupId>net.javacrumbs.shedlock</groupId>
@@ -140,6 +131,10 @@
             <artifactId>shedlock-provider-jdbc-template</artifactId>
             <version>${shedlock.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+		</dependency>
     </dependencies>
 
     <build>
@@ -164,8 +159,6 @@
 
     <properties>
         <start-class>com.baeldung.sample.App</start-class>
-        <!-- Spring -->
-        <org.springframework.version>5.3.0</org.springframework.version>
         <annotation-api.version>1.3.2</annotation-api.version>
         <!-- persistence -->
         <hibernate.version>5.2.5.Final</hibernate.version>

spring-core-2/src/main/java/com/baeldung/version/VersionObtainer.java

@@ -1,20 +1,20 @@
-package com.baeldung.version;
-
-import org.springframework.boot.system.JavaVersion;
-import org.springframework.boot.system.SystemProperties;
-import org.springframework.core.SpringVersion;
-
-public class VersionObtainer {
-
-    public String getSpringVersion() {
-        return SpringVersion.getVersion();
-    }
-    
-    public String getJavaVersion() {
-        return JavaVersion.getJavaVersion().toString();
-    }
-    
-    public String getJdkVersion() {
-        return SystemProperties.get("java.version");
-    }
-}
+package com.baeldung.version;
+
+import org.springframework.boot.system.JavaVersion;
+import org.springframework.boot.system.SystemProperties;
+import org.springframework.core.SpringVersion;
+
+public class VersionObtainer {
+
+    public String getSpringVersion() {
+        return SpringVersion.getVersion();
+    }
+    
+    public String getJavaVersion() {
+        return JavaVersion.getJavaVersion().toString();
+    }
+    
+    public String getJdkVersion() {
+        return SystemProperties.get("java.version");
+    }
+}

spring-core-2/src/main/resources/application.properties

@@ -0,0 +1 @@
+config.file.path=./spring-core-2/src/main/resources/config.properties

spring-core-2/src/test/java/com/baeldung/version/VersionObtainerUnitTest.java

@@ -1,30 +1,30 @@
-package com.baeldung.version;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-import org.junit.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-
-@SpringBootTest(classes = VersionObtainer.class)
-public class VersionObtainerUnitTest {
-
-    public VersionObtainer version = new VersionObtainer();
-    
-    @Test
-    public void testGetSpringVersion() {
-        String res = version.getSpringVersion();
-        assertThat(res).isNotEmpty();
-    }
-
-    @Test
-    public void testGetJdkVersion() {
-        String res = version.getJdkVersion();
-        assertThat(res).isNotEmpty();
-    }
-
-    @Test
-    public void testGetJavaVersion() {
-        String res = version.getJavaVersion();
-        assertThat(res).isNotEmpty();
-    }
-}
+package com.baeldung.version;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.junit.Test;
+import org.springframework.boot.test.context.SpringBootTest;
+
+@SpringBootTest(classes = VersionObtainer.class)
+public class VersionObtainerUnitTest {
+
+    public VersionObtainer version = new VersionObtainer();
+    
+    @Test
+    public void testGetSpringVersion() {
+        String res = version.getSpringVersion();
+        assertThat(res).isNotEmpty();
+    }
+
+    @Test
+    public void testGetJdkVersion() {
+        String res = version.getJdkVersion();
+        assertThat(res).isNotEmpty();
+    }
+
+    @Test
+    public void testGetJavaVersion() {
+        String res = version.getJavaVersion();
+        assertThat(res).isNotEmpty();
+    }
+}

spring-core-3/README.md

@@ -10,4 +10,5 @@ This module contains articles about core Spring functionality
 - [Design Patterns in the Spring Framework](https://www.baeldung.com/spring-framework-design-patterns)
 - [Difference Between BeanFactory and ApplicationContext](https://www.baeldung.com/spring-beanfactory-vs-applicationcontext)
 - [Custom Scope in Spring](http://www.baeldung.com/spring-custom-scope)
+- [The Spring ApplicationContext](https://www.baeldung.com/spring-application-context)
 - More articles: [[<-- prev]](/spring-core-2) [[next -->]](/spring-core-4)

spring-core-4/README.md

@@ -6,5 +6,4 @@ This module contains articles about core Spring functionality
 
 - [Creating Spring Beans Through Factory Methods](https://www.baeldung.com/spring-beans-factory-methods)
 - [Spring BeanPostProcessor](https://www.baeldung.com/spring-beanpostprocessor)
-- [The Spring ApplicationContext](https://www.baeldung.com/spring-application-context)
-- More articles: [[<-- prev]](/spring-core-3) [[next -->]](/spring-core-5)
+- More articles: [[<-- prev]](/spring-core-3)

spring-core-5/README.md

@@ -1,10 +0,0 @@
-## Spring Core
-
-This module contains articles about core Spring functionality.
-
-## Relevant Articles:
-
-- [Solving Spring’s “not eligible for auto-proxying” Warning](https://www.baeldung.com/spring-not-eligible-for-auto-proxying)
-- [Finding the Spring Version](https://www.baeldung.com/spring-find-version)
-- [How Does the Spring Singleton Bean Serve Concurrent Requests?](https://www.baeldung.com/spring-singleton-concurrent-requests)
-- More articles: [[<-- prev]](../spring-core-4)

spring-core-5/pom.xml

@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>spring-core-5</artifactId>
-    <name>spring-core-5</name>
-
-    <parent>
-        <groupId>com.baeldung</groupId>
-        <artifactId>parent-spring-5</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-spring-5</relativePath>
-    </parent>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter</artifactId>
-            <version>${spring-boot-starter.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-            <version>${spring-boot-starter.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <version>${spring-boot-starter.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.projectlombok</groupId>
-            <artifactId>lombok</artifactId>
-            <version>${lombok.version}</version>
-        </dependency>
-    </dependencies>
-
-    <properties>
-        <spring.version>5.3.3</spring.version>
-        <spring-boot-starter.version>2.4.2</spring-boot-starter.version>
-    </properties>
-
-</project>

spring-core-5/src/test/resources/logback-test.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration scan="true" scanPeriod="15 seconds" debug="false">
-    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>[%d{ISO8601}]-[%thread] %-5level %logger - %msg%n</pattern>
-        </encoder>
-    </appender>
-
-    <root level="INFO">
-        <appender-ref ref="STDOUT" />
-    </root>
-</configuration>

spring-core-6/README.md

@@ -1,5 +0,0 @@
-
-### Relevant Articles:
-- [Reinitialize Singleton Bean in Spring Context](https://www.baeldung.com/spring-reinitialize-singleton-bean)
-- [Getting the Current ApplicationContext in Spring](https://www.baeldung.com/spring-get-current-applicationcontext)
-- More articles: [[<-- prev]](../spring-core-5)

spring-core-6/pom.xml

@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>com.baeldung</groupId>
-    <artifactId>spring-core-6</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
-    <name>spring-core-6</name>
-    <url>http://www.baeldung.com</url>
-
-    <parent>
-        <groupId>com.baeldung</groupId>
-        <artifactId>parent-boot-3</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-boot-3</relativePath>
-    </parent>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>io.projectreactor</groupId>
-            <artifactId>reactor-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <artifactId>maven-clean-plugin</artifactId>
-                    <version>3.1.0</version>
-                </plugin>
-                <plugin>
-                    <artifactId>maven-resources-plugin</artifactId>
-                    <version>3.0.2</version>
-                </plugin>
-                <plugin>
-                    <artifactId>maven-compiler-plugin</artifactId>
-                    <version>3.8.0</version>
-                </plugin>
-                <plugin>
-                    <artifactId>maven-surefire-plugin</artifactId>
-                    <version>2.22.1</version>
-                </plugin>
-                <plugin>
-                    <artifactId>maven-jar-plugin</artifactId>
-                    <version>3.0.2</version>
-                </plugin>
-                <plugin>
-                    <artifactId>maven-install-plugin</artifactId>
-                    <version>2.5.2</version>
-                </plugin>
-                <plugin>
-                    <artifactId>maven-deploy-plugin</artifactId>
-                    <version>2.8.2</version>
-                </plugin>
-                <plugin>
-                    <artifactId>maven-site-plugin</artifactId>
-                    <version>3.7.1</version>
-                </plugin>
-                <plugin>
-                    <artifactId>maven-project-info-reports-plugin</artifactId>
-                    <version>3.0.0</version>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>17</source>
-                    <target>17</target>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
-    </properties>
-
-</project>

spring-core-6/src/main/resources/application.properties

@@ -1 +0,0 @@
-config.file.path=./spring-core-6/src/main/resources/config.properties