From d9290e05f382be5a8402d2dff2c9497a51b31269 Mon Sep 17 00:00:00 2001
From: Ralf Ueberfuhr <40685729+ueberfuhr@users.noreply.github.com>
Date: Sun, 27 Nov 2022 10:58:07 +0100
Subject: [PATCH] BAEL 5951: Update Spring Boot 3 Version from release
 candidate to release version (#13091)

* Update Spring Boot, Spring Native and Native Maven Plugin versions

* BAEL-5951: Spring Boot 3 Sample for Native Image builds incl. Runtime Hints

* BAEL-5951: Configure POMs and add Swagger UI runtime hints

* BAEL-5951: Remove Swagger UI runtime hints

* BAEL-5951: Remove Spring Boot3 parent POM from profiles because of JDK17 dependency during build (building the parent POM is even not necessary)

* BAEL-5951: Add tests

* BAEL-5951: Fix tests (PMD naming conventions)

* BAEL-5951: Update from Spring Boot version 3.0.0-RC1 to 3.0.0 (release)
---
 parent-boot-3/pom.xml                         | 26 +------------------
 .../spring-boot-3-native/pom.xml              |  9 +++----
 spring-boot-modules/spring-boot-3/pom.xml     | 13 ++++++----
 3 files changed, 13 insertions(+), 35 deletions(-)

diff --git a/parent-boot-3/pom.xml b/parent-boot-3/pom.xml
index 8f891ec788..44f7d97310 100644
--- a/parent-boot-3/pom.xml
+++ b/parent-boot-3/pom.xml
@@ -223,29 +223,6 @@
         </profile>
     </profiles>
 
-    <!-- We currently use a Release Candidate, that is not available in Maven Central -->
-    <repositories>
-        <repository>
-            <id>spring-milestones</id>
-            <name>Spring Milestones</name>
-            <url>https://repo.spring.io/milestone</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
-
-    <pluginRepositories>
-        <pluginRepository>
-            <id>spring-milestones</id>
-            <name>Spring Milestones</name>
-            <url>https://repo.spring.io/milestone</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </pluginRepository>
-    </pluginRepositories>
-
     <properties>
         <maven-clean-plugin.version>3.2.0</maven-clean-plugin.version>
         <maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
@@ -253,9 +230,8 @@
         <maven-resources-plugin.version>3.3.0</maven-resources-plugin.version>
         <maven-surefire-plugin.version>2.22.2</maven-surefire-plugin.version>
 
-        <spring-boot.version>3.0.0-M3</spring-boot.version>
+        <spring-boot.version>3.0.0</spring-boot.version>
         <junit-jupiter.version>5.8.2</junit-jupiter.version>
-        <maven-surefire-plugin.version>3.0.0-M7</maven-surefire-plugin.version>
         <native-build-tools-plugin.version>0.9.17</native-build-tools-plugin.version>
         <java.version>17</java.version>
         <maven.compiler.source>${java.version}</maven.compiler.source>
diff --git a/spring-boot-modules/spring-boot-3-native/pom.xml b/spring-boot-modules/spring-boot-3-native/pom.xml
index 9e664efc02..411e9d652b 100644
--- a/spring-boot-modules/spring-boot-3-native/pom.xml
+++ b/spring-boot-modules/spring-boot-3-native/pom.xml
@@ -12,7 +12,7 @@
         <groupId>com.baeldung</groupId>
         <artifactId>parent-boot-3</artifactId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../../parent-boot-3/pom.xml</relativePath>
+        <relativePath>../../parent-boot-3</relativePath>
     </parent>
 
     <dependencies>
@@ -23,7 +23,7 @@
         <dependency>
             <groupId>org.springdoc</groupId>
             <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
-            <version>${spring-doc.version}</version>
+            <version>${springdoc.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -77,10 +77,9 @@
     </profiles>
 
     <properties>
-        <spring-boot.version>3.0.0-RC2</spring-boot.version>
-        <spring-doc.version>2.0.0-RC1</spring-doc.version>
+        <springdoc.version>2.0.0</springdoc.version>
+        <maven-surefire-plugin.version>3.0.0-M7</maven-surefire-plugin.version>
         <native.maven.plugin.version>0.9.17</native.maven.plugin.version>
-        <start-class>com.baeldung.sample.TodoApplication</start-class>
     </properties>
 
 </project>
diff --git a/spring-boot-modules/spring-boot-3/pom.xml b/spring-boot-modules/spring-boot-3/pom.xml
index a5e9ca903c..2fcb8cd8e1 100644
--- a/spring-boot-modules/spring-boot-3/pom.xml
+++ b/spring-boot-modules/spring-boot-3/pom.xml
@@ -49,9 +49,11 @@
             <artifactId>spring-boot-configuration-processor</artifactId>
             <optional>true</optional>
         </dependency>
-        <!-- depends on javax.servlet, see https://github.com/springdoc/springdoc-openapi/issues/1284 -->
-        <!--<dependency> <groupId>org.springdoc</groupId> <artifactId>springdoc-openapi-ui</artifactId> -->
-        <!-- <version>1.6.9</version> </dependency> -->
+        <dependency>
+            <groupId>org.springdoc</groupId>
+            <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
+            <version>${springdoc.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
@@ -120,7 +122,8 @@
 
     <properties>
         <mapstruct.version>1.5.2.Final</mapstruct.version>
-        <start-class>com.baeldung.sample.TodoApplication</start-class>
+        <springdoc.version>2.0.0</springdoc.version>
+        <maven-surefire-plugin.version>3.0.0-M7</maven-surefire-plugin.version>
     </properties>
 
-</project>
\ No newline at end of file
+</project>