eugenp · anastasiosioannidis · Nov 17, 2025 · Nov 14, 2025
diff --git a/docker-modules/docker-multi-module-maven/Dockerfile b/docker-modules/docker-multi-module-maven/Dockerfile
@@ -1,7 +1,7 @@
 FROM maven:3.8.5-openjdk-17 AS DEPENDENCIES
 
 WORKDIR /opt/app
-COPY api/pom.xml api/pom.xml
+COPY docker-rest-api/pom.xml docker-rest-api/pom.xml
 COPY domain/pom.xml domain/pom.xml
 COPY pom.xml .
 
@@ -12,15 +12,15 @@ FROM maven:3.8.5-openjdk-17 AS BUILDER
 WORKDIR /opt/app
 COPY --from=DEPENDENCIES /root/.m2 /root/.m2
 COPY --from=DEPENDENCIES /opt/app/ /opt/app
-COPY api/src /opt/app/api/src
+COPY docker-rest-api/src /opt/app/docker-rest-api/src
 COPY domain/src /opt/app/domain/src
 
 RUN mvn -B -e clean install -DskipTests
 
 FROM openjdk:17-slim
 
 WORKDIR /opt/app
-COPY --from=BUILDER /opt/app/api/target/*.jar /app.jar
+COPY --from=BUILDER /opt/app/docker-rest-api/target/*.jar /app.jar
 EXPOSE 8080
 
 ENTRYPOINT ["java", "-jar", "/app.jar"]
diff --git a/...ker-multi-module-maven/api/countries.http → ...dule-maven/docker-rest-api/countries.http b/...ker-multi-module-maven/api/countries.http → ...dule-maven/docker-rest-api/countries.http
diff --git a/...les/docker-multi-module-maven/api/pom.xml → ...ulti-module-maven/docker-rest-api/pom.xml b/...les/docker-multi-module-maven/api/pom.xml → ...ulti-module-maven/docker-rest-api/pom.xml
@@ -3,7 +3,7 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>api</artifactId>
+    <artifactId>docker-rest-api</artifactId>
 
     <parent>
         <groupId>com.baeldung.docker-multi-module-maven</groupId>
@@ -20,7 +20,7 @@
         <dependency>
             <groupId>com.baeldung.docker-multi-module-maven</groupId>
             <artifactId>domain</artifactId>
-            <version>0.0.1-SNAPSHOT</version>
+            <version>${project.version}</version>
         </dependency>
 
         <dependency>

diff --git a/...in/java/com/baeldung/api/Application.java → ...in/java/com/baeldung/api/Application.java b/...in/java/com/baeldung/api/Application.java → ...in/java/com/baeldung/api/Application.java
diff --git a/...va/com/baeldung/api/StaticDataLoader.java → ...va/com/baeldung/api/StaticDataLoader.java b/...va/com/baeldung/api/StaticDataLoader.java → ...va/com/baeldung/api/StaticDataLoader.java
diff --git a/...g/api/controller/CountriesController.java → ...g/api/controller/CountriesController.java b/...g/api/controller/CountriesController.java → ...g/api/controller/CountriesController.java
diff --git a/...m/baeldung/api/controller/CountryDto.java → ...m/baeldung/api/controller/CountryDto.java b/...m/baeldung/api/controller/CountryDto.java → ...m/baeldung/api/controller/CountryDto.java
diff --git a/...en/api/src/main/resources/application.yml → ...st-api/src/main/resources/application.yml b/...en/api/src/main/resources/application.yml → ...st-api/src/main/resources/application.yml
diff --git a/docker-modules/docker-multi-module-maven/pom.xml b/docker-modules/docker-multi-module-maven/pom.xml
@@ -15,7 +15,7 @@
     </parent>
 
     <modules>
-        <module>api</module>
+        <module>docker-rest-api</module>
         <module>domain</module>
     </modules>
 </project>
diff --git a/docker-modules/pom.xml b/docker-modules/pom.xml
@@ -24,6 +24,7 @@
 
     <properties>
         <spring-boot.version>3.3.2</spring-boot.version>
+        <h2.version>2.2.224</h2.version>
     </properties>
 
 </project>
diff --git a/maven-modules/versions-maven-plugin/pom.xml b/maven-modules/versions-maven-plugin/pom.xml
@@ -15,7 +15,7 @@
     </parent>
 
     <modules>
-        <module>original</module>
+        <module>versions-plugin-original-state</module>
     </modules>
 
     <dependencies>

diff --git a/...es/versions-maven-plugin/original/pom.xml → ...in/versions-plugin-original-state/pom.xml b/...es/versions-maven-plugin/original/pom.xml → ...in/versions-plugin-original-state/pom.xml
@@ -4,7 +4,7 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.baeldung</groupId>
-    <artifactId>original</artifactId>
+    <artifactId>versions-plugin-original-state</artifactId>
     <version>0.0.1-SNAPSHOT</version>
 
     <dependencies>

diff --git a/spring-cloud-modules/spring-cloud-bootstrap/pom.xml b/spring-cloud-modules/spring-cloud-bootstrap/pom.xml
@@ -18,7 +18,7 @@
         <module>config</module>
         <module>discovery</module>
         <module>gateway</module>
-        <module>gateway-2</module>
+        <module>spring-cloud-gateway-intro</module>
         <module>zipkin-log-svc-book</module>
         <module>zipkin-log-svc-rating</module>
         <module>customer-service</module>

diff --git a/...pring-cloud-bootstrap/gateway-2/README.md → ...trap/spring-cloud-gateway-intro/README.md b/...pring-cloud-bootstrap/gateway-2/README.md → ...trap/spring-cloud-gateway-intro/README.md
diff --git a/.../spring-cloud-bootstrap/gateway-2/pom.xml → ...tstrap/spring-cloud-gateway-intro/pom.xml b/.../spring-cloud-bootstrap/gateway-2/pom.xml → ...tstrap/spring-cloud-gateway-intro/pom.xml
@@ -3,8 +3,8 @@
     xmlns="http://maven.apache.org/POM/4.0.0"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>gateway-2</artifactId>
-    <name>gateway-2</name>
+    <artifactId>spring-cloud-gateway-intro</artifactId>
+    <name>spring-cloud-gateway-intro</name>
     <packaging>jar</packaging>
 
     <parent>

diff --git a/...edicates/CustomPredicatesApplication.java → ...edicates/CustomPredicatesApplication.java b/...edicates/CustomPredicatesApplication.java → ...edicates/CustomPredicatesApplication.java
diff --git a/...icates/config/CustomPredicatesConfig.java → ...icates/config/CustomPredicatesConfig.java b/...icates/config/CustomPredicatesConfig.java → ...icates/config/CustomPredicatesConfig.java
diff --git a/.../GoldenCustomerRoutePredicateFactory.java → .../GoldenCustomerRoutePredicateFactory.java b/.../GoldenCustomerRoutePredicateFactory.java → .../GoldenCustomerRoutePredicateFactory.java
diff --git a/...icates/service/GoldenCustomerService.java → ...icates/service/GoldenCustomerService.java b/...icates/service/GoldenCustomerService.java → ...icates/service/GoldenCustomerService.java
diff --git a/...ction/IntroductionGatewayApplication.java → ...ction/IntroductionGatewayApplication.java b/...ction/IntroductionGatewayApplication.java → ...ction/IntroductionGatewayApplication.java
diff --git a/...in/resources/application-customroutes.yml → ...in/resources/application-customroutes.yml b/...in/resources/application-customroutes.yml → ...in/resources/application-customroutes.yml
diff --git a/...eway-2/src/main/resources/application.yml → ...-intro/src/main/resources/application.yml b/...eway-2/src/main/resources/application.yml → ...-intro/src/main/resources/application.yml
diff --git a/...urces/introduction-application.properties → ...urces/introduction-application.properties b/...urces/introduction-application.properties → ...urces/introduction-application.properties
diff --git a/.../gateway-2/src/main/resources/logback.xml → ...eway-intro/src/main/resources/logback.xml b/.../gateway-2/src/main/resources/logback.xml → ...eway-intro/src/main/resources/logback.xml
diff --git a/.../CustomPredicatesApplicationLiveTest.java → .../CustomPredicatesApplicationLiveTest.java b/.../CustomPredicatesApplicationLiveTest.java → .../CustomPredicatesApplicationLiveTest.java
diff --git a/...eway/introduction/LoggerListAppender.java → ...eway/introduction/LoggerListAppender.java b/...eway/introduction/LoggerListAppender.java → ...eway/introduction/LoggerListAppender.java
diff --git a/...teway/introduction/SpringContextTest.java → ...teway/introduction/SpringContextTest.java b/...teway/introduction/SpringContextTest.java → ...teway/introduction/SpringContextTest.java
diff --git a/...way-2/src/test/resources/logback-test.xml → ...intro/src/test/resources/logback-test.xml b/...way-2/src/test/resources/logback-test.xml → ...intro/src/test/resources/logback-test.xml
diff --git a/...security-dynamic-registration/server/.env → ...stration/oauth2-authorization-server/.env b/...security-dynamic-registration/server/.env → ...stration/oauth2-authorization-server/.env
diff --git a/...urity-dynamic-registration/server/pom.xml → ...ation/oauth2-authorization-server/pom.xml b/...urity-dynamic-registration/server/pom.xml → ...ation/oauth2-authorization-server/pom.xml
@@ -3,9 +3,9 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>server</artifactId>
+    <artifactId>oauth2-authorization-server</artifactId>
     <packaging>jar</packaging>
-    <name>server</name>
+    <name>oauth2-authorization-server</name>
     <description>Demo project for Dynamic Client: Server module</description>
 
     <parent>

diff --git a/...erver/AuthorizationServerApplication.java → ...erver/AuthorizationServerApplication.java b/...erver/AuthorizationServerApplication.java → ...erver/AuthorizationServerApplication.java
diff --git a/...ity/authserver/config/SecurityConfig.java → ...ity/authserver/config/SecurityConfig.java b/...ity/authserver/config/SecurityConfig.java → ...ity/authserver/config/SecurityConfig.java
diff --git a/...ory/CustomRegisteredClientRepository.java → ...ory/CustomRegisteredClientRepository.java b/...ory/CustomRegisteredClientRepository.java → ...ory/CustomRegisteredClientRepository.java
diff --git a/...erver/src/main/resources/application.yaml → ...erver/src/main/resources/application.yaml b/...erver/src/main/resources/application.yaml → ...erver/src/main/resources/application.yaml
diff --git a/...thorizationServerApplicationUnitTest.java → ...thorizationServerApplicationUnitTest.java b/...thorizationServerApplicationUnitTest.java → ...thorizationServerApplicationUnitTest.java
diff --git a/...urity-dynamic-registration/client/pom.xml → ...egistration/oauth2-dynamic-client/pom.xml b/...urity-dynamic-registration/client/pom.xml → ...egistration/oauth2-dynamic-client/pom.xml
@@ -3,9 +3,9 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>client</artifactId>
+    <artifactId>oauth2-dynamic-client</artifactId>
     <packaging>jar</packaging>
-    <name>client</name>
+    <name>oauth2-dynamic-client</name>
     <description>Demo project for Dynamic Client: Client module</description>
 
     <parent>

diff --git a/...DynamicRegistrationClientApplication.java → ...DynamicRegistrationClientApplication.java b/...DynamicRegistrationClientApplication.java → ...DynamicRegistrationClientApplication.java
diff --git a/...fig/OAuth2DynamicClientConfiguration.java → ...fig/OAuth2DynamicClientConfiguration.java b/...fig/OAuth2DynamicClientConfiguration.java → ...fig/OAuth2DynamicClientConfiguration.java
diff --git a/...reg/client/controller/HomeController.java → ...reg/client/controller/HomeController.java b/...reg/client/controller/HomeController.java → ...reg/client/controller/HomeController.java
diff --git a/.../DynamicClientRegistrationRepository.java → .../DynamicClientRegistrationRepository.java b/.../DynamicClientRegistrationRepository.java → .../DynamicClientRegistrationRepository.java
diff --git a/...lient/src/main/resources/application.yaml → ...lient/src/main/resources/application.yaml b/...lient/src/main/resources/application.yaml → ...lient/src/main/resources/application.yaml
diff --git a/...t/src/main/resources/templates/index.html → ...t/src/main/resources/templates/index.html b/...t/src/main/resources/templates/index.html → ...t/src/main/resources/templates/index.html
diff --git a/spring-security-modules/spring-security-dynamic-registration/pom.xml b/spring-security-modules/spring-security-dynamic-registration/pom.xml
@@ -17,8 +17,8 @@
     <description>Demo project for Spring Security Authorization Server Dynamic Client Registration</description>
 
     <modules>
-        <module>server</module>
-        <module>client</module>
+        <module>oauth2-authorization-server</module>
+        <module>oauth2-dynamic-client</module>
     </modules>
 
     <build>