From 91293d64b0be2e2d1bb61d44de5fa85aa5328fee Mon Sep 17 00:00:00 2001
From: panos-kakos <102670093+panos-kakos@users.noreply.github.com>
Date: Mon, 6 Nov 2023 08:52:53 +0000
Subject: [PATCH] =?UTF-8?q?[JAVA-26049]=20Upgraded=20spring-boot-environme?=
 =?UTF-8?q?nt=20module=20to=20spring-boot=203=E2=80=A6=20(#14994)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../spring-boot-environment/pom.xml           | 22 +++++++++++--------
 .../main/resources/META-INF/spring.factories  |  6 -----
 .../META-INF/spring/AutoConfiguration.imports |  1 +
 .../META-INF/spring/spring.factories          |  3 +++
 4 files changed, 17 insertions(+), 15 deletions(-)
 delete mode 100644 spring-boot-modules/spring-boot-environment/src/main/resources/META-INF/spring.factories
 create mode 100644 spring-boot-modules/spring-boot-environment/src/main/resources/META-INF/spring/AutoConfiguration.imports
 create mode 100644 spring-boot-modules/spring-boot-environment/src/main/resources/META-INF/spring/spring.factories

diff --git a/spring-boot-modules/spring-boot-environment/pom.xml b/spring-boot-modules/spring-boot-environment/pom.xml
index 4bdb35358c..9974d41f45 100644
--- a/spring-boot-modules/spring-boot-environment/pom.xml
+++ b/spring-boot-modules/spring-boot-environment/pom.xml
@@ -9,9 +9,10 @@
     <description>Demo project for Spring Boot</description>
 
     <parent>
-        <groupId>com.baeldung.spring-boot-modules</groupId>
-        <artifactId>spring-boot-modules</artifactId>
-        <version>1.0.0-SNAPSHOT</version>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-boot-3</artifactId>
+        <version>0.0.1-SNAPSHOT</version>
+        <relativePath>../../parent-boot-3</relativePath>
     </parent>
 
     <dependencies>
@@ -46,11 +47,6 @@
             <artifactId>h2</artifactId>
             <scope>runtime</scope>
         </dependency>
-        <dependency>
-            <groupId>javax.persistence</groupId>
-            <artifactId>javax.persistence-api</artifactId>
-            <version>${jpa.version}</version>
-        </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
@@ -96,6 +92,15 @@
                 </excludes>
             </resource>
         </resources>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <mainClass>com.baeldung.environmentpostprocessor.PriceCalculationApplication</mainClass>
+                </configuration>
+            </plugin>
+        </plugins>
     </build>
 
     <profiles>
@@ -151,7 +156,6 @@
     </profiles>
 
     <properties>
-        <jpa.version>2.2</jpa.version>
         <subethasmtp.version>3.1.7</subethasmtp.version>
         <httpclient.version>4.5.8</httpclient.version>
         <spring.cloud-version>2021.0.0</spring.cloud-version>
diff --git a/spring-boot-modules/spring-boot-environment/src/main/resources/META-INF/spring.factories b/spring-boot-modules/spring-boot-environment/src/main/resources/META-INF/spring.factories
deleted file mode 100644
index c36b67f8d7..0000000000
--- a/spring-boot-modules/spring-boot-environment/src/main/resources/META-INF/spring.factories
+++ /dev/null
@@ -1,6 +0,0 @@
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-com.baeldung.environmentpostprocessor.autoconfig.PriceCalculationAutoConfig
-
-org.springframework.boot.env.EnvironmentPostProcessor=\
-com.baeldung.environmentpostprocessor.PriceCalculationEnvironmentPostProcessor
-
diff --git a/spring-boot-modules/spring-boot-environment/src/main/resources/META-INF/spring/AutoConfiguration.imports b/spring-boot-modules/spring-boot-environment/src/main/resources/META-INF/spring/AutoConfiguration.imports
new file mode 100644
index 0000000000..350e2efa94
--- /dev/null
+++ b/spring-boot-modules/spring-boot-environment/src/main/resources/META-INF/spring/AutoConfiguration.imports
@@ -0,0 +1 @@
+com.baeldung.environmentpostprocessor.autoconfig.PriceCalculationAutoConfig
diff --git a/spring-boot-modules/spring-boot-environment/src/main/resources/META-INF/spring/spring.factories b/spring-boot-modules/spring-boot-environment/src/main/resources/META-INF/spring/spring.factories
new file mode 100644
index 0000000000..ff5e404c84
--- /dev/null
+++ b/spring-boot-modules/spring-boot-environment/src/main/resources/META-INF/spring/spring.factories
@@ -0,0 +1,3 @@
+org.springframework.boot.env.EnvironmentPostProcessor=\
+com.baeldung.environmentpostprocessor.PriceCalculationEnvironmentPostProcessor
+