From 81c7737d92aa71f6df15646ab79d99053c0fcfe3 Mon Sep 17 00:00:00 2001
From: timis1 <12120641+timis1@users.noreply.github.com>
Date: Sun, 7 Jan 2024 13:09:50 +0200
Subject: [PATCH] JAVA-27740 Fix failing module jhipster-6 - upgrade to JDK 17
 (#15474)

---
 jhipster-6/bookstore-monolith/pom.xml                        | 3 ---
 .../com/baeldung/jhipster6/service/mapper/BookMapper.java    | 5 +----
 pom.xml                                                      | 4 ++--
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/jhipster-6/bookstore-monolith/pom.xml b/jhipster-6/bookstore-monolith/pom.xml
index 2ef093fadb..110eec514b 100644
--- a/jhipster-6/bookstore-monolith/pom.xml
+++ b/jhipster-6/bookstore-monolith/pom.xml
@@ -1124,14 +1124,11 @@
 
     <properties>
         <!-- Build properties -->
-        <maven.version>3.0.0</maven.version>
         <scala.version>2.12.6</scala.version>
         <node.version>v10.15.0</node.version>
         <npm.version>6.4.1</npm.version>
         <project.testresult.directory>${project.build.directory}/test-results</project.testresult.directory>
         <maven.build.timestamp.format>yyyyMMddHHmmss</maven.build.timestamp.format>
-        <maven.compiler.source>${java.version}</maven.compiler.source>
-        <maven.compiler.target>${java.version}</maven.compiler.target>
         <argLine>-Djava.security.egd=file:/dev/./urandom -Xmx256m</argLine>
         <m2e.apt.activation>jdt_apt</m2e.apt.activation>
         <run.addResources>false</run.addResources>
diff --git a/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/service/mapper/BookMapper.java b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/service/mapper/BookMapper.java
index 64350fb4ed..4833da7d4e 100644
--- a/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/service/mapper/BookMapper.java
+++ b/jhipster-6/bookstore-monolith/src/main/java/com/baeldung/jhipster6/service/mapper/BookMapper.java
@@ -1,6 +1,5 @@
 package com.baeldung.jhipster6.service.mapper;
 
-import com.baeldung.jhipster6.domain.*;
 import com.baeldung.jhipster6.service.dto.BookDTO;
 import com.baeldung.jhipster6.domain.Book;
 
@@ -9,11 +8,9 @@ import org.mapstruct.*;
 /**
  * Mapper for the entity Book and its DTO BookDTO.
  */
-@Mapper(componentModel = "spring", uses = {})
+@Mapper(componentModel = "spring")
 public interface BookMapper extends EntityMapper<BookDTO, Book> {
 
-
-
     default Book fromId(Long id) {
         if (id == null) {
             return null;
diff --git a/pom.xml b/pom.xml
index 913ce39212..5b87978a86 100644
--- a/pom.xml
+++ b/pom.xml
@@ -739,7 +739,7 @@
                 <module>jaxb</module>
                 <module>jetbrains</module>
                 <module>jgit</module>
-                <!--<module>jhipster-6</module>--> <!-- failing after upgrading to jdk17-->
+                <module>jhipster-6</module>
                 <module>jmh</module>
                 <module>json-modules</module>
                 <module>jsoup</module>
@@ -979,7 +979,7 @@
                 <module>jaxb</module>
                 <module>jetbrains</module>
                 <module>jgit</module>
-                <!--<module>jhipster-6</module>--> <!-- failing after upgrading to jdk17-->
+                <module>jhipster-6</module>
                 <module>jmh</module>
                 <module>json-modules</module>
                 <module>jsoup</module>