From 47f7b926e60709efe74245b33a37a3cb0c2f7db0 Mon Sep 17 00:00:00 2001
From: panos-kakos <kakos.programmer@gmail.com>
Date: Sun, 12 Nov 2023 07:32:39 +0200
Subject: [PATCH 1/3] [JAVA-26774] Upgraded mapstruct library to latest version

---
 core-java-modules/core-java-lang-6/pom.xml                 | 3 +--
 jhipster-6/bookstore-monolith/pom.xml                      | 2 +-
 jhipster-modules/jhipster-microservice/car-app/pom.xml     | 2 +-
 jhipster-modules/jhipster-microservice/dealer-app/pom.xml  | 2 +-
 jhipster-modules/jhipster-microservice/gateway-app/pom.xml | 2 +-
 jhipster-modules/jhipster-monolithic/pom.xml               | 2 +-
 jhipster-modules/jhipster-uaa/gateway/pom.xml              | 2 +-
 jhipster-modules/jhipster-uaa/quotes/pom.xml               | 2 +-
 jhipster-modules/jhipster-uaa/uaa/pom.xml                  | 2 +-
 mapstruct/pom.xml                                          | 2 +-
 performance-tests/pom.xml                                  | 2 +-
 persistence-modules/spring-data-jpa-enterprise/pom.xml     | 4 ++--
 spring-boot-modules/spring-boot-3-2/pom.xml                | 2 +-
 spring-boot-modules/spring-boot-3/pom.xml                  | 4 ++--
 14 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/core-java-modules/core-java-lang-6/pom.xml b/core-java-modules/core-java-lang-6/pom.xml
index 6561c4fdcc..54035c1eb0 100644
--- a/core-java-modules/core-java-lang-6/pom.xml
+++ b/core-java-modules/core-java-lang-6/pom.xml
@@ -29,7 +29,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.5.1</version>
                 <configuration>
                     <source>17</source>
                     <target>17</target>
@@ -50,7 +49,7 @@
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <mapstruct.version>1.5.5.Final</mapstruct.version>
+        <mapstruct.version>1.6.0.Beta1</mapstruct.version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/jhipster-6/bookstore-monolith/pom.xml b/jhipster-6/bookstore-monolith/pom.xml
index a35abb9c19..26a1ff6214 100644
--- a/jhipster-6/bookstore-monolith/pom.xml
+++ b/jhipster-6/bookstore-monolith/pom.xml
@@ -1159,7 +1159,7 @@
         <spring.version>5.1.5.RELEASE</spring.version>
         <validation-api.version>2.0.1.Final</validation-api.version>
         <jaxb-runtime.version>2.3.2</jaxb-runtime.version>
-        <mapstruct.version>1.3.0.Final</mapstruct.version>
+        <mapstruct.version>1.6.0.Beta1</mapstruct.version>
 
         <!-- Plugin versions -->
         <maven-clean-plugin.version>3.1.0</maven-clean-plugin.version>
diff --git a/jhipster-modules/jhipster-microservice/car-app/pom.xml b/jhipster-modules/jhipster-microservice/car-app/pom.xml
index f345688939..3789dc35c1 100644
--- a/jhipster-modules/jhipster-microservice/car-app/pom.xml
+++ b/jhipster-modules/jhipster-microservice/car-app/pom.xml
@@ -36,7 +36,7 @@
         <liquibase.version>3.6.2</liquibase.version>
         <logstash-logback-encoder.version>4.8</logstash-logback-encoder.version>
         <m2e.apt.activation>jdt_apt</m2e.apt.activation>
-        <mapstruct.version>1.1.0.Final</mapstruct.version>
+        <mapstruct.version>1.6.0.Beta1</mapstruct.version>
         <maven-eclipse-plugin.version>2.10</maven-eclipse-plugin.version>
         <maven-enforcer-plugin.version>1.4.1</maven-enforcer-plugin.version>
         <maven-resources-plugin.version>3.0.1</maven-resources-plugin.version>
diff --git a/jhipster-modules/jhipster-microservice/dealer-app/pom.xml b/jhipster-modules/jhipster-microservice/dealer-app/pom.xml
index 056bd60f33..5d588e8dcb 100644
--- a/jhipster-modules/jhipster-microservice/dealer-app/pom.xml
+++ b/jhipster-modules/jhipster-microservice/dealer-app/pom.xml
@@ -35,7 +35,7 @@
         <liquibase.version>3.6.2</liquibase.version>
         <logstash-logback-encoder.version>4.8</logstash-logback-encoder.version>
         <m2e.apt.activation>jdt_apt</m2e.apt.activation>
-        <mapstruct.version>1.1.0.Final</mapstruct.version>
+        <mapstruct.version>1.6.0.Beta1</mapstruct.version>
         <maven-eclipse-plugin.version>2.10</maven-eclipse-plugin.version>
         <maven-enforcer-plugin.version>1.4.1</maven-enforcer-plugin.version>
         <maven-resources-plugin.version>3.0.1</maven-resources-plugin.version>
diff --git a/jhipster-modules/jhipster-microservice/gateway-app/pom.xml b/jhipster-modules/jhipster-microservice/gateway-app/pom.xml
index b90f22f009..26c621bb57 100644
--- a/jhipster-modules/jhipster-microservice/gateway-app/pom.xml
+++ b/jhipster-modules/jhipster-microservice/gateway-app/pom.xml
@@ -39,7 +39,7 @@
         <logstash-logback-encoder.version>4.8</logstash-logback-encoder.version>
         <lz4.version>1.3.0</lz4.version>
         <m2e.apt.activation>jdt_apt</m2e.apt.activation>
-        <mapstruct.version>1.1.0.Final</mapstruct.version>
+        <mapstruct.version>1.6.0.Beta1</mapstruct.version>
         <maven-eclipse-plugin.version>2.10</maven-eclipse-plugin.version>
         <maven-enforcer-plugin.version>1.4.1</maven-enforcer-plugin.version>
         <maven-resources-plugin.version>3.0.1</maven-resources-plugin.version>
diff --git a/jhipster-modules/jhipster-monolithic/pom.xml b/jhipster-modules/jhipster-monolithic/pom.xml
index fbcee8f1ff..a8b93b5514 100644
--- a/jhipster-modules/jhipster-monolithic/pom.xml
+++ b/jhipster-modules/jhipster-monolithic/pom.xml
@@ -904,7 +904,7 @@
         <liquibase-maven-plugin.version>3.6.2</liquibase-maven-plugin.version>
         <logstash-logback-encoder.version>4.8</logstash-logback-encoder.version>
         <m2e.apt.activation>jdt_apt</m2e.apt.activation>
-        <mapstruct.version>1.1.0.Final</mapstruct.version>
+        <mapstruct.version>1.6.0.Beta1</mapstruct.version>
         <maven-enforcer-plugin.version>1.4.1</maven-enforcer-plugin.version>
         <maven-resources-plugin.version>3.0.1</maven-resources-plugin.version>
         <maven-eclipse-plugin.version>2.10</maven-eclipse-plugin.version>
diff --git a/jhipster-modules/jhipster-uaa/gateway/pom.xml b/jhipster-modules/jhipster-uaa/gateway/pom.xml
index 13652575cd..b1982a6f93 100644
--- a/jhipster-modules/jhipster-uaa/gateway/pom.xml
+++ b/jhipster-modules/jhipster-uaa/gateway/pom.xml
@@ -1048,7 +1048,7 @@
         <liquibase.version>3.5.5</liquibase.version>
         <liquibase-hibernate5.version>3.6</liquibase-hibernate5.version>
         <validation-api.version>2.0.1.Final</validation-api.version>
-        <mapstruct.version>1.2.0.Final</mapstruct.version>
+        <mapstruct.version>1.6.0.Beta1</mapstruct.version>
 
         <!-- Plugin versions -->
         <maven-clean-plugin.version>3.1.0</maven-clean-plugin.version>
diff --git a/jhipster-modules/jhipster-uaa/quotes/pom.xml b/jhipster-modules/jhipster-uaa/quotes/pom.xml
index 2a3c550071..11033af395 100644
--- a/jhipster-modules/jhipster-uaa/quotes/pom.xml
+++ b/jhipster-modules/jhipster-uaa/quotes/pom.xml
@@ -868,7 +868,7 @@
         <liquibase.version>3.5.5</liquibase.version>
         <liquibase-hibernate5.version>3.6</liquibase-hibernate5.version>
         <validation-api.version>2.0.1.Final</validation-api.version>
-        <mapstruct.version>1.2.0.Final</mapstruct.version>
+        <mapstruct.version>1.6.0.Beta1</mapstruct.version>
 
         <!-- Plugin versions -->
         <maven-clean-plugin.version>3.1.0</maven-clean-plugin.version>
diff --git a/jhipster-modules/jhipster-uaa/uaa/pom.xml b/jhipster-modules/jhipster-uaa/uaa/pom.xml
index 42802b6040..47a5c81c1e 100644
--- a/jhipster-modules/jhipster-uaa/uaa/pom.xml
+++ b/jhipster-modules/jhipster-uaa/uaa/pom.xml
@@ -869,7 +869,7 @@
         <liquibase.version>3.5.5</liquibase.version>
         <liquibase-hibernate5.version>3.6</liquibase-hibernate5.version>
         <validation-api.version>2.0.1.Final</validation-api.version>
-        <mapstruct.version>1.2.0.Final</mapstruct.version>
+        <mapstruct.version>1.6.0.Beta1</mapstruct.version>
 
         <!-- Plugin versions -->
         <maven-clean-plugin.version>3.1.0</maven-clean-plugin.version>
diff --git a/mapstruct/pom.xml b/mapstruct/pom.xml
index 7c279acb7b..5332bcaeb3 100644
--- a/mapstruct/pom.xml
+++ b/mapstruct/pom.xml
@@ -73,7 +73,7 @@
     </build>
 
     <properties>
-        <org.mapstruct.version>1.5.5.Final</org.mapstruct.version>
+        <org.mapstruct.version>1.6.0.Beta1</org.mapstruct.version>
         <springframework.version>4.3.4.RELEASE</springframework.version>
         <lombok.mapstruct.binding.version>0.2.0</lombok.mapstruct.binding.version>
     </properties>
diff --git a/performance-tests/pom.xml b/performance-tests/pom.xml
index 9f57a1a90c..d22a9cf3ac 100644
--- a/performance-tests/pom.xml
+++ b/performance-tests/pom.xml
@@ -151,7 +151,7 @@
     <properties>
         <orika.version>1.5.4</orika.version>
         <dozer.version>6.5.2</dozer.version>
-        <mapstruct.version>1.5.2.Final</mapstruct.version>
+        <mapstruct.version>1.6.0.Beta1</mapstruct.version>
         <modelmapper.version>3.2.0</modelmapper.version>
         <jmapper.version>1.6.1.CR2</jmapper.version>
         <!-- Java source/target to use for compilation. -->
diff --git a/persistence-modules/spring-data-jpa-enterprise/pom.xml b/persistence-modules/spring-data-jpa-enterprise/pom.xml
index 6bd89032fa..d998849ffb 100644
--- a/persistence-modules/spring-data-jpa-enterprise/pom.xml
+++ b/persistence-modules/spring-data-jpa-enterprise/pom.xml
@@ -45,7 +45,7 @@
         </dependency>
         <dependency>
             <groupId>org.mapstruct</groupId>
-            <artifactId>mapstruct-jdk8</artifactId>
+            <artifactId>mapstruct</artifactId>
             <version>${mapstruct.version}</version>
             <scope>provided</scope>
         </dependency>
@@ -97,7 +97,7 @@
     </build>
 
     <properties>
-        <mapstruct.version>1.3.1.Final</mapstruct.version>
+        <mapstruct.version>1.6.0.Beta1</mapstruct.version>
         <testcontainers.version>1.19.1</testcontainers.version>
     </properties>
 
diff --git a/spring-boot-modules/spring-boot-3-2/pom.xml b/spring-boot-modules/spring-boot-3-2/pom.xml
index 276659c609..9b5b7ea254 100644
--- a/spring-boot-modules/spring-boot-3-2/pom.xml
+++ b/spring-boot-modules/spring-boot-3-2/pom.xml
@@ -280,7 +280,7 @@
     </build>
 
     <properties>
-        <mapstruct.version>1.5.2.Final</mapstruct.version>
+        <mapstruct.version>1.6.0.Beta1</mapstruct.version>
         <springdoc.version>2.0.0</springdoc.version>
         <maven-surefire-plugin.version>3.0.0-M7</maven-surefire-plugin.version>
         <mockserver.version>5.14.0</mockserver.version>
diff --git a/spring-boot-modules/spring-boot-3/pom.xml b/spring-boot-modules/spring-boot-3/pom.xml
index bb8c5dd53c..a1a5eab563 100644
--- a/spring-boot-modules/spring-boot-3/pom.xml
+++ b/spring-boot-modules/spring-boot-3/pom.xml
@@ -206,8 +206,8 @@
     </build>
 
     <properties>
-        <java.version>19</java.version>
-        <mapstruct.version>1.5.2.Final</mapstruct.version>
+        <java.version>17</java.version>
+        <mapstruct.version>1.6.0.Beta1</mapstruct.version>
         <springdoc.version>2.2.0</springdoc.version>
         <maven-surefire-plugin.version>3.0.0-M7</maven-surefire-plugin.version>
         <start-class>com.baeldung.sample.TodoApplication</start-class>

From 6db881bfa2df6776a67b7de0873c07bed1402aed Mon Sep 17 00:00:00 2001
From: panos-kakos <kakos.programmer@gmail.com>
Date: Sun, 12 Nov 2023 07:53:55 +0200
Subject: [PATCH 2/3] [JAVA-26774] Revert mapstruct upgrade on jhipster modules

---
 jhipster-6/bookstore-monolith/pom.xml                      | 2 +-
 jhipster-modules/jhipster-microservice/car-app/pom.xml     | 2 +-
 jhipster-modules/jhipster-microservice/dealer-app/pom.xml  | 2 +-
 jhipster-modules/jhipster-microservice/gateway-app/pom.xml | 2 +-
 jhipster-modules/jhipster-monolithic/pom.xml               | 2 +-
 jhipster-modules/jhipster-uaa/gateway/pom.xml              | 2 +-
 jhipster-modules/jhipster-uaa/quotes/pom.xml               | 2 +-
 jhipster-modules/jhipster-uaa/uaa/pom.xml                  | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/jhipster-6/bookstore-monolith/pom.xml b/jhipster-6/bookstore-monolith/pom.xml
index 26a1ff6214..a35abb9c19 100644
--- a/jhipster-6/bookstore-monolith/pom.xml
+++ b/jhipster-6/bookstore-monolith/pom.xml
@@ -1159,7 +1159,7 @@
         <spring.version>5.1.5.RELEASE</spring.version>
         <validation-api.version>2.0.1.Final</validation-api.version>
         <jaxb-runtime.version>2.3.2</jaxb-runtime.version>
-        <mapstruct.version>1.6.0.Beta1</mapstruct.version>
+        <mapstruct.version>1.3.0.Final</mapstruct.version>
 
         <!-- Plugin versions -->
         <maven-clean-plugin.version>3.1.0</maven-clean-plugin.version>
diff --git a/jhipster-modules/jhipster-microservice/car-app/pom.xml b/jhipster-modules/jhipster-microservice/car-app/pom.xml
index 3789dc35c1..f345688939 100644
--- a/jhipster-modules/jhipster-microservice/car-app/pom.xml
+++ b/jhipster-modules/jhipster-microservice/car-app/pom.xml
@@ -36,7 +36,7 @@
         <liquibase.version>3.6.2</liquibase.version>
         <logstash-logback-encoder.version>4.8</logstash-logback-encoder.version>
         <m2e.apt.activation>jdt_apt</m2e.apt.activation>
-        <mapstruct.version>1.6.0.Beta1</mapstruct.version>
+        <mapstruct.version>1.1.0.Final</mapstruct.version>
         <maven-eclipse-plugin.version>2.10</maven-eclipse-plugin.version>
         <maven-enforcer-plugin.version>1.4.1</maven-enforcer-plugin.version>
         <maven-resources-plugin.version>3.0.1</maven-resources-plugin.version>
diff --git a/jhipster-modules/jhipster-microservice/dealer-app/pom.xml b/jhipster-modules/jhipster-microservice/dealer-app/pom.xml
index 5d588e8dcb..056bd60f33 100644
--- a/jhipster-modules/jhipster-microservice/dealer-app/pom.xml
+++ b/jhipster-modules/jhipster-microservice/dealer-app/pom.xml
@@ -35,7 +35,7 @@
         <liquibase.version>3.6.2</liquibase.version>
         <logstash-logback-encoder.version>4.8</logstash-logback-encoder.version>
         <m2e.apt.activation>jdt_apt</m2e.apt.activation>
-        <mapstruct.version>1.6.0.Beta1</mapstruct.version>
+        <mapstruct.version>1.1.0.Final</mapstruct.version>
         <maven-eclipse-plugin.version>2.10</maven-eclipse-plugin.version>
         <maven-enforcer-plugin.version>1.4.1</maven-enforcer-plugin.version>
         <maven-resources-plugin.version>3.0.1</maven-resources-plugin.version>
diff --git a/jhipster-modules/jhipster-microservice/gateway-app/pom.xml b/jhipster-modules/jhipster-microservice/gateway-app/pom.xml
index 26c621bb57..b90f22f009 100644
--- a/jhipster-modules/jhipster-microservice/gateway-app/pom.xml
+++ b/jhipster-modules/jhipster-microservice/gateway-app/pom.xml
@@ -39,7 +39,7 @@
         <logstash-logback-encoder.version>4.8</logstash-logback-encoder.version>
         <lz4.version>1.3.0</lz4.version>
         <m2e.apt.activation>jdt_apt</m2e.apt.activation>
-        <mapstruct.version>1.6.0.Beta1</mapstruct.version>
+        <mapstruct.version>1.1.0.Final</mapstruct.version>
         <maven-eclipse-plugin.version>2.10</maven-eclipse-plugin.version>
         <maven-enforcer-plugin.version>1.4.1</maven-enforcer-plugin.version>
         <maven-resources-plugin.version>3.0.1</maven-resources-plugin.version>
diff --git a/jhipster-modules/jhipster-monolithic/pom.xml b/jhipster-modules/jhipster-monolithic/pom.xml
index a8b93b5514..fbcee8f1ff 100644
--- a/jhipster-modules/jhipster-monolithic/pom.xml
+++ b/jhipster-modules/jhipster-monolithic/pom.xml
@@ -904,7 +904,7 @@
         <liquibase-maven-plugin.version>3.6.2</liquibase-maven-plugin.version>
         <logstash-logback-encoder.version>4.8</logstash-logback-encoder.version>
         <m2e.apt.activation>jdt_apt</m2e.apt.activation>
-        <mapstruct.version>1.6.0.Beta1</mapstruct.version>
+        <mapstruct.version>1.1.0.Final</mapstruct.version>
         <maven-enforcer-plugin.version>1.4.1</maven-enforcer-plugin.version>
         <maven-resources-plugin.version>3.0.1</maven-resources-plugin.version>
         <maven-eclipse-plugin.version>2.10</maven-eclipse-plugin.version>
diff --git a/jhipster-modules/jhipster-uaa/gateway/pom.xml b/jhipster-modules/jhipster-uaa/gateway/pom.xml
index b1982a6f93..13652575cd 100644
--- a/jhipster-modules/jhipster-uaa/gateway/pom.xml
+++ b/jhipster-modules/jhipster-uaa/gateway/pom.xml
@@ -1048,7 +1048,7 @@
         <liquibase.version>3.5.5</liquibase.version>
         <liquibase-hibernate5.version>3.6</liquibase-hibernate5.version>
         <validation-api.version>2.0.1.Final</validation-api.version>
-        <mapstruct.version>1.6.0.Beta1</mapstruct.version>
+        <mapstruct.version>1.2.0.Final</mapstruct.version>
 
         <!-- Plugin versions -->
         <maven-clean-plugin.version>3.1.0</maven-clean-plugin.version>
diff --git a/jhipster-modules/jhipster-uaa/quotes/pom.xml b/jhipster-modules/jhipster-uaa/quotes/pom.xml
index 11033af395..2a3c550071 100644
--- a/jhipster-modules/jhipster-uaa/quotes/pom.xml
+++ b/jhipster-modules/jhipster-uaa/quotes/pom.xml
@@ -868,7 +868,7 @@
         <liquibase.version>3.5.5</liquibase.version>
         <liquibase-hibernate5.version>3.6</liquibase-hibernate5.version>
         <validation-api.version>2.0.1.Final</validation-api.version>
-        <mapstruct.version>1.6.0.Beta1</mapstruct.version>
+        <mapstruct.version>1.2.0.Final</mapstruct.version>
 
         <!-- Plugin versions -->
         <maven-clean-plugin.version>3.1.0</maven-clean-plugin.version>
diff --git a/jhipster-modules/jhipster-uaa/uaa/pom.xml b/jhipster-modules/jhipster-uaa/uaa/pom.xml
index 47a5c81c1e..42802b6040 100644
--- a/jhipster-modules/jhipster-uaa/uaa/pom.xml
+++ b/jhipster-modules/jhipster-uaa/uaa/pom.xml
@@ -869,7 +869,7 @@
         <liquibase.version>3.5.5</liquibase.version>
         <liquibase-hibernate5.version>3.6</liquibase-hibernate5.version>
         <validation-api.version>2.0.1.Final</validation-api.version>
-        <mapstruct.version>1.6.0.Beta1</mapstruct.version>
+        <mapstruct.version>1.2.0.Final</mapstruct.version>
 
         <!-- Plugin versions -->
         <maven-clean-plugin.version>3.1.0</maven-clean-plugin.version>

From 7dbd9cf9f60aa62ce088a7196d606f6c2e4c870c Mon Sep 17 00:00:00 2001
From: panos-kakos <kakos.programmer@gmail.com>
Date: Sun, 12 Nov 2023 08:00:42 +0200
Subject: [PATCH 3/3] [JAVA-26774]

---
 spring-boot-modules/spring-boot-3/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-boot-modules/spring-boot-3/pom.xml b/spring-boot-modules/spring-boot-3/pom.xml
index a1a5eab563..ae9e9d7308 100644
--- a/spring-boot-modules/spring-boot-3/pom.xml
+++ b/spring-boot-modules/spring-boot-3/pom.xml
@@ -206,7 +206,7 @@
     </build>
 
     <properties>
-        <java.version>17</java.version>
+        <java.version>19</java.version>
         <mapstruct.version>1.6.0.Beta1</mapstruct.version>
         <springdoc.version>2.2.0</springdoc.version>
         <maven-surefire-plugin.version>3.0.0-M7</maven-surefire-plugin.version>