diff --git a/mapstruct-2/pom.xml b/mapstruct-2/pom.xml
index abeee5840e02..a976b2e7403c 100644
--- a/mapstruct-2/pom.xml
+++ b/mapstruct-2/pom.xml
@@ -26,18 +26,6 @@
             <version>${lombok.version}</version>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context</artifactId>
-            <version>${springframework.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-test</artifactId>
-            <version>${springframework.version}</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <build>
@@ -74,7 +62,6 @@
     <properties>
         <org.mapstruct.version>1.6.3</org.mapstruct.version>
         <lombok.mapstruct.binding.version>0.2.0</lombok.mapstruct.binding.version>
-        <springframework.version>6.2.1</springframework.version>
     </properties>
 
 </project>
diff --git a/mapstruct-3/pom.xml b/mapstruct-3/pom.xml
new file mode 100644
index 000000000000..55997271f853
--- /dev/null
+++ b/mapstruct-3/pom.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0"?>
+<project 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"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>mapstruct-3</artifactId>
+    <version>1.0</version>
+    <packaging>jar</packaging>
+    <name>mapstruct-3</name>
+
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-modules</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.mapstruct</groupId>
+            <artifactId>mapstruct</artifactId>
+            <version>${org.mapstruct.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.projectlombok</groupId>
+            <artifactId>lombok</artifactId>
+            <version>${lombok.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+            <version>${springframework.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+            <version>${springframework.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <finalName>mapstruct-3</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <annotationProcessorPaths>
+                        <path>
+                            <groupId>org.mapstruct</groupId>
+                            <artifactId>mapstruct-processor</artifactId>
+                            <version>${org.mapstruct.version}</version>
+                        </path>
+                        <path>
+                            <groupId>org.projectlombok</groupId>
+                            <artifactId>lombok</artifactId>
+                            <version>${lombok.version}</version>
+                        </path>
+                        <path>
+                            <groupId>org.projectlombok</groupId>
+                            <artifactId>lombok-mapstruct-binding</artifactId>
+                            <version>${lombok.mapstruct.binding.version}</version>
+                        </path>
+                    </annotationProcessorPaths>
+                    <source>17</source>
+                    <target>17</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <properties>
+        <org.mapstruct.version>1.6.3</org.mapstruct.version>
+        <lombok.mapstruct.binding.version>0.2.0</lombok.mapstruct.binding.version>
+        <springframework.version>6.2.1</springframework.version>
+    </properties>
+
+</project>
diff --git a/mapstruct-2/src/main/java/com/baeldung/dto/MediaDto.java b/mapstruct-3/src/main/java/com/baeldung/dto/MediaDto.java
similarity index 100%
rename from mapstruct-2/src/main/java/com/baeldung/dto/MediaDto.java
rename to mapstruct-3/src/main/java/com/baeldung/dto/MediaDto.java
diff --git a/mapstruct-2/src/main/java/com/baeldung/entity/Media.java b/mapstruct-3/src/main/java/com/baeldung/entity/Media.java
similarity index 100%
rename from mapstruct-2/src/main/java/com/baeldung/entity/Media.java
rename to mapstruct-3/src/main/java/com/baeldung/entity/Media.java
diff --git a/mapstruct-2/src/main/java/com/baeldung/mapper/MediaMapper.java b/mapstruct-3/src/main/java/com/baeldung/mapper/MediaMapper.java
similarity index 100%
rename from mapstruct-2/src/main/java/com/baeldung/mapper/MediaMapper.java
rename to mapstruct-3/src/main/java/com/baeldung/mapper/MediaMapper.java
diff --git a/mapstruct-2/src/main/java/com/baeldung/service/MediaService.java b/mapstruct-3/src/main/java/com/baeldung/service/MediaService.java
similarity index 100%
rename from mapstruct-2/src/main/java/com/baeldung/service/MediaService.java
rename to mapstruct-3/src/main/java/com/baeldung/service/MediaService.java
diff --git a/mapstruct-3/src/main/resources/logback.xml b/mapstruct-3/src/main/resources/logback.xml
new file mode 100644
index 000000000000..7d900d8ea884
--- /dev/null
+++ b/mapstruct-3/src/main/resources/logback.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
+            </pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT" />
+    </root>
+</configuration>
\ No newline at end of file
diff --git a/mapstruct-2/src/test/java/com/baeldung/service/MediaServiceGeneratedMapperUnitTest.java b/mapstruct-3/src/test/java/com/baeldung/service/MediaServiceGeneratedMapperUnitTest.java
similarity index 100%
rename from mapstruct-2/src/test/java/com/baeldung/service/MediaServiceGeneratedMapperUnitTest.java
rename to mapstruct-3/src/test/java/com/baeldung/service/MediaServiceGeneratedMapperUnitTest.java
diff --git a/mapstruct-2/src/test/java/com/baeldung/service/MediaServiceMockedMapperUnitTest.java b/mapstruct-3/src/test/java/com/baeldung/service/MediaServiceMockedMapperUnitTest.java
similarity index 100%
rename from mapstruct-2/src/test/java/com/baeldung/service/MediaServiceMockedMapperUnitTest.java
rename to mapstruct-3/src/test/java/com/baeldung/service/MediaServiceMockedMapperUnitTest.java
diff --git a/mapstruct-2/src/test/java/com/baeldung/spring/Config.java b/mapstruct-3/src/test/java/com/baeldung/spring/Config.java
similarity index 100%
rename from mapstruct-2/src/test/java/com/baeldung/spring/Config.java
rename to mapstruct-3/src/test/java/com/baeldung/spring/Config.java
diff --git a/mapstruct-2/src/test/java/com/baeldung/spring/MediaServiceSpringGeneratedMapperUnitTest.java b/mapstruct-3/src/test/java/com/baeldung/spring/MediaServiceSpringGeneratedMapperUnitTest.java
similarity index 100%
rename from mapstruct-2/src/test/java/com/baeldung/spring/MediaServiceSpringGeneratedMapperUnitTest.java
rename to mapstruct-3/src/test/java/com/baeldung/spring/MediaServiceSpringGeneratedMapperUnitTest.java
diff --git a/mapstruct-2/src/test/java/com/baeldung/spring/MediaServiceSpringMockedMapperUnitTest.java b/mapstruct-3/src/test/java/com/baeldung/spring/MediaServiceSpringMockedMapperUnitTest.java
similarity index 100%
rename from mapstruct-2/src/test/java/com/baeldung/spring/MediaServiceSpringMockedMapperUnitTest.java
rename to mapstruct-3/src/test/java/com/baeldung/spring/MediaServiceSpringMockedMapperUnitTest.java
diff --git a/mapstruct-2/src/test/java/com/baeldung/spring/MediaSpringMapper.java b/mapstruct-3/src/test/java/com/baeldung/spring/MediaSpringMapper.java
similarity index 100%
rename from mapstruct-2/src/test/java/com/baeldung/spring/MediaSpringMapper.java
rename to mapstruct-3/src/test/java/com/baeldung/spring/MediaSpringMapper.java
diff --git a/pom.xml b/pom.xml
index 732051f3a337..5d96a8f814ed 100644
--- a/pom.xml
+++ b/pom.xml
@@ -732,6 +732,7 @@
                 <module>lwjgl</module>
                 <module>mapstruct</module>
                 <module>mapstruct-2</module>
+                <module>mapstruct-3</module>
                 <module>maven-modules</module>
                 <module>messaging-modules</module>
                 <module>metrics</module>
@@ -1171,6 +1172,7 @@
                 <module>lwjgl</module>
                 <module>mapstruct</module>
                 <module>mapstruct-2</module>
+                <module>mapstruct-3</module>
                 <module>maven-modules</module>
                 <module>messaging-modules</module>
                 <module>metrics</module>