From 1934b9f9440509fe3d456dfb0cafb43dd99e3d33 Mon Sep 17 00:00:00 2001
From: timis1 <12120641+timis1@users.noreply.github.com>
Date: Sat, 16 Dec 2023 11:03:41 +0200
Subject: [PATCH] JAVA-27019 Simplify spring-di modules' poms (#15330)

---
 spring-di-2/pom.xml                           | 34 ++----------
 spring-di-3/pom.xml                           | 30 +---------
 .../java/com/baeldung/autowiring/App.java     |  1 -
 spring-di/pom.xml                             | 55 +------------------
 4 files changed, 9 insertions(+), 111 deletions(-)

diff --git a/spring-di-2/pom.xml b/spring-di-2/pom.xml
index 898dd182f1..6b4ecc6039 100644
--- a/spring-di-2/pom.xml
+++ b/spring-di-2/pom.xml
@@ -9,46 +9,21 @@
 
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>parent-spring-6</artifactId>
+        <artifactId>parent-boot-3</artifactId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-spring-6</relativePath>
+        <relativePath>../parent-boot-3</relativePath>
     </parent>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.apache.logging.log4j</groupId>
-                <artifactId>log4j-bom</artifactId>
-                <version>${log4j2.version}</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
-            <dependency>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-dependencies</artifactId>
-                <version>${spring-boot.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
+            <version>${spring-boot.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-jpa</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-aspects</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
+            <version>${spring-boot.version}</version>
         </dependency>
     </dependencies>
 
@@ -79,7 +54,6 @@
     </build>
 
     <properties>
-        <spring-boot.version>3.1.2</spring-boot.version>
         <aspectj-maven-plugin.version>1.13.1</aspectj-maven-plugin.version>
         <log4j2.version>2.17.1</log4j2.version>
     </properties>
diff --git a/spring-di-3/pom.xml b/spring-di-3/pom.xml
index ba1a18ae8c..818ecc509c 100644
--- a/spring-di-3/pom.xml
+++ b/spring-di-3/pom.xml
@@ -9,44 +9,20 @@
 
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>parent-spring-6</artifactId>
+        <artifactId>parent-boot-3</artifactId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-spring-6</relativePath>
+        <relativePath>../parent-boot-3</relativePath>
     </parent>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.apache.logging.log4j</groupId>
-                <artifactId>log4j-bom</artifactId>
-                <version>${log4j2.version}</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
-            <dependency>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-dependencies</artifactId>
-                <version>${spring-boot.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
     <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>
+            <version>${spring-boot.version}</version>
         </dependency>
     </dependencies>
 
     <properties>
-        <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>
diff --git a/spring-di-3/src/main/java/com/baeldung/autowiring/App.java b/spring-di-3/src/main/java/com/baeldung/autowiring/App.java
index d2d0db7a60..873b152da1 100644
--- a/spring-di-3/src/main/java/com/baeldung/autowiring/App.java
+++ b/spring-di-3/src/main/java/com/baeldung/autowiring/App.java
@@ -2,7 +2,6 @@ package com.baeldung.autowiring;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.annotation.ComponentScan;
 
 @SpringBootApplication
 public class App {
diff --git a/spring-di/pom.xml b/spring-di/pom.xml
index d073f5359d..a1be835af7 100644
--- a/spring-di/pom.xml
+++ b/spring-di/pom.xml
@@ -10,44 +10,12 @@
 
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>parent-spring-6</artifactId>
+        <artifactId>parent-boot-3</artifactId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-spring-6</relativePath>
+        <relativePath>../parent-boot-3</relativePath>
     </parent>
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.springframework</groupId>
-                <artifactId>spring-framework-bom</artifactId>
-                <version>${spring.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.springframework</groupId>
-                <artifactId>spring-core</artifactId>
-                <version>${spring.version}</version>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
     <dependencies>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-test</artifactId>
-            <version>${spring.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-beans</artifactId>
-            <version>${spring.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context</artifactId>
-            <version>${spring.version}</version>
-        </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
@@ -63,12 +31,6 @@
             <artifactId>spring-boot-starter</artifactId>
             <version>${spring-boot.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-test</artifactId>
-            <version>${spring-boot.version}</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
@@ -79,17 +41,6 @@
             <artifactId>aspectjweaver</artifactId>
             <version>${aspectjweaver.version}</version>
         </dependency>
-        <!-- Spring -->
-        <!-- <dependency> -->
-        <!-- <groupId>org.springframework</groupId> -->
-        <!-- <artifactId>spring-context</artifactId> -->
-        <!-- </dependency> -->
-        <!-- &lt;!&ndash; test scoped &ndash;&gt; -->
-        <!-- <dependency> -->
-        <!-- <groupId>org.springframework</groupId> -->
-        <!-- <artifactId>spring-test</artifactId> -->
-        <!-- <scope>test</scope> -->
-        <!-- </dependency> -->
     </dependencies>
 
     <build>
@@ -132,8 +83,6 @@
 
     <properties>
         <start-class>org.baeldung.org.baeldung.sample.App</start-class>
-        <!-- Spring -->
-        <spring-boot.version>3.1.2</spring-boot.version>
         <aspectjweaver.version>1.9.20.1</aspectjweaver.version>
     </properties>