Merge branch 'master' into master

spring-boot-modules/pom.xml

@@ -11,16 +11,16 @@
 
     <parent>
         <groupId>com.baeldung</groupId>
-        <artifactId>parent-boot-2</artifactId>
+        <artifactId>parent-boot-3</artifactId>
         <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../parent-boot-2</relativePath>
+        <relativePath>../parent-boot-3</relativePath>
     </parent>
 
     <modules>
         <module>spring-boot-admin</module>
         <module>spring-boot-angular</module>
         <module>spring-boot-annotations</module>
-        <module>spring-boot-annotations-2</module>
+<!--        <module>spring-boot-annotations-2</module>--> <!-- failing after upgrading to spring boot 3.2.x -->
         <module>spring-boot-artifacts</module>
         <module>spring-boot-artifacts-2</module>
         <module>spring-boot-autoconfiguration</module>
@@ -31,33 +31,34 @@
         <module>spring-boot-config-jpa-error</module>
         <module>spring-boot-ctx-fluent</module>
         <module>spring-boot-deployment</module>
-        <module>spring-boot-di</module>
+<!--        <module>spring-boot-di</module>--> <!-- failing after upgrading to spring boot 3.2.x -->
         <module>spring-boot-disable-logging</module>
         <module>spring-boot-ci-cd</module>
         <!-- <module>spring-boot-cli</module> --> <!-- Not a maven project -->
-        <module>spring-boot-custom-starter</module>
+<!--        <module>spring-boot-custom-starter</module>--> <!-- failing after upgrading to spring boot 3.2.x -->
         <module>spring-boot-crud</module>
         <module>spring-boot-data</module>
         <module>spring-boot-environment</module>
         <module>spring-boot-exceptions</module>
         <module>spring-boot-flowable</module>
-        <module>spring-boot-graphql</module>
+<!--        <module>spring-boot-graphql</module>--> <!-- failing after upgrading to spring boot 3.2.x -->
         <!--<module>spring-boot-groovy</module>--> <!-- failing after upgrading to jdk17-->
         <!-- <module>spring-boot-gradle</module> --> <!-- Not a maven project -->
         <module>spring-boot-jasypt</module>
-        <module>spring-boot-jsp</module>
+<!--        <module>spring-boot-jsp</module>--> <!-- failing after upgrading to spring boot 3.2.x -->
         <module>spring-boot-keycloak</module>
         <module>spring-boot-keycloak-2</module>
-        <module>spring-boot-libraries</module>
-        <module>spring-boot-libraries-2</module>
+        <!--        <module>spring-boot-libraries</module>--> <!-- failing after upgrading to spring boot 3.2.x -->
+<!--        <module>spring-boot-libraries-2</module>--> <!-- failing after upgrading to spring boot 3.2.x -->
+        <module>spring-boot-libraries-3</module>
         <module>spring-boot-process-automation</module>
         <module>spring-boot-logging-logback</module>
         <module>spring-boot-logging-log4j2</module>
-        <module>spring-boot-mvc</module>
+<!--        <module>spring-boot-mvc</module>--> <!-- failing after upgrading to spring boot 3.2.x -->
         <module>spring-boot-mvc-2</module>
         <module>spring-boot-mvc-3</module>
         <module>spring-boot-mvc-4</module>
-        <module>spring-boot-mvc-5</module>
+        <!--        <module>spring-boot-mvc-5</module>--> <!-- failing after upgrading to spring boot 3.2.x -->
         <module>spring-boot-mvc-birt</module>
         <module>spring-boot-mvc-jersey</module>
         <module>spring-boot-nashorn</module>
@@ -65,34 +66,34 @@
         <module>spring-boot-performance</module>
         <module>spring-boot-property-exp</module>
         <module>spring-boot-request-params</module>
-        <module>spring-boot-runtime</module>
-        <module>spring-boot-runtime-2</module>
+<!--        <module>spring-boot-runtime</module>--> <!-- failing after upgrading to spring boot 3.2.x -->
+<!--        <module>spring-boot-runtime-2</module>--> <!-- failing after upgrading to spring boot 3.2.x -->
         <module>spring-boot-security</module>
         <module>spring-boot-security-2</module>
         <module>spring-boot-ssl-bundles</module>
         <module>spring-boot-telegram</module>
-        <module>spring-boot-springdoc</module>
-        <module>spring-boot-swagger</module>
-        <module>spring-boot-swagger-2</module>
+<!--        <module>spring-boot-springdoc</module>--> <!-- failing after upgrading to spring boot 3.2.x -->
+<!--        <module>spring-boot-swagger</module>--> <!-- failing after upgrading to spring boot 3.2.x -->
+<!--        <module>spring-boot-swagger-2</module>--> <!-- failing after upgrading to spring boot 3. Swagger codegen yet not compatible?!-->
         <module>spring-boot-swagger-jwt</module>
         <module>spring-boot-swagger-keycloak</module>
         <module>spring-boot-swagger-springfox</module>
-        <module>spring-boot-testing</module>
-        <module>spring-boot-testing-2</module>
+        <!--        <module>spring-boot-testing</module>--> <!-- failing after upgrading to spring boot 3.2.x -->
+<!--        <module>spring-boot-testing-2</module>--> <!-- failing after upgrading to spring boot 3.2.x -->
         <module>spring-boot-testing-spock</module>
         <module>spring-boot-vue</module>
         <module>spring-boot-actuator</module>
         <module>spring-boot-data-2</module>
         <module>spring-boot-validation</module>
-        <module>spring-boot-data-3</module>
-        <module>spring-caching</module>
-        <module>spring-caching-2</module>
-        <module>spring-boot-redis</module>
+<!--        <module>spring-boot-data-3</module>--> <!-- failing after upgrading to spring boot 3.2.x -->
+<!--        <module>spring-caching</module>--> <!-- failing after upgrading to spring boot 3.2.x -->
+<!--        <module>spring-caching-2</module>--> <!-- failing after upgrading to spring boot 3.2.x -->
+        <!--        <module>spring-boot-redis</module>--> <!-- failing after upgrading to spring boot 3.2.x -->
         <module>spring-boot-cassandre</module>
-        <module>spring-boot-react</module>
+<!--        <module>spring-boot-react</module>--> <!-- failing after upgrading to spring boot 3.2.x. very old node version which is not available now. -->
         <!-- <module>spring-boot-3</module> --> <!-- JAVA-20931 -->
         <module>spring-boot-3-grpc</module>
-        <module>spring-boot-3-native</module>
+        <!--        <module>spring-boot-3-native</module>--> <!-- failing after upgrading to spring boot 3.2.x -->
         <module>spring-boot-3-observation</module>
         <module>spring-boot-3-test-pitfalls</module>
         <module>spring-boot-3-testcontainers</module>
@@ -100,10 +101,10 @@
         <module>spring-boot-resilience4j</module>
         <module>spring-boot-properties</module>
         <module>spring-boot-properties-2</module>
-        <module>spring-boot-properties-3</module>
+<!--        <module>spring-boot-properties-3</module>--> <!-- failing after upgrading to spring boot 3.2.x -->
         <module>spring-boot-properties-4</module>
         <module>spring-boot-properties-migrator-demo</module>
-        <module>spring-boot-aws</module>
+        <module>spring-boot-aws</module> <!-- This project is Spring Boot 2 and cannot be updated -->
         <module>spring-boot-keycloak-adapters</module>
         <module>spring-boot-mvc-legacy</module>
         <module>spring-boot-springdoc-2</module>

spring-boot-modules/spring-boot-3-grpc/helloworld-grpc-consumer/pom.xml

@@ -8,10 +8,9 @@
     <name>helloworld-grpc-consumer</name>
 
     <parent>
-        <groupId>com.baeldung</groupId>
-        <artifactId>parent-boot-3</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../../../parent-boot-3</relativePath>
+        <groupId>com.baeldung.spring-boot-modules</groupId>
+        <artifactId>spring-boot-3-grpc</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
 
     <dependencies>
@@ -28,7 +27,6 @@
     </dependencies>
 
     <properties>
-        <spring-boot.version>3.2.0</spring-boot.version>
         <grpc-spring-boot-starter.version>2.15.0.RELEASE</grpc-spring-boot-starter.version>
     </properties>
 

spring-boot-modules/spring-boot-3-grpc/helloworld-grpc-java/pom.xml

@@ -84,6 +84,7 @@
         <os-maven-plugin.version>1.7.1</os-maven-plugin.version>
         <protobuf-maven-plugin.version>0.6.1</protobuf-maven-plugin.version>
         <annotation-api.version>1.3.2</annotation-api.version>
+        <spring-boot.repackage.skip>true</spring-boot.repackage.skip>
     </properties>
 
 </project>

spring-boot-modules/spring-boot-3-grpc/helloworld-grpc-provider/pom.xml

@@ -8,10 +8,9 @@
     <name>helloworld-grpc-provider</name>
 
     <parent>
-        <groupId>com.baeldung</groupId>
-        <artifactId>parent-boot-3</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../../../parent-boot-3</relativePath>
+        <groupId>com.baeldung.spring-boot-modules</groupId>
+        <artifactId>spring-boot-3-grpc</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
 
     <dependencies>
@@ -28,7 +27,6 @@
     </dependencies>
 
     <properties>
-        <spring-boot.version>3.2.0</spring-boot.version>
         <grpc-spring-boot-starter.version>2.15.0.RELEASE</grpc-spring-boot-starter.version>
     </properties>
 

spring-boot-modules/spring-boot-3-grpc/pom.xml

@@ -3,17 +3,15 @@
     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.spring-boot-modules</groupId>
     <artifactId>spring-boot-3-grpc</artifactId>
     <version>1.0.0-SNAPSHOT</version>
     <name>spring-boot-3-grpc</name>
     <packaging>pom</packaging>
 
     <parent>
-        <groupId>com.baeldung</groupId>
-        <artifactId>parent-modules</artifactId>
+        <groupId>com.baeldung.spring-boot-modules</groupId>
+        <artifactId>spring-boot-modules</artifactId>
         <version>1.0.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modules>

spring-boot-modules/spring-boot-3-native/pom.xml

@@ -9,10 +9,9 @@
     <description>Demo project for Spring Boot</description>
 
     <parent>
-        <groupId>com.baeldung</groupId>
-        <artifactId>parent-boot-3</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../../parent-boot-3</relativePath>
+        <groupId>com.baeldung.spring-boot-modules</groupId>
+        <artifactId>spring-boot-modules</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
 
     <dependencies>
@@ -100,6 +99,7 @@
         <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>
+        <java.version>17</java.version>
     </properties>
 
 </project>

spring-boot-modules/spring-boot-3-observation/pom.xml

@@ -8,10 +8,9 @@
     <description>Demo project for Spring Boot 3 Observation</description>
 
     <parent>
-        <groupId>com.baeldung</groupId>
-        <artifactId>parent-boot-3</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../../parent-boot-3</relativePath>
+        <groupId>com.baeldung.spring-boot-modules</groupId>
+        <artifactId>spring-boot-modules</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
 
     <dependencies>
@@ -109,6 +108,7 @@
     <properties>
         <start-class>com.baeldung.samples.SimpleObservationApplication</start-class>
         <p6spy-spring-boot-starter.version>1.9.0</p6spy-spring-boot-starter.version>
+        <java.version>17</java.version>
     </properties>
 
 </project>

spring-boot-modules/spring-boot-3-test-pitfalls/pom.xml

@@ -9,10 +9,9 @@
     <description>Demo project for Spring Boot Testing Pitfalls</description>
 
     <parent>
-        <groupId>com.baeldung</groupId>
-        <artifactId>parent-boot-3</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../../parent-boot-3</relativePath>
+        <groupId>com.baeldung.spring-boot-modules</groupId>
+        <artifactId>spring-boot-modules</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
 
     <dependencies>
@@ -82,6 +81,7 @@
         <org.mapstruct.version>1.5.3.Final</org.mapstruct.version>
         <lombok-mapstruct-binding.version>0.2.0</lombok-mapstruct-binding.version>
         <maven-surefire-plugin.version>3.0.0-M7</maven-surefire-plugin.version>
+        <java.version>17</java.version>
     </properties>
 
 </project>

spring-boot-modules/spring-boot-3-testcontainers/README.md

@@ -1,3 +1,4 @@
 ## Relevant Articles
 - [Built-in Testcontainers Support in Spring Boot](https://www.baeldung.com/spring-boot-built-in-testcontainers)
 - [How to Reuse Testcontainers in Java](https://www.baeldung.com/java-reuse-testcontainers)
+- [Testcontainers Desktop](https://www.baeldung.com/testcontainers-desktop)

spring-boot-modules/spring-boot-3-testcontainers/pom.xml

@@ -9,10 +9,9 @@
     <description>Testcontainer Improvements in Spring Boot 3</description>
 
     <parent>
-        <groupId>com.baeldung</groupId>
-        <artifactId>parent-boot-3</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../../parent-boot-3</relativePath>
+        <groupId>com.baeldung.spring-boot-modules</groupId>
+        <artifactId>spring-boot-modules</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
 
     <dependencies>
@@ -96,6 +95,7 @@
         <maven-surefire-plugin.version>3.0.0-M7</maven-surefire-plugin.version>
         <testcontainers.version>1.18.3</testcontainers.version>
         <rest-assured.version>5.3.1</rest-assured.version>
+        <java.version>17</java.version>
     </properties>
 
 </project>

spring-boot-modules/spring-boot-3-url-matching/pom.xml

@@ -9,10 +9,9 @@
     <description>URL Matching in Spring Boot 3</description>
 
     <parent>
-        <groupId>com.baeldung</groupId>
-        <artifactId>parent-boot-3</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../../parent-boot-3</relativePath>
+        <groupId>com.baeldung.spring-boot-modules</groupId>
+        <artifactId>spring-boot-modules</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
 
     <dependencies>
@@ -46,7 +45,6 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-test</artifactId>
-            <version>${spring-test.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -94,7 +92,6 @@
     </build>
 
     <properties>
-        <spring-test.version>6.0.6</spring-test.version>
         <javax.servlet-api.version>3.1.0</javax.servlet-api.version>
         <reactor-core.version>3.6.0</reactor-core.version>
         <reactor-test.version>3.6.0></reactor-test.version>

spring-boot-modules/spring-boot-actuator/pom.xml

@@ -9,10 +9,9 @@
     <description>This is simple boot application for Spring boot actuator test</description>
 
     <parent>
-        <groupId>com.baeldung</groupId>
-        <artifactId>parent-boot-3</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../../parent-boot-3</relativePath>
+        <groupId>com.baeldung.spring-boot-modules</groupId>
+        <artifactId>spring-boot-modules</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
 
     <dependencies>

spring-boot-modules/spring-boot-admin/spring-boot-admin-server/pom.xml

@@ -25,13 +25,13 @@
         <dependency>
             <groupId>de.codecentric</groupId>
             <artifactId>spring-boot-admin-starter-server</artifactId>
-            <version>${spring-boot-admin-server.version}</version>
+            <version>${spring-boot.version}</version>
         </dependency>
         <!--Add login page and logout feature -->
         <dependency>
             <groupId>de.codecentric</groupId>
-            <artifactId>spring-boot-admin-server-ui-login</artifactId>
-            <version>${spring-boot-admin-server-ui-login.version}</version>
+            <artifactId>spring-boot-admin-server-ui</artifactId>
+            <version>${spring-boot.version}</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -45,7 +45,7 @@
         <dependency>
             <groupId>de.codecentric</groupId>
             <artifactId>spring-boot-admin-starter-client</artifactId>
-            <version>${spring-boot-admin-starter-client.version}</version>
+            <version>${spring-boot.version}</version>
         </dependency>
         <!--mail notifications -->
         <dependency>
@@ -69,16 +69,8 @@
             <plugin>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
-                <version>${spring-boot-maven-plugin.version}</version>
             </plugin>
         </plugins>
     </build>
 
-    <properties>
-        <spring-boot-admin-server.version>2.4.1</spring-boot-admin-server.version>
-        <spring-boot-admin-starter-client.version>2.4.1</spring-boot-admin-starter-client.version>
-        <spring-boot-admin-server-ui-login.version>1.5.7</spring-boot-admin-server-ui-login.version>
-        <spring-boot-maven-plugin.version>2.0.4.RELEASE</spring-boot-maven-plugin.version>
-    </properties>
-
 </project>

spring-boot-modules/spring-boot-admin/spring-boot-admin-server/src/main/java/com/baeldung/springbootadminserver/configs/WebSecurityConfig.java

@@ -5,6 +5,7 @@ import java.util.UUID;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.HttpMethod;
+import org.springframework.security.config.Customizer;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 import org.springframework.security.web.SecurityFilterChain;
@@ -17,6 +18,7 @@ import de.codecentric.boot.admin.server.config.AdminServerProperties;
 @Configuration
 @EnableWebSecurity
 public class WebSecurityConfig {
+
     private final AdminServerProperties adminServer;
 
     public WebSecurityConfig(AdminServerProperties adminServer) {
@@ -29,32 +31,24 @@ public class WebSecurityConfig {
         successHandler.setTargetUrlParameter("redirectTo");
         successHandler.setDefaultTargetUrl(this.adminServer.getContextPath() + "/");
 
-        http.authorizeRequests()
-            .antMatchers(this.adminServer.getContextPath() + "/assets/**")
-            .permitAll()
-            .antMatchers(this.adminServer.getContextPath() + "/login")
-            .permitAll()
-            .anyRequest()
-            .authenticated()
-            .and()
-            .formLogin()
-            .loginPage(this.adminServer.getContextPath() + "/login")
-            .successHandler(successHandler)
-            .and()
-            .logout()
-            .logoutUrl(this.adminServer.getContextPath() + "/logout")
-            .and()
-            .httpBasic()
-            .and()
-            .csrf()
-            .csrfTokenRepository(CookieCsrfTokenRepository.withHttpOnlyFalse())
-            .ignoringRequestMatchers(new AntPathRequestMatcher(this.adminServer.getContextPath() + "/instances", HttpMethod.POST.toString()), new AntPathRequestMatcher(this.adminServer.getContextPath() + "/instances/*", HttpMethod.DELETE.toString()),
-                new AntPathRequestMatcher(this.adminServer.getContextPath() + "/actuator/**"))
-            .and()
-            .rememberMe()
-            .key(UUID.randomUUID()
-                .toString())
-            .tokenValiditySeconds(1209600);
+        http.authorizeHttpRequests(req -> req.requestMatchers(this.adminServer.getContextPath() + "/assets/**")
+                .permitAll()
+                .requestMatchers(this.adminServer.getContextPath() + "/login")
+                .permitAll()
+                .anyRequest()
+                .authenticated())
+            .formLogin(formLogin -> formLogin.loginPage(this.adminServer.getContextPath() + "/login")
+                .successHandler(successHandler))
+            .logout((logout) -> logout.logoutUrl(this.adminServer.getContextPath() + "/logout"))
+            .httpBasic(Customizer.withDefaults())
+            .csrf(csrf -> csrf.csrfTokenRepository(CookieCsrfTokenRepository.withHttpOnlyFalse())
+                .ignoringRequestMatchers(
+                    new AntPathRequestMatcher(this.adminServer.getContextPath() + "/instances", HttpMethod.POST.toString()),
+                    new AntPathRequestMatcher(this.adminServer.getContextPath() + "/instances/*", HttpMethod.DELETE.toString()),
+                    new AntPathRequestMatcher(this.adminServer.getContextPath() + "/actuator/**")))
+            .rememberMe(rememberMe -> rememberMe.key(UUID.randomUUID()
+                    .toString())
+                .tokenValiditySeconds(1209600));
         return http.build();
     }
 }

spring-boot-modules/spring-boot-admin/spring-boot-admin-server/src/test/java/com/baeldung/springbootadminserver/WebSecurityConfigIntegrationTest.java

@@ -52,7 +52,7 @@ public class WebSecurityConfigIntegrationTest {
           .password("admin"));
 
         mockMvc
-          .perform(get("/applications/"))
+          .perform(get("/applications"))
           .andExpect(status().is2xxSuccessful());
 
     }

spring-boot-modules/spring-boot-angular/pom.xml

@@ -49,4 +49,8 @@
         </plugins>
     </build>
 
+    <properties>
+        <start-class>com.baeldung.Application</start-class>
+    </properties>
+
 </project>

spring-boot-modules/spring-boot-angular/src/main/java/com/baeldung/application/entities/User.java

@@ -1,9 +1,9 @@
 package com.baeldung.application.entities;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
 
 @Entity
 public class User {

spring-boot-modules/spring-boot-angular/src/main/java/com/baeldung/ecommerce/controller/OrderController.java

@@ -1,5 +1,22 @@
 package com.baeldung.ecommerce.controller;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
+
 import com.baeldung.ecommerce.dto.OrderProductDto;
 import com.baeldung.ecommerce.exception.ResourceNotFoundException;
 import com.baeldung.ecommerce.model.Order;
@@ -8,18 +25,8 @@ import com.baeldung.ecommerce.model.OrderStatus;
 import com.baeldung.ecommerce.service.OrderProductService;
 import com.baeldung.ecommerce.service.OrderService;
 import com.baeldung.ecommerce.service.ProductService;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.util.CollectionUtils;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.servlet.support.ServletUriComponentsBuilder;
 
-import javax.validation.constraints.NotNull;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-import java.util.stream.Collectors;
+import jakarta.validation.constraints.NotNull;
 
 @RestController
 @RequestMapping("/api/orders")

spring-boot-modules/spring-boot-angular/src/main/java/com/baeldung/ecommerce/controller/ProductController.java

@@ -1,12 +1,13 @@
 package com.baeldung.ecommerce.controller;
 
-import com.baeldung.ecommerce.model.Product;
-import com.baeldung.ecommerce.service.ProductService;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.validation.constraints.NotNull;
+import com.baeldung.ecommerce.model.Product;
+import com.baeldung.ecommerce.service.ProductService;
+
+import jakarta.validation.constraints.NotNull;
 
 @RestController
 @RequestMapping("/api/products")

spring-boot-modules/spring-boot-angular/src/main/java/com/baeldung/ecommerce/exception/ApiExceptionHandler.java

@@ -6,8 +6,8 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
 
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.ConstraintViolationException;
 import java.util.ArrayList;
 import java.util.List;
 

spring-boot-modules/spring-boot-angular/src/main/java/com/baeldung/ecommerce/model/Order.java

@@ -1,16 +1,22 @@
 package com.baeldung.ecommerce.model;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIdentityInfo;
-import com.fasterxml.jackson.annotation.JsonManagedReference;
-import com.fasterxml.jackson.annotation.ObjectIdGenerators;
-
-import javax.persistence.*;
-import javax.validation.Valid;
 import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIdentityInfo;
+import com.fasterxml.jackson.annotation.ObjectIdGenerators;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
+import jakarta.persistence.Transient;
+import jakarta.validation.Valid;
+
 @Entity
 @Table(name = "orders")
 @JsonIdentityInfo(generator=ObjectIdGenerators.PropertyGenerator.class, property="orderProducts")

spring-boot-modules/spring-boot-angular/src/main/java/com/baeldung/ecommerce/model/OrderProduct.java

@@ -2,10 +2,10 @@ package com.baeldung.ecommerce.model;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
-import javax.persistence.Column;
-import javax.persistence.EmbeddedId;
-import javax.persistence.Entity;
-import javax.persistence.Transient;
+import jakarta.persistence.Column;
+import jakarta.persistence.EmbeddedId;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Transient;
 
 @Entity
 public class OrderProduct {

spring-boot-modules/spring-boot-angular/src/main/java/com/baeldung/ecommerce/model/OrderProductPK.java

@@ -1,13 +1,14 @@
 package com.baeldung.ecommerce.model;
 
+import java.io.Serializable;
+
 import com.fasterxml.jackson.annotation.JsonIdentityInfo;
 import com.fasterxml.jackson.annotation.ObjectIdGenerators;
 
-import javax.persistence.Embeddable;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import java.io.Serializable;
+import jakarta.persistence.Embeddable;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
 
 @Embeddable
 @JsonIdentityInfo(generator = ObjectIdGenerators.PropertyGenerator.class, property = "order")

spring-boot-modules/spring-boot-angular/src/main/java/com/baeldung/ecommerce/model/Product.java

@@ -1,7 +1,11 @@
 package com.baeldung.ecommerce.model;
 
-import javax.persistence.*;
-import javax.validation.constraints.NotNull;
+import jakarta.persistence.Basic;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.validation.constraints.NotNull;
 
 @Entity
 public class Product {

spring-boot-modules/spring-boot-angular/src/main/java/com/baeldung/ecommerce/service/OrderProductService.java

@@ -1,10 +1,11 @@
 package com.baeldung.ecommerce.service;
 
-import com.baeldung.ecommerce.model.OrderProduct;
 import org.springframework.validation.annotation.Validated;
 
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
+import com.baeldung.ecommerce.model.OrderProduct;
+
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
 
 @Validated
 public interface OrderProductService {

spring-boot-modules/spring-boot-angular/src/main/java/com/baeldung/ecommerce/service/OrderService.java

@@ -1,10 +1,11 @@
 package com.baeldung.ecommerce.service;
 
-import com.baeldung.ecommerce.model.Order;
 import org.springframework.validation.annotation.Validated;
 
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
+import com.baeldung.ecommerce.model.Order;
+
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
 
 @Validated
 public interface OrderService {

spring-boot-modules/spring-boot-angular/src/main/java/com/baeldung/ecommerce/service/ProductService.java

@@ -1,10 +1,11 @@
 package com.baeldung.ecommerce.service;
 
-import com.baeldung.ecommerce.model.Product;
 import org.springframework.validation.annotation.Validated;
 
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
+import com.baeldung.ecommerce.model.Product;
+
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
 
 @Validated
 public interface ProductService {

spring-boot-modules/spring-boot-angular/src/test/java/com/baeldung/ecommerce/EcommerceApplicationIntegrationTest.java

@@ -1,37 +1,37 @@
 package com.baeldung.ecommerce;
 
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.hasItem;
+import static org.hamcrest.Matchers.hasProperty;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.util.Collections;
+
+import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.web.client.TestRestTemplate;
+import org.springframework.boot.test.web.server.LocalServerPort;
+import org.springframework.core.ParameterizedTypeReference;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+
 import com.baeldung.ecommerce.controller.OrderController;
 import com.baeldung.ecommerce.controller.ProductController;
 import com.baeldung.ecommerce.dto.OrderProductDto;
 import com.baeldung.ecommerce.model.Order;
 import com.baeldung.ecommerce.model.Product;
-import org.assertj.core.api.Assertions;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.web.client.TestRestTemplate;
-import org.springframework.boot.web.server.LocalServerPort;
-import org.springframework.core.ParameterizedTypeReference;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-import org.springframework.test.context.junit4.SpringRunner;
 
-import java.util.Collections;
-
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.hasItem;
-import static org.hamcrest.Matchers.hasProperty;
-
-@RunWith(SpringRunner.class)
 @SpringBootTest(classes = { EcommerceApplication.class }, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 public class EcommerceApplicationIntegrationTest {
 
     @Autowired private TestRestTemplate restTemplate;
 
-    @LocalServerPort private int port;
+    @LocalServerPort
+    private int port;
 
     @Autowired private ProductController productController;
 
@@ -80,9 +80,7 @@ public class EcommerceApplicationIntegrationTest {
     public void givenPostOrder_whenBodyRequestMatcherJson_thenResponseContainsEqualObjectProperties() {
         final ResponseEntity<Order> postResponse = restTemplate.postForEntity("http://localhost:" + port + "/api/orders", prepareOrderForm(), Order.class);
         Order order = postResponse.getBody();
-        Assertions
-          .assertThat(postResponse.getStatusCode())
-          .isEqualByComparingTo(HttpStatus.CREATED);
+        assertEquals(HttpStatus.CREATED, postResponse.getStatusCode());
 
         assertThat(order, hasProperty("status", is("PAID")));
         assertThat(order.getOrderProducts(), hasItem(hasProperty("quantity", is(2))));

spring-boot-modules/spring-boot-annotations/pom.xml

@@ -39,6 +39,7 @@
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-core</artifactId>
+            <version>${hibernate.core.version}</version>
         </dependency>
         <!--Test -->
         <dependency>
@@ -49,8 +50,15 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-inline</artifactId>
+            <version>${mockito.inline.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
 
+    <properties>
+        <hibernate.core.version>6.4.2.Final</hibernate.core.version>
+        <mockito.inline.version>5.2.0</mockito.inline.version>
+        <start-class>com.baeldung.annotations.VehicleFactoryApplication</start-class>
+    </properties>
+
 </project>

spring-boot-modules/spring-boot-annotations/src/main/java/com/baeldung/annotations/Bike.java

@@ -1,6 +1,5 @@
 package com.baeldung.annotations;
 
-import org.springframework.beans.factory.annotation.Required;
 import org.springframework.context.annotation.DependsOn;
 
 @DependsOn
@@ -8,7 +7,10 @@ public class Bike implements Vehicle {
 
     private String color;
 
-    @Required
+    public Bike(String color) {
+        this.color = color;
+    }
+
     public void setColor(String color) {
         this.color = color;
     }

spring-boot-modules/spring-boot-autoconfiguration/pom.xml

@@ -10,10 +10,9 @@
     <description>This is simple boot application demonstrating a custom auto-configuration</description>
 
     <parent>
-        <groupId>com.baeldung</groupId>
-        <artifactId>parent-boot-3</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../../parent-boot-3</relativePath>
+        <groupId>com.baeldung.spring-boot-modules</groupId>
+        <artifactId>spring-boot-modules</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
 
     <dependencies>

spring-boot-modules/spring-boot-basic-customization-2/pom.xml

@@ -9,10 +9,9 @@
     <description>Module For Spring Boot Basic Customization 2</description>
 
     <parent>
-        <groupId>com.baeldung</groupId>
-        <artifactId>parent-boot-3</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../../parent-boot-3</relativePath>
+        <groupId>com.baeldung.spring-boot-modules</groupId>
+        <artifactId>spring-boot-modules</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
 
     <dependencies>

spring-boot-modules/spring-boot-basic-customization-2/src/main/java/com/baeldung/dispatchservlet/conf/WebConf.java

@@ -1,12 +1,13 @@
 package com.baeldung.dispatchservlet.conf;
 
-import com.baeldung.dispatchservlet.listener.CustomListener;
-import com.baeldung.dispatchservlet.servlet.CustomServlet;
 import org.springframework.boot.web.servlet.ServletListenerRegistrationBean;
 import org.springframework.boot.web.servlet.ServletRegistrationBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
+import com.baeldung.dispatchservlet.listener.CustomListener;
+import com.baeldung.dispatchservlet.servlet.CustomServlet;
+
 import jakarta.servlet.ServletContextListener;
 
 @Configuration

spring-boot-modules/spring-boot-basic-customization-2/src/main/java/com/baeldung/dispatchservlet/filter/CustomFilter.java

@@ -1,11 +1,17 @@
 package com.baeldung.dispatchservlet.filter;
 
+import java.io.IOException;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
-import jakarta.servlet.*;
-import java.io.IOException;
+import jakarta.servlet.Filter;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
 
 @Component
 public class CustomFilter implements Filter {
@@ -13,7 +19,7 @@ public class CustomFilter implements Filter {
     Logger logger = LoggerFactory.getLogger(CustomFilter.class);
 
     @Override
-    public void init(FilterConfig filterConfig) throws ServletException {
+    public void init(FilterConfig filterConfig) {
 
     }
 

spring-boot-modules/spring-boot-basic-customization-2/src/main/java/com/baeldung/dispatchservlet/servlet/CustomServlet.java

@@ -1,15 +1,14 @@
 package com.baeldung.dispatchservlet.servlet;
 
-import com.baeldung.dispatchservlet.filter.CustomFilter;
+import java.io.IOException;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import jakarta.servlet.ServletException;
-import jakarta.servlet.annotation.WebServlet;
 import jakarta.servlet.http.HttpServlet;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
-import java.io.IOException;
 
 public class CustomServlet extends HttpServlet {
 

spring-boot-modules/spring-boot-basic-customization-2/src/main/java/com/baeldung/onceperrequestfilter/AuthenticationFilter.java

@@ -1,5 +1,7 @@
 package com.baeldung.onceperrequestfilter;
 
+import java.io.IOException;
+
 import org.springframework.stereotype.Component;
 import org.springframework.web.filter.OncePerRequestFilter;
 
@@ -7,7 +9,6 @@ import jakarta.servlet.FilterChain;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
-import java.io.IOException;
 
 @Component
 public class AuthenticationFilter extends OncePerRequestFilter {

spring-boot-modules/spring-boot-basic-customization-2/src/main/java/com/baeldung/onceperrequestfilter/HelloController.java

@@ -1,5 +1,8 @@
 package com.baeldung.onceperrequestfilter;
 
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Controller;
@@ -7,8 +10,6 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.context.request.async.DeferredResult;
 
 import jakarta.servlet.http.HttpServletResponse;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
 
 @Controller
 public class HelloController implements AutoCloseable {
@@ -18,7 +19,7 @@ public class HelloController implements AutoCloseable {
     private Logger logger = LoggerFactory.getLogger(HelloController.class);
 
     @GetMapping(path = "/greeting")
-    public DeferredResult<String> hello(HttpServletResponse response) throws Exception {
+    public DeferredResult<String> hello(HttpServletResponse response) {
         DeferredResult<String> deferredResult = new DeferredResult<>();
         executorService.submit(() -> perform(deferredResult));
         return deferredResult;

spring-boot-modules/spring-boot-basic-customization-2/src/main/java/com/baeldung/onceperrequestfilter/MyOncePerRequestFilter.java

@@ -1,5 +1,7 @@
 package com.baeldung.onceperrequestfilter;
 
+import java.io.IOException;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
@@ -9,7 +11,6 @@ import jakarta.servlet.FilterChain;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
-import java.io.IOException;
 
 @Component
 public class MyOncePerRequestFilter extends OncePerRequestFilter {

spring-boot-modules/spring-boot-basic-customization/pom.xml

@@ -9,10 +9,9 @@
     <description>Module For Spring Boot Basic Customization</description>
 
     <parent>
-        <groupId>com.baeldung</groupId>
-        <artifactId>parent-boot-3</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../../parent-boot-3</relativePath>
+        <groupId>com.baeldung.spring-boot-modules</groupId>
+        <artifactId>spring-boot-modules</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
 
     <dependencies>

spring-boot-modules/spring-boot-basic-customization/src/main/java/com/baeldung/bootcustomfilters/filters/RequestResponseLoggingFilter.java

@@ -1,5 +1,7 @@
 package com.baeldung.bootcustomfilters.filters;
 
+import java.io.IOException;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.core.annotation.Order;
@@ -13,7 +15,6 @@ import jakarta.servlet.ServletRequest;
 import jakarta.servlet.ServletResponse;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
-import java.io.IOException;
 
 /**
  * A servlet filter to log request and response
@@ -28,7 +29,7 @@ public class RequestResponseLoggingFilter implements Filter {
 	private final static Logger LOG = LoggerFactory.getLogger(RequestResponseLoggingFilter.class);
 
 	@Override
-	public void init(final FilterConfig filterConfig) {
+	public void init(final FilterConfig filterConfig) throws ServletException {
 		LOG.info("Initializing filter :{}", this);
 	}
 

spring-boot-modules/spring-boot-basic-customization/src/main/java/com/baeldung/bootcustomfilters/filters/TransactionFilter.java

@@ -1,5 +1,7 @@
 package com.baeldung.bootcustomfilters.filters;
 
+import java.io.IOException;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.core.annotation.Order;
@@ -12,7 +14,6 @@ import jakarta.servlet.ServletException;
 import jakarta.servlet.ServletRequest;
 import jakarta.servlet.ServletResponse;
 import jakarta.servlet.http.HttpServletRequest;
-import java.io.IOException;
 
 /**
  * A filter to create transaction before and commit it once request completes

spring-boot-modules/spring-boot-bootstrap/pom.xml

@@ -9,10 +9,9 @@
     <description>Demo project for Spring Boot</description>
 
     <parent>
-        <groupId>com.baeldung</groupId>
-        <artifactId>parent-boot-3</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../../parent-boot-3</relativePath>
+        <groupId>com.baeldung.spring-boot-modules</groupId>
+        <artifactId>spring-boot-modules</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
 
     <dependencies>

spring-boot-modules/spring-boot-config-jpa-error/data-jpa-application/pom.xml

@@ -12,4 +12,6 @@
         <version>0.0.1-SNAPSHOT</version>
     </parent>
 
+
+
 </project>

spring-boot-modules/spring-boot-config-jpa-error/data-jpa-application/src/main/java/com/baeldung/data/jpa/ApplicationFound.java

@@ -1,7 +1,12 @@
 package com.baeldung.data.jpa;
 
+import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 @SpringBootApplication
 public class ApplicationFound {
+
+    public static void main(String[] args) {
+        SpringApplication.run(ApplicationFound.class, args);
+    }
 }

spring-boot-modules/spring-boot-config-jpa-error/data-jpa-library/src/main/java/com/baeldung/data/jpa/library/TestApplication.java

@@ -0,0 +1,13 @@
+package com.baeldung.data.jpa.library;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class TestApplication {
+
+    public static void main(String[] args) {
+        SpringApplication.run(TestApplication.class, args);
+    }
+
+}

spring-boot-modules/spring-boot-config-jpa-error/data-jpa-library/src/main/java/com/baeldung/data/jpa/library/model/Example.java

@@ -1,4 +1,4 @@
-package com.baeldung.data.jpa.libarary.model;
+package com.baeldung.data.jpa.library.model;
 
 public class Example {
     private String example;

spring-boot-modules/spring-boot-config-jpa-error/data-jpa-library/src/test/java/com/baeldung/data/jpa/TestApplication.java

@@ -1,7 +0,0 @@
-package com.baeldung.data.jpa;
-
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-
-@SpringBootApplication
-public class TestApplication {
-}

spring-boot-modules/spring-boot-config-jpa-error/data-jpa-library/src/test/java/com/baeldung/data/jpa/library/DataJpaUnitTest.java

@@ -1,24 +1,23 @@
-package com.baeldung.data.jpa.libarary;
+package com.baeldung.data.jpa.library;
 
-import static org.junit.Assert.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.orm.jpa.AutoConfigureDataJpa;
 import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
 import org.springframework.boot.test.autoconfigure.orm.jpa.TestEntityManager;
-import org.springframework.test.context.junit4.SpringRunner;
 
-@RunWith(SpringRunner.class)
 @DataJpaTest
-public class DataJpaUnitTest {
+@AutoConfigureDataJpa
+class DataJpaUnitTest {
 
     @Autowired
     private TestEntityManager entityManager;
 
     @Test
-    public void givenACorrectSetup_thenAnEntityManagerWillBeAvailable() {
+    void givenACorrectSetup_thenAnEntityManagerWillBeAvailable() {
         assertNotNull(entityManager);
     }
 
-}
+}

spring-boot-modules/spring-boot-crud/pom.xml

@@ -80,6 +80,7 @@
 
     <properties>
         <maven-assembly-plugin.version>3.3.0</maven-assembly-plugin.version>
+        <start-class>com.baeldung.demo.DemoApplication,</start-class>
     </properties>
 
 </project>

spring-boot-modules/spring-boot-crud/src/main/java/com/baeldung/crud/controllers/UserController.java

@@ -1,6 +1,6 @@
 package com.baeldung.crud.controllers;
 
-import javax.validation.Valid;
+import jakarta.validation.Valid;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;

spring-boot-modules/spring-boot-crud/src/main/java/com/baeldung/crud/entities/User.java

@@ -1,10 +1,10 @@
 package com.baeldung.crud.entities;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.validation.constraints.NotBlank;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.validation.constraints.NotBlank;
 
 @Entity
 public class User {

spring-boot-modules/spring-boot-crud/src/main/java/com/baeldung/demo/model/Foo.java

@@ -2,9 +2,9 @@ package com.baeldung.demo.model;
 
 import java.io.Serializable;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.Id;
 
 @Entity
 public class Foo implements Serializable {

spring-boot-modules/spring-boot-crud/src/main/java/com/baeldung/entitydtodifferences/entity/Book.java

@@ -1,8 +1,8 @@
 package com.baeldung.entitydtodifferences.entity;
 
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 
 @Entity
 @Table(name = "books")

spring-boot-modules/spring-boot-crud/src/main/java/com/baeldung/entitydtodifferences/entity/User.java

@@ -4,13 +4,13 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
 
 @Entity
 @Table(name = "users")

spring-boot-modules/spring-boot-crud/src/main/java/com/baeldung/session/exception/repository/FooRepositoryImpl.java

@@ -1,6 +1,6 @@
 package com.baeldung.session.exception.repository;
 
-import javax.persistence.EntityManagerFactory;
+import jakarta.persistence.EntityManagerFactory;
 
 import com.baeldung.demo.model.Foo;
 import org.hibernate.SessionFactory;

spring-boot-modules/spring-boot-data-2/pom.xml

@@ -6,10 +6,9 @@
     <artifactId>spring-boot-data-2</artifactId>
 
     <parent>
-        <groupId>com.baeldung</groupId>
-        <artifactId>parent-boot-3</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../../parent-boot-3</relativePath>
+        <groupId>com.baeldung.spring-boot-modules</groupId>
+        <artifactId>spring-boot-modules</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
 
     <dependencies>

spring-boot-modules/spring-boot-data-3/pom.xml

@@ -16,6 +16,11 @@
     </parent>
 
     <dependencies>
+        <dependency>
+            <groupId>io.hypersistence</groupId>
+            <artifactId>hypersistence-utils-hibernate-55</artifactId>
+            <version>3.7.1</version>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
@@ -62,6 +67,7 @@
     <properties>
         <spring-cloud-starter-aws-secrets-manager-config.version>2.4.4</spring-cloud-starter-aws-secrets-manager-config.version>
         <aws-secretsmanager-jdbc.version>1.0.11</aws-secretsmanager-jdbc.version>
+        <start-class>com.baeldung.startwithoutdb.StartWithoutDbApplication</start-class>
     </properties>
 
 </project>

spring-boot-modules/spring-boot-data-3/src/main/java/com/baeldung/nopropertyfound/model/Person.java

@@ -1,9 +1,9 @@
 package com.baeldung.nopropertyfound.model;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
 
 @Entity
 public class Person {

spring-boot-modules/spring-boot-data-3/src/main/java/com/baeldung/skipselectbeforeinsert/SkipSelectBeforeInsertApplication.java

@@ -0,0 +1,18 @@
+package com.baeldung.skipselectbeforeinsert;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
+
+import io.hypersistence.utils.spring.repository.BaseJpaRepositoryImpl;
+
+@SpringBootApplication
+@EnableJpaRepositories(
+    value = "com.baeldung.skipselectbeforeinsert.repository",
+    repositoryBaseClass = BaseJpaRepositoryImpl.class
+)
+public class SkipSelectBeforeInsertApplication {
+    public static void main(String[] args) {
+        SpringApplication.run(SkipSelectBeforeInsertApplication.class, args);
+    }
+}

spring-boot-modules/spring-boot-data-3/src/main/java/com/baeldung/skipselectbeforeinsert/model/PersistableTask.java

@@ -0,0 +1,45 @@
+package com.baeldung.skipselectbeforeinsert.model;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Transient;
+
+import org.springframework.data.domain.Persistable;
+
+@Entity
+public class PersistableTask implements Persistable<Integer> {
+
+    @Id
+    private int id;
+    private String description;
+
+    @Transient
+    private boolean isNew = true;
+
+    public void setNew(boolean isNew) {
+        this.isNew = isNew;
+    }
+
+    @Override
+    public Integer getId() {
+        return id;
+    }
+
+    @Override
+    public boolean isNew() {
+        return isNew;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+}

spring-boot-modules/spring-boot-data-3/src/main/java/com/baeldung/skipselectbeforeinsert/model/Task.java

@@ -0,0 +1,30 @@
+package com.baeldung.skipselectbeforeinsert.model;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+
+@Entity
+public class Task {
+
+    @Id
+    private Integer id;
+    private String description;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+}

spring-boot-modules/spring-boot-data-3/src/main/java/com/baeldung/skipselectbeforeinsert/model/TaskWithGeneratedId.java

@@ -0,0 +1,31 @@
+package com.baeldung.skipselectbeforeinsert.model;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+
+@Entity
+public class TaskWithGeneratedId {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Integer id;
+    private String description;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+}

spring-boot-modules/spring-boot-data-3/src/main/java/com/baeldung/skipselectbeforeinsert/repository/PersistableTaskRepository.java

@@ -0,0 +1,12 @@
+package com.baeldung.skipselectbeforeinsert.repository;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+import com.baeldung.skipselectbeforeinsert.model.PersistableTask;
+import com.baeldung.skipselectbeforeinsert.model.Task;
+
+@Repository
+public interface PersistableTaskRepository extends JpaRepository<PersistableTask, Integer> {
+
+}

spring-boot-modules/spring-boot-data-3/src/main/java/com/baeldung/skipselectbeforeinsert/repository/TaskJpaRepository.java

@@ -0,0 +1,12 @@
+package com.baeldung.skipselectbeforeinsert.repository;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+import com.baeldung.skipselectbeforeinsert.model.Task;
+
+import io.hypersistence.utils.spring.repository.BaseJpaRepository;
+
+@Repository
+public interface TaskJpaRepository extends JpaRepository<Task, Integer>, BaseJpaRepository<Task, Integer> {
+}

spring-boot-modules/spring-boot-data-3/src/main/java/com/baeldung/skipselectbeforeinsert/repository/TaskRepository.java

@@ -0,0 +1,17 @@
+package com.baeldung.skipselectbeforeinsert.repository;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+import org.springframework.stereotype.Repository;
+
+import com.baeldung.skipselectbeforeinsert.model.Task;
+
+@Repository
+public interface TaskRepository extends JpaRepository<Task, Integer>, TaskRepositoryExtension {
+
+    @Modifying
+    @Query(value = "insert into task(id, description) values(:#{#task.id}, :#{#task.description})", nativeQuery = true)
+    void insert(@Param("task") Task task);
+}

spring-boot-modules/spring-boot-data-3/src/main/java/com/baeldung/skipselectbeforeinsert/repository/TaskRepositoryExtension.java

@@ -0,0 +1,7 @@
+package com.baeldung.skipselectbeforeinsert.repository;
+
+import com.baeldung.skipselectbeforeinsert.model.Task;
+
+public interface TaskRepositoryExtension {
+    Task persistAndFlush(Task task);
+}

spring-boot-modules/spring-boot-data-3/src/main/java/com/baeldung/skipselectbeforeinsert/repository/TaskRepositoryExtensionImpl.java

@@ -0,0 +1,21 @@
+package com.baeldung.skipselectbeforeinsert.repository;
+
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+
+import org.springframework.stereotype.Component;
+
+import com.baeldung.skipselectbeforeinsert.model.Task;
+
+@Component
+public class TaskRepositoryExtensionImpl implements TaskRepositoryExtension {
+    @PersistenceContext
+    private EntityManager entityManager;
+
+    @Override
+    public Task persistAndFlush(Task task) {
+        entityManager.persist(task);
+        entityManager.flush();
+        return task;
+    }
+}

spring-boot-modules/spring-boot-data-3/src/main/java/com/baeldung/skipselectbeforeinsert/repository/TaskWithGeneratedIdRepository.java

@@ -0,0 +1,14 @@
+package com.baeldung.skipselectbeforeinsert.repository;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+import org.springframework.stereotype.Repository;
+
+import com.baeldung.skipselectbeforeinsert.model.Task;
+import com.baeldung.skipselectbeforeinsert.model.TaskWithGeneratedId;
+
+@Repository
+public interface TaskWithGeneratedIdRepository extends JpaRepository<TaskWithGeneratedId, Integer> {
+}

spring-boot-modules/spring-boot-data-3/src/main/java/com/baeldung/startdbwithawssecretsmanager/StartWithAWSSecretsManagerApplication.java

@@ -5,7 +5,7 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.Profile;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 
 @SpringBootApplication
 @Profile("aws")

spring-boot-modules/spring-boot-data-3/src/main/java/com/baeldung/startdbwithawssecretsmanager/model/UserEntity.java

@@ -1,9 +1,9 @@
 package com.baeldung.startdbwithawssecretsmanager.model;
 
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
 
 @Entity
 public class UserEntity {

spring-boot-modules/spring-boot-data-3/src/main/resources/application.properties

@@ -2,7 +2,7 @@ spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 spring.datasource.url=jdbc:mysql://localhost:3306/myDb
 spring.datasource.username=root
 spring.datasource.password=root
-spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQL5Dialect
+spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MySQLDialect
 spring.jpa.hibernate.ddl-auto=none
 spring.jpa.properties.hibernate.temp.use_jdbc_metadata_defaults=false
 

spring-boot-modules/spring-boot-data-3/src/test/java/com/baeldung/skipselectbeforeinsert/SkipSelectBeforeInsertIntegrationTest.java

@@ -0,0 +1,110 @@
+package com.baeldung.skipselectbeforeinsert;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
+import org.springframework.dao.DataIntegrityViolationException;
+
+import com.baeldung.skipselectbeforeinsert.model.PersistableTask;
+import com.baeldung.skipselectbeforeinsert.model.Task;
+import com.baeldung.skipselectbeforeinsert.model.TaskWithGeneratedId;
+import com.baeldung.skipselectbeforeinsert.repository.PersistableTaskRepository;
+import com.baeldung.skipselectbeforeinsert.repository.TaskJpaRepository;
+import com.baeldung.skipselectbeforeinsert.repository.TaskRepository;
+import com.baeldung.skipselectbeforeinsert.repository.TaskWithGeneratedIdRepository;
+
+@DataJpaTest
+public class SkipSelectBeforeInsertIntegrationTest {
+
+    @Autowired
+    private TaskRepository taskRepository;
+    @Autowired
+    private TaskWithGeneratedIdRepository taskWithGeneratedIdRepository;
+    @Autowired
+    private PersistableTaskRepository persistableTaskRepository;
+    @Autowired
+    private TaskJpaRepository taskJpaRepository;
+
+    @Test
+    void givenRepository_whenSaveNewTaskWithPopulatedId_thenExtraSelectIsExpected() {
+        Task task = new Task();
+        task.setId(1);
+        taskRepository.saveAndFlush(task);
+    }
+
+    @Test
+    void givenRepository_whenSaveNewTaskWithGeneratedId_thenNoExtraSelectIsExpected() {
+        TaskWithGeneratedId task = new TaskWithGeneratedId();
+        TaskWithGeneratedId saved = taskWithGeneratedIdRepository.saveAndFlush(task);
+        assertNotNull(saved.getId());
+    }
+
+    @Test
+    void givenRepository_whenSaveNewPersistableTask_thenNoExtraSelectIsExpected() {
+        PersistableTask persistableTask = new PersistableTask();
+        persistableTask.setId(2);
+        persistableTask.setNew(true);
+        PersistableTask saved = persistableTaskRepository.saveAndFlush(persistableTask);
+        assertEquals(2, saved.getId());
+    }
+
+    @Test
+    void givenRepository_whenSaveNewPersistableTasksWithSameId_thenExceptionIsExpected() {
+        PersistableTask persistableTask = new PersistableTask();
+        persistableTask.setId(3);
+        persistableTask.setNew(true);
+        persistableTaskRepository.saveAndFlush(persistableTask);
+
+        PersistableTask duplicateTask = new PersistableTask();
+        duplicateTask.setId(3);
+        duplicateTask.setNew(true);
+
+        assertThrows(DataIntegrityViolationException.class,
+          () -> persistableTaskRepository.saveAndFlush(duplicateTask));
+    }
+
+    @Test
+    void givenRepository_whenPersistNewTaskUsingCustomPersistMethod_thenNoExtraSelectIsExpected() {
+        Task task = new Task();
+        task.setId(4);
+        Task saved = taskRepository.persistAndFlush(task);
+
+        assertEquals(4, saved.getId());
+    }
+
+    @Test
+    void givenRepository_whenPersistNewTaskUsingPersist_thenNoExtraSelectIsExpected() {
+        Task task = new Task();
+        task.setId(5);
+        Task saved = taskJpaRepository.persistAndFlush(task);
+
+        assertEquals(5, saved.getId());
+    }
+
+    @Test
+    void givenRepository_whenPersistTaskWithTheSameId_thenExceptionIsExpected() {
+        Task task = new Task();
+        task.setId(5);
+        taskJpaRepository.persistAndFlush(task);
+
+        Task secondTask = new Task();
+        secondTask.setId(5);
+
+        assertThrows(DataIntegrityViolationException.class,
+          () ->  taskJpaRepository.persistAndFlush(secondTask));
+    }
+
+    @Test
+    void givenRepository_whenPersistNewTaskUsingNativeQuery_thenNoExtraSelectIsExpected() {
+        Task task = new Task();
+        task.setId(6);
+        taskRepository.insert(task);
+
+        assertTrue(taskRepository.findById(6).isPresent());
+    }
+}

spring-boot-modules/spring-boot-data-3/src/test/java/com/baeldung/startwithoutdb/StartWithoutDbIntegrationTest.java

@@ -1,13 +1,11 @@
 package com.baeldung.startwithoutdb;
 
+import javax.sql.DataSource;
+
 import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.NoSuchBeanDefinitionException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.context.ApplicationContext;
-import org.springframework.test.context.junit4.SpringRunner;
-
-import javax.sql.DataSource;
 
 @SpringBootTest(classes = StartWithoutDbApplication.class)
 class StartWithoutDbIntegrationTest {
@@ -16,7 +14,7 @@ class StartWithoutDbIntegrationTest {
     private ApplicationContext context;
 
     @Test
-    public void givenAutoConfigDisabled_whenStarting_thenNoAutoconfiguredBeansInContext() {
+    void givenAutoConfigDisabled_whenStarting_thenNoAutoconfiguredBeansInContext() {
         context.getBean(DataSource.class);
     }
 

spring-boot-modules/spring-boot-data-3/src/test/resources/application.properties

@@ -0,0 +1,12 @@
+# spring.datasource.x
+spring.datasource.driver-class-name=org.h2.Driver
+spring.datasource.url=jdbc:h2:mem:db;DB_CLOSE_DELAY=-1
+spring.datasource.username=sa
+spring.datasource.password=sa
+
+# hibernate.X
+spring.jpa.hibernate.dialect=org.hibernate.dialect.H2Dialect
+spring.jpa.hibernate.ddl-auto=create-drop
+spring.jpa.hibernate.show_sql=true
+spring.jpa.hibernate.hbm2ddl.auto=create-drop
+spring.jpa.defer-datasource-initialization=true

spring-boot-modules/spring-boot-data/pom.xml

@@ -159,6 +159,7 @@
     <properties>
         <git-commit-id-plugin.version>2.2.4</git-commit-id-plugin.version>
         <javafx.version>19</javafx.version>
+        <start-class>com.baeldung.SpringBootDataApplication</start-class>
     </properties>
 
 </project>

spring-boot-modules/spring-boot-data/src/main/java/com/baeldung/boot/jackson/controller/CoffeeController.java

@@ -12,9 +12,8 @@ import com.baeldung.boot.jackson.model.Coffee;
 public class CoffeeController {
 
     @GetMapping("/coffee")
-    public Coffee getCoffee(
-            @RequestParam(required = false) String brand,
-            @RequestParam(required = false) String name) {
+    public Coffee getCoffee(@RequestParam(name = "brand", required = false) String brand,
+        @RequestParam(name = "name", required = false) String name) {
         return new Coffee().setBrand(brand)
                 .setDate(FIXED_DATE)
                 .setName(name);

spring-boot-modules/spring-boot-data/src/main/java/com/baeldung/startup/AllStrategiesExampleBean.java

@@ -6,7 +6,7 @@ import org.springframework.beans.factory.InitializingBean;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 
 @Component
 @Scope(value = "prototype")

spring-boot-modules/spring-boot-data/src/main/java/com/baeldung/startup/PostConstructExampleBean.java

@@ -7,7 +7,7 @@ import org.springframework.context.annotation.Scope;
 import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 import java.util.Arrays;
 
 @Component

spring-boot-modules/spring-boot-data/src/test/java/com/baeldung/jsondateformat/ContactAppIntegrationTest.java

@@ -7,7 +7,7 @@ import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.web.client.TestRestTemplate;
-import org.springframework.boot.web.server.LocalServerPort;
+import org.springframework.boot.test.web.server.LocalServerPort;
 import org.springframework.http.ResponseEntity;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit4.SpringRunner;

spring-boot-modules/spring-boot-data/src/test/java/com/baeldung/jsondateformat/ContactAppWithObjectMapperCustomizerIntegrationTest.java

@@ -7,7 +7,7 @@ import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.web.client.TestRestTemplate;
-import org.springframework.boot.web.server.LocalServerPort;
+import org.springframework.boot.test.web.server.LocalServerPort;
 import org.springframework.http.ResponseEntity;
 import org.springframework.test.context.junit4.SpringRunner;
 

spring-boot-modules/spring-boot-deployment/src/main/java/com/baeldung/gracefulshutdown/beans/LongRunningProcessBean.java

@@ -1,6 +1,6 @@
 package com.baeldung.gracefulshutdown.beans;
 
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

spring-boot-modules/spring-boot-deployment/src/main/java/com/baeldung/gracefulshutdown/config/SpringConfiguration.java

@@ -1,6 +1,6 @@
 package com.baeldung.gracefulshutdown.config;
 
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PreDestroy;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

spring-boot-modules/spring-boot-deployment/src/main/java/com/baeldung/shutdownhooks/beans/Bean1.java

@@ -1,6 +1,6 @@
 package com.baeldung.shutdownhooks.beans;
 
-import javax.annotation.PreDestroy;
+import jakarta.annotation.PreDestroy;
 
 import org.springframework.stereotype.Component;
 

spring-boot-modules/spring-boot-deployment/src/main/java/com/baeldung/shutdownhooks/config/ExampleServletContextListener.java

@@ -1,7 +1,7 @@
 package com.baeldung.shutdownhooks.config;
 
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
+import jakarta.servlet.ServletContextEvent;
+import jakarta.servlet.ServletContextListener;
 
 public class ExampleServletContextListener implements ServletContextListener {
 

spring-boot-modules/spring-boot-deployment/src/main/java/com/baeldung/shutdownhooks/config/ShutdownHookConfiguration.java

@@ -1,6 +1,6 @@
 package com.baeldung.shutdownhooks.config;
 
-import javax.servlet.ServletContextListener;
+import jakarta.servlet.ServletContextListener;
 
 import org.springframework.boot.web.servlet.ServletListenerRegistrationBean;
 import org.springframework.context.annotation.Bean;

spring-boot-modules/spring-boot-documentation/pom.xml

@@ -11,10 +11,9 @@
     <packaging>pom</packaging>
 
     <parent>
-        <groupId>com.baeldung</groupId>
-        <artifactId>parent-boot-3</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../../parent-boot-3/pom.xml</relativePath>
+        <groupId>com.baeldung.spring-boot-modules</groupId>
+        <artifactId>spring-boot-modules</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
 
     <dependencyManagement>

spring-boot-modules/spring-boot-environment/pom.xml

@@ -9,10 +9,9 @@
     <description>Demo project for Spring Boot</description>
 
     <parent>
-        <groupId>com.baeldung</groupId>
-        <artifactId>parent-boot-3</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../../parent-boot-3</relativePath>
+        <groupId>com.baeldung.spring-boot-modules</groupId>
+        <artifactId>spring-boot-modules</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
 
     <dependencies>

spring-boot-modules/spring-boot-exceptions/pom.xml

@@ -32,4 +32,8 @@
         </resources>
     </build>
 
+    <properties>
+        <start-class>com.baeldung.applicationcontextexception.MainEntryPoint</start-class>
+    </properties>
+
 </project>

spring-boot-modules/spring-boot-flowable/pom.xml

@@ -51,7 +51,7 @@
     </build>
 
     <properties>
-        <flowable.version>6.4.1</flowable.version>
+        <flowable.version>7.0.1</flowable.version>
     </properties>
 
 </project>

spring-boot-modules/spring-boot-flowable/src/test/java/com/baeldung/processes/ArticleWorkflowIntegrationTest.java

@@ -17,7 +17,7 @@ import org.springframework.boot.test.context.SpringBootTest;
 
 @ExtendWith(FlowableSpringExtension.class)
 @SpringBootTest
-public class ArticleWorkflowIntegrationTest {
+class ArticleWorkflowIntegrationTest {
     @Autowired
     private RuntimeService runtimeService;
     @Autowired

spring-boot-modules/spring-boot-graalvm-docker/pom.xml

@@ -10,10 +10,9 @@
     <description>Spring Boot GrralVM with Docker</description>
 
     <parent>
-        <groupId>com.baeldung</groupId>
-        <artifactId>parent-boot-3</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
-        <relativePath>../../parent-boot-3</relativePath>
+        <groupId>com.baeldung.spring-boot-modules</groupId>
+        <artifactId>spring-boot-modules</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
 
     <dependencies>

spring-boot-modules/spring-boot-graphql/src/main/java/com/baeldung/returnnull/GraphQLVoidScalar.java

@@ -0,0 +1,30 @@
+package com.baeldung.returnnull;
+
+import graphql.schema.Coercing;
+import graphql.schema.GraphQLScalarType;
+
+public class GraphQLVoidScalar {
+
+    public static final GraphQLScalarType Void = GraphQLScalarType.newScalar()
+      .name("Void")
+      .description("A custom scalar that represents the null value")
+      .coercing(new Coercing() {
+
+          @Override
+          public Object serialize(Object dataFetcherResult) {
+              return null;
+          }
+
+          @Override
+          public Object parseValue(Object input) {
+              return null;
+          }
+
+          @Override
+          public Object parseLiteral(Object input) {
+              return null;
+          }
+      })
+      .build();
+
+}

spring-boot-modules/spring-boot-graphql/src/main/java/com/baeldung/returnnull/GraphQlConfig.java

@@ -0,0 +1,14 @@
+package com.baeldung.returnnull;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.graphql.execution.RuntimeWiringConfigurer;
+
+@Configuration
+public class GraphQlConfig {
+
+    @Bean
+    public RuntimeWiringConfigurer runtimeWiringConfigurer() {
+        return wiringBuilder -> wiringBuilder.scalar(GraphQLVoidScalar.Void);
+    }
+}

spring-boot-modules/spring-boot-graphql/src/main/java/com/baeldung/returnnull/Post.java

@@ -0,0 +1,51 @@
+package com.baeldung.returnnull;
+
+public class Post {
+
+    private String id;
+    private String title;
+    private String text;
+    private String category;
+    private String author;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getText() {
+        return text;
+    }
+
+    public void setText(String text) {
+        this.text = text;
+    }
+
+    public String getCategory() {
+        return category;
+    }
+
+    public void setCategory(String category) {
+        this.category = category;
+    }
+
+    public String getAuthor() {
+        return author;
+    }
+
+    public void setAuthor(String author) {
+        this.author = author;
+    }
+
+}

spring-boot-modules/spring-boot-graphql/src/main/java/com/baeldung/returnnull/PostController.java

@@ -0,0 +1,28 @@
+package com.baeldung.returnnull;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
+import org.springframework.graphql.data.method.annotation.Argument;
+import org.springframework.graphql.data.method.annotation.MutationMapping;
+import org.springframework.stereotype.Controller;
+
+@Controller
+public class PostController {
+
+    List<Post> posts = new ArrayList<>();
+
+    @MutationMapping
+    public Void createPostReturnCustomScalar(@Argument String title, @Argument String text, @Argument String category, @Argument String author) {
+        Post post = new Post();
+        post.setId(UUID.randomUUID()
+          .toString());
+        post.setTitle(title);
+        post.setText(text);
+        post.setCategory(category);
+        post.setAuthor(author);
+        posts.add(post);
+        return null;
+    }
+}

spring-boot-modules/spring-boot-graphql/src/main/java/com/baeldung/returnnull/ReturnNullApp.java

@@ -0,0 +1,14 @@
+package com.baeldung.returnnull;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class ReturnNullApp {
+
+    public static void main(String[] args) {
+        System.setProperty("spring.profiles.default", "returnnull");
+        SpringApplication.run(com.baeldung.chooseapi.ChooseApiApp.class, args);
+    }
+}
+

spring-boot-modules/spring-boot-graphql/src/main/resources/application-returnnull.yml

@@ -0,0 +1,9 @@
+server:
+  port: 8082
+
+spring:
+  graphql:
+    graphiql:
+      enabled: true
+    schema:
+      locations: classpath:returnnull/

spring-boot-modules/spring-boot-graphql/src/main/resources/returnnull/returnnull.graphqls

@@ -0,0 +1,18 @@
+scalar Void
+
+type Mutation {
+    createPostReturnNullableType(title: String!, text: String!, category: String!, author: String!) : Int
+    createPostReturnCustomScalar(title: String!, text: String!, category: String!, author: String!) : Void
+}
+
+type Post {
+    id: ID
+    title: String
+    text: String
+    category: String
+    author: String
+}
+
+type Query {
+    recentPosts(count: Int, offset: Int): [Post]!
+}

spring-boot-modules/spring-boot-graphql/src/test/java/com/baeldung/returnnull/PostControllerIntegrationTest.java

@@ -0,0 +1,48 @@
+package com.baeldung.returnnull;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.graphql.GraphQlTest;
+import org.springframework.context.annotation.Import;
+import org.springframework.graphql.test.tester.GraphQlTester;
+import org.springframework.test.context.ActiveProfiles;
+
+@GraphQlTest(PostController.class)
+@ActiveProfiles("returnnull")
+@Import(GraphQlConfig.class)
+class PostControllerIntegrationTest {
+
+    @Autowired
+    private GraphQlTester graphQlTester;
+
+    @Test
+    void givenNewPostData_whenExecuteMutation_thenReturnCustomNullScalar() {
+        String documentName = "create_post_return_custom_scalar";
+
+        graphQlTester.documentName(documentName)
+          .variable("title", "New Post")
+          .variable("text", "New post text")
+          .variable("category", "category")
+          .variable("author", "Alex")
+          .execute()
+          .path("createPostReturnCustomScalar")
+          .valueIsNull();
+
+    }
+
+    @Test
+    void givenNewPostData_whenExecuteMutation_thenReturnNullType() {
+        String documentName = "create_post_return_nullable_type";
+
+        graphQlTester.documentName(documentName)
+          .variable("title", "New Post")
+          .variable("text", "New post text")
+          .variable("category", "category")
+          .variable("author", "Alex")
+          .execute()
+          .path("createPostReturnNullableType")
+          .valueIsNull();
+
+    }
+
+}

spring-boot-modules/spring-boot-graphql/src/test/resources/graphql-test/create_post_return_custom_scalar.graphql

@@ -0,0 +1,3 @@
+mutation createPostReturnCustomScalar($title: String!, $text: String!, $category: String!, $author: String!) {
+    createPostReturnCustomScalar(title: $title, text: $text, category: $category, author: $author)
+}