From 2991701dc704b30794aeb954a9601b86946436a9 Mon Sep 17 00:00:00 2001
From: sampadawagde <sampada.aws@gmail.com>
Date: Tue, 5 Jul 2022 19:38:52 +0530
Subject: [PATCH 1/2] JAVA-12733: Move spring-boot-jsp into spring-boot-modules

---
 .../spring-boot-jsp/README.md                               | 0
 .../spring-boot-jsp/pom.xml                                 | 6 +++---
 .../com/baeldung/boot/jsp/SpringBootJspApplication.java     | 0
 .../com/baeldung/boot/jsp/SpringBootJspConfiguration.java   | 0
 .../com/baeldung/boot/jsp/controller/BookController.java    | 0
 .../src/main/java/com/baeldung/boot/jsp/dto/Book.java       | 0
 .../baeldung/boot/jsp/exception/DuplicateBookException.java | 0
 .../boot/jsp/exception/LibraryControllerAdvice.java         | 0
 .../com/baeldung/boot/jsp/repository/BookRepository.java    | 0
 .../boot/jsp/repository/impl/InMemoryBookRepository.java    | 0
 .../com/baeldung/boot/jsp/repository/model/BookData.java    | 0
 .../java/com/baeldung/boot/jsp/service/BookService.java     | 0
 .../com/baeldung/boot/jsp/service/impl/BookServiceImpl.java | 0
 .../src/main/resources/application.properties               | 0
 .../src/main/resources/static/css/common.css                | 0
 .../src/main/resources/static/error/4xx.html                | 0
 .../src/main/webapp/WEB-INF/jsp/add-book.jsp                | 0
 .../src/main/webapp/WEB-INF/jsp/error-book.jsp              | 0
 .../src/main/webapp/WEB-INF/jsp/view-books.jsp              | 0
 .../boot/jsp/controller/BookControllerIntegrationTest.java  | 0
 .../boot/jsp/controller/BookControllerUnitTest.java         | 0
 .../jsp/repository/impl/InMemoryBookRepositoryUnitTest.java | 0
 .../boot/jsp/service/BookServiceIntegrationTest.java        | 0
 .../boot/jsp/service/impl/BookServiceImplUnitTest.java      | 0
 .../spring-boot-jsp/src/test/resources/logback-test.xml     | 0
 25 files changed, 3 insertions(+), 3 deletions(-)
 rename {spring-web-modules => spring-boot-modules}/spring-boot-jsp/README.md (100%)
 rename {spring-web-modules => spring-boot-modules}/spring-boot-jsp/pom.xml (95%)
 rename {spring-web-modules => spring-boot-modules}/spring-boot-jsp/src/main/java/com/baeldung/boot/jsp/SpringBootJspApplication.java (100%)
 rename {spring-web-modules => spring-boot-modules}/spring-boot-jsp/src/main/java/com/baeldung/boot/jsp/SpringBootJspConfiguration.java (100%)
 rename {spring-web-modules => spring-boot-modules}/spring-boot-jsp/src/main/java/com/baeldung/boot/jsp/controller/BookController.java (100%)
 rename {spring-web-modules => spring-boot-modules}/spring-boot-jsp/src/main/java/com/baeldung/boot/jsp/dto/Book.java (100%)
 rename {spring-web-modules => spring-boot-modules}/spring-boot-jsp/src/main/java/com/baeldung/boot/jsp/exception/DuplicateBookException.java (100%)
 rename {spring-web-modules => spring-boot-modules}/spring-boot-jsp/src/main/java/com/baeldung/boot/jsp/exception/LibraryControllerAdvice.java (100%)
 rename {spring-web-modules => spring-boot-modules}/spring-boot-jsp/src/main/java/com/baeldung/boot/jsp/repository/BookRepository.java (100%)
 rename {spring-web-modules => spring-boot-modules}/spring-boot-jsp/src/main/java/com/baeldung/boot/jsp/repository/impl/InMemoryBookRepository.java (100%)
 rename {spring-web-modules => spring-boot-modules}/spring-boot-jsp/src/main/java/com/baeldung/boot/jsp/repository/model/BookData.java (100%)
 rename {spring-web-modules => spring-boot-modules}/spring-boot-jsp/src/main/java/com/baeldung/boot/jsp/service/BookService.java (100%)
 rename {spring-web-modules => spring-boot-modules}/spring-boot-jsp/src/main/java/com/baeldung/boot/jsp/service/impl/BookServiceImpl.java (100%)
 rename {spring-web-modules => spring-boot-modules}/spring-boot-jsp/src/main/resources/application.properties (100%)
 rename {spring-web-modules => spring-boot-modules}/spring-boot-jsp/src/main/resources/static/css/common.css (100%)
 rename {spring-web-modules => spring-boot-modules}/spring-boot-jsp/src/main/resources/static/error/4xx.html (100%)
 rename {spring-web-modules => spring-boot-modules}/spring-boot-jsp/src/main/webapp/WEB-INF/jsp/add-book.jsp (100%)
 rename {spring-web-modules => spring-boot-modules}/spring-boot-jsp/src/main/webapp/WEB-INF/jsp/error-book.jsp (100%)
 rename {spring-web-modules => spring-boot-modules}/spring-boot-jsp/src/main/webapp/WEB-INF/jsp/view-books.jsp (100%)
 rename {spring-web-modules => spring-boot-modules}/spring-boot-jsp/src/test/java/com/baeldung/boot/jsp/controller/BookControllerIntegrationTest.java (100%)
 rename {spring-web-modules => spring-boot-modules}/spring-boot-jsp/src/test/java/com/baeldung/boot/jsp/controller/BookControllerUnitTest.java (100%)
 rename {spring-web-modules => spring-boot-modules}/spring-boot-jsp/src/test/java/com/baeldung/boot/jsp/repository/impl/InMemoryBookRepositoryUnitTest.java (100%)
 rename {spring-web-modules => spring-boot-modules}/spring-boot-jsp/src/test/java/com/baeldung/boot/jsp/service/BookServiceIntegrationTest.java (100%)
 rename {spring-web-modules => spring-boot-modules}/spring-boot-jsp/src/test/java/com/baeldung/boot/jsp/service/impl/BookServiceImplUnitTest.java (100%)
 rename {spring-web-modules => spring-boot-modules}/spring-boot-jsp/src/test/resources/logback-test.xml (100%)

diff --git a/spring-web-modules/spring-boot-jsp/README.md b/spring-boot-modules/spring-boot-jsp/README.md
similarity index 100%
rename from spring-web-modules/spring-boot-jsp/README.md
rename to spring-boot-modules/spring-boot-jsp/README.md
diff --git a/spring-web-modules/spring-boot-jsp/pom.xml b/spring-boot-modules/spring-boot-jsp/pom.xml
similarity index 95%
rename from spring-web-modules/spring-boot-jsp/pom.xml
rename to spring-boot-modules/spring-boot-jsp/pom.xml
index d2a363bafa..ab81d65cc6 100644
--- a/spring-web-modules/spring-boot-jsp/pom.xml
+++ b/spring-boot-modules/spring-boot-jsp/pom.xml
@@ -9,9 +9,9 @@
     <packaging>war</packaging>
 
     <parent>
-        <groupId>com.baeldung</groupId>
-        <artifactId>spring-web-modules</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
+        <groupId>com.baeldung.spring-boot-modules</groupId>
+        <artifactId>spring-boot-modules</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
     </parent>
 
     <dependencyManagement>
diff --git a/spring-web-modules/spring-boot-jsp/src/main/java/com/baeldung/boot/jsp/SpringBootJspApplication.java b/spring-boot-modules/spring-boot-jsp/src/main/java/com/baeldung/boot/jsp/SpringBootJspApplication.java
similarity index 100%
rename from spring-web-modules/spring-boot-jsp/src/main/java/com/baeldung/boot/jsp/SpringBootJspApplication.java
rename to spring-boot-modules/spring-boot-jsp/src/main/java/com/baeldung/boot/jsp/SpringBootJspApplication.java
diff --git a/spring-web-modules/spring-boot-jsp/src/main/java/com/baeldung/boot/jsp/SpringBootJspConfiguration.java b/spring-boot-modules/spring-boot-jsp/src/main/java/com/baeldung/boot/jsp/SpringBootJspConfiguration.java
similarity index 100%
rename from spring-web-modules/spring-boot-jsp/src/main/java/com/baeldung/boot/jsp/SpringBootJspConfiguration.java
rename to spring-boot-modules/spring-boot-jsp/src/main/java/com/baeldung/boot/jsp/SpringBootJspConfiguration.java
diff --git a/spring-web-modules/spring-boot-jsp/src/main/java/com/baeldung/boot/jsp/controller/BookController.java b/spring-boot-modules/spring-boot-jsp/src/main/java/com/baeldung/boot/jsp/controller/BookController.java
similarity index 100%
rename from spring-web-modules/spring-boot-jsp/src/main/java/com/baeldung/boot/jsp/controller/BookController.java
rename to spring-boot-modules/spring-boot-jsp/src/main/java/com/baeldung/boot/jsp/controller/BookController.java
diff --git a/spring-web-modules/spring-boot-jsp/src/main/java/com/baeldung/boot/jsp/dto/Book.java b/spring-boot-modules/spring-boot-jsp/src/main/java/com/baeldung/boot/jsp/dto/Book.java
similarity index 100%
rename from spring-web-modules/spring-boot-jsp/src/main/java/com/baeldung/boot/jsp/dto/Book.java
rename to spring-boot-modules/spring-boot-jsp/src/main/java/com/baeldung/boot/jsp/dto/Book.java
diff --git a/spring-web-modules/spring-boot-jsp/src/main/java/com/baeldung/boot/jsp/exception/DuplicateBookException.java b/spring-boot-modules/spring-boot-jsp/src/main/java/com/baeldung/boot/jsp/exception/DuplicateBookException.java
similarity index 100%
rename from spring-web-modules/spring-boot-jsp/src/main/java/com/baeldung/boot/jsp/exception/DuplicateBookException.java
rename to spring-boot-modules/spring-boot-jsp/src/main/java/com/baeldung/boot/jsp/exception/DuplicateBookException.java
diff --git a/spring-web-modules/spring-boot-jsp/src/main/java/com/baeldung/boot/jsp/exception/LibraryControllerAdvice.java b/spring-boot-modules/spring-boot-jsp/src/main/java/com/baeldung/boot/jsp/exception/LibraryControllerAdvice.java
similarity index 100%
rename from spring-web-modules/spring-boot-jsp/src/main/java/com/baeldung/boot/jsp/exception/LibraryControllerAdvice.java
rename to spring-boot-modules/spring-boot-jsp/src/main/java/com/baeldung/boot/jsp/exception/LibraryControllerAdvice.java
diff --git a/spring-web-modules/spring-boot-jsp/src/main/java/com/baeldung/boot/jsp/repository/BookRepository.java b/spring-boot-modules/spring-boot-jsp/src/main/java/com/baeldung/boot/jsp/repository/BookRepository.java
similarity index 100%
rename from spring-web-modules/spring-boot-jsp/src/main/java/com/baeldung/boot/jsp/repository/BookRepository.java
rename to spring-boot-modules/spring-boot-jsp/src/main/java/com/baeldung/boot/jsp/repository/BookRepository.java
diff --git a/spring-web-modules/spring-boot-jsp/src/main/java/com/baeldung/boot/jsp/repository/impl/InMemoryBookRepository.java b/spring-boot-modules/spring-boot-jsp/src/main/java/com/baeldung/boot/jsp/repository/impl/InMemoryBookRepository.java
similarity index 100%
rename from spring-web-modules/spring-boot-jsp/src/main/java/com/baeldung/boot/jsp/repository/impl/InMemoryBookRepository.java
rename to spring-boot-modules/spring-boot-jsp/src/main/java/com/baeldung/boot/jsp/repository/impl/InMemoryBookRepository.java
diff --git a/spring-web-modules/spring-boot-jsp/src/main/java/com/baeldung/boot/jsp/repository/model/BookData.java b/spring-boot-modules/spring-boot-jsp/src/main/java/com/baeldung/boot/jsp/repository/model/BookData.java
similarity index 100%
rename from spring-web-modules/spring-boot-jsp/src/main/java/com/baeldung/boot/jsp/repository/model/BookData.java
rename to spring-boot-modules/spring-boot-jsp/src/main/java/com/baeldung/boot/jsp/repository/model/BookData.java
diff --git a/spring-web-modules/spring-boot-jsp/src/main/java/com/baeldung/boot/jsp/service/BookService.java b/spring-boot-modules/spring-boot-jsp/src/main/java/com/baeldung/boot/jsp/service/BookService.java
similarity index 100%
rename from spring-web-modules/spring-boot-jsp/src/main/java/com/baeldung/boot/jsp/service/BookService.java
rename to spring-boot-modules/spring-boot-jsp/src/main/java/com/baeldung/boot/jsp/service/BookService.java
diff --git a/spring-web-modules/spring-boot-jsp/src/main/java/com/baeldung/boot/jsp/service/impl/BookServiceImpl.java b/spring-boot-modules/spring-boot-jsp/src/main/java/com/baeldung/boot/jsp/service/impl/BookServiceImpl.java
similarity index 100%
rename from spring-web-modules/spring-boot-jsp/src/main/java/com/baeldung/boot/jsp/service/impl/BookServiceImpl.java
rename to spring-boot-modules/spring-boot-jsp/src/main/java/com/baeldung/boot/jsp/service/impl/BookServiceImpl.java
diff --git a/spring-web-modules/spring-boot-jsp/src/main/resources/application.properties b/spring-boot-modules/spring-boot-jsp/src/main/resources/application.properties
similarity index 100%
rename from spring-web-modules/spring-boot-jsp/src/main/resources/application.properties
rename to spring-boot-modules/spring-boot-jsp/src/main/resources/application.properties
diff --git a/spring-web-modules/spring-boot-jsp/src/main/resources/static/css/common.css b/spring-boot-modules/spring-boot-jsp/src/main/resources/static/css/common.css
similarity index 100%
rename from spring-web-modules/spring-boot-jsp/src/main/resources/static/css/common.css
rename to spring-boot-modules/spring-boot-jsp/src/main/resources/static/css/common.css
diff --git a/spring-web-modules/spring-boot-jsp/src/main/resources/static/error/4xx.html b/spring-boot-modules/spring-boot-jsp/src/main/resources/static/error/4xx.html
similarity index 100%
rename from spring-web-modules/spring-boot-jsp/src/main/resources/static/error/4xx.html
rename to spring-boot-modules/spring-boot-jsp/src/main/resources/static/error/4xx.html
diff --git a/spring-web-modules/spring-boot-jsp/src/main/webapp/WEB-INF/jsp/add-book.jsp b/spring-boot-modules/spring-boot-jsp/src/main/webapp/WEB-INF/jsp/add-book.jsp
similarity index 100%
rename from spring-web-modules/spring-boot-jsp/src/main/webapp/WEB-INF/jsp/add-book.jsp
rename to spring-boot-modules/spring-boot-jsp/src/main/webapp/WEB-INF/jsp/add-book.jsp
diff --git a/spring-web-modules/spring-boot-jsp/src/main/webapp/WEB-INF/jsp/error-book.jsp b/spring-boot-modules/spring-boot-jsp/src/main/webapp/WEB-INF/jsp/error-book.jsp
similarity index 100%
rename from spring-web-modules/spring-boot-jsp/src/main/webapp/WEB-INF/jsp/error-book.jsp
rename to spring-boot-modules/spring-boot-jsp/src/main/webapp/WEB-INF/jsp/error-book.jsp
diff --git a/spring-web-modules/spring-boot-jsp/src/main/webapp/WEB-INF/jsp/view-books.jsp b/spring-boot-modules/spring-boot-jsp/src/main/webapp/WEB-INF/jsp/view-books.jsp
similarity index 100%
rename from spring-web-modules/spring-boot-jsp/src/main/webapp/WEB-INF/jsp/view-books.jsp
rename to spring-boot-modules/spring-boot-jsp/src/main/webapp/WEB-INF/jsp/view-books.jsp
diff --git a/spring-web-modules/spring-boot-jsp/src/test/java/com/baeldung/boot/jsp/controller/BookControllerIntegrationTest.java b/spring-boot-modules/spring-boot-jsp/src/test/java/com/baeldung/boot/jsp/controller/BookControllerIntegrationTest.java
similarity index 100%
rename from spring-web-modules/spring-boot-jsp/src/test/java/com/baeldung/boot/jsp/controller/BookControllerIntegrationTest.java
rename to spring-boot-modules/spring-boot-jsp/src/test/java/com/baeldung/boot/jsp/controller/BookControllerIntegrationTest.java
diff --git a/spring-web-modules/spring-boot-jsp/src/test/java/com/baeldung/boot/jsp/controller/BookControllerUnitTest.java b/spring-boot-modules/spring-boot-jsp/src/test/java/com/baeldung/boot/jsp/controller/BookControllerUnitTest.java
similarity index 100%
rename from spring-web-modules/spring-boot-jsp/src/test/java/com/baeldung/boot/jsp/controller/BookControllerUnitTest.java
rename to spring-boot-modules/spring-boot-jsp/src/test/java/com/baeldung/boot/jsp/controller/BookControllerUnitTest.java
diff --git a/spring-web-modules/spring-boot-jsp/src/test/java/com/baeldung/boot/jsp/repository/impl/InMemoryBookRepositoryUnitTest.java b/spring-boot-modules/spring-boot-jsp/src/test/java/com/baeldung/boot/jsp/repository/impl/InMemoryBookRepositoryUnitTest.java
similarity index 100%
rename from spring-web-modules/spring-boot-jsp/src/test/java/com/baeldung/boot/jsp/repository/impl/InMemoryBookRepositoryUnitTest.java
rename to spring-boot-modules/spring-boot-jsp/src/test/java/com/baeldung/boot/jsp/repository/impl/InMemoryBookRepositoryUnitTest.java
diff --git a/spring-web-modules/spring-boot-jsp/src/test/java/com/baeldung/boot/jsp/service/BookServiceIntegrationTest.java b/spring-boot-modules/spring-boot-jsp/src/test/java/com/baeldung/boot/jsp/service/BookServiceIntegrationTest.java
similarity index 100%
rename from spring-web-modules/spring-boot-jsp/src/test/java/com/baeldung/boot/jsp/service/BookServiceIntegrationTest.java
rename to spring-boot-modules/spring-boot-jsp/src/test/java/com/baeldung/boot/jsp/service/BookServiceIntegrationTest.java
diff --git a/spring-web-modules/spring-boot-jsp/src/test/java/com/baeldung/boot/jsp/service/impl/BookServiceImplUnitTest.java b/spring-boot-modules/spring-boot-jsp/src/test/java/com/baeldung/boot/jsp/service/impl/BookServiceImplUnitTest.java
similarity index 100%
rename from spring-web-modules/spring-boot-jsp/src/test/java/com/baeldung/boot/jsp/service/impl/BookServiceImplUnitTest.java
rename to spring-boot-modules/spring-boot-jsp/src/test/java/com/baeldung/boot/jsp/service/impl/BookServiceImplUnitTest.java
diff --git a/spring-web-modules/spring-boot-jsp/src/test/resources/logback-test.xml b/spring-boot-modules/spring-boot-jsp/src/test/resources/logback-test.xml
similarity index 100%
rename from spring-web-modules/spring-boot-jsp/src/test/resources/logback-test.xml
rename to spring-boot-modules/spring-boot-jsp/src/test/resources/logback-test.xml

From dda5fc0093d15086d6a6f3751484dc49a2b84a8b Mon Sep 17 00:00:00 2001
From: sampadawagde <sampada.aws@gmail.com>
Date: Tue, 5 Jul 2022 19:39:15 +0530
Subject: [PATCH 2/2] JAVA-12733: Move spring-boot-jsp into spring-boot-modules

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

diff --git a/spring-boot-modules/pom.xml b/spring-boot-modules/pom.xml
index d0a35859b4..a470d7acf0 100644
--- a/spring-boot-modules/pom.xml
+++ b/spring-boot-modules/pom.xml
@@ -44,6 +44,7 @@
         <module>spring-boot-groovy</module>
         <!-- <module>spring-boot-gradle</module> --> <!-- Not a maven project -->
         <module>spring-boot-jasypt</module>
+        <module>spring-boot-jsp</module>
         <module>spring-boot-keycloak</module>
         <module>spring-boot-libraries</module>
         <module>spring-boot-libraries-2</module>
diff --git a/spring-web-modules/pom.xml b/spring-web-modules/pom.xml
index a2bdc9035e..62be6fbb3c 100644
--- a/spring-web-modules/pom.xml
+++ b/spring-web-modules/pom.xml
@@ -47,7 +47,6 @@
         <module>spring-thymeleaf-3</module>
         <module>spring-thymeleaf-4</module>
         <module>spring-thymeleaf-5</module>
-        <module>spring-boot-jsp</module>
         <module>spring-web-url</module>
     </modules>